vvm-rb 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32c51f21af48612f2f8c9555e5e9c9622c9470f0
-  data.tar.gz: 8ef8927b47f61441d738b544856a7961f7553738
+  metadata.gz: 755c774b73d58d917c74b88af6e7754aa10412a6
+  data.tar.gz: 2f095924c9429d711f559812f79f805ff96ef44c
 SHA512:
-  metadata.gz: b0a57c971bd69c88fcca3fdfc8df79b57d097e518ddf7dd2d3dd19ced076347e4771edb5c33630228e255b6321d16038791319a9e536ee33fee9a4418c96005a
-  data.tar.gz: 07dbc860185e3158c12b0d294eee2968e33de91bfa5411c98ebf92f207a32ad59bc6dbd2df2ff2fce1391fd95bb66881e7d4215c4c231cdcccb47a28b4660524
+  metadata.gz: ef4019d4ab749de4ef027487e8c3b17de6d6f9364c91f79974c26e86fe0d4135083013c3b7d28c7b3daaf49201a7728710d8367410a06d60589263a9838d29af
+  data.tar.gz: 6d0eec7ce158aa3e07ac6285b7af50a7cfc3d144aa7b1010b3639905773535a99d2ad03c6985ce0268935cd1b786d4e0d3819722abe2bc246315953000960c82

data/README.rdoc

@@ -1,10 +1,11 @@
 = vvm-rb
 
-{<img src="https://badge.fury.io/rb/vvm-rb.png" alt="Gem Version" />}[http://badge.fury.io/rb/vvm-rb]
-{<img src="https://gemnasium.com/calorie/vvm-rb.png" alt="Dependency Status" />}[https://gemnasium.com/calorie/vvm-rb]
-{<img src="https://travis-ci.org/calorie/vvm-rb.png" />}[https://travis-ci.org/calorie/vvm-rb]
-{<img src="https://coveralls.io/repos/calorie/vvm-rb/badge.png" alt="Coverage Status" />}[https://coveralls.io/r/calorie/vvm-rb]
-{<img src="https://codeclimate.com/github/calorie/vvm-rb.png" />}[https://codeclimate.com/github/calorie/vvm-rb]
+{<img src="https://img.shields.io/gem/v/vvm-rb.svg" alt="Gem Version" />}[http://badge.fury.io/rb/vvm-rb]
+{<img src="https://img.shields.io/gemnasium/calorie/vvm-rb.svg" alt="Dependency Status" />}[https://gemnasium.com/calorie/vvm-rb]
+{<img src="https://img.shields.io/travis/calorie/vvm-rb.svg" />}[https://travis-ci.org/calorie/vvm-rb]
+{<img src="https://img.shields.io/coveralls/calorie/vvm-rb.svg" alt="Coverage Status" />}[https://coveralls.io/r/calorie/vvm-rb]
+{<img src="https://img.shields.io/codeclimate/github/calorie/vvm-rb.svg" />}[https://codeclimate.com/github/calorie/vvm-rb]
+{<img src="http://img.shields.io/badge/license-MIT-brightgreen.svg" />}[https://raw.githubusercontent.com/calorie/vvm-rb/master/LICENSE.txt]
 
 
 vim version manager : forked from https://github.com/kana/vim-version-manager
@@ -24,7 +25,7 @@ or
   $ bundle install
   $ rake install
 
-== Usage
+== Setup
 please add the following line into your ~/.bash_login etc:
 
   test -f ~/.vvm-rb/etc/login && source ~/.vvm-rb/etc/login
@@ -38,7 +39,7 @@ you can set your default options of configure:
 
   export VVMOPT="--enable-rubyinterp --enable-pythoninterp"
 
-== Commands Examples
+== Usage
 
   $ vvm help
   $ vvm install 7.4.103 --enable-rubyinterp
@@ -51,7 +52,7 @@ you can set your default options of configure:
   $ vvm uninstall 7.4.103
   $ vvm update
 
-after use command, you have to reload shell:
+after `vvm use`, you have to reload shell:
 
   $ exec $SHELL
 

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/vvm/cli.rb

@@ -13,15 +13,14 @@ module Vvm
       i.configure
       i.make_install
       Installer.cp_etc
-
       invoke :use, [version], {} if options[:use]
       i.message
     end
 
     desc 'update', 'Update to latest version of Vim'
     def update
-      current = Version.current
-      if current == 'system'
+      Installer.pull
+      if (current = Version.current) == 'system'
         run 'vvm install --use latest'
         run 'vvm use system' unless $?.success?
       else
@@ -53,6 +52,7 @@ module Vvm
 
     desc 'list', 'Look available versions of Vim.'
     def list
+      Installer.pull
       puts Version.list.join("\n")
     end
 
@@ -69,8 +69,6 @@ module Vvm
     no_commands do
       def invoke_command(command, *args)
         validate_before_invoke(command.name)
-        Installer.fetch unless File.exist?(vimorg_dir)
-        Installer.pull if %w(install list).include?(command.name)
         super
       end
     end

data/lib/vvm/installer.rb

@@ -16,6 +16,7 @@ module Vvm
     end
 
     def self.pull
+      fetch unless File.exist?(vimorg_dir)
       Dir.chdir(vimorg_dir) { system('hg -q pull') }
     end
 

data/lib/vvm/validator.rb

@@ -6,7 +6,7 @@ module Vvm
 
     def validate_before_invoke(command)
       version? if %w(install rebuild use uninstall).include?(command)
-      hg? if %w(install reinstall rebuild list).include?(command)
+      hg? if %w(install reinstall rebuild list update).include?(command)
       new_version? if command == 'install'
       installed_version? if %w(reinstall rebuild use uninstall).include?(command)
     end
@@ -21,7 +21,9 @@ module Vvm
       true
     end
 
-    def new_version?(ver = version)
+    def new_version?(ver = nil)
+      Installer.pull
+      ver = version if ver.nil?
       abort "#{ver} is already installed." if version_include?(ver)
       true
     end

data/lib/vvm/version.rb

@@ -1,7 +1,7 @@
 module Vvm
   class Version
     def self.list
-      Installer.fetch unless File.exist?(vimorg_dir)
+      abort "#{vimorg_dir} not found." unless File.exist?(vimorg_dir)
       Dir.chdir(vimorg_dir) do
         list = `hg tags`.split.reverse
         return list.values_at(* list.each_index.select(&:odd?))

data/spec/installer_spec.rb

@@ -31,6 +31,12 @@ describe 'Installer', disable_cache: true do
     context 'pull', clean: true, vimorg: true do
       before :all do
         Dir.chdir(vimorg_dir) { system('hg rollback') }
+      end
+
+      it 'vimorg_dir not found' do
+        allow(File).to receive(:exist?).with(vimorg_dir).and_return(false)
+        allow(Vvm::Installer).to receive(:fetch).and_return(true)
+        expect(Vvm::Installer).to receive(:fetch)
         Vvm::Installer.pull
       end
 

data/spec/validator_spec.rb

@@ -133,6 +133,10 @@ describe 'Validator' do
   end
 
   describe 'new_version?' do
+    before do
+      allow(Vvm::Installer).to receive(:pull).and_return(true)
+    end
+
     context 'with arg' do
       context 'new version' do
         it 'success to run the method' do

data/spec/version_spec.rb

@@ -4,8 +4,12 @@ require 'tmpdir'
 
 describe 'Version' do
   describe 'list' do
+    it 'vimorg_dir not found' do
+      allow(File).to receive(:exist?).and_return(false)
+      expect(proc { Vvm::Version.list }).to raise_error
+    end
+
     it 'echo available vim versions' do
-      FileUtils.rm_rf(vimorg_dir) if File.exist?(vimorg_dir)
       expect(Vvm::Version.list.join("\n")).to match(/\Astart\n(v7-.+\n)+tip\z/)
     end
   end

data/vvm-rb.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: vvm-rb 1.0.4 ruby lib
+# stub: vvm-rb 1.0.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "vvm-rb"
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Yuu Shigetani"]
-  s.date = "2015-02-21"
+  s.date = "2015-02-27"
   s.description = "vim version manager."
   s.email = "s2g4t1n2@gmail.com"
   s.executables = ["vvm"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vvm-rb
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Yuu Shigetani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-21 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor