vvm-rb 0.2.2 → 1.0.0

data/spec/uninstaller_spec.rb

@@ -5,8 +5,8 @@ describe 'Uninstaller' do
     context 'vim version is currently used' do
       before :all do
         version = VERSION1
-        Switcher.new(version).use
-        @uninstaller = Uninstaller.new(version)
+        Vvm::Switcher.new(version).use
+        @uninstaller = Vvm::Uninstaller.new(version)
       end
 
       after :all do
@@ -21,15 +21,16 @@ describe 'Uninstaller' do
     context 'can uninstall version' do
       before :all do
         @version = VERSION1
-        Uninstaller.new(@version).uninstall
+        Vvm::Switcher.new('system').use
+        Vvm::Uninstaller.new(@version).uninstall
       end
 
       it 'delete src dir' do
-        expect(File.exist?(get_src_dir(@version))).not_to be_true
+        expect(File.exist?(get_src_dir(@version))).not_to be_truthy
       end
 
       it 'delete vims dir' do
-        expect(File.exist?(get_vims_dir(@version))).not_to be_true
+        expect(File.exist?(get_vims_dir(@version))).not_to be_truthy
       end
     end
   end

data/spec/validator_spec.rb

@@ -1,41 +1,36 @@
 require 'spec_helper'
-include VvmRb::Base
 
 describe 'Validator' do
+  include Vvm::Validator
+
   NEW_VERSION = 'v7-4-050'
 
   describe 'has_hg?' do
-    def dummy_method ; end
-    before_method(:dummy_method) { has_hg? }
-
     context 'hg is installed' do
-      before { Kernel.stub(:system).and_return(true) }
+      before { allow(Kernel).to receive(:find_executable).and_return(true) }
 
       it 'success to run the method' do
-        expect(dummy_method).to be_nil
+        expect(has_hg?).to be_truthy
       end
     end
 
     context 'hg is not installed' do
-      before { Kernel.stub(:system).and_return(false) }
+      before { allow(Kernel).to receive(:find_executable).and_return(false) }
 
       it 'cannot run the method' do
-        expect(proc { dummy_method }).to raise_error
+        expect(proc { has_hg? }).to raise_error
       end
     end
   end
 
   describe 'version?' do
-    def dummy_method ; end
-    before_method(:dummy_method) { version? }
-
     before(:all) { $* << %w(vvm-rb install) }
 
     context 'available tag' do
       before { $*[2] = NEW_VERSION }
 
       it 'success to run the method' do
-        expect(dummy_method).to be_nil
+        expect(version?).to be_truthy
       end
     end
 
@@ -43,7 +38,7 @@ describe 'Validator' do
       before { $*[2] = 'latest' }
 
       it 'success to run the method' do
-        expect(dummy_method).to be_nil
+        expect(version?).to be_truthy
       end
     end
 
@@ -51,47 +46,35 @@ describe 'Validator' do
       before { $*[2] = '--use' }
 
       it 'cannot run the method' do
-        expect(proc { dummy_method }).to raise_error
+        expect(proc { version? }).to raise_error
       end
     end
   end
 
   describe 'new_version?' do
-    def dummy_method ; end
-
     context 'new version' do
-      before_method(:dummy_method) { new_version?(NEW_VERSION) }
-
       it 'success to run the method' do
-        expect(dummy_method).to be_nil
+        expect(new_version?(NEW_VERSION)).to be_truthy
       end
     end
 
     context 'version is installed' do
-      before_method(:dummy_method) { new_version?(VERSION1) }
-
       it 'cannot run the method' do
-        expect(proc { dummy_method }).to raise_error
+        expect(proc { new_version?(VERSION1) }).to raise_error
       end
     end
   end
 
   describe 'has_version?' do
-    def dummy_method ; end
-
     context 'version is installed' do
-      before_method(:dummy_method) { has_version?(VERSION1) }
-
       it 'success to run the method' do
-        expect(dummy_method).to be_nil
+        expect(has_version?(VERSION1)).to be_truthy
       end
     end
 
     context 'version is not installed' do
-      before_method(:dummy_method) { has_version?(NEW_VERSION) }
-
       it 'cannot run the method' do
-        expect(proc { dummy_method }).to raise_error
+        expect(proc { has_version?(NEW_VERSION) }).to raise_error
       end
     end
   end

data/spec/version_spec.rb

@@ -5,14 +5,14 @@ require 'tmpdir'
 describe 'Version' do
   describe 'list' do
     it 'echo available vim versions' do
-      expect(Version.list.join("\n")).to match(/\Astart\n(v7-.+\n)+tip\z/)
+      expect(Vvm::Version.list.join("\n")).to match(/\Astart\n(v7-.+\n)+tip\z/)
     end
   end
 
   describe 'versions' do
     context 'vims dirctory exists' do
       it 'echo installed vim versions' do
-        expect(Version.versions.join("\n")).to eq "#{VERSION1}\n#{VERSION2}"
+        expect(Vvm::Version.versions.join("\n")).to eq "#{VERSION1}\n#{VERSION2}"
       end
     end
     context 'vims dirctory is not found' do
@@ -28,36 +28,36 @@ describe 'Version' do
       end
 
       it 'echo nothing' do
-        expect(Version.versions).to eq []
+        expect(Vvm::Version.versions).to eq []
       end
     end
   end
 
   describe 'latest' do
     it 'return latest vim version' do
-      expect(Version.latest).to match(/\Av7-.+\z/)
+      expect(Vvm::Version.latest).to match(/\Av7-.+\z/)
     end
   end
 
   describe 'current' do
     context 'current version is system' do
-      before { Switcher.new('system').use }
+      before { Vvm::Switcher.new('system').use }
       it 'return current vim version' do
-        expect(Version.current).to eq 'system'
+        expect(Vvm::Version.current).to eq 'system'
       end
     end
 
     context 'current version is not system' do
-      before { Switcher.new(VERSION1).use }
+      before { Vvm::Switcher.new(VERSION1).use }
       it 'return current vim version' do
-        expect(Version.current).to eq VERSION1
+        expect(Vvm::Version.current).to eq VERSION1
       end
     end
   end
 
   describe 'convert' do
     it 'version to tag' do
-      expect(Version.convert('7.4.112')).to eq 'v7-4-112'
+      expect(Vvm::Version.convert('7.4.112')).to eq 'v7-4-112'
     end
   end
 
@@ -65,19 +65,19 @@ describe 'Version' do
 
     context 'tag' do
       it 'return formated vim version' do
-        expect(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(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(Version.format('latest')).to match(/\Av7-.+\z/)
+        expect(Vvm::Version.format('latest')).to match(/\Av7-.+\z/)
       end
     end
   end

data/vvm-rb.gemspec

@@ -2,19 +2,19 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: vvm-rb 0.2.2 ruby lib
+# stub: vvm-rb 1.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "vvm-rb"
-  s.version = "0.2.2"
+  s.version = "1.0.0"
 
   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-05-16"
+  s.date = "2015-02-20"
   s.description = "vim version manager."
   s.email = "s2g4t1n2@gmail.com"
-  s.executables = ["vvm-rb"]
+  s.executables = ["vvm"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -30,19 +30,19 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "bin/vvm-rb",
+    "bin/vvm",
     "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",
-    "lib/vvm-rb/switcher.rb",
-    "lib/vvm-rb/uninstaller.rb",
-    "lib/vvm-rb/validator.rb",
-    "lib/vvm-rb/version.rb",
-    "spec/accesser_spec.rb",
+    "lib/vvm.rb",
+    "lib/vvm/accessor.rb",
+    "lib/vvm/cli.rb",
+    "lib/vvm/constants.rb",
+    "lib/vvm/ext/mkmf.rb",
+    "lib/vvm/installer.rb",
+    "lib/vvm/switcher.rb",
+    "lib/vvm/uninstaller.rb",
+    "lib/vvm/validator.rb",
+    "lib/vvm/version.rb",
+    "spec/accessor_spec.rb",
     "spec/installer_spec.rb",
     "spec/spec_helper.rb",
     "spec/switcher_spec.rb",
@@ -54,7 +54,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/calorie/vvm-rb"
   s.licenses = ["MIT"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.5"
   s.summary = "vim version manager"
 
   if s.respond_to? :specification_version then
@@ -62,28 +62,28 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<thor>, ["~> 0.19.1"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.14.1"])
-      s.add_development_dependency(%q<rubocop>, ["~> 0.21.0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 4.1.1"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_development_dependency(%q<simplecov>, ["~> 0.8.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 3.0"])
+      s.add_development_dependency(%q<rubocop>, ["~> 0.25.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 4.1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
+      s.add_development_dependency(%q<simplecov>, ["~> 0.9.0"])
       s.add_development_dependency(%q<coveralls>, ["~> 0.7.0"])
     else
       s.add_dependency(%q<thor>, ["~> 0.19.1"])
-      s.add_dependency(%q<rspec>, ["~> 2.14.1"])
-      s.add_dependency(%q<rubocop>, ["~> 0.21.0"])
-      s.add_dependency(%q<rdoc>, ["~> 4.1.1"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_dependency(%q<simplecov>, ["~> 0.8.2"])
+      s.add_dependency(%q<rspec>, ["~> 3.0"])
+      s.add_dependency(%q<rubocop>, ["~> 0.25.0"])
+      s.add_dependency(%q<rdoc>, ["~> 4.1"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0"])
+      s.add_dependency(%q<simplecov>, ["~> 0.9.0"])
       s.add_dependency(%q<coveralls>, ["~> 0.7.0"])
     end
   else
     s.add_dependency(%q<thor>, ["~> 0.19.1"])
-    s.add_dependency(%q<rspec>, ["~> 2.14.1"])
-    s.add_dependency(%q<rubocop>, ["~> 0.21.0"])
-    s.add_dependency(%q<rdoc>, ["~> 4.1.1"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-    s.add_dependency(%q<simplecov>, ["~> 0.8.2"])
+    s.add_dependency(%q<rspec>, ["~> 3.0"])
+    s.add_dependency(%q<rubocop>, ["~> 0.25.0"])
+    s.add_dependency(%q<rdoc>, ["~> 4.1"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0"])
+    s.add_dependency(%q<simplecov>, ["~> 0.9.0"])
     s.add_dependency(%q<coveralls>, ["~> 0.7.0"])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vvm-rb
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Yuu Shigetani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,70 +30,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.25.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.25.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +111,7 @@ dependencies:
 description: vim version manager.
 email: s2g4t1n2@gmail.com
 executables:
-- vvm-rb
+- vvm
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
@@ -127,19 +127,19 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- bin/vvm-rb
+- bin/vvm
 - 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
-- lib/vvm-rb/switcher.rb
-- lib/vvm-rb/uninstaller.rb
-- lib/vvm-rb/validator.rb
-- lib/vvm-rb/version.rb
-- spec/accesser_spec.rb
+- lib/vvm.rb
+- lib/vvm/accessor.rb
+- lib/vvm/cli.rb
+- lib/vvm/constants.rb
+- lib/vvm/ext/mkmf.rb
+- lib/vvm/installer.rb
+- lib/vvm/switcher.rb
+- lib/vvm/uninstaller.rb
+- lib/vvm/validator.rb
+- lib/vvm/version.rb
+- spec/accessor_spec.rb
 - spec/installer_spec.rb
 - spec/spec_helper.rb
 - spec/switcher_spec.rb
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: vim version manager

data/bin/vvm-rb

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-begin
-  require 'vvm-rb'
-  require 'vvm-rb/cli'
-rescue LoadError
-  require 'rubygems'
-  require 'vvm-rb'
-  require 'vvm-rb/cli'
-end
-
-include VvmRb
-Cli.source_root(File.join(File.dirname(__FILE__), '..'))
-Cli.start

data/lib/vvm-rb/accesser.rb

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

data/lib/vvm-rb/base.rb

@@ -1,19 +0,0 @@
-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

@@ -1,101 +0,0 @@
-require 'thor'
-
-class Cli < Thor
-  include Thor::Actions
-  include VvmRb::Base
-
-  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)
-    i = Installer.new(Version.format(version), conf)
-    i.checkout
-    i.configure
-    i.make_install
-    Installer.cp_etc
-
-    invoke :use, [version], {} if options[:use]
-
-    message if $?.success?
-  end
-
-  desc 'update', 'Update to latest version of Vim'
-  def update
-    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'
-      action = $?.success? ? 'uninstall' : 'use'
-      run "vvm-rb #{action} #{current}"
-    end
-  end
-
-  desc 'reinstall [VERSION] [CONFIGURE_OPTS]', 'Reinstall a specific version'
-  def reinstall(version, *conf)
-    invoke :uninstall, [version]
-    invoke :install, [version, *conf]
-  end
-
-  desc 'rebuild [VERSION] [CONFIGURE_OPTS]', 'Rebuild a specific version of Vim'
-  def rebuild(version, *conf)
-    r = Installer.new(Version.format(version), conf)
-    r.make_clean
-    r.configure
-    r.make_install
-  end
-
-  desc 'use [VERSION]', 'Use a specific version of Vim as the default one.'
-  def use(version)
-    Switcher.new(Version.format(version)).use
-  end
-
-  desc 'list', 'Look available versions of Vim.'
-  def list
-    puts Version.list.join("\n")
-  end
-
-  desc 'versions', 'Look installed versions of Vim.'
-  def versions
-    puts Version.versions.join("\n")
-  end
-
-  desc 'uninstall [VERSION]', 'Uninstall a specific version of Vim.'
-  def uninstall(version)
-    Uninstaller.new(Version.format(version)).uninstall
-  end
-
-  private
-
-  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
-
-  def self.init_vvm_rb
-    before_method(*instance_methods(false)) do
-      Installer.fetch unless File.exist?(get_vimorg_dir)
-    end
-  end
-
-  def self.validations
-    before_method(:install) { new_version? }
-    before_method(:reinstall, :rebuild, :use, :uninstall) { has_version? }
-    before_method(:install, :reinstall, :rebuild, :use, :uninstall) { version? }
-    before_method(:install, :list) { Installer.pull }
-    before_method(:install, :reinstall, :rebuild, :list) { has_hg? }
-  end
-
-  validations
-
-  init_vvm_rb
-end

data/lib/vvm-rb/constants.rb

@@ -1 +0,0 @@
-VIM_URI = 'https://vim.googlecode.com/hg/'