[SCM] vim-addon-manager packaging branch, master, updated. v0.4.4-65-g995b8fc
Antonio Terceiro
terceiro at debian.org
Wed Mar 14 01:09:07 UTC 2012
The following commit has been merged in the master branch:
commit 995b8fc6c61e9f112c88a59a407e49a61fd2e676
Author: Antonio Terceiro <terceiro at debian.org>
Date: Tue Mar 13 22:03:19 2012 -0300
Change "vambundle" to just "vam"
diff --git a/etc/vim/vimrc.d/vim-addon-manager.vim b/etc/vim/vimrc.d/vim-addon-manager.vim
index a87c1ad..517b732 100644
--- a/etc/vim/vimrc.d/vim-addon-manager.vim
+++ b/etc/vim/vimrc.d/vim-addon-manager.vim
@@ -1,11 +1,11 @@
-" adds all addons installed (vambundle/* inside all pre-existing runtime path
+" adds all addons installed (vam/* inside all pre-existing runtime path
" directories) to the runtimepath
let s:path = []
for dir in split(&runtimepath, ',')
call add(s:path, dir)
- for vambundle in split(glob(dir . '/vambundle/*'))
- " FIXME test if vambundle here is actually a directory
- call add(s:path, vambundle)
+ for vam in split(glob(dir . '/vam/*'))
+ " FIXME test if vam here is actually a directory
+ call add(s:path, vam)
endfor
endfor
let &runtimepath = join(s:path, ',')
diff --git a/features/step_definitions/steps.rb b/features/step_definitions/steps.rb
index 61b41a5..1164211 100644
--- a/features/step_definitions/steps.rb
+++ b/features/step_definitions/steps.rb
@@ -47,7 +47,7 @@ def installed_addon_files(addon)
if !File.exists?(descriptor) || YAML.load_file(descriptor)['files']
Dir.glob(File.join($tmpdir, '*', addon + '.vim'))
else
- Dir.glob(File.join($tmpdir, 'vambundle', addon))
+ Dir.glob(File.join($tmpdir, 'vam', addon))
end
end
diff --git a/lib/vim/addon_manager/addon/directory.rb b/lib/vim/addon_manager/addon/directory.rb
index 6535f1e..18c8c5e 100644
--- a/lib/vim/addon_manager/addon/directory.rb
+++ b/lib/vim/addon_manager/addon/directory.rb
@@ -46,18 +46,18 @@ module Vim
Dir.chdir(source) do
Dir.glob('**/*')
end.map do |filename|
- File.join('vambundle', name, filename)
+ File.join('vam', name, filename)
end
end
protected
def source
- directory || File.join(basedir, 'vambundle', name)
+ directory || File.join(basedir, 'vam', name)
end
def destination(target_dir)
- File.join(target_dir.to_s, 'vambundle', name)
+ File.join(target_dir.to_s, 'vam', name)
end
end
diff --git a/spec/data/scripts/vambundle/newstyle/doc/newstyle.txt b/spec/data/scripts/vam/newstyle/doc/newstyle.txt
similarity index 100%
rename from spec/data/scripts/vambundle/newstyle/doc/newstyle.txt
rename to spec/data/scripts/vam/newstyle/doc/newstyle.txt
diff --git a/spec/data/scripts/vambundle/newstyle/ftplugin/newstyle.vim b/spec/data/scripts/vam/newstyle/ftplugin/newstyle.vim
similarity index 100%
rename from spec/data/scripts/vambundle/newstyle/ftplugin/newstyle.vim
rename to spec/data/scripts/vam/newstyle/ftplugin/newstyle.vim
diff --git a/spec/data/scripts/vambundle/newstyle/syntax/newstyle.vim b/spec/data/scripts/vam/newstyle/syntax/newstyle.vim
similarity index 100%
rename from spec/data/scripts/vambundle/newstyle/syntax/newstyle.vim
rename to spec/data/scripts/vam/newstyle/syntax/newstyle.vim
diff --git a/spec/data/scripts/vambundle/newstylemigrated/ftplugin/newstylemigrated.vim b/spec/data/scripts/vam/newstylemigrated/ftplugin/newstylemigrated.vim
similarity index 100%
rename from spec/data/scripts/vambundle/newstylemigrated/ftplugin/newstylemigrated.vim
rename to spec/data/scripts/vam/newstylemigrated/ftplugin/newstylemigrated.vim
diff --git a/spec/data/scripts/vambundle/newstylemigrated/syntax/newstylemigrated.vim b/spec/data/scripts/vam/newstylemigrated/syntax/newstylemigrated.vim
similarity index 100%
rename from spec/data/scripts/vambundle/newstylemigrated/syntax/newstylemigrated.vim
rename to spec/data/scripts/vam/newstylemigrated/syntax/newstylemigrated.vim
diff --git a/spec/vim/addon_manager/addon/directory_spec.rb b/spec/vim/addon_manager/addon/directory_spec.rb
index 854f8d3..0de6509 100644
--- a/spec/vim/addon_manager/addon/directory_spec.rb
+++ b/spec/vim/addon_manager/addon/directory_spec.rb
@@ -9,15 +9,15 @@ describe Vim::AddonManager::Addon::Directory do
it 'lists files inside the directory' do
addon = addon('newstyle')
addon.stub(:basedir).and_return(File.join(FAKE_SCRIPTS))
- addon.files.should include('vambundle/newstyle/ftplugin/newstyle.vim')
- addon.files.should include('vambundle/newstyle/syntax/newstyle.vim')
+ addon.files.should include('vam/newstyle/ftplugin/newstyle.vim')
+ addon.files.should include('vam/newstyle/syntax/newstyle.vim')
end
it 'constructs source with basedir by default' do
addon = addon('newstyle')
addon.stub(:basedir).and_return('/base/dir')
addon.directory.should be_nil
- addon.send(:source).should == '/base/dir/vambundle/newstyle'
+ addon.send(:source).should == '/base/dir/vam/newstyle'
end
it 'uses directory as source if specified' do
@@ -32,12 +32,12 @@ describe Vim::AddonManager::Addon::Directory do
@addon.install(target_dir)
end
- it 'installs symlink into ~/.vim/vambundle/' do
- Dir.glob(File.join(target_dir.path, 'vambundle', 'newstyle')).should_not be_empty
+ it 'installs symlink into ~/.vim/vam/' do
+ Dir.glob(File.join(target_dir.path, 'vam', 'newstyle')).should_not be_empty
end
it 'points to the source directory' do
- File.readlink(File.join(target_dir.path, 'vambundle', 'newstyle')).should == @addon.send(:source)
+ File.readlink(File.join(target_dir.path, 'vam', 'newstyle')).should == @addon.send(:source)
end
it 'reports status as :installed' do
@@ -54,8 +54,8 @@ describe Vim::AddonManager::Addon::Directory do
@addon.status(target_dir.path).status.should == :not_installed
end
- it 'removes symlink from ~/.vim/vambundle/' do
- Dir.glob(File.join(target_dir.path, 'vambundle', 'newstyle')).should be_empty
+ it 'removes symlink from ~/.vim/vam/' do
+ Dir.glob(File.join(target_dir.path, 'vam', 'newstyle')).should be_empty
end
end
diff --git a/spec/vim/addon_manager_spec.rb b/spec/vim/addon_manager_spec.rb
index f0bb86f..ad9904a 100644
--- a/spec/vim/addon_manager_spec.rb
+++ b/spec/vim/addon_manager_spec.rb
@@ -27,7 +27,7 @@ describe Vim::AddonManager do
addon_manager.upgrade_from_legacy(registry.to_a)
target_dir.should_not have_symlink('syntax/newstylemigrated.vim')
- target_dir.should have_file('vambundle/newstylemigrated/syntax/newstylemigrated.vim')
+ target_dir.should have_file('vam/newstylemigrated/syntax/newstylemigrated.vim')
end
end
--
vim-addon-manager packaging
More information about the pkg-vim-maintainers
mailing list