vvm-rb 0.2.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c5ab61d4211e9a7958ac8dda739e0fc334b313f
-  data.tar.gz: fdeaf8c8d31b478e520884c865e3bdf67b6c2889
+  metadata.gz: d205eff702304a8422fee7de8fb6104dcfe8edfb
+  data.tar.gz: c60209e5e6328a7a8d33ea581d8fed9336f4fef5
 SHA512:
-  metadata.gz: f6c0d21a3d7936a7d00a536f5547a1fb474eb2a60f9e7f705ae5651750e67636061c25f30fc5b1c81646f91cacca2c3a017e07215507bb24a95caf5704742e6d
-  data.tar.gz: a7a27a9a069e8f664cb092036a96d371d8510cf8c7685fb5a3feb7de55bc5422c933ae95a9c667535bb7f72c51adf63482e733f7bea32083aa1a3c9babd18833
+  metadata.gz: 26a043ccc72fdcbd398190ac5ba44be137c149b9b51762d886ef1d39da7686454510a89c1645aeab0bf920e624c9f453d441d4199cab1a62242c5273d596d95f
+  data.tar.gz: 78f2b9d88963a33e02f21ac2a66eb2233e9d16e7c52d7291407ac3383e0f5a3aed616ad9016cef3d4c1e4a6c17c31d48aac548ed1635b9e73af0b20b8571f13d

data/.rubocop.yml

@@ -1,14 +1,16 @@
 AllCops:
   Exclude:
-    - .bundle/**
-    - .git/**
-    - .vvm_cache/**
-    - coverage/**
-    - etc/**
-    - pkg/**
-    - vendor/**
+    - .bundle/**/*
+    - .git/**/*
+    - .vvm_cache/**/*
+    - coverage/**/*
+    - etc/**/*
+    - pkg/**/*
+    - vendor/**/*
+    - Rakefile
+    - vvm-rb.gemspec
 LineLength:
-  Max: 80
+  Max: 90
 MethodLength:
   Max: 30
 RedundantReturn:

data/Gemfile

@@ -3,10 +3,10 @@ source 'http://rubygems.org'
 gem 'thor', '~> 0.19.1'
 
 group :development do
-  gem 'rspec', '~> 2.14.1'
-  gem 'rubocop', '~> 0.21.0'
-  gem 'rdoc', '~> 4.1.1'
-  gem 'jeweler', '~> 2.0.1'
-  gem 'simplecov', '~> 0.8.2'
+  gem 'rspec', '~> 3.0'
+  gem 'rubocop', '~> 0.25.0'
+  gem 'rdoc', '~> 4.1'
+  gem 'jeweler', '~> 2.0'
+  gem 'simplecov', '~> 0.9.0'
   gem 'coveralls', '~> 0.7.0', require: false
 end

data/VERSION

@@ -1 +1 @@
-0.2.2
+1.0.0

data/bin/vvm

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

data/lib/vvm/accessor.rb

@@ -0,0 +1,37 @@
+module Vvm
+  module Accessor
+    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
+end

data/lib/vvm/cli.rb

@@ -0,0 +1,78 @@
+require 'thor'
+
+module Vvm
+  class Cli < Thor
+    include Thor::Actions
+    include Validator
+
+    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]
+      i.message
+    end
+
+    desc 'update', 'Update to latest version of Vim'
+    def update
+      current = Version.current
+      if current == 'system'
+        run 'vvm install --use latest'
+        run 'vvm use system' unless $?.success?
+      else
+        run 'vvm use system'
+        run 'vvm install --use latest'
+        action = $?.success? ? 'uninstall' : 'use'
+        run "vvm #{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
+
+    no_commands do
+      def invoke_command(command, *args)
+        validate_before_invoke(command.name)
+        Installer.pull if %w(install list).include?(command.name)
+        Installer.fetch unless File.exist?(get_vimorg_dir)
+        super
+      end
+    end
+  end
+end

data/lib/vvm/constants.rb

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

data/lib/vvm/ext/mkmf.rb

@@ -0,0 +1,8 @@
+require 'mkmf'
+
+module MakeMakefile
+  module Logging
+    @logfile = File::NULL
+    @quiet   = true
+  end
+end

data/lib/vvm/installer.rb

@@ -0,0 +1,83 @@
+require 'fileutils'
+
+module Vvm
+  class Installer
+    def initialize(version, conf, silent = false)
+      vvmopt   = ENV['VVMOPT']
+      @silent  = silent ? '> /dev/null 2>&1' : ''
+      @version = version
+      @conf    = conf.flatten.empty? && vvmopt ? vvmopt.split(' ') : conf
+    end
+
+    def self.fetch
+      FileUtils.mkdir_p(get_repos_dir)
+      repos_dir = get_vimorg_dir
+      system("hg -q clone #{VIM_URI} #{repos_dir}") unless File.exist?(repos_dir)
+    end
+
+    def self.pull
+      Dir.chdir(get_vimorg_dir) { system('hg -q pull') }
+    end
+
+    def checkout
+      src_dir = get_src_dir
+      FileUtils.mkdir_p(src_dir)
+      return if File.exist?(get_src_dir(@version))
+      archive = "hg archive -t tar -r #{@version} -p #{@version} -"
+      expand  = "(cd #{src_dir} && tar xf -)"
+      Dir.chdir get_vimorg_dir do
+        system("#{archive} | #{expand} #{@silent}")
+      end
+    end
+
+    def configure
+      vims_dir = get_vims_dir(@version)
+      src_dir  = get_src_dir(@version)
+      default  = "--prefix=#{vims_dir}"
+      Dir.chdir src_dir do
+        system("./configure #{default} #{@conf.join(' ')} #{@silent}")
+      end
+    end
+
+    def make_clean
+      src_dir = get_src_dir(@version)
+      Dir.chdir src_dir do
+        system("make clean #{@silent}")
+      end
+    end
+
+    def make_install
+      src_dir = get_src_dir(@version)
+      Dir.chdir src_dir do
+        system("make all install #{@silent}")
+      end
+    end
+
+    def self.cp_etc
+      current_login = get_login_file
+      path = File.join(File.dirname(__FILE__), '..', '..', 'etc', 'login')
+      login = File.expand_path(path)
+      if !File.exist?(current_login)
+        etc_dir = get_etc_dir
+        FileUtils.mkdir_p(etc_dir)
+        FileUtils.cp(login, etc_dir)
+      elsif !FileUtils.compare_file(login, current_login)
+        FileUtils.cp(login, get_etc_dir)
+      end
+    end
+
+    def message
+      return if !$?.success? || @silent.empty?
+      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
+end

data/lib/vvm/switcher.rb

@@ -0,0 +1,18 @@
+require 'fileutils'
+
+module Vvm
+  class Switcher
+    def initialize(version)
+      @version = version
+    end
+
+    def use
+      current = get_current_dir
+      FileUtils.rm(current) if File.exist?(current)
+      return if @version == 'system'
+      vims_dir = get_vims_dir(@version)
+      abort "#{@version} is not installed." unless File.exist?(vims_dir)
+      FileUtils.ln_s(vims_dir, current)
+    end
+  end
+end

data/lib/vvm/uninstaller.rb

@@ -0,0 +1,23 @@
+require 'fileutils'
+
+module Vvm
+  class Uninstaller
+    def initialize(version)
+      @version = version
+    end
+
+    def uninstall
+      current  = get_current_dir
+      vims_dir = get_vims_dir(@version)
+      src_dir  = get_src_dir(@version)
+      if File.exist?(current)
+        target = File.readlink(current)
+        if target == vims_dir
+          abort "#{@version} can not be uninstalled; it is currently used."
+        end
+      end
+      FileUtils.rm_rf(src_dir) if File.exist?(src_dir)
+      FileUtils.rm_rf(vims_dir) if File.exist?(vims_dir)
+    end
+  end
+end

data/lib/vvm/validator.rb

@@ -0,0 +1,55 @@
+require 'mkmf'
+
+module Vvm
+  module Validator
+    module_function
+
+    def validate_before_invoke(command)
+      new_version? if command == 'install'
+      has_version? if %w(reinstall rebuild use uninstall).include?(command)
+      version? if %w(install reinstall rebuild use uninstall).include?(command)
+      has_hg? if %w(install reinstall rebuild list).include?(command)
+    end
+
+    def has_hg?
+      unless Kernel.find_executable('hg')
+        abort 'mercurial is required to install.'
+      end
+      return true
+    end
+
+    def version?
+      if get_version.nil?
+        abort 'undefined vim version. please run [ vvm-rb list ].'
+      end
+      return true
+    end
+
+    def new_version?(version = get_version)
+      abort "#{version} is already installed." if version_include?(version)
+      return true
+    end
+
+    def has_version?(version = get_version)
+      abort "#{version} is not installed." unless version_include?(version)
+      return true
+    end
+
+    private
+
+    def get_version
+      version_regex = /\Av7-.+\z|\A(\d\.\d(a|b){0,1}(\.\d+){0,1})\z/
+      regex = /(\Astart\z|\Atip\z|\Asystem\z|\Alatest\z|#{version_regex})/
+      version = $*.find { |v| v =~ regex }
+      return Version.format(version)
+    end
+
+    def version_include?(version)
+      return Version.versions.include?(version) || use_system?(version)
+    end
+
+    def use_system?(version)
+      return version == 'system' && $*.include?('use')
+    end
+  end
+end

data/lib/vvm/version.rb

@@ -0,0 +1,43 @@
+module Vvm
+  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? })
+      end
+    end
+
+    def self.versions
+      output   = []
+      vims_dir = get_vims_dir
+      return output unless File.exist?(vims_dir)
+      Dir.glob(File.join(vims_dir, 'v*')).sort.each do |d|
+        output << File.basename(d)
+      end
+      return output
+    end
+
+    def self.latest
+      return list.select { |v| v =~ /\Av7-.+\z/ }.last
+    end
+
+    def self.current
+      c = get_current_dir
+      return File.exist?(c) ? File.basename(File.readlink(c)) : 'system'
+    end
+
+    def self.convert(version)
+      return "v#{version.gsub(/\./, '-')}"
+    end
+
+    def self.format(version)
+      case version
+      when /\Alatest\z/
+        version = latest
+      when /\A(\d\.\d(a|b){0,1}(\.\d+){0,1})\z/
+        version = convert(version)
+      end
+      return version
+    end
+  end
+end

data/lib/vvm.rb

@@ -0,0 +1,10 @@
+require_relative 'vvm/ext/mkmf'
+require_relative 'vvm/constants'
+require_relative 'vvm/installer'
+require_relative 'vvm/uninstaller'
+require_relative 'vvm/switcher'
+require_relative 'vvm/validator'
+require_relative 'vvm/accessor'
+require_relative 'vvm/version'
+
+include Vvm::Accessor

data/spec/accessor_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe 'Accessor' do
+  it 'can access vvm-rb home directory' do
+    expect(File.exist?(get_dot_dir)).to be_truthy
+  end
+
+  it 'can access etc directory' do
+    expect(File.exist?(get_etc_dir)).to be_truthy
+  end
+
+  it 'can access repos directory' do
+    expect(File.exist?(get_repos_dir)).to be_truthy
+  end
+
+  it 'can access src directory' do
+    expect(File.exist?(get_src_dir)).to be_truthy
+  end
+
+  it 'can access vims directory' do
+    expect(File.exist?(get_vims_dir)).to be_truthy
+  end
+
+  it 'can access vimorg directory' do
+    expect(File.exist?(get_vimorg_dir)).to be_truthy
+  end
+
+  it 'can access login file' do
+    expect(File.exist?(get_login_file)).to be_truthy
+  end
+
+  context 'of current directory' do
+    before { Vvm::Switcher.new(VERSION1).use }
+    after { Vvm::Switcher.new('system').use }
+
+    it 'can access current directory' do
+      expect(File.exist?(get_current_dir)).to be_truthy
+    end
+  end
+end

data/spec/installer_spec.rb

@@ -4,7 +4,7 @@ describe 'Installer', disable_cache: true do
   before :all do
     ENV['VVMOPT'] = '--enable-rubyinterp'
     @version      = VERSION1
-    @installer    = Installer.new(@version, [], true)
+    @installer    = Vvm::Installer.new(@version, [], true)
   end
 
   let(:version_src_dir) { get_src_dir(@version) }
@@ -13,29 +13,29 @@ describe 'Installer', disable_cache: true do
 
   describe 'install' do
     context 'fetch', clean: true do
-      before(:all) { Installer.fetch }
+      before(:all) { Vvm::Installer.fetch }
 
       it 'exists vimorg dir' do
-        expect(File.exist?(get_vimorg_dir)).to be_true
+        expect(File.exist?(get_vimorg_dir)).to be_truthy
       end
 
       it 'success to clone' do
-        expect($?.success?).to be_true
+        expect($?.success?).to be_truthy
       end
 
       it 'exists configure file' do
-        expect(File.exist?(File.join(get_vimorg_dir, 'configure'))).to be_true
+        expect(File.exist?(File.join(get_vimorg_dir, 'configure'))).to be_truthy
       end
     end
 
     context 'pull', clean: true, vimorg: true do
       before :all do
         Dir.chdir(get_vimorg_dir) { system('hg rollback') }
-        Installer.pull
+        Vvm::Installer.pull
       end
 
       it 'success to pull' do
-        expect($?.success?).to be_true
+        expect($?.success?).to be_truthy
       end
 
       it 'vim is uptodate' do
@@ -51,11 +51,12 @@ describe 'Installer', disable_cache: true do
       end
 
       it 'exists src dir' do
-        expect(File.exist?(version_src_dir)).to be_true
+        expect(File.exist?(version_src_dir)).to be_truthy
       end
 
       it 'exists configure file' do
-        expect(File.exist?(File.join(version_src_dir, 'configure'))).to be_true
+        configure = File.join(version_src_dir, 'configure')
+        expect(File.exist?(configure)).to be_truthy
       end
     end
 
@@ -66,11 +67,11 @@ describe 'Installer', disable_cache: true do
       end
 
       it 'exists vims dir' do
-        expect(File.exist?(version_vims_dir)).to be_true
+        expect(File.exist?(version_vims_dir)).to be_truthy
       end
 
       it 'can execute vim' do
-        expect(system("#{vim} --version > /dev/null 2>&1")).to be_true
+        expect(system("#{vim} --version > /dev/null 2>&1")).to be_truthy
       end
 
       it 'enable rubyinterp' do
@@ -80,27 +81,27 @@ describe 'Installer', disable_cache: true do
 
     context 'cp_etc', clean: true do
       context 'login file not exist' do
-        before(:all) { Installer.cp_etc }
+        before(:all) { Vvm::Installer.cp_etc }
 
         it 'exists etc dir' do
-          expect(File.exist?(get_etc_dir)).to be_true
+          expect(File.exist?(get_etc_dir)).to be_truthy
         end
 
         it 'exists login file' do
-          expect(File.exist?(get_login_file)).to be_true
+          expect(File.exist?(get_login_file)).to be_truthy
         end
       end
 
       context 'login file exists and it is not latest' do
-        before :all do
-          FileUtils.stub(:compare_file).and_return(false)
+        before do
+          allow(FileUtils).to receive(:compare_file).and_return(false)
         end
 
         it 'exists login file' do
           path = File.join(File.dirname(__FILE__), '..', 'etc', 'login')
           login = File.expand_path(path)
           expect(FileUtils).to receive(:cp).with(login, get_etc_dir)
-          Installer.cp_etc
+          Vvm::Installer.cp_etc
         end
       end
     end
@@ -114,7 +115,7 @@ describe 'Installer', disable_cache: true do
 
       it 'not exists objects dir' do
         path = File.join(version_src_dir, 'src', 'objects', '*')
-        expect(Dir[path].empty?).to be_true
+        expect(Dir[path].empty?).to be_truthy
       end
     end
   end

data/spec/spec_helper.rb

@@ -14,11 +14,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'fileutils'
 require 'tmpdir'
-require 'vvm-rb'
-include VvmRb
-
-support = File.join(File.dirname(__FILE__), 'support', '**', '*.rb')
-Dir[support].each { |f| require f }
+require 'vvm'
 
 VERSION1, VERSION2 = 'v7-4-083', 'v7-4-103'
 
@@ -30,14 +26,14 @@ RSpec.configure do |config|
     unless File.exist?(cache_dir)
       ENV['VVMROOT'] = cache_dir
       FileUtils.mkdir_p(cache_dir)
-      Installer.fetch
+      Vvm::Installer.fetch
       [VERSION1, VERSION2].each do |v|
         i = Installer.new(v, [], true)
         i.checkout
         i.configure
         i.make_install
       end
-      Installer.cp_etc
+      Vvm::Installer.cp_etc
     end
   end
 

data/spec/switcher_spec.rb

@@ -4,24 +4,24 @@ describe 'Switcher' do
   describe 'use' do
     context 'system vim' do
       before :all do
-        Switcher.new('system').use
+        Vvm::Switcher.new('system').use
       end
 
       it 'delete current' do
-        expect(File.exist?(get_current_dir)).not_to be_true
+        expect(File.exist?(get_current_dir)).not_to be_truthy
       end
     end
 
     context 'different version' do
       before :all do
         version = VERSION1
-        Switcher.new(version).use
+        Vvm::Switcher.new(version).use
         @vims_dir = get_vims_dir(version)
         @current  = get_current_dir
       end
 
       it 'exist current' do
-        expect(File.exist?(@current)).to be_true
+        expect(File.exist?(@current)).to be_truthy
       end
 
       it 'switch current' do
@@ -31,7 +31,7 @@ describe 'Switcher' do
 
     context 'unknown version' do
       before :all do
-        @switcher = Switcher.new('v7-5')
+        @switcher = Vvm::Switcher.new('v7-5')
       end
 
       it 'raise error' do