vvm-rb 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92d7636b91886c3e0a45ef4e2779486c8772c7ce
-  data.tar.gz: 76c68c1f61a3ddf83f0ea625055f084b0a29b171
+  metadata.gz: 6460e5f25ab99eb833d852445ecfe65a3443d1d6
+  data.tar.gz: bef91e26064a61d186ab25b764089c0b84948584
 SHA512:
-  metadata.gz: 08de45835f8864995fed2e7e4b4387d705887ae1164d2914a670cf9df600f09120578c1af50bb8698b03b698b26795679bf14a8ab3a1c249269c9041a9081fe7
-  data.tar.gz: c9d04866473b2787d120711f098c895995e57d5387546bfe7e553e42ecc8e0b9bb9973166a7f6f096c035ccac71beebf5cea2557c9ee892896f28809aee44512
+  metadata.gz: b2939f83821f0a37d90aca329703bd88dc671742b5134bd93cad0f4d6b90d8e5611887de95eb422b5e32357171ea798361fce24eb14a35d5af29cd9c1474406d
+  data.tar.gz: 308801fa96bae8bd6094a8bb3a042d1a1d8e90035b42b0b11b458b3488b0a1d00d16edb930d36abaf668e6de167a97775f80c37db2598963b1ceb9a954e4e64e

data/.coveralls.yml

@@ -1,2 +1 @@
 service_name: travis-ci
-repo_token: JXdUC0No2jFLktGfjwVfInePFNnFKEnYb

data/README.rdoc

@@ -26,15 +26,19 @@ please add the following line into your ~/.bash_login etc:
 
   test -f ~/.vvm-rb/etc/login && source ~/.vvm-rb/etc/login
 
-or
+you can set own root.
 
   export VVMROOT=/your/vvm-rb/root/path
   test -f $VVMROOT/etc/login && source $VVMROOT/etc/login
 
-commands
+you can set your default options of configure.
+
+  export VVMOPT="--enable-rubyinterp --enable-pythoninterp"
+
+== Commands
 
   $ vvm-rb help
-  $ vvm-rb install v7-4
+  $ vvm-rb install v7-4 --enable-rubyinterp
   $ vvm-rb install v7-4-035
   $ vvm-rb reinstall v7-4
   $ vvm-rb rebuild v7-4 --enable-rubyinterp --enable-pythoninterp

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/vvm-rb/accesser.rb

@@ -1,39 +1,36 @@
 module Accesser
+
   module_function
 
   def get_dot_dir
-    return File.expand_path(ENV['VVMROOT'] || '~/.vvm-rb')
+    File.expand_path(ENV['VVMROOT'] || '~/.vvm-rb')
   end
 
   def get_etc_dir
-    return File.join(get_dot_dir, 'etc')
+    File.join(get_dot_dir, 'etc')
   end
 
   def get_repos_dir
-    return File.join(get_dot_dir, 'repos')
+    File.join(get_dot_dir, 'repos')
   end
 
   def get_src_dir(version = '')
-    return File.join(get_dot_dir, 'src', version)
+    File.join(get_dot_dir, 'src', version)
   end
 
   def get_vims_dir(version = '')
-    return File.join(get_dot_dir, 'vims', version)
+    File.join(get_dot_dir, 'vims', version)
   end
 
   def get_vimorg_dir
-    return File.join(get_repos_dir, 'vimorg')
+    File.join(get_repos_dir, 'vimorg')
   end
 
   def get_login_file
-    return File.join(get_etc_dir, 'login')
+    File.join(get_etc_dir, 'login')
   end
 
   def get_current_dir
-    return File.join(get_vims_dir, 'current')
-  end
-
-  def get_cache_dir
-    return File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '.vvm_cache'))
+    File.join(get_vims_dir, 'current')
   end
 end

data/lib/vvm-rb/base.rb

@@ -0,0 +1,19 @@
+module VvmRb
+  module Base
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def before_method(*names)
+        names.each do |name|
+          m = instance_method(name)
+          define_method(name) do |*args, &block|
+            yield
+            m.bind(self).call(*args, &block)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vvm-rb/cli.rb

@@ -2,7 +2,7 @@ require 'thor'
 
 class Cli < Thor
   include Thor::Actions
-  include Validator
+  include VvmRb::Base
 
   desc 'install [TAG] [options]', 'Install a specific version of Vim'
   def install(version, *conf)
@@ -26,7 +26,7 @@ test -f ~/.vvm-rb/etc/login && source ~/.vvm-rb/etc/login
     installer(version, conf)
   end
 
-  desc 'rebuild [TAG] [options]', 'Rebuild a specific version of Vim, then install it'
+  desc 'rebuild [TAG] [options]', 'Rebuild a specific version of Vim'
   def rebuild(version, *conf)
     rebuilder(version, conf)
   end

data/lib/vvm-rb/installer.rb

@@ -4,24 +4,25 @@ class Installer
 
   def initialize(version, conf = [])
     @version = version
-    @conf    = conf
+    @conf = conf.empty? && ENV['VVMOPT'] ? ENV['VVMOPT'].split(' ') : conf
   end
 
   def fetch
     FileUtils.mkdir_p(get_repos_dir)
     repos_dir = get_vimorg_dir
-    unless File.exists?(repos_dir)
-      system("hg clone #{VIM_URI} #{repos_dir}")
-    end
+    system("hg clone #{VIM_URI} #{repos_dir}") unless File.exists?(repos_dir)
     Dir.chdir(repos_dir) { system('hg pull') }
   end
 
   def checkout
-    repos_dir = get_vimorg_dir
     src_dir = get_src_dir
     FileUtils.mkdir_p(src_dir)
     unless File.exists?(get_src_dir(@version))
-      system("cd #{repos_dir} && hg archive -t tar -r #{@version} -p #{@version} - | (cd #{src_dir} && tar xf -)")
+      archive = "hg archive -t tar -r #{@version} -p #{@version} -"
+      expand = "(cd #{src_dir} && tar xf -)"
+      Dir.chdir get_vimorg_dir do
+        system("#{archive} | #{expand}")
+      end
     end
   end
 

data/lib/vvm-rb/switcher.rb

@@ -7,14 +7,10 @@ class Switcher
 
   def use
     current = get_current_dir
-    if File.exists?(current)
-      FileUtils.rm(current)
-    end
+    FileUtils.rm(current) if File.exists?(current)
     unless @version == 'system'
       vims_dir = get_vims_dir(@version)
-      unless File.exists?(vims_dir)
-        abort "#{@version} is not installed."
-      end
+      abort "#{@version} is not installed." unless File.exists?(vims_dir)
       FileUtils.ln_s(vims_dir, current)
     end
   end

data/lib/vvm-rb/uninstaller.rb

@@ -15,11 +15,7 @@ class Uninstaller
         abort "#{@version} can not be uninstalled; it is currently used."
       end
     end
-    if File.exists?(src_dir)
-      FileUtils.rm_rf(src_dir)
-    end
-    if File.exists?(vims_dir)
-      FileUtils.rm_rf(vims_dir)
-    end
+    FileUtils.rm_rf(src_dir) if File.exists?(src_dir)
+    FileUtils.rm_rf(vims_dir) if File.exists?(vims_dir)
   end
 end

data/lib/vvm-rb/validator.rb

@@ -1,31 +1,18 @@
 module Validator
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
 
-  module ClassMethods
-    def before_method(*names)
-      names.each do |name|
-        m = instance_method(name)
-        define_method(name) do |*args, &block|
-          yield
-          m.bind(self).call(*args, &block)
-        end
-      end
-    end
+  module_function
 
-    def check_hg
-      unless Kernel.system('hg --version > /dev/null')
-        abort 'mercurial is required to install.'
-      end
-      return true
+  def check_hg
+    unless Kernel.system('which hg > /dev/null')
+      abort 'mercurial is required to install.'
     end
+    return true
+  end
 
-    def check_tag
-      unless $*[1] =~ /(^start$|^tip$|^v7-.+$|^system$)/
-        abort 'undefined vim version. please run [ vvm-rb list ] and check available versions.'
-      end
-      return true
+  def check_tag
+    unless $*[1] =~ /(^start$|^tip$|^v7-.+$|^system$)/
+      abort 'undefined vim version. please run [ vvm-rb list ].'
     end
+    return true
   end
 end

data/lib/vvm-rb/version.rb

@@ -2,13 +2,15 @@ class Version
   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?}).join("\n")
+      return list.values_at(* list.each_index.select { |i| i.odd? }).join("\n")
     end
   end
 
   def self.versions
     output = []
-    Dir.glob(File.join(get_vims_dir, 'v*')).sort.each{ |d| output << File.basename(d) }
+    Dir.glob(File.join(get_vims_dir, 'v*')).sort.each do |d|
+      output << File.basename(d)
+    end
     return output.join("\n")
   end
 end

data/lib/vvm-rb.rb

@@ -1,3 +1,4 @@
+require 'vvm-rb/base'
 require 'vvm-rb/constants'
 require 'vvm-rb/installer'
 require 'vvm-rb/uninstaller'
@@ -8,4 +9,5 @@ require 'vvm-rb/version'
 
 module VvmRb
   include Accesser
+  include Validator
 end

data/spec/installer_spec.rb

@@ -7,6 +7,7 @@ describe 'Installer' do
       FileUtils.rm_rf(get_vims_dir)
       FileUtils.rm_rf(get_repos_dir)
       FileUtils.rm_rf(get_etc_dir)
+      ENV['VVMOPT'] = '--enable-rubyinterp'
       @version = 'v7-4'
       @installer = Installer.new(@version)
     end
@@ -55,6 +56,14 @@ describe 'Installer' do
         expect(File.exists?(get_login_file)).to be_true
       end
     end
+
+    context 'vvmopt' do
+      let(:vim) { "#{get_vims_dir(@version)}/bin/vim" }
+
+      it 'enable rubyinterp' do
+        expect(`#{vim} --version |grep ruby`).to match(/\+ruby/)
+      end
+    end
   end
 
   describe 'rebuild' do

data/spec/spec_helper.rb

@@ -17,7 +17,7 @@ require 'tmpdir'
 require 'vvm-rb'
 include VvmRb
 
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
   config.before :suite do
@@ -41,9 +41,14 @@ RSpec.configure do |config|
     FileUtils.cp_r(get_cache_dir, @tmp)
     @vvm_tmp = File.expand_path(File.join(@tmp, '.vvm_cache'))
     ENV['VVMROOT'] = @vvm_tmp
+    ENV['VVMOPT'] = nil
   end
 
   config.after :all do
     FileUtils.rm_rf(@tmp)
   end
 end
+
+def get_cache_dir
+  File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '.vvm_cache'))
+end

data/spec/validator_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-include Validator
+include VvmRb::Base
 
 describe 'Validator' do
 

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.6 ruby lib
+# stub: vvm-rb 0.0.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "vvm-rb"
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yuu Shigetani"]
-  s.date = "2013-11-02"
+  s.date = "2013-11-04"
   s.description = "vim version manager."
   s.email = "s2g4t1n2@gmail.com"
   s.executables = ["vvm-rb"]
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "etc/login",
     "lib/vvm-rb.rb",
     "lib/vvm-rb/accesser.rb",
+    "lib/vvm-rb/base.rb",
     "lib/vvm-rb/cli.rb",
     "lib/vvm-rb/constants.rb",
     "lib/vvm-rb/installer.rb",
@@ -45,7 +46,6 @@ Gem::Specification.new do |s|
     "spec/uninstaller_spec.rb",
     "spec/validator_spec.rb",
     "spec/version_spec.rb",
-    "spec/vvm-rb_spec.rb",
     "vvm-rb.gemspec"
   ]
   s.homepage = "http://github.com/calorie/vvm-rb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vvm-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Yuu Shigetani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-02 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -144,6 +144,7 @@ files:
 - etc/login
 - lib/vvm-rb.rb
 - lib/vvm-rb/accesser.rb
+- lib/vvm-rb/base.rb
 - lib/vvm-rb/cli.rb
 - lib/vvm-rb/constants.rb
 - lib/vvm-rb/installer.rb
@@ -157,7 +158,6 @@ files:
 - spec/uninstaller_spec.rb
 - spec/validator_spec.rb
 - spec/version_spec.rb
-- spec/vvm-rb_spec.rb
 - vvm-rb.gemspec
 homepage: http://github.com/calorie/vvm-rb
 licenses:

data/spec/vvm-rb_spec.rb

@@ -1,4 +0,0 @@
-require 'spec_helper'
-
-describe "VvmRb" do
-end