evm 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA512: 
-  metadata.gz: 5c19e7ab6e93b6890668373889e4b95f8a770ad2fb9b1fe6d46c3e397fee76b4d866a5a5c873051f40fc2630c701142f890f1a69463c801cc1c3f3d2937e1622
-  data.tar.gz: 70d68f0c0f4d0f8037b86b6e0f50967c48395998227a9677212ee9e697203e1ca50ef5676ece268964be38a0fc61e167441933e2efe09d8b6349bac2b72dd1d3
-SHA1: 
-  metadata.gz: 73e49dcdb060f4b283993c8aa3bcad6cb4c97128
-  data.tar.gz: 0af6f5750c6045bbd6110e54fe98f09fab4b5898
+---
+SHA1:
+  metadata.gz: 85c1201baf8435e4ffb71e01e7b65ce7a26746c7
+  data.tar.gz: 28a30c595841d29dda1914b5f4403daeaad899e4
+SHA512:
+  metadata.gz: 23ad9dc361c42c787a797ad4a1d4f82242bd2a08d110c1f8fc4d7056fb2c0e927e4ce3c74c9d8b195b23ef0ed860820ac6196e8996b199b60f6e31601ff91089
+  data.tar.gz: 1b5366dc367c7ffed7cc178c2f6cd98d7a6676c8c3655ab4bbe170331c39c4d24bc35b3c9b472ea87baec7b241053cfed73bf4e6d978fa09eb93aa7e6e6d7fd8

data/lib/evm/command.rb

@@ -8,3 +8,4 @@ require 'evm/command/uninstall'
 require 'evm/command/use'
 require 'evm/command/list'
 require 'evm/command/bin'
+require 'evm/command/help'

data/lib/evm/package.rb

@@ -11,7 +11,7 @@ module Evm
     end
 
     def installed?
-      File.exist?(path)
+      File.file?(bin) && File.executable?(bin)
     end
 
     def bin
@@ -23,8 +23,9 @@ module Evm
     end
 
     def use!
-      File.open(Package.current_file, 'w') do |file|
-        file.write(@name)
+      FileUtils.ln_sf(bin, Evm::EVM_EMACS_PATH)
+      unless File.symlink?(Evm::EMACS_PATH)
+        FileUtils.ln_sf(Evm::EVM_EMACS_PATH, Evm::EMACS_PATH)
       end
     end
 
@@ -46,7 +47,7 @@ module Evm
       end
 
       if current?
-        File.delete(Package.current_file)
+        FileUtils.rm(Evm::EVM_EMACS_PATH)
       end
     end
 
@@ -67,13 +68,12 @@ module Evm
     end
 
     class << self
-      def current_file
-        File.join(Evm::LOCAL_PATH, 'current')
-      end
-
       def current
-        if File.exist?(current_file)
-          find File.read(current_file)
+        if File.symlink?(Evm::EVM_EMACS_PATH)
+          current_bin_path = File.readlink(Evm::EVM_EMACS_PATH)
+          if (match = Regexp.new("#{Evm::LOCAL_PATH}/?(?<current>[^/]+)/.+").match(current_bin_path))
+            find match[:current]
+          end
         end
       end
 

data/lib/evm.rb

@@ -3,6 +3,8 @@ require 'fileutils'
 module Evm
   ROOT_PATH = File.expand_path('..', File.dirname(__FILE__))
   LOCAL_PATH = File.join('/', 'usr', 'local', 'evm')
+  EMACS_PATH = File.join(ROOT_PATH, 'bin', 'emacs')
+  EVM_EMACS_PATH = File.join(ROOT_PATH, 'bin', 'evm-emacs')
 
   def self.abort(*args)
     STDERR.puts args.join(' ')
@@ -22,6 +24,7 @@ COMMANDS:
  bin [name]                 Show path to Emacs binary for package name
  list                       List all available packages
  use <name>                 Select name as current package
+ help                       Display this help message
 
 OPTIONS:
  --force                    Force install even when already installed

metadata

@@ -1,27 +1,22 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: evm
-version: !ruby/object:Gem::Version 
-  version: 0.3.4
+version: !ruby/object:Gem::Version
+  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - Johan Andersson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-12-08 00:00:00 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies: []
-
-description: EVM is a command-line tool that allows you to install multiple Emacs versions.
+description: EVM is a command-line tool that allows you to install multiple Emacs
+  versions.
 email: johan.rejeep@gmail.com
-executables: 
-- evm
-- emacs
+executables: []
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/evm.rb
 - lib/evm/builder.rb
 - lib/evm/cli.rb
@@ -49,33 +44,28 @@ files:
 - recipes/emacs-24.3-bin.rb
 - recipes/emacs-24.3.rb
 - recipes/emacs-git-snapshot.rb
-- bin/evm
-- bin/emacs
 homepage: http://github.com/rejeep/evm
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - &id001 
-    - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id001
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Emacs Version Manager
 test_files: []
-

data/bin/emacs

@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-
-$: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'evm'
-
-if current = Evm::Package.current
-  exec current.bin, *ARGV
-else
-  abort 'EVM: No Emacs selected. Select one using "evm use".'
-end

data/bin/evm

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-
-$: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'evm'
-
-Evm::Cli.parse(ARGV)