vvm-rb 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80ebe5ef4e32f2933efe5727f345798146602003
-  data.tar.gz: bf5d4af88468594a2f9efb52c195ee07c1e96340
+  metadata.gz: 73e14a90f5be3f1bf0a37ddd611a6c639d0d13c2
+  data.tar.gz: 15cff45395ac493061e1ddbe63e5109a20bf9e72
 SHA512:
-  metadata.gz: 39f33e0a8caec985a264bd290072ebae78962fbf2985570a88c5e2aea1470036813ee1ad864fa835116dba48bb7d783849b6a5076abe5ae07017c54a77a7c869
-  data.tar.gz: 78bba39052f745552cdf662fe8a71fe024f00b88f0e70d526bdc335b3dafa8d83ef99d5a6e01544791a1684511d75f23a546c6b7c816aaf1f4f1546f7ea80fe7
+  metadata.gz: ff9d9bf9b3d1296a636764b9a8485e156e36a4e0ba2079523741436a883e0614c43ad03c7c4c29304702aab5242a78e1b08ac6d9850d5c8cec3ffdcc2e3c3dd8
+  data.tar.gz: 8ca000a8edc886b54ccec1cf9917f6de1f81d5966d1ab7799065af40e7bdbf82e5480ca0de2d7fe0c42b06b9f9e980dd001682c0dc5291a13e713495ef3dff0d

data/README.rdoc

@@ -45,6 +45,7 @@ you can set your default options of configure.
   $ vvm-rb list
   $ vvm-rb versions
   $ vvm-rb uninstall 7.4.103
+  $ vvm-rb update
 
 after use command, you have to reload shell.
 

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/vvm-rb/cli.rb

@@ -20,10 +20,15 @@ class Cli < Thor
 
   desc 'update', 'Update to latest version of Vim'
   def update
-    current = Version.versions.last
-    run 'vvm-rb use system'
-    run 'vvm-rb install --use latest'
-    run "vvm-rb #{$?.success? ? 'uninstall' : 'use'} #{current}"
+    current = Version.current
+    if current == 'system'
+      run 'vvm-rb install --use latest'
+      run 'vvm-rb use system' unless $?.success?
+    else
+      run 'vvm-rb use system'
+      run 'vvm-rb install --use latest'
+      run "vvm-rb #{$?.success? ? 'uninstall' : 'use'} #{current}"
+    end
   end
 
   desc 'reinstall [VERSION] [CONFIGURE_OPTS]', 'Reinstall a specific version'

data/lib/vvm-rb/version.rb

@@ -20,6 +20,11 @@ class Version
     return list.select { |v| v =~ /^v7-.+$/ }.last
   end
 
+  def self.current
+    c = get_current_dir
+    return File.exists?(c) ? File.basename(File.readlink(c)) : 'system'
+  end
+
   def self.convert(version)
     return "v#{version.gsub(/\./, '-')}"
   end

data/spec/version_spec.rb

@@ -39,6 +39,22 @@ describe 'Version' do
     end
   end
 
+  describe 'current' do
+    context 'current version is system' do
+      before { Switcher.new('system').use }
+      it 'return current vim version' do
+        expect(Version.current).to eq 'system'
+      end
+    end
+
+    context 'current version is not system' do
+      before { Switcher.new('v7-4-083').use }
+      it 'return current vim version' do
+        expect(Version.current).to eq 'v7-4-083'
+      end
+    end
+  end
+
   describe 'convert' do
     it 'version to tag' do
       expect(Version.convert('7.4.112')).to eq 'v7-4-112'

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 0.1.5 ruby lib
+# stub: vvm-rb 0.1.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "vvm-rb"
-  s.version = "0.1.5"
+  s.version = "0.1.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 = "2014-01-18"
+  s.date = "2014-01-19"
   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.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Yuu Shigetani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake