[SCM] vim-addon-manager packaging branch, master, updated. v0.4.4-52-geef7258

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 26f06345d0f9d485960a62c7aae68f993e72245f
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Jan 22 18:29:37 2012 -0200

    Use 'bundle' instead of 'bundles'
    
    This way we are compatible with vim-pathogen

diff --git a/features/step_definitions/steps.rb b/features/step_definitions/steps.rb
index a513ccf..f8abd5d 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, 'bundles', addon))
+    Dir.glob(File.join($tmpdir, 'bundle', addon))
   end
 end
 
diff --git a/lib/vim/addon_manager/addon/directory.rb b/lib/vim/addon_manager/addon/directory.rb
index 22ca928..5f3c7f7 100644
--- a/lib/vim/addon_manager/addon/directory.rb
+++ b/lib/vim/addon_manager/addon/directory.rb
@@ -35,11 +35,11 @@ module Vim
       protected
 
         def source
-          File.join(basedir, 'bundles', name)
+          File.join(basedir, 'bundle', name)
         end
 
         def destination(target_dir)
-          File.join(target_dir.to_s, 'bundles', name)
+          File.join(target_dir.to_s, 'bundle', name)
         end
 
       end
diff --git a/spec/data/scripts/bundles/newstyle/ftplugin/newstyle.vim b/spec/data/scripts/bundle/newstyle/ftplugin/newstyle.vim
similarity index 100%
rename from spec/data/scripts/bundles/newstyle/ftplugin/newstyle.vim
rename to spec/data/scripts/bundle/newstyle/ftplugin/newstyle.vim
diff --git a/spec/data/scripts/bundles/newstyle/syntax/newstyle.vim b/spec/data/scripts/bundle/newstyle/syntax/newstyle.vim
similarity index 100%
rename from spec/data/scripts/bundles/newstyle/syntax/newstyle.vim
rename to spec/data/scripts/bundle/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 081a5f5..775949a 100644
--- a/spec/vim/addon_manager/addon/directory_spec.rb
+++ b/spec/vim/addon_manager/addon/directory_spec.rb
@@ -19,8 +19,8 @@ describe Vim::AddonManager::Addon::Directory do
       @addon.install(target_dir)
     end
 
-    it 'installs symlink into ~/.vim/bundles/' do
-      Dir.glob(File.join(target_dir.path, 'bundles', 'newstyle')).should_not be_empty
+    it 'installs symlink into ~/.vim/bundle/' do
+      Dir.glob(File.join(target_dir.path, 'bundle', 'newstyle')).should_not be_empty
     end
 
     it 'reports status as :installed' do
@@ -37,8 +37,8 @@ describe Vim::AddonManager::Addon::Directory do
         @addon.status(target_dir.path).status.should == :not_installed
       end
 
-      it 'removes symlink from ~/.vim/bundles/' do
-        Dir.glob(File.join(target_dir.path, 'bundles', 'newstyle')).should be_empty
+      it 'removes symlink from ~/.vim/bundle/' do
+        Dir.glob(File.join(target_dir.path, 'bundle', 'newstyle')).should be_empty
       end
 
     end

-- 
vim-addon-manager packaging