[SCM] vim-addon-manager packaging branch, one-directory-per-addon, updated. v0.4.4-48-g6b8bd0d

[Antonio Terceiro]

The following commit has been merged in the one-directory-per-addon branch:
commit 6b8bd0da2c865c40260b62432c547fa83de1989e
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Wed Jan 25 23:24:56 2012 -0200

    Using 'vambundle' instead of 'bundle' for dir name

diff --git a/TODO b/TODO
index 8242066..2659a1d 100644
--- a/TODO
+++ b/TODO
@@ -1,9 +1,6 @@
 Short term
 ==========
 
-- find a good name (debvam, debundle, ?) for the directory where the new style
-  addons are installed.  Using the same as pathogen is not a good idea.
-
 - implement a way of modifying the runtimepath to include the directories under
   ~/.vim/bundle. Maybe bundling vim-pathogen together with this package.
 
diff --git a/features/step_definitions/steps.rb b/features/step_definitions/steps.rb
index f8abd5d..c022470 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, 'bundle', addon))
+    Dir.glob(File.join($tmpdir, 'vambundle', addon))
   end
 end
 
diff --git a/lib/vim/addon_manager/addon/directory.rb b/lib/vim/addon_manager/addon/directory.rb
index cf140b2..1ec4127 100644
--- a/lib/vim/addon_manager/addon/directory.rb
+++ b/lib/vim/addon_manager/addon/directory.rb
@@ -42,11 +42,11 @@ module Vim
       protected
 
         def source
-          directory || File.join(basedir, 'bundle', name)
+          directory || File.join(basedir, 'vambundle', name)
         end
 
         def destination(target_dir)
-          File.join(target_dir.to_s, 'bundle', name)
+          File.join(target_dir.to_s, 'vambundle', name)
         end
 
       end
diff --git a/spec/data/scripts/bundle/newstyle/ftplugin/newstyle.vim b/spec/data/scripts/vambundle/newstyle/ftplugin/newstyle.vim
similarity index 100%
rename from spec/data/scripts/bundle/newstyle/ftplugin/newstyle.vim
rename to spec/data/scripts/vambundle/newstyle/ftplugin/newstyle.vim
diff --git a/spec/data/scripts/bundle/newstyle/syntax/newstyle.vim b/spec/data/scripts/vambundle/newstyle/syntax/newstyle.vim
similarity index 100%
rename from spec/data/scripts/bundle/newstyle/syntax/newstyle.vim
rename to spec/data/scripts/vambundle/newstyle/syntax/newstyle.vim
diff --git a/spec/vim/addon_manager/addon/directory_spec.rb b/spec/vim/addon_manager/addon/directory_spec.rb
index 3daa310..91f42cf 100644
--- a/spec/vim/addon_manager/addon/directory_spec.rb
+++ b/spec/vim/addon_manager/addon/directory_spec.rb
@@ -17,7 +17,7 @@ describe Vim::AddonManager::Addon::Directory do
     addon = addon('newstyle')
     addon.stub(:basedir).and_return('/base/dir')
     addon.directory.should be_nil
-    addon.send(:source).should == '/base/dir/bundle/newstyle'
+    addon.send(:source).should == '/base/dir/vambundle/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/bundle/' do
-      Dir.glob(File.join(target_dir.path, 'bundle', 'newstyle')).should_not be_empty
+    it 'installs symlink into ~/.vim/vambundle/' do
+      Dir.glob(File.join(target_dir.path, 'vambundle', 'newstyle')).should_not be_empty
     end
 
     it 'points to the source directory' do
-      File.readlink(File.join(target_dir.path, 'bundle', 'newstyle')).should == @addon.send(:source)
+      File.readlink(File.join(target_dir.path, 'vambundle', '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/bundle/' do
-        Dir.glob(File.join(target_dir.path, 'bundle', 'newstyle')).should be_empty
+      it 'removes symlink from ~/.vim/vambundle/' do
+        Dir.glob(File.join(target_dir.path, 'vambundle', 'newstyle')).should be_empty
       end
 
     end

-- 
vim-addon-manager packaging