vim-bundler 0.2.1 → 0.3.0

data/Gemfile

@@ -3,12 +3,22 @@ source "http://rubygems.org"
 # Example:
 gem "activesupport", ">= 3.1.0.beta1"
 gem "thor", ">= 0.14.6"
+gem 'awesome_print'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.0"
-  gem "rcov", ">= 0"
+  gem "bundler"
+  gem "jeweler"
+  gem "rcov"
+end
+group :rspec, :cucumber do
+  gem 'rspec'
+  gem 'cucumber'
+  gem 'spork'
+  gem 'guard-spork'
+  gem 'guard-rspec'
+  gem 'guard-cucumber'
+  gem 'rr'
+  gem 'rb-readline'
 end

data/Gemfile.lock

@@ -1,17 +1,57 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.0.beta1)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
+    awesome_print (1.0.2)
+    builder (3.0.0)
+    cucumber (1.1.9)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.9.0)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    diff-lcs (1.1.3)
+    ffi (1.0.11)
+    gherkin (2.9.3)
+      json (>= 1.4.6)
     git (1.2.5)
-    jeweler (1.6.2)
+    guard (1.0.1)
+      ffi (>= 0.5.0)
+      thor (~> 0.14.6)
+    guard-cucumber (0.7.5)
+      cucumber (>= 0.10)
+      guard (>= 0.8.3)
+    guard-rspec (0.7.0)
+      guard (>= 0.10.0)
+    guard-spork (0.7.0)
+      guard (>= 0.10.0)
+      spork (>= 0.8.4)
+    i18n (0.6.0)
+    jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    multi_json (1.0.3)
-    rake (0.9.2)
+      rdoc
+    json (1.6.6)
+    multi_json (1.3.2)
+    rake (0.9.2.2)
+    rb-readline (0.4.2)
     rcov (0.9.9)
-    shoulda (2.11.3)
+    rdoc (3.12)
+      json (~> 1.4)
+    rr (1.0.4)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    spork (0.9.0)
+    term-ansicolor (1.0.7)
     thor (0.14.6)
 
 PLATFORMS
@@ -19,8 +59,16 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (>= 3.1.0.beta1)
-  bundler (~> 1.0.0)
-  jeweler (~> 1.6.0)
+  awesome_print
+  bundler
+  cucumber
+  guard-cucumber
+  guard-rspec
+  guard-spork
+  jeweler
+  rb-readline
   rcov
-  shoulda
+  rr
+  rspec
+  spork
   thor (>= 0.14.6)

data/GuardFile

@@ -0,0 +1,16 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'spork', :cucumber_env => { 'RACK_ENV' => 'cucumber' }, :rspec_env => { 'RACK_ENV' => 'rspec' } do
+  watch('config/boot.rb')
+  watch('config/config.rb')
+  watch('spec/spec_helper.rb')
+  watch('Gemfile')
+  watch('Gemfile.lock')
+  watch('features/support/env.rb')
+end
+guard 'rspec' do
+  watch('spec/spec_helper.rb')                        { "spec" }
+  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^spec/(.+)_spec\.rb$})                     { |m| "spec/lib/#{m[1]}_spec.rb" }
+end

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/vim-bundler.rb

@@ -1,4 +1,5 @@
 module VimBundler
+  autoload :CLI, 'vim-bundler/cli'
   autoload :DSL, 'vim-bundler/dsl'
   autoload :Installer, 'vim-bundler/installer'
   autoload :Git, 'vim-bundler/git'
@@ -6,6 +7,7 @@ module VimBundler
   autoload :Local, 'vim-bundler/local'
   autoload :UI, 'vim-bundler/ui'
   autoload :Actions, 'vim-bundler/actions'
+  autoload :Lock, 'vim-bundler/lock'
 
   class << self
     attr_accessor :ui
@@ -16,4 +18,5 @@ module VimBundler
   include Git
   include VimOrg
   include Local
+  include Lock
 end

data/lib/vim-bundler/actions.rb

@@ -1,20 +1,18 @@
 module VimBundler
   module Actions
-    def clean(bundle)
-      dir = File.join(@opts[:bundles_dir], bundle.name)
-      if Dir.exists?(dir)
-        FileUtils.rm_rf(dir)
-        VimBundler.ui.info "#{bundle.name} removed"
+    def clean
+      if Dir.exists?(@dir)
+        FileUtils.rm_rf(@dir)
       else
-        VimBundler.ui.warn "#{bundle.name} not found"
+        raise "not found"
       end
     end
-    def post_action(dir, bundle)
-      return true if bundle.block.nil?
+    def post_action
+      return true if @bundle.block.nil?
       cur_dir = FileUtils.pwd
-      FileUtils.cd(dir)
+      FileUtils.cd(@dir)
       begin
-        bundle.block.call
+        @bundle.block.call
       rescue
         FileUtils.cd(cur_dir)
         return false

data/lib/vim-bundler/cli.rb

@@ -44,9 +44,13 @@ module VimBundler
     end
     desc 'list', 'List all installed bundles'
     def list
-      definition[:bundles].each { |k, v| puts k }
+      definition[:bundles].each_value { |bundle| VimBundler.ui.info prepare_name(bundle) }
     end
+    default_task :install
     private
+    def prepare_name(bundle)
+      bundle.name
+    end
     def definition
       file = File.join(FileUtils.pwd, VimBundler.default_bundles_file)
       unless File.exists? file

data/lib/vim-bundler/dsl.rb

@@ -34,6 +34,10 @@ module VimBundler
       bundle = OpenStruct.new(args[1])
       bundle.name = args[0]
       bundle.block = block
+      opts = @opts
+      bundle.define_singleton_method :opts do
+        opts
+      end
       self.class.handlers.each do |k, v|
         if v.call(bundle)
           bundle.type = k

data/lib/vim-bundler/git.rb

@@ -5,54 +5,41 @@ module VimBundler
     module Installer
       extend ActiveSupport::Concern
       include VimBundler::Actions
-      def git_install(bundle)
-        dir = File.join(@opts[:bundles_dir], bundle.name)
-        if Dir.exists?(dir)
-          VimBundler.ui.info "#{bundle.name} already installed" 
-          return
-        end
-        if @opts[:use_git_submodules]
-          `#{@opts[:git_bin]} submodule add #{bundle.git} #{dir} 2>&1`
-        else
-          `#{@opts[:git_bin]} clone #{bundle.git} #{dir} 2>&1`
-        end
-        if $?.to_i == 0 && post_action(dir, bundle)
-          VimBundler.ui.info "#{bundle.name} installed"
+      def git_install
+        if @bundle.opts[:use_git_submodules]
+          `#{@opts[:git_bin]} submodule add #{@bundle.git} #{@dir} 2>&1`
+          raise "unable to add submodule" unless $?.to_i == 0
         else
-          VimBundler.ui.warn "#{bundle.name} not installed"
+          `#{@bundle.opts[:git_bin]} clone #{@bundle.git} #{@dir} 2>&1`
+          raise "unable to clone" unless $?.to_i == 0
         end
       end
-      def git_update(bundle)
-        dir = File.join(@opts[:bundles_dir], bundle.name)
-        unless Dir.exists?(dir)
-          VimBundler.ui.warn "#{bundle.name} not found" 
-          return
-        end
-        `cd #{dir} && #{@opts[:git_bin]} pull #{bundle.git} 2>&1 && cd - `
-        if $?.to_i == 0 && post_action(dir, bundle)
-          VimBundler.ui.info "#{bundle.name} updated"
-        else
-          VimBundler.ui.warn "#{bundle.name} not updated"
-        end
+      def git_update
+        `cd #{@dir} && #{@bundle.opts[:git_bin]} pull #{@bundle.git} 2>&1 && cd - `
+        raise "unable to pull" unless $?.to_i == 0
       end
-      def git_clean(bundle)
-        clean(bundle)
-        if @opts[:use_git_submodules]
-          clean_config_file('.gitmodules', bundle)
-          clean_config_file('.git/config', bundle)
-          lines = File.readlines('.gitmodules')
-          dir = File.join(@opts[:bundles_dir], bundle.name)
-          `#{@opts[:git_bin]} rm --cached #{dir}`
+      def git_clean
+        begin
+          clean
+        rescue StandardError => e
+          raise e
+        ensure
+          if @bundle.opts[:git_bin]
+            clean_config_file('.gitmodules')
+            clean_config_file('.git/config')
+            lines = File.readlines('.gitmodules')
+            `#{@bundle.opts[:git_bin]} rm --cached #{@dir}`
+          end
         end
       end
       private
-      def clean_config_file(path, bundle)
+      def clean_config_file(path)
         temp = []
         delete = false
         file = File.open(path, 'r') do |f|
           while (line = f.gets)
             delete = false if line.include?('[submodule')
-            delete = true if line.include?(bundle.name) && line.include?('[submodule')
+            delete = true if line.include?(@bundle.name) && line.include?('[submodule')
             temp << line unless delete
           end
         end

data/lib/vim-bundler/installer.rb

@@ -12,31 +12,52 @@ module VimBundler
       end
     end
     define_actions :install, :update, :clean
-    def initialize(opts)
-      @opts = opts
+    def initialize(opts, bundle, type)
+      @opts   = opts
+      @bundle = bundle
+      @type   = type
+      @dir    = File.join(@opts[:bundles_dir], @bundle.name)
     end
-    private
-    def self.process(installer, type, bundle)
-      installer.run_callbacks(type.to_sym, bundle) do
-        installer.run_callbacks(:process, bundle) do
-          installer.send("#{bundle.type.to_s}_#{type}", bundle)
-        end
+    set_callback :install, :before, :check_installed
+    set_callback :update,  :before, :check_dir
+    set_callback :process, :after,  :final_message
+    set_callback :all,     :after,  :all_final_message
+    def final_message
+      VimBundler.ui.info "#{@bundle.name} #{@type}ed" 
+    end
+    def check_installed
+      if Dir.exists?(@dir)
+        raise "already installed" 
       end
     end
-    def self.process_all(definitions, type, name)
-      installer = new(definitions[:opts])
-      installer.run_callbacks(:all) do
-        unless name.nil?
-          bundle = definitions[:bundles][name]
-          if(bundle.nil?)
-            VimBundler.ui.warn "bundle #{name} not exists"
-          else
-            process(installer, type, definitions[:bundles][name])
+    def check_dir
+      unless Dir.exists?(@dir)
+        raise "not found" 
+      end
+    end
+    def process
+      begin
+        run_callbacks :process do
+          run_callbacks @type do
+            send("#{@bundle.type.to_s}_#{@type}")
           end
+        end
+      rescue StandardError => e
+        VimBundler.ui.warn "#{@bundle.name} #{e.message}"
+      end
+    end
+    def self.process_all(definitions, type, name = nil)
+      FileUtils.mkdir_p(definitions[:opts][:bundles_dir])
+      unless name.nil?
+        bundle = definitions[:bundles][name]
+        if(bundle.nil?)
+          VimBundler.ui.warn "bundle #{name} not exists"
         else
-          definitions[:bundles].each do |k, v|
-            process(installer, type, v)
-          end
+          new(definitions[:opts], bundle, type).process
+        end
+      else
+        definitions[:bundles].each do |k, bundle|
+          new(definitions[:opts], bundle, type).process
         end
       end
       VimBundler.ui.confirm "all bundles processed"

data/lib/vim-bundler/local.rb

@@ -5,39 +5,15 @@ module VimBundler
     module Installer
       extend ActiveSupport::Concern
       include VimBundler::Actions
-      def local_install(bundle)
-        dir = File.join(@opts[:bundles_dir], bundle.name)
-        if Dir.exists?(dir)
-          VimBundler.ui.info "#{bundle.name} already installed" 
-          return
-        end
-        `ln -s #{bundle.local} #{dir}`
-        if $?.to_i == 0 && post_action(dir, bundle)
-          VimBundler.ui.info "#{bundle.name} installed"
-        else
-          VimBundler.ui.warn "#{bundle.name} not installed"
-        end
+      def local_install
+        `ln -s #{@bundle.local} #{@dir}`
+        raise "unable to make symlink" unless $?.to_i == 0
       end
-      def local_update(bundle)
-        dir = File.join(@opts[:bundles_dir], bundle.name)
-        unless Dir.exists?(dir)
-          VimBundler.ui.warn "#{bundle.name} not found" 
-          return
-        end
-        if post_action(dir, bundle)
-          VimBundler.ui.info "#{bundle.name} updated"
-        else
-          VimBundler.ui.warn "#{bundle.name} not updated"
-        end
+      def local_update
       end
-      def local_clean(bundle)
-        dir = File.join(@opts[:bundles_dir], bundle.name)
-        if Dir.exists?(dir)
-          `unlink #{dir}`
-          VimBundler.ui.info "#{bundle.name} removed"
-        else
-          VimBundler.ui.warn "#{bundle.name} not found"
-        end
+      def local_clean
+        `unlink #{@dir}`
+        raise "unable to make unlink" unless $?.to_i == 0
       end
     end
     module DSL

data/lib/vim-bundler/lock.rb

@@ -0,0 +1,71 @@
+# encoding: UTF-8
+require 'active_support/concern'
+require 'yaml'
+module VimBundler
+  module Lock
+    def self.default_lock_file
+      file = File.join(FileUtils.pwd, VimBundler.default_bundles_file) + ".lock"
+    end
+    def self.merge_lock!(definitions)
+      data = {}
+      file = VimBundler::Lock.default_lock_file
+      data = YAML.load_file(file) if File.exists?(file)
+      data.each do |k, v| 
+        v[:name] = k
+        v[:block] = nil
+        v[:installed] = true
+        bundle = OpenStruct.new(v)
+        bundle.define_singleton_method :opts do
+          v[:opts]
+        end
+        data[k] = bundle
+      end
+      definitions[:bundles].merge! data
+      definitions
+    end
+    extend ActiveSupport::Concern
+    module Installer
+      extend ActiveSupport::Concern
+      def write_to_lock
+        file = VimBundler::Lock.default_lock_file
+        data = {}
+        data = YAML.load_file(file) if File.exists?(file)
+        hash = @bundle.marshal_dump
+        hash[:opts] = @bundle.opts
+        data[hash[:name].to_s] = hash.select { |k, v| not [:name, :block].include? k }
+        File.open(file, 'w') { |f| f.write(data.to_yaml) }
+      end
+      def remove_from_lock
+        file = VimBundler::Lock.default_lock_file
+        data = {}
+        data = YAML.load_file(file) if File.exists?(file)
+        data.delete(@bundle.name.to_s)
+        File.open(file, 'w') { |f| f.write(data.to_yaml) }
+      end
+      included do
+        set_callback :install, :after,  :write_to_lock
+        set_callback :clean,   :after,  :remove_from_lock
+        YAML::ENGINE.yamler = 'syck'
+      end
+    end
+    module CLI
+      extend ActiveSupport::Concern
+      private
+      def definition_with_lock
+        VimBundler::Lock.merge_lock!(definition_without_lock)
+      end
+      def prepare_name_with_lock(bundle)
+        suffix = bundle.installed.nil? ? " (not installed)" : ""
+        bundle.name + suffix 
+      end
+      included do
+        alias_method_chain :definition, :lock
+        alias_method_chain :prepare_name, :lock
+      end
+    end
+    included do
+      VimBundler::Installer.send(:include, VimBundler::Lock::Installer)
+      VimBundler::CLI.send(:include, VimBundler::Lock::CLI)
+    end
+  end
+end

data/lib/vim-bundler/vim_org.rb

@@ -6,14 +6,9 @@ module VimBundler
     module Installer
       extend ActiveSupport::Concern
       include VimBundler::Actions
-      def vim_org_install(bundle)
-        dir = File.join(@opts[:bundles_dir], bundle.name)
-        if Dir.exists?(dir)
-          VimBundler.ui.info "#{bundle.name} already installed" 
-          return
-        end
-        FileUtils.mkdir_p(dir)
-        f = open("http://www.vim.org/scripts/download_script.php?src_id=#{bundle.vim_script_id}")
+      def vim_org_install
+        FileUtils.mkdir_p(@dir)
+        f = open("http://www.vim.org/scripts/download_script.php?src_id=#{@bundle.vim_script_id}")
         local_file = f.meta["content-disposition"].gsub(/attachment; filename=/,"")
 
         # if local_file.end_with? 'tar.gz'
@@ -23,20 +18,19 @@ module VimBundler
           # `tar xvfz #{data.path}`
         # end
         if local_file.end_with? 'vim'
-          as = bundle.respond_to?(:as) ? bundle.as.to_s : 'plugin'
-          FileUtils.mkdir_p(File.join(dir, as))
-          data = open(File.join(dir, as, local_file), 'w')
+          as = @bundle.respond_to?(:as) ? @bundle.as.to_s : 'plugin'
+          FileUtils.mkdir_p(File.join(@dir, as))
+          data = open(File.join(@dir, as, local_file), 'w')
           data.write f.read
           data.close
         end
-        VimBundler.ui.info "#{bundle.name} installed"
       end
-      def vim_org_update(bundle)
-        clean(bundle)
-        vim_org_install(bundle)
+      def vim_org_update
+        clean
+        vim_org_install
       end
-      def vim_org_clean(bundle)
-        clean(bundle)
+      def vim_org_clean
+        clean
       end
     end
     module DSL

data/spec/lib/vim-bundler/git_spec.rb

@@ -0,0 +1,91 @@
+require 'spec_helper.rb'
+describe VimBundler::Git::Installer do
+  context "when don't use submodule" do
+    before :each do
+      `rm -rf bundle`
+      `rm -rf vim_bundles.lock`
+    end
+    let :dsl do
+      dsl = VimBundler::DSL.new
+    end
+    let :definitions do
+      dsl.bundle "snipmate", :git => "git://github.com/msanders/snipmate.vim.git"
+      dsl.to_definition
+    end
+    context "when #install" do
+      before do
+        VimBundler::Installer.process_all definitions, :install
+      end
+      it "loads bundle from git repo" do
+        `git status bundle/snipmate`.should ~ /branch\smaster/
+      end
+    end
+    context "when #update" do
+      before do
+        VimBundler::Installer.process_all definitions, :install
+        VimBundler::Installer.process_all definitions, :update
+      end
+      it "updates git repo" do
+        pending "don't know how to check update"
+      end
+    end
+    context "when #clean" do
+      before do
+        VimBundler::Installer.process_all definitions, :install
+        VimBundler::Installer.process_all definitions, :clean
+      end
+      it "deletes bundle folder" do
+        File.exists?("bundle/snipmate").should_not be_true
+      end
+    end
+  end
+  context "when use submodule" do
+    before :each do
+      `rm -rf bundle`
+      `rm -rf vim_bundles.lock`
+      `rm -rf .gitmodules`
+      `git rm --cached bundle/snipmate`
+    end
+    let :dsl do
+      dsl = VimBundler::DSL.new
+      dsl.use_git_submodules true
+      dsl
+    end
+    let :definitions do
+      dsl.bundle "snipmate", :git => "git://github.com/msanders/snipmate.vim.git"
+      dsl.to_definition
+    end
+    context "when #install" do
+      before do
+        VimBundler::Installer.process_all definitions, :install
+      end
+      it "adds new submodule" do
+        string = File.open('.gitmodules', 'rb') { |file| file.read }
+        string.should ~ /snipmate/
+      end
+    end
+    context "when #update" do
+      before do
+        VimBundler::Installer.process_all definitions, :install
+        VimBundler::Installer.process_all definitions, :update
+      end
+      it "updates submodule" do
+        pending "don't know how to check update"
+      end
+    end
+    context "when #clean" do
+      before do
+        VimBundler::Installer.process_all definitions, :install
+        VimBundler::Installer.process_all definitions, :clean
+      end
+      it "deletes bundle folder" do
+        File.exists?("bundle/snipmate").should_not be_true
+      end
+      it "removes submodule" do
+        string = File.open('.gitmodules', 'rb') { |file| file.read }
+        string.should_not ~ /snipmate/
+      end
+    end
+
+  end
+end

data/spec/lib/vim-bundler/local_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper.rb'
+describe VimBundler::Local::Installer do
+  before :each do
+    `rm -rf bundle`
+    `rm -rf vim_bundles.lock`
+  end
+  let :dsl do
+    dsl = VimBundler::DSL.new
+  end
+  let :definitions do
+    dsl.bundle 'spec', :local => "spec"
+    dsl.to_definition
+  end
+  context "when #install" do
+    before do
+      VimBundler::Installer.process_all definitions, :install
+    end
+    it "creates symlink" do
+      `ls -al bundle/spec`.should ~ /-> spec/
+    end
+  end
+  context "when #update" do
+    before do
+      VimBundler::Installer.process_all definitions, :install
+      VimBundler::Installer.process_all definitions, :update
+    end
+    it "does nothing" do
+      `ls -al bundle/spec`.should ~ /-> spec/
+    end
+  end
+  context "when #clean" do
+    before do
+      VimBundler::Installer.process_all definitions, :install
+      VimBundler::Installer.process_all definitions, :clean
+    end
+    it "unlinks folder" do
+      `ls -al bundle/spec 2>/dev/null`.should be_empty
+    end
+  end
+end

data/spec/lib/vim-bundler/vim_org_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper.rb'
+describe VimBundler::VimOrg::Installer do
+  before :each do
+    `rm -rf bundle`
+    `rm -rf vim_bundles.lock`
+  end
+  let :dsl do
+    dsl = VimBundler::DSL.new
+  end
+  let :definitions do
+    dsl.bundle 'indexed-search', :vim_script_id => 7062
+    dsl.to_definition
+  end
+  context "when #install" do
+    before do
+      VimBundler::Installer.process_all definitions, :install
+    end
+    it "loads bundle vim.org" do
+      File.exists?("bundle/indexed-search").should be_true
+    end
+  end
+  context "when #update" do
+    before do
+      VimBundler::Installer.process_all definitions, :install
+      VimBundler::Installer.process_all definitions, :update
+    end
+    it "updates bundle" do
+      pending "don't know how to check update"
+    end
+  end
+  context "when #clean" do
+    before do
+      VimBundler::Installer.process_all definitions, :install
+      VimBundler::Installer.process_all definitions, :clean
+    end
+    it "deletes bundle folder" do
+      File.exists?("bundle/indexed-search").should_not be_true
+    end
+  end
+  context "when use as option" do
+    let :dsl do
+      dsl = VimBundler::DSL.new
+    end
+    let :definitions do
+      dsl.bundle 'vrackets', :vim_script_id => 16753, :as => :plugin
+      dsl.to_definition
+    end
+    context "when #install" do
+      before do
+        VimBundler::Installer.process_all definitions, :install
+      end
+      it "loads bundle vim.org" do
+        File.exists?("bundle/vrackets/plugin").should be_true
+      end
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,63 @@
+require 'rubygems'
+require 'spork'
+require 'rr'
+
+
+Spork.prefork do
+  RUBY_HEAP_MIN_SLOTS=500000
+  RUBY_HEAP_SLOTS_INCREMENT=500000
+  RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
+  RUBY_GC_MALLOC_LIMIT=100000000 
+  RUBY_HEAP_FREE_MIN=500000
+  # require "rails/application"
+  # Spork.trap_method(Rails::Application, :reload_routes!)
+  # require 'rails/mongoid'
+  # Spork.trap_class_method(Rails::Mongoid, :load_models)
+  ENV['RACK_ENV'] ||= "rspec"
+  require File.expand_path(File.dirname(__FILE__) + "/../lib/vim-bundler")
+  # require File.expand_path("../../config/environment", __FILE__)
+  # require 'rspec/rails'
+
+  # # Requires supporting ruby files with custom matchers and macros, etc,
+  # # in spec/support/ and its subdirectories.
+  # Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+
+  RSpec.configure do |config|
+    config.backtrace_clean_patterns = [
+      /\/lib\d*\/ruby\//,
+      /bin\//,
+      #/gems/,
+      /spec\/spec_helper\.rb/,
+      /lib\/rspec\/(core|expectations|matchers|mocks)/
+    ]
+    # == Mock Framework
+    #
+    # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+    #
+    # config.mock_with :mocha
+    # config.mock_with :flexmock
+    config.mock_with :rr
+    # config.mock_with :rspec
+    
+
+
+    # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+    # config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+    # If you're not using ActiveRecord, or you'd prefer not to run each of your
+    # examples within a transaction, remove the following line or assign false
+    # instead of true.
+    # config.use_transactional_fixtures = true
+    # require 'database_cleaner'
+    #
+  end
+  
+end
+
+Spork.each_run do
+  RSpec.configure do |config|
+    config.before(:each) do
+      VimBundler.ui = VimBundler::UI.new(stub!.say.subject)
+    end
+  end
+end

data/vim-bundler.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vim-bundler}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Pavel Tatarsky}]
-  s.date = %q{2012-04-12}
+  s.date = %q{2012-04-25}
   s.description = %q{This gem provides a simple way to manage your vim bundles (aka plugins).
 If you are familiar with ruby gem bundler - you are familar with vim-bundler.}
   s.email = %q{fazzzenda@mail.ru}
@@ -22,6 +22,7 @@ If you are familiar with ruby gem bundler - you are familar with vim-bundler.}
     ".document",
     "Gemfile",
     "Gemfile.lock",
+    "GuardFile",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
@@ -34,10 +35,13 @@ If you are familiar with ruby gem bundler - you are familar with vim-bundler.}
     "lib/vim-bundler/git.rb",
     "lib/vim-bundler/installer.rb",
     "lib/vim-bundler/local.rb",
+    "lib/vim-bundler/lock.rb",
     "lib/vim-bundler/ui.rb",
     "lib/vim-bundler/vim_org.rb",
-    "test/helper.rb",
-    "test/test_vim-bundler.rb",
+    "spec/lib/vim-bundler/git_spec.rb",
+    "spec/lib/vim-bundler/local_spec.rb",
+    "spec/lib/vim-bundler/vim_org_spec.rb",
+    "spec/spec_helper.rb",
     "vim-bundler.gemspec"
   ]
   s.homepage = %q{http://github.com/vintikzzz/vim-bundler}
@@ -52,24 +56,24 @@ If you are familiar with ruby gem bundler - you are familar with vim-bundler.}
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 3.1.0.beta1"])
       s.add_runtime_dependency(%q<thor>, [">= 0.14.6"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
+      s.add_runtime_dependency(%q<awesome_print>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 3.1.0.beta1"])
       s.add_dependency(%q<thor>, [">= 0.14.6"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
+      s.add_dependency(%q<awesome_print>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 3.1.0.beta1"])
     s.add_dependency(%q<thor>, [">= 0.14.6"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
+    s.add_dependency(%q<awesome_print>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rcov>, [">= 0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vim-bundler
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70189720029180 !ruby/object:Gem::Requirement
+  requirement: &70228374993600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0.beta1
   type: :runtime
   prerelease: false
-  version_requirements: *70189720029180
+  version_requirements: *70228374993600
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70189720028660 !ruby/object:Gem::Requirement
+  requirement: &70228377060360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,43 +32,43 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70189720028660
+  version_requirements: *70228377060360
 - !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &70189720028060 !ruby/object:Gem::Requirement
+  name: awesome_print
+  requirement: &70228377059600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
-  version_requirements: *70189720028060
+  version_requirements: *70228377059600
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70189720027460 !ruby/object:Gem::Requirement
+  requirement: &70228377058920 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189720027460
+  version_requirements: *70228377058920
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70189720026940 !ruby/object:Gem::Requirement
+  requirement: &70228377058160 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189720026940
+  version_requirements: *70228377058160
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70189720026320 !ruby/object:Gem::Requirement
+  requirement: &70228377057480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189720026320
+  version_requirements: *70228377057480
 description: ! 'This gem provides a simple way to manage your vim bundles (aka plugins).
 
   If you are familiar with ruby gem bundler - you are familar with vim-bundler.'
@@ -91,6 +91,7 @@ files:
 - .document
 - Gemfile
 - Gemfile.lock
+- GuardFile
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -103,10 +104,13 @@ files:
 - lib/vim-bundler/git.rb
 - lib/vim-bundler/installer.rb
 - lib/vim-bundler/local.rb
+- lib/vim-bundler/lock.rb
 - lib/vim-bundler/ui.rb
 - lib/vim-bundler/vim_org.rb
-- test/helper.rb
-- test/test_vim-bundler.rb
+- spec/lib/vim-bundler/git_spec.rb
+- spec/lib/vim-bundler/local_spec.rb
+- spec/lib/vim-bundler/vim_org_spec.rb
+- spec/spec_helper.rb
 - vim-bundler.gemspec
 homepage: http://github.com/vintikzzz/vim-bundler
 licenses:
@@ -123,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1478265139794191694
+      hash: -2008285335090375143
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/test/helper.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'vim-bundler'
-
-class Test::Unit::TestCase
-end

data/test/test_vim-bundler.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestVimBundler < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end