vvm-rb 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ca509efad41c570ea6149eb75ad18a1a232cfb7
-  data.tar.gz: 5b1cf1aec013315ac192db95300872edd01a3456
+  metadata.gz: 3b0c5ce1f3171c0f708d880c112ee34c77d504a7
+  data.tar.gz: 4f4cd9ff34744a99727838d46682c98b7a4561ed
 SHA512:
-  metadata.gz: df10d6dd84f272c1684b1d2f9d56a2cd7f8cccca16b5de0216d23747e4a01980c8a96a1ee3c01615df3853cbdffe81bc395b9c73b4745e4da513123adc41b07d
-  data.tar.gz: 8ae64bf45876b565f67c1d31dabffd53d898e84ada747a374a8498f126686f49944964fca43719abd1f0dfe978e538d29c6b90e8c174a8f0613b78719f6f3bc4
+  metadata.gz: be346af4b466e0a5cd50deb9d4464a2c8bd9456c9beb63f847a19b7f4c66fcf1c589490a798602edbc53aa65d45650a5fed6f7e941e072aad06b19682498a27b
+  data.tar.gz: e9b8e6a2ed72f820de74d39f419231460c51c64f349b8743dce35aded380a329756e1ef3a3d878451caedf175dcca2e9a2dc919567730efd190c1c7d51893910

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/lib/vvm-rb/cli.rb

@@ -7,9 +7,10 @@ class Cli < Thor
   desc 'install [VERSION] [CONFIGURE_OPTS]', 'Install a specific version of Vim'
   method_option :use, type: :boolean, aliases: '-u', banner: 'Use installed vim'
   def install(version, *conf)
-    version = format_version(version)
+    version = Version.format(version)
+    new_version?(version)
 
-    Installer.fetch
+    Installer.pull
     i = Installer.new(version, conf)
     i.checkout
     i.configure
@@ -42,7 +43,7 @@ class Cli < Thor
 
   desc 'list', 'Look available vim versions'
   def list
-    Installer.fetch
+    Installer.pull
     puts Version.list.join("\n")
   end
 
@@ -56,21 +57,16 @@ class Cli < Thor
     Uninstaller.new(version).uninstall
   end
 
-  before_method(:install, :reinstall, :rebuild, :list) { check_hg }
-  before_method(:install, :reinstall, :rebuild, :use, :uninstall) { check_tag }
   before_method(:install) { new_version? }
   before_method(:reinstall, :rebuild, :use, :uninstall) { version_exist? }
+  before_method(:install, :reinstall, :rebuild, :use, :uninstall) { check_tag }
+  before_method(:install, :reinstall, :rebuild, :list) { check_hg }
+  before_method(*instance_methods(false)) do
+    Installer.fetch unless File.exists?(get_vimorg_dir)
+  end
 
   private
 
-  def format_version(version)
-    if version == 'latest'
-      version = Version.list.select { |v| v =~ /^v7-.+$/ }.last
-      new_version?(version)
-    end
-    return version
-  end
-
   def message
     print "\e[32m"
     puts <<-EOS

data/lib/vvm-rb/installer.rb

@@ -10,7 +10,10 @@ class Installer
     FileUtils.mkdir_p(get_repos_dir)
     repos_dir = get_vimorg_dir
     system("hg clone #{VIM_URI} #{repos_dir}") unless File.exists?(repos_dir)
-    Dir.chdir(repos_dir) { system('hg pull') }
+  end
+
+  def self.pull
+    Dir.chdir(get_vimorg_dir) { system('hg pull') }
   end
 
   def checkout

data/lib/vvm-rb/validator.rb

@@ -28,11 +28,9 @@ module Validator
   private
 
   def get_version
-    version = $*.find { |v| v =~ /(^start$|^tip$|^v7-.+$|^system$|^latest$)/ }
-    if version == 'latest'
-      version = Version.list.select { |v| v =~ /^v7-.+$/ }.last
-    end
-    return version
+    regex = /(^start$|^tip$|^v7-.+$|^(\d\.\d\.\d+)$|^system$|^latest$)/
+    version = $*.find { |v| v =~ regex }
+    return Version.format(version)
   end
 
   def version_include?(version)

data/lib/vvm-rb/version.rb

@@ -1,8 +1,6 @@
 class Version
   def self.list
-    vimorg_dir = get_vimorg_dir
-    return [] unless File.exists?(vimorg_dir)
-    Dir.chdir(vimorg_dir) do
+    Dir.chdir(get_vimorg_dir) do
       list = `hg tags`.split.reverse
       return list.values_at(* list.each_index.select { |i| i.odd? })
     end
@@ -17,4 +15,22 @@ class Version
     end
     return output
   end
+
+  def self.latest
+    return list.select { |v| v =~ /^v7-.+$/ }.last
+  end
+
+  def self.convert(version)
+    return "v#{version.gsub(/\./, '-')}"
+  end
+
+  def self.format(version)
+    case version
+    when /^latest$/
+      version = latest
+    when /^(\d\.\d\.\d+)$/
+      version = convert(version)
+    end
+    return version
+  end
 end

data/spec/installer_spec.rb

@@ -22,6 +22,16 @@ describe 'Installer' do
       end
     end
 
+    context 'pull' do
+      before :all do
+        Installer.pull
+      end
+
+      it 'exists vimorg dir' do
+        expect($?.success?).to be_true
+      end
+    end
+
     context 'checkout' do
       before :all do
         @installer.checkout

data/spec/validator_spec.rb

@@ -33,7 +33,7 @@ describe 'Validator' do
     before_method(:dummy_method) { check_tag }
 
     before :all do
-      $* << ['vvm-rb', 'install']
+      $* << %w(vvm-rb install)
     end
 
     context 'available tag' do

data/spec/version_spec.rb

@@ -1,20 +1,11 @@
 require 'spec_helper'
 require 'fileutils'
+require 'tmpdir'
 
 describe 'Version' do
   describe 'list' do
-    context 'vimorg dirctory exists' do
-      it 'echo available vim versions' do
-        expect(Version.list.join("\n")).to match(/start\n(v7-.+\n)+tip$/)
-      end
-    end
-    context 'vimorg dirctory is not found' do
-      before do
-        FileUtils.rm_rf(get_vimorg_dir)
-      end
-      it 'echo nothing' do
-        expect(Version.list).to eq []
-      end
+    it 'echo available vim versions' do
+      expect(Version.list.join("\n")).to match(/start\n(v7-.+\n)+tip$/)
     end
   end
 
@@ -26,11 +17,52 @@ describe 'Version' do
     end
     context 'vims dirctory is not found' do
       before do
-        FileUtils.rm_rf(get_vims_dir)
+        @tmp_vvmroot = ENV['VVMROOT']
+        @tmp2 = Dir.mktmpdir
+        ENV['VVMROOT'] = @tmp2
       end
+
+      after do
+        ENV['VVMROOT'] = @tmp_vvmroot
+        FileUtils.rm_rf(@tmp2)
+      end
+
       it 'echo nothing' do
         expect(Version.versions).to eq []
       end
     end
   end
+
+  describe 'latest' do
+    it 'return latest vim version' do
+      expect(Version.latest).to match(/^v7-.+$/)
+    end
+  end
+
+  describe 'convert' do
+    it 'version to tag' do
+      expect(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(Version.format('v7-4-112')).to eq 'v7-4-112'
+      end
+    end
+
+    context 'dicimal version' do
+      it 'return formated vim version' do
+        expect(Version.format('7.4.112')).to eq 'v7-4-112'
+      end
+    end
+
+    context 'latest' do
+      it 'return latest vim version' do
+        expect(Version.format('latest')).to match(/^v7-.+$/)
+      end
+    end
+  end
 end

data/vvm-rb.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vvm-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Yuu Shigetani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake