vvm-rb 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b5f4f657faa8d83bc1809b0694c174dbebb8cf5
-  data.tar.gz: d6b500f4c0d840f22b4d150932f0787b077cb347
+  metadata.gz: 32c51f21af48612f2f8c9555e5e9c9622c9470f0
+  data.tar.gz: 8ef8927b47f61441d738b544856a7961f7553738
 SHA512:
-  metadata.gz: d4e66aecc2c932705db678fc21bd23b8863d858041b09c0eb3d46dc67d7d892e98574bd4f4b15126241754abc8ff9d9396327d0c29ee4822235bec5e1760cd94
-  data.tar.gz: ec9702e41aed414e9cfd2168b1659ba15e8abfc3fea5956cd0647aab29eb7665eb7eb88c154a5c7057a3b595da513e8b3b9fba48ce4e135173e4128ce555f605
+  metadata.gz: b0a57c971bd69c88fcca3fdfc8df79b57d097e518ddf7dd2d3dd19ced076347e4771edb5c33630228e255b6321d16038791319a9e536ee33fee9a4418c96005a
+  data.tar.gz: 07dbc860185e3158c12b0d294eee2968e33de91bfa5411c98ebf92f207a32ad59bc6dbd2df2ff2fce1391fd95bb66881e7d4215c4c231cdcccb47a28b4660524

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/lib/vvm/validator.rb

@@ -5,10 +5,10 @@ module Vvm
     module_function
 
     def validate_before_invoke(command)
-      new_version? if command == 'install'
-      installed_version? if %w(reinstall rebuild use uninstall).include?(command)
       version? if %w(install rebuild use uninstall).include?(command)
       hg? if %w(install reinstall rebuild list).include?(command)
+      new_version? if command == 'install'
+      installed_version? if %w(reinstall rebuild use uninstall).include?(command)
     end
 
     def hg?
@@ -17,7 +17,7 @@ module Vvm
     end
 
     def version?
-      abort 'undefined vim version. please run [ vvm list ].' if version.nil?
+      abort 'undefined vim version. please run [ vvm list ].' if find_version.nil?
       true
     end
 
@@ -33,11 +33,14 @@ module Vvm
 
     private
 
-    def version
+    def find_version
       version_regex = /\Av7-.+\z|\A(\d\.\d(a|b){0,1}(\.\d+){0,1})\z/
       regex = /(\Astart\z|\Atip\z|\Asystem\z|\Alatest\z|#{version_regex})/
-      ver = $*.find { |v| v =~ regex }
-      Version.format(ver)
+      $*.find { |v| v =~ regex }
+    end
+
+    def version
+      Version.format(find_version)
     end
 
     def version_include?(ver)

data/lib/vvm/version.rb

@@ -1,6 +1,7 @@
 module Vvm
   class Version
     def self.list
+      Installer.fetch 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/validator_spec.rb

@@ -108,7 +108,7 @@ describe 'Validator' do
     before(:all) { $* << %w(vvm install) }
 
     context 'available tag' do
-      before { $*[2] = NEW_VERSION }
+      before(:all) { $*[2] = NEW_VERSION }
 
       it 'success to run the method' do
         expect(version?).to be_truthy
@@ -116,7 +116,7 @@ describe 'Validator' do
     end
 
     context 'latest' do
-      before { $*[2] = 'latest' }
+      before(:all) { $*[2] = 'latest' }
 
       it 'success to run the method' do
         expect(version?).to be_truthy
@@ -124,7 +124,7 @@ describe 'Validator' do
     end
 
     context 'tag is not available' do
-      before { $*[2] = '--use' }
+      before(:all) { $*[2] = '--use' }
 
       it 'cannot run the method' do
         expect(proc { version? }).to raise_error
@@ -133,29 +133,73 @@ describe 'Validator' do
   end
 
   describe 'new_version?' do
-    context 'new version' do
-      it 'success to run the method' do
-        expect(new_version?(NEW_VERSION)).to be_truthy
+    context 'with arg' do
+      context 'new version' do
+        it 'success to run the method' do
+          expect(new_version?(NEW_VERSION)).to be_truthy
+        end
+      end
+
+      context 'version is installed' do
+        it 'cannot run the method' do
+          expect(proc { new_version?(VERSION1) }).to raise_error
+        end
       end
     end
 
-    context 'version is installed' do
-      it 'cannot run the method' do
-        expect(proc { new_version?(VERSION1) }).to raise_error
+    context 'without arg' do
+      before(:all) { $* << %w(vvm install) }
+
+      context 'new version' do
+        before(:all) { $*[2] = NEW_VERSION }
+
+        it 'success to run the method' do
+          expect(new_version?).to be_truthy
+        end
+      end
+
+      context 'version is installed' do
+        before(:all) { $*[2] = VERSION1 }
+
+        it 'cannot run the method' do
+          expect(proc { new_version? }).to raise_error
+        end
       end
     end
   end
 
   describe 'installed_version?' do
-    context 'version is installed' do
-      it 'success to run the method' do
-        expect(installed_version?(VERSION1)).to be_truthy
+    context 'with arg' do
+      context 'version is installed' do
+        it 'success to run the method' do
+          expect(installed_version?(VERSION1)).to be_truthy
+        end
+      end
+
+      context 'version is not installed' do
+        it 'cannot run the method' do
+          expect(proc { installed_version?(NEW_VERSION) }).to raise_error
+        end
       end
     end
 
-    context 'version is not installed' do
-      it 'cannot run the method' do
-        expect(proc { installed_version?(NEW_VERSION) }).to raise_error
+    context 'without arg' do
+      before(:all) { $* << %w(vvm install) }
+
+      context 'version is installed' do
+        before(:all) { $*[2] = VERSION1 }
+
+        it 'success to run the method' do
+          expect(installed_version?).to be_truthy
+        end
+      end
+
+      context 'version is not installed' do
+        before(:all) { $*[2] = NEW_VERSION }
+
+        it 'cannot run the method' do
+          expect(proc { installed_version? }).to raise_error
+        end
       end
     end
   end

data/spec/version_spec.rb

@@ -5,6 +5,7 @@ require 'tmpdir'
 describe 'Version' do
   describe 'list' do
     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,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: vvm-rb 1.0.3 ruby lib
+# stub: vvm-rb 1.0.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "vvm-rb"
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vvm-rb
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Yuu Shigetani