vvm-rb 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d23b1d893762e7b53129bd02944bb255d0d1bbbf
-  data.tar.gz: 5f6efaafb1739fdd8de78efa860616e360b53233
+  metadata.gz: 9e9c706910ddb03703d262b22e7d33cce1c2f069
+  data.tar.gz: 2f28d5d4d793828541773537be03d6aeb6151e95
 SHA512:
-  metadata.gz: 0f78ee5c4c315e1a759e369dacc03349ec63c2517d41db114f7b0f2d6e657edc4c57cbd1118b45d4729c6b14eda929f04cb77cad471aa27f824258e05456308d
-  data.tar.gz: 32afd991ac596ce286075671a1c02d21c02db3550044a8e986ebe94cedeb90b84c87ec5d5ff541aea5ecd7c083414568d5c07065bafd0bc94df1d968ccd66adb
+  metadata.gz: cfc490b737bf80052ea5d948593a396beea97f7cdc6c71bfd94fc966048b9525d8eb93a53a3673c9d4edeccd3859635afdfe99a1c4addf1835952f89a801e719
+  data.tar.gz: 8b9c112b945c48ed7fbaeb84ad380b071422462787b2f045062892a0674c553715764efdc8f5bbbe2baf06150aae01288546854aa3321fa31e9cce0b386dadc8

data/README.rdoc

@@ -17,7 +17,7 @@ or
 
   $ git clone https://github.com/calorie/vvm-rb.git
   $ cd vvm-rb
-  $ bundle install --path vendor/bundle
+  $ bundle install
   $ bundle exec rake install
 
 == Usage

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.12

data/lib/vvm-rb/cli.rb

@@ -4,36 +4,38 @@ class Cli < Thor
   include Thor::Actions
   include VvmRb::Base
 
-  desc 'install [TAG] [options]', 'Install a specific version of Vim'
-  method_option :use, :type => :boolean, :aliases => '-u'
+  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)
-    installer(version, conf)
-    use(version) if options[:use]
-
-    print "\e[32m"
-    puts <<-EOS
+    version = format_version(version)
 
-Vim is successfully installed.  For daily use,
-please add the following line into your ~/.bash_login etc:
+    Installer.fetch
+    i = Installer.new(version, conf)
+    i.checkout
+    i.configure
+    i.make_install
+    Installer.cp_etc
 
-test -f ~/.vvm-rb/etc/login && source ~/.vvm-rb/etc/login
+    use(version) if options[:use]
 
-    EOS
-    print "\e[0m"
+    message
   end
 
-  desc 'reinstall [TAG] [options]', 'Reinstall a specific version of Vim'
+  desc 'reinstall [VERSION] [CONFIGURE_OPTS]', 'Reinstall a specific version'
   def reinstall(version, *conf)
-    Uninstaller.new(version).uninstall
-    installer(version, conf)
+    uninstall(version)
+    install(version, conf)
   end
 
-  desc 'rebuild [TAG] [options]', 'Rebuild a specific version of Vim'
+  desc 'rebuild [VERSION] [CONFIGURE_OPTS]', 'Rebuild a specific version of Vim'
   def rebuild(version, *conf)
-    rebuilder(version, conf)
+    r = Installer.new(version, conf)
+    r.make_clean
+    r.configure
+    r.make_install
   end
 
-  desc 'use [TAG]', 'Use a specific version of Vim as the default one.'
+  desc 'use [VERSION]', 'Use a specific version of Vim as the default one.'
   def use(version)
     Switcher.new(version).use
   end
@@ -49,7 +51,7 @@ test -f ~/.vvm-rb/etc/login && source ~/.vvm-rb/etc/login
     puts Version.versions.join("\n")
   end
 
-  desc 'uninstall [TAG]', 'Uninstall a specific version of Vim.'
+  desc 'uninstall [VERSION]', 'Uninstall a specific version of Vim.'
   def uninstall(version)
     Uninstaller.new(version).uninstall
   end
@@ -61,23 +63,24 @@ test -f ~/.vvm-rb/etc/login && source ~/.vvm-rb/etc/login
 
   private
 
-  def installer(version, conf)
-    Installer.fetch
+  def format_version(version)
     if version == 'latest'
       version = Version.list.select { |v| v =~ /^v7-.+$/ }.last
       new_version?(version)
     end
-    i = Installer.new(version, conf)
-    i.checkout
-    i.configure
-    i.make_install
-    Installer.cp_etc
+    return version
   end
 
-  def rebuilder(version, conf)
-    r = Installer.new(version, conf)
-    r.make_clean
-    r.configure
-    r.make_install
+  def message
+    print "\e[32m"
+    puts <<-EOS
+
+Vim is successfully installed.  For daily use,
+please add the following line into your ~/.bash_login etc:
+
+test -f ~/.vvm-rb/etc/login && source ~/.vvm-rb/etc/login
+
+    EOS
+    print "\e[0m"
   end
 end

data/lib/vvm-rb/validator.rb

@@ -9,7 +9,7 @@ module Validator
   end
 
   def check_tag
-    unless get_version
+    if get_version.nil?
       abort 'undefined vim version. please run [ vvm-rb list ].'
     end
     return true
@@ -28,10 +28,18 @@ module Validator
   private
 
   def get_version
-    return $*.find { |v| v =~ /(^start$|^tip$|^v7-.+$|^system$|^latest$)/ }
+    version = $*.find { |v| v =~ /(^start$|^tip$|^v7-.+$|^system$|^latest$)/ }
+    if version == 'latest'
+      version = Version.list.select { |v| v =~ /^v7-.+$/ }.last
+    end
+    return version
   end
 
   def version_include?(version)
-    return Version.versions.include?(version) || version == 'system'
+    return Version.versions.include?(version) || use_system?(version)
+  end
+
+  def use_system?(version)
+    return version == 'system' && $*.include?('use')
   end
 end

data/vvm-rb.gemspec

@@ -2,14 +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.12 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "vvm-rb"
-  s.version = "0.0.11"
+  s.version = "0.0.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yuu Shigetani"]
-  s.date = "2013-12-07"
+  s.date = "2013-12-08"
   s.description = "vim version manager."
   s.email = "s2g4t1n2@gmail.com"
   s.executables = ["vvm-rb"]
@@ -51,7 +52,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/calorie/vvm-rb"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.14"
+  s.rubygems_version = "2.1.5"
   s.summary = "vim version manager"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vvm-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Yuu Shigetani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-07 00:00:00.000000000 Z
+date: 2013-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: vim version manager