vvm-rb 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d205eff702304a8422fee7de8fb6104dcfe8edfb
-  data.tar.gz: c60209e5e6328a7a8d33ea581d8fed9336f4fef5
+  metadata.gz: 8c6de49e7509ecb572267660fdd61c11810fbd5c
+  data.tar.gz: f1b2cc3256b02ed495dbe48bc8f4861a923ee188
 SHA512:
-  metadata.gz: 26a043ccc72fdcbd398190ac5ba44be137c149b9b51762d886ef1d39da7686454510a89c1645aeab0bf920e624c9f453d441d4199cab1a62242c5273d596d95f
-  data.tar.gz: 78f2b9d88963a33e02f21ac2a66eb2233e9d16e7c52d7291407ac3383e0f5a3aed616ad9016cef3d4c1e4a6c17c31d48aac548ed1635b9e73af0b20b8571f13d
+  metadata.gz: 9752390df48dd241a47824cb5d01704b4852f8649b465047cd159f013a110c23e938af04a1c0ca96ca2946d897268da7c859e7bc8e4383e88c7881a6213e0108
+  data.tar.gz: f9f83ba5b0cbe2da4d1ab96d1a9e6c01acadafcfd4245d07b8e198cba362dc9c2e8389969a2d2148655a021293f2320268617f8a74d672b7f9c49378208ef1e4

data/Gemfile

@@ -3,10 +3,10 @@ source 'http://rubygems.org'
 gem 'thor', '~> 0.19.1'
 
 group :development do
-  gem 'rspec', '~> 3.0'
-  gem 'rubocop', '~> 0.25.0'
-  gem 'rdoc', '~> 4.1'
+  gem 'rspec', '~> 3.2'
+  gem 'rubocop', '~> 0.29.1'
+  gem 'rdoc', '~> 4.2'
   gem 'jeweler', '~> 2.0'
-  gem 'simplecov', '~> 0.9.0'
-  gem 'coveralls', '~> 0.7.0', require: false
+  gem 'simplecov', '~> 0.9.2'
+  gem 'coveralls', '~> 0.7.10', require: false
 end

data/README.rdoc

@@ -40,16 +40,16 @@ you can set your default options of configure:
 
 == Commands Examples
 
-  $ vvm-rb help
-  $ vvm-rb install 7.4.103 --enable-rubyinterp
-  $ vvm-rb install --use latest
-  $ vvm-rb reinstall 7.4.103
-  $ vvm-rb rebuild 7.4.103 --enable-rubyinterp --enable-pythoninterp
-  $ vvm-rb use 7.4.103
-  $ vvm-rb list
-  $ vvm-rb versions
-  $ vvm-rb uninstall 7.4.103
-  $ vvm-rb update
+  $ vvm help
+  $ vvm install 7.4.103 --enable-rubyinterp
+  $ vvm install --use latest
+  $ vvm reinstall 7.4.103
+  $ vvm rebuild 7.4.103 --enable-rubyinterp --enable-pythoninterp
+  $ vvm use 7.4.103
+  $ vvm list
+  $ vvm versions
+  $ vvm uninstall 7.4.103
+  $ vvm update
 
 after use command, you have to reload shell:
 

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/vvm/installer.rb

@@ -67,7 +67,7 @@ module Vvm
     end
 
     def message
-      return if !$?.success? || @silent.empty?
+      return if !$?.success? || !@silent.empty?
       print "\e[32m"
       puts <<-EOS
 

data/lib/vvm/validator.rb

@@ -7,20 +7,18 @@ module Vvm
     def validate_before_invoke(command)
       new_version? if command == 'install'
       has_version? if %w(reinstall rebuild use uninstall).include?(command)
-      version? if %w(install reinstall rebuild use uninstall).include?(command)
+      version? if %w(install rebuild use uninstall).include?(command)
       has_hg? if %w(install reinstall rebuild list).include?(command)
     end
 
     def has_hg?
-      unless Kernel.find_executable('hg')
-        abort 'mercurial is required to install.'
-      end
+      abort 'mercurial is required to install.' unless find_executable('hg')
       return true
     end
 
     def version?
       if get_version.nil?
-        abort 'undefined vim version. please run [ vvm-rb list ].'
+        abort 'undefined vim version. please run [ vvm list ].'
       end
       return true
     end

data/lib/vvm/version.rb

@@ -3,7 +3,7 @@ module Vvm
     def self.list
       Dir.chdir(get_vimorg_dir) do
         list = `hg tags`.split.reverse
-        return list.values_at(* list.each_index.select { |i| i.odd? })
+        return list.values_at(* list.each_index.select(&:odd?))
       end
     end
 

data/spec/installer_spec.rb

@@ -119,4 +119,24 @@ describe 'Installer', disable_cache: true do
       end
     end
   end
+
+  describe 'message' do
+    before { system('') }
+
+    it 'command failed' do
+      allow($?).to receive(:success?).and_return(false)
+      expect { @installer.message }.to_not output(/success/).to_stdout
+    end
+
+    it 'silent' do
+      allow($?).to receive(:success?).and_return(true)
+      expect { @installer.message }.to_not output(/success/).to_stdout
+    end
+
+    it 'success' do
+      allow($?).to receive(:success?).and_return(true)
+      installer = Vvm::Installer.new(@version, [])
+      expect { installer.message }.to output(/success/).to_stdout
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -28,7 +28,7 @@ RSpec.configure do |config|
       FileUtils.mkdir_p(cache_dir)
       Vvm::Installer.fetch
       [VERSION1, VERSION2].each do |v|
-        i = Installer.new(v, [], true)
+        i = Vvm::Installer.new(v, [], true)
         i.checkout
         i.configure
         i.make_install

data/spec/validator_spec.rb

@@ -5,26 +5,107 @@ describe 'Validator' do
 
   NEW_VERSION = 'v7-4-050'
 
+  describe 'validate_before_invoke' do
+    before do
+      allow(Vvm::Validator).to receive(:new_version?).and_return(true)
+      allow(Vvm::Validator).to receive(:has_version?).and_return(true)
+      allow(Vvm::Validator).to receive(:version?).and_return(true)
+      allow(Vvm::Validator).to receive(:has_hg?).and_return(true)
+    end
+
+    context 'install' do
+      it 'new_version?' do
+        expect(Vvm::Validator).to receive(:new_version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('install')
+      end
+
+      it 'version?' do
+        expect(Vvm::Validator).to receive(:version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('install')
+      end
+
+      it 'has_hg?' do
+        expect(Vvm::Validator).to receive(:has_hg?).with(no_args)
+        Vvm::Validator.validate_before_invoke('install')
+      end
+    end
+
+    context 'reinstall' do
+      it 'has_hg?' do
+        expect(Vvm::Validator).to receive(:has_hg?).with(no_args)
+        Vvm::Validator.validate_before_invoke('reinstall')
+      end
+    end
+
+    context 'rebuild' do
+      it 'has_version?' do
+        expect(Vvm::Validator).to receive(:has_version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('rebuild')
+      end
+
+      it 'version?' do
+        expect(Vvm::Validator).to receive(:version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('rebuild')
+      end
+
+      it 'has_hg?' do
+        expect(Vvm::Validator).to receive(:has_hg?).with(no_args)
+        Vvm::Validator.validate_before_invoke('rebuild')
+      end
+    end
+
+    context 'use' do
+      it 'has_version?' do
+        expect(Vvm::Validator).to receive(:has_version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('use')
+      end
+
+      it 'version?' do
+        expect(Vvm::Validator).to receive(:version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('use')
+      end
+    end
+
+    context 'list' do
+      it 'has_hg?' do
+        expect(Vvm::Validator).to receive(:has_hg?).with(no_args)
+        Vvm::Validator.validate_before_invoke('list')
+      end
+    end
+
+    context 'uninstall' do
+      it 'has_version?' do
+        expect(Vvm::Validator).to receive(:has_version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('uninstall')
+      end
+
+      it 'version?' do
+        expect(Vvm::Validator).to receive(:version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('uninstall')
+      end
+    end
+  end
+
   describe 'has_hg?' do
     context 'hg is installed' do
-      before { allow(Kernel).to receive(:find_executable).and_return(true) }
+      before { allow(Vvm::Validator).to receive(:find_executable).and_return(true) }
 
       it 'success to run the method' do
-        expect(has_hg?).to be_truthy
+        expect(Vvm::Validator.has_hg?).to be_truthy
       end
     end
 
     context 'hg is not installed' do
-      before { allow(Kernel).to receive(:find_executable).and_return(false) }
+      before { allow(Vvm::Validator).to receive(:find_executable).and_return(false) }
 
       it 'cannot run the method' do
-        expect(proc { has_hg? }).to raise_error
+        expect(proc { Vvm::Validator.has_hg? }).to raise_error
       end
     end
   end
 
   describe 'version?' do
-    before(:all) { $* << %w(vvm-rb install) }
+    before(:all) { $* << %w(vvm install) }
 
     context 'available tag' do
       before { $*[2] = NEW_VERSION }

data/spec/version_spec.rb

@@ -62,7 +62,6 @@ describe 'Version' do
   end
 
   describe 'format' do
-
     context 'tag' do
       it 'return formated vim version' do
         expect(Vvm::Version.format('v7-4-112')).to eq 'v7-4-112'

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.0 ruby lib
+# stub: vvm-rb 1.0.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "vvm-rb"
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -62,29 +62,29 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<thor>, ["~> 0.19.1"])
-      s.add_development_dependency(%q<rspec>, ["~> 3.0"])
-      s.add_development_dependency(%q<rubocop>, ["~> 0.25.0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 4.1"])
+      s.add_development_dependency(%q<rspec>, ["~> 3.2"])
+      s.add_development_dependency(%q<rubocop>, ["~> 0.29.1"])
+      s.add_development_dependency(%q<rdoc>, ["~> 4.2"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
-      s.add_development_dependency(%q<simplecov>, ["~> 0.9.0"])
-      s.add_development_dependency(%q<coveralls>, ["~> 0.7.0"])
+      s.add_development_dependency(%q<simplecov>, ["~> 0.9.2"])
+      s.add_development_dependency(%q<coveralls>, ["~> 0.7.10"])
     else
       s.add_dependency(%q<thor>, ["~> 0.19.1"])
-      s.add_dependency(%q<rspec>, ["~> 3.0"])
-      s.add_dependency(%q<rubocop>, ["~> 0.25.0"])
-      s.add_dependency(%q<rdoc>, ["~> 4.1"])
+      s.add_dependency(%q<rspec>, ["~> 3.2"])
+      s.add_dependency(%q<rubocop>, ["~> 0.29.1"])
+      s.add_dependency(%q<rdoc>, ["~> 4.2"])
       s.add_dependency(%q<jeweler>, ["~> 2.0"])
-      s.add_dependency(%q<simplecov>, ["~> 0.9.0"])
-      s.add_dependency(%q<coveralls>, ["~> 0.7.0"])
+      s.add_dependency(%q<simplecov>, ["~> 0.9.2"])
+      s.add_dependency(%q<coveralls>, ["~> 0.7.10"])
     end
   else
     s.add_dependency(%q<thor>, ["~> 0.19.1"])
-    s.add_dependency(%q<rspec>, ["~> 3.0"])
-    s.add_dependency(%q<rubocop>, ["~> 0.25.0"])
-    s.add_dependency(%q<rdoc>, ["~> 4.1"])
+    s.add_dependency(%q<rspec>, ["~> 3.2"])
+    s.add_dependency(%q<rubocop>, ["~> 0.29.1"])
+    s.add_dependency(%q<rdoc>, ["~> 4.2"])
     s.add_dependency(%q<jeweler>, ["~> 2.0"])
-    s.add_dependency(%q<simplecov>, ["~> 0.9.0"])
-    s.add_dependency(%q<coveralls>, ["~> 0.7.0"])
+    s.add_dependency(%q<simplecov>, ["~> 0.9.2"])
+    s.add_dependency(%q<coveralls>, ["~> 0.7.10"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vvm-rb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Yuu Shigetani
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.29.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.29.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.10
 description: vim version manager.
 email: s2g4t1n2@gmail.com
 executables: