vvm-rb 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 755c774b73d58d917c74b88af6e7754aa10412a6
-  data.tar.gz: 2f095924c9429d711f559812f79f805ff96ef44c
+  metadata.gz: e08c72a5b27ed92131730f671b43e6ec6f61f480
+  data.tar.gz: f16fa32a4e6ad7a062b07b473bfa7ac4665851d0
 SHA512:
-  metadata.gz: ef4019d4ab749de4ef027487e8c3b17de6d6f9364c91f79974c26e86fe0d4135083013c3b7d28c7b3daaf49201a7728710d8367410a06d60589263a9838d29af
-  data.tar.gz: 6d0eec7ce158aa3e07ac6285b7af50a7cfc3d144aa7b1010b3639905773535a99d2ad03c6985ce0268935cd1b786d4e0d3819722abe2bc246315953000960c82
+  metadata.gz: 02f5817f4248013fc4e6fabeddeab196851e10c7bf4b4ae60fce0fc5f77df871f9b9324831befb1a8fc5181804c77535cc6386e4a84bb61e635d79bb4c21fbe1
+  data.tar.gz: 371b7bb3c16c0f358696f851a9975cbb156dde7a9699b9872f4c8d6911977b6f94f766fbe7fa44a1426ae817a8f96b130dce1b291f37ae43ef4499ec58ff5cf2

data/.rubocop.yml

@@ -15,3 +15,5 @@ Documentation:
   Enabled: false
 SpecialGlobalVars:
   Enabled: false
+AssignmentInCondition:
+  Enabled: false

data/Gemfile

@@ -9,4 +9,8 @@ group :development do
   gem 'jeweler', '~> 2.0'
   gem 'simplecov', '~> 0.9.2'
   gem 'coveralls', '~> 0.7.10', require: false
+
+  platforms :ruby_19 do
+    gem 'tins', '~> 1.6.0'
+  end
 end

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/lib/vvm/constants.rb

@@ -1,3 +1,3 @@
 module Vvm
-  VIM_URI = 'https://vim.googlecode.com/hg/'
+  VIM_URI = 'https://bitbucket.org/vim-mirror/vim'
 end

data/lib/vvm/validator.rb

@@ -2,13 +2,21 @@ require 'mkmf'
 
 module Vvm
   module Validator
+    METHOD_MAP = {
+      install:   %w(version? hg? new_version?),
+      update:    %w(hg?),
+      reinstall: %w(hg? installed_version?),
+      rebuild:   %w(version? hg? installed_version?),
+      use:       %w(version? installed_version?),
+      list:      %w(hg?),
+      uninstall: %w(version? installed_version?)
+    }
+
     module_function
 
     def validate_before_invoke(command)
-      version? if %w(install rebuild use uninstall).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)
+      return unless validations = METHOD_MAP[command.to_sym]
+      validations.each { |m| send(m) }
     end
 
     def hg?
@@ -36,8 +44,8 @@ module Vvm
     private
 
     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})/
+      version_regex = /\Av7\..+\z|\A(\d\.\d(a|b){0,1}(\.\d+){0,1})\z/
+      regex = /(\Atip\z|\Asystem\z|\Alatest\z|#{version_regex})/
       $*.find { |v| v =~ regex }
     end
 

data/lib/vvm/version.rb

@@ -19,7 +19,7 @@ module Vvm
     end
 
     def self.latest
-      list.select { |v| v =~ /\Av7-.+\z/ }.last
+      list.select { |v| v =~ /\Av7\..+\z/ }.last
     end
 
     def self.current
@@ -28,7 +28,7 @@ module Vvm
     end
 
     def self.convert(version)
-      "v#{version.gsub(/\./, '-')}"
+      "v#{version}"
     end
 
     def self.format(version)

data/spec/spec_helper.rb

@@ -16,7 +16,7 @@ require 'fileutils'
 require 'tmpdir'
 require 'vvm'
 
-VERSION1, VERSION2 = 'v7-4-083', 'v7-4-103'
+VERSION1, VERSION2 = 'v7.4.083', 'v7.4.103'
 
 # [todo] - test is too slow
 

data/spec/switcher_spec.rb

@@ -31,7 +31,7 @@ describe 'Switcher' do
 
     context 'unknown version' do
       before :all do
-        @switcher = Vvm::Switcher.new('v7-5')
+        @switcher = Vvm::Switcher.new('v7.5')
       end
 
       it 'raise error' do

data/spec/validator_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'Validator' do
   include Vvm::Validator
 
-  NEW_VERSION = 'v7-4-050'
+  NEW_VERSION = 'v7.4.050'
 
   describe 'validate_before_invoke' do
     before do
@@ -14,11 +14,6 @@ describe 'Validator' do
     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')
@@ -28,21 +23,41 @@ describe 'Validator' do
         expect(Vvm::Validator).to receive(:hg?).with(no_args)
         Vvm::Validator.validate_before_invoke('install')
       end
+
+      it 'new_version?' do
+        expect(Vvm::Validator).to receive(:new_version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('install')
+      end
+
+      it 'installed_version?' do
+        expect(Vvm::Validator).not_to receive(:installed_version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('install')
+      end
     end
 
     context 'reinstall' do
+      it 'version?' do
+        expect(Vvm::Validator).not_to receive(:version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('reinstall')
+      end
+
       it 'hg?' do
         expect(Vvm::Validator).to receive(:hg?).with(no_args)
         Vvm::Validator.validate_before_invoke('reinstall')
       end
-    end
 
-    context 'rebuild' do
+      it 'new_version?' do
+        expect(Vvm::Validator).not_to receive(:new_version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('reinstall')
+      end
+
       it 'installed_version?' do
         expect(Vvm::Validator).to receive(:installed_version?).with(no_args)
-        Vvm::Validator.validate_before_invoke('rebuild')
+        Vvm::Validator.validate_before_invoke('reinstall')
       end
+    end
 
+    context 'rebuild' do
       it 'version?' do
         expect(Vvm::Validator).to receive(:version?).with(no_args)
         Vvm::Validator.validate_before_invoke('rebuild')
@@ -52,37 +67,104 @@ describe 'Validator' do
         expect(Vvm::Validator).to receive(:hg?).with(no_args)
         Vvm::Validator.validate_before_invoke('rebuild')
       end
-    end
 
-    context 'use' do
+      it 'new_version?' do
+        expect(Vvm::Validator).not_to receive(:new_version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('rebuild')
+      end
+
       it 'installed_version?' do
         expect(Vvm::Validator).to receive(:installed_version?).with(no_args)
-        Vvm::Validator.validate_before_invoke('use')
+        Vvm::Validator.validate_before_invoke('rebuild')
       end
+    end
 
+    context 'use' do
       it 'version?' do
         expect(Vvm::Validator).to receive(:version?).with(no_args)
         Vvm::Validator.validate_before_invoke('use')
       end
+
+      it 'hg?' do
+        expect(Vvm::Validator).not_to receive(:hg?).with(no_args)
+        Vvm::Validator.validate_before_invoke('use')
+      end
+
+      it 'new_version?' do
+        expect(Vvm::Validator).not_to receive(:new_version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('use')
+      end
+
+      it 'installed_version?' do
+        expect(Vvm::Validator).to receive(:installed_version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('use')
+      end
     end
 
     context 'list' do
+      it 'version?' do
+        expect(Vvm::Validator).not_to receive(:version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('list')
+      end
+
       it 'hg?' do
         expect(Vvm::Validator).to receive(:hg?).with(no_args)
         Vvm::Validator.validate_before_invoke('list')
       end
+
+      it 'new_version?' do
+        expect(Vvm::Validator).not_to receive(:new_version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('list')
+      end
+
+      it 'installed_version?' do
+        expect(Vvm::Validator).not_to receive(:installed_version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('list')
+      end
     end
 
-    context 'uninstall' do
+    context 'versions' do
+      it 'version?' do
+        expect(Vvm::Validator).not_to receive(:version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('versions')
+      end
+
+      it 'hg?' do
+        expect(Vvm::Validator).not_to receive(:hg?).with(no_args)
+        Vvm::Validator.validate_before_invoke('versions')
+      end
+
+      it 'new_version?' do
+        expect(Vvm::Validator).not_to receive(:new_version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('versions')
+      end
+
       it 'installed_version?' do
-        expect(Vvm::Validator).to receive(:installed_version?).with(no_args)
-        Vvm::Validator.validate_before_invoke('uninstall')
+        expect(Vvm::Validator).not_to receive(:installed_version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('versions')
       end
+    end
 
+    context 'uninstall' do
       it 'version?' do
         expect(Vvm::Validator).to receive(:version?).with(no_args)
         Vvm::Validator.validate_before_invoke('uninstall')
       end
+
+      it 'hg?' do
+        expect(Vvm::Validator).not_to receive(:hg?).with(no_args)
+        Vvm::Validator.validate_before_invoke('uninstall')
+      end
+
+      it 'new_version?' do
+        expect(Vvm::Validator).not_to receive(:new_version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('uninstall')
+      end
+
+      it 'installed_version?' do
+        expect(Vvm::Validator).to receive(:installed_version?).with(no_args)
+        Vvm::Validator.validate_before_invoke('uninstall')
+      end
     end
   end
 

data/spec/version_spec.rb

@@ -10,7 +10,7 @@ describe 'Version' do
     end
 
     it 'echo available vim versions' do
-      expect(Vvm::Version.list.join("\n")).to match(/\Astart\n(v7-.+\n)+tip\z/)
+      expect(Vvm::Version.list.join("\n")).to match(/\A(v7\..+\n)+tip\z/)
     end
   end
 
@@ -40,7 +40,7 @@ describe 'Version' do
 
   describe 'latest' do
     it 'return latest vim version' do
-      expect(Vvm::Version.latest).to match(/\Av7-.+\z/)
+      expect(Vvm::Version.latest).to match(/\Av7\..+\z/)
     end
   end
 
@@ -62,26 +62,26 @@ describe 'Version' do
 
   describe 'convert' do
     it 'version to tag' do
-      expect(Vvm::Version.convert('7.4.112')).to eq 'v7-4-112'
+      expect(Vvm::Version.convert('7.4.112')).to eq 'v7.4.112'
     end
   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'
+        expect(Vvm::Version.format('v7.4.112')).to eq 'v7.4.112'
       end
     end
 
     context 'dicimal version' do
       it 'return formated vim version' do
-        expect(Vvm::Version.format('7.4a.001')).to eq 'v7-4a-001'
+        expect(Vvm::Version.format('7.4a.001')).to eq 'v7.4a.001'
       end
     end
 
     context 'latest' do
       it 'return latest vim version' do
-        expect(Vvm::Version.format('latest')).to match(/\Av7-.+\z/)
+        expect(Vvm::Version.format('latest')).to match(/\Av7\..+\z/)
       end
     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.5 ruby lib
+# stub: vvm-rb 1.0.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "vvm-rb"
-  s.version = "1.0.5"
+  s.version = "1.0.6"
 
   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-27"
+  s.date = "2016-03-20"
   s.description = "vim version manager."
   s.email = "s2g4t1n2@gmail.com"
   s.executables = ["vvm"]
@@ -68,6 +68,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
       s.add_development_dependency(%q<simplecov>, ["~> 0.9.2"])
       s.add_development_dependency(%q<coveralls>, ["~> 0.7.10"])
+      s.add_development_dependency(%q<tins>, ["~> 1.6.0"])
     else
       s.add_dependency(%q<thor>, ["~> 0.19.1"])
       s.add_dependency(%q<rspec>, ["~> 3.2"])
@@ -76,6 +77,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 2.0"])
       s.add_dependency(%q<simplecov>, ["~> 0.9.2"])
       s.add_dependency(%q<coveralls>, ["~> 0.7.10"])
+      s.add_dependency(%q<tins>, ["~> 1.6.0"])
     end
   else
     s.add_dependency(%q<thor>, ["~> 0.19.1"])
@@ -85,6 +87,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, ["~> 2.0"])
     s.add_dependency(%q<simplecov>, ["~> 0.9.2"])
     s.add_dependency(%q<coveralls>, ["~> 0.7.10"])
+    s.add_dependency(%q<tins>, ["~> 1.6.0"])
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vvm-rb
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Yuu Shigetani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2016-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.10
+- !ruby/object:Gem::Dependency
+  name: tins
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 description: vim version manager.
 email: s2g4t1n2@gmail.com
 executables: