vim-bundler 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/vim-bundler/git.rb

@@ -4,63 +4,61 @@ module VimBundler
     extend ActiveSupport::Concern
     module Installer
       extend ActiveSupport::Concern
-      module InstanceMethods
-        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"
-          else
-            VimBundler.ui.warn "#{bundle.name} not installed"
-          end
+      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"
+        else
+          VimBundler.ui.warn "#{bundle.name} not installed"
+        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(bundle)
+      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)
-          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
+          `#{@opts[:git_bin]} rm --cached #{dir}`
         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}`
+      end
+      private
+      def clean_config_file(path, bundle)
+        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')
+            temp << line unless delete
           end
         end
-        private
-        def clean_config_file(path, bundle)
-          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')
-              temp << line unless delete
-            end
-          end
-          file = File.open(path, 'w') do |f|
-            temp.each do |line|
-              f.write line
-            end
+        file = File.open(path, 'w') do |f|
+          temp.each do |line|
+            f.write line
           end
         end
       end

data/lib/vim-bundler/installer.rb

@@ -27,7 +27,12 @@ module VimBundler
       installer = new(definitions[:opts])
       installer.run_callbacks(:all) do
         unless name.nil?
-          process(installer, type, definitions[:bundles][name])
+          bundle = definitions[:bundles][name]
+          if(bundle.nil?)
+            VimBundler.ui.warn "bundle #{name} not exists"
+          else
+            process(installer, type, definitions[:bundles][name])
+          end
         else
           definitions[:bundles].each do |k, v|
             process(installer, type, v)

data/lib/vim-bundler/local.rb

@@ -4,41 +4,39 @@ module VimBundler
     extend ActiveSupport::Concern
     module Installer
       extend ActiveSupport::Concern
-      module InstanceMethods
-        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
+      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
-        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
+        `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_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
+      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
+      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
       end
     end

data/lib/vim-bundler/vim_org.rb

@@ -5,32 +5,38 @@ module VimBundler
     extend ActiveSupport::Concern
     module Installer
       extend ActiveSupport::Concern
-      module InstanceMethods
-        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}")
-          local_file = f.meta["content-disposition"].gsub(/attachment; filename=/,"")
-          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')
-            data.write f.read
-          end
-          VimBundler.ui.info "#{bundle.name} installed"
+      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
-        def vim_org_update(bundle)
-          clean(bundle)
-          vim_org_install(bundle)
-        end
-        def vim_org_clean(bundle)
-          clean(bundle)
+        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'
+          # data = open(File.join(dir, local_file), 'w')
+          # data.write f.read
+          # data.close
+          # `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')
+          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)
+      end
+      def vim_org_clean(bundle)
+        clean(bundle)
       end
     end
     module DSL

data/vim-bundler.gemspec

@@ -5,16 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vim-bundler}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Pavel Tatarsky"]
-  s.date = %q{2011-06-22}
-  s.default_executable = %q{vbundle}
+  s.authors = [%q{Pavel Tatarsky}]
+  s.date = %q{2012-04-12}
   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}
-  s.executables = ["vbundle"]
+  s.executables = [%q{vbundle}]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -42,9 +41,9 @@ If you are familiar with ruby gem bundler - you are familar with vim-bundler.}
     "vim-bundler.gemspec"
   ]
   s.homepage = %q{http://github.com/vintikzzz/vim-bundler}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{Bundler for vim}
 
   if s.respond_to? :specification_version then

metadata

@@ -1,96 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vim-bundler
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Pavel Tatarsky
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-22 00:00:00 +04:00
-default_executable: vbundle
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70189720029180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.1.0.beta1
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70189720029180
+- !ruby/object:Gem::Dependency
   name: thor
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70189720028660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70189720028660
+- !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70189720028060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70189720028060
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70189720027460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70189720027460
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70189720026940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70189720026940
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70189720026320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-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.
+  version_requirements: *70189720026320
+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.'
 email: fazzzenda@mail.ru
-executables: 
+executables:
 - vbundle
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -111,36 +108,32 @@ files:
 - test/helper.rb
 - test/test_vim-bundler.rb
 - vim-bundler.gemspec
-has_rdoc: true
 homepage: http://github.com/vintikzzz/vim-bundler
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -3257628406436740927
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1478265139794191694
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Bundler for vim
 test_files: []
-