evm 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA512: 
-  data.tar.gz: 4ad3add1192b42406f85dd12af112b3d28e063b038002bcd4bf44459c81cb2fe54359e6f91417c93b958a43a62ac305af5a1f1db37411a48fe7ac39d8c6745db
-  metadata.gz: f617730f648c069120615ef2d0bec2e8c990c30dfc2d2d3c5e76d10d8f6dc236c913a5d34d70589d4d85eb5ba467a1ec069a8bbdfec3e1f22a9a45f023a446da
+  metadata.gz: 5c19e7ab6e93b6890668373889e4b95f8a770ad2fb9b1fe6d46c3e397fee76b4d866a5a5c873051f40fc2630c701142f890f1a69463c801cc1c3f3d2937e1622
+  data.tar.gz: 70d68f0c0f4d0f8037b86b6e0f50967c48395998227a9677212ee9e697203e1ca50ef5676ece268964be38a0fc61e167441933e2efe09d8b6349bac2b72dd1d3
 SHA1: 
-  data.tar.gz: 5c51b5b35973cc9307d4787358f95a251a9b5c56
-  metadata.gz: 8a405130221823886838ae414788cf016126c592
+  metadata.gz: 73e49dcdb060f4b283993c8aa3bcad6cb4c97128
+  data.tar.gz: 0af6f5750c6045bbd6110e54fe98f09fab4b5898

data/bin/emacs

@@ -4,5 +4,8 @@ $: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'evm'
 
-system = Evm::System.new(Evm::Package.current.bin.to_s)
-system.run(*ARGV)
+if current = Evm::Package.current
+  exec current.bin, *ARGV
+else
+  abort 'EVM: No Emacs selected. Select one using "evm use".'
+end

data/lib/evm/builder.rb

@@ -24,7 +24,7 @@ module Evm
       end
 
       def tar_gz(url)
-        tar_file_path = builds_path.join(@name + '.tar.gz')
+        tar_file_path = File.join(builds_path, @name + '.tar.gz')
 
         remote_file = Evm::RemoteFile.new(url)
         remote_file.download(tar_file_path) do |progress|
@@ -66,19 +66,19 @@ module Evm
       end
 
       def builds_path
-        Evm.local.join('tmp')
+        File.join(Evm::LOCAL_PATH, 'tmp')
       end
 
       def build_path
-        builds_path.join(@name)
+        File.join(builds_path, @name)
       end
 
       def installations_path
-        Evm.local
+        Evm::LOCAL_PATH
       end
 
       def installation_path
-        installations_path.join(@name)
+        File.join(installations_path, @name)
       end
 
       def platform_name
@@ -98,7 +98,7 @@ module Evm
       def run_command(command, *args)
         Dir.chdir(build_path) do
           system = Evm::System.new(command)
-          system.run(args)
+          system.run(*args)
         end
       end
     end

data/lib/evm/cli.rb

@@ -12,7 +12,7 @@ module Evm
       end
 
       if argv.include?('--help') || argv.include?('-h')
-        Evm.print_usage_and_die
+        Evm.print_usage_and_exit
       end
 
       command, argument = argv
@@ -20,13 +20,13 @@ module Evm
       begin
         const = Evm::Command.const_get(command.capitalize)
       rescue NameError => exception
-        Evm.die "No such command: #{command}"
+        Evm.abort 'No such command:', command
       end
 
       begin
         const.new(argument, options)
-      rescue => exception
-        Evm.die exception.message
+      rescue Evm::Exception => exception
+        Evm.abort exception.message
       end
     end
   end

data/lib/evm/git.rb

@@ -5,15 +5,15 @@ module Evm
     end
 
     def exist?
-      @path.exist?
+      File.exist?(@path)
     end
 
     def clone(url)
-      git 'clone', url, @path.to_s
+      git 'clone', url, @path
     end
 
     def pull
-      Dir.chdir(@path.to_s) do
+      Dir.chdir(@path) do
         git 'pull'
       end
     end

data/lib/evm/package.rb

@@ -11,14 +11,14 @@ module Evm
     end
 
     def installed?
-      path.exist?
+      File.exist?(path)
     end
 
     def bin
-      if Evm::Os.osx? && path.join('Emacs.app').exist?
-        path.join('Emacs.app', 'Contents', 'MacOS', 'Emacs')
+      if Evm::Os.osx? && File.exist?(File.join(path, 'Emacs.app'))
+        File.join(path, 'Emacs.app', 'Contents', 'MacOS', 'Emacs')
       else
-        path.join('bin', 'emacs')
+        File.join(path, 'bin', 'emacs')
       end
     end
 
@@ -29,22 +29,24 @@ module Evm
     end
 
     def install!
-      unless path.exist?
-        path.mkdir
+      unless File.exist?(path)
+        Dir.mkdir(path)
       end
 
-      unless tmp_path.exist?
-        tmp_path.mkdir
+      unless File.exist?(tmp_path)
+        Dir.mkdir(tmp_path)
       end
 
       Evm::Builder.new(recipe).build!
     end
 
     def uninstall!
-      path.rmtree if path.exist?
+      if File.exist?(path)
+        FileUtils.rm_r(path)
+      end
 
       if current?
-        Package.current_file.delete
+        File.delete(Package.current_file)
       end
     end
 
@@ -57,21 +59,21 @@ module Evm
     end
 
     def path
-      Evm.local.join(@name)
+      File.join(Evm::LOCAL_PATH, @name)
     end
 
     def tmp_path
-      Evm.local.join('tmp')
+      File.join(Evm::LOCAL_PATH, 'tmp')
     end
 
     class << self
       def current_file
-        Evm.local.join('current')
+        File.join(Evm::LOCAL_PATH, 'current')
       end
 
       def current
-        if current_file.exist?
-          find(current_file.read)
+        if File.exist?(current_file)
+          find File.read(current_file)
         end
       end
 

data/lib/evm/recipe.rb

@@ -1,6 +1,6 @@
 module Evm
   class Recipe
-    RECIPE_PATH = Evm.root.join('recipes')
+    RECIPES_PATH = File.join(Evm::ROOT_PATH, 'recipes')
 
     attr_reader :name
 
@@ -31,7 +31,7 @@ module Evm
       end
 
       def all
-        Dir.glob(RECIPE_PATH.join('*.rb')).map do |recipe_file|
+        Dir.glob(File.join(RECIPES_PATH, '*.rb')).map do |recipe_file|
           Recipe.new(recipe_file)
         end
       end

data/lib/evm/remote_file.rb

@@ -9,7 +9,7 @@ module Evm
     end
 
     def download(path, &block)
-      return if path.exist?
+      return if File.exist?(path)
 
       file = File.open(path, 'w')
 

data/lib/evm/system.rb

@@ -5,7 +5,7 @@ module Evm
     end
 
     def run(*args)
-      Kernel.exec(@executable, *args)
+      Kernel.system(@executable, *args)
     end
   end
 end

data/lib/evm/tar_file.rb

@@ -5,7 +5,7 @@ module Evm
     end
 
     def extract(extract_to)
-      tar '-xzf', @tar_file.to_s, '-C', extract_to.to_s
+      tar '-xzf', @tar_file, '-C', extract_to
     end
 
     private

data/lib/evm.rb

@@ -1,25 +1,17 @@
-require 'pathname'
+require 'fileutils'
 
 module Evm
-  def self.root
-    Pathname.new(__FILE__).parent.parent.expand_path
-  end
-
-  def self.local
-    Pathname.new('/').join('usr', 'local', 'evm')
-  end
+  ROOT_PATH = File.expand_path('..', File.dirname(__FILE__))
+  LOCAL_PATH = File.join('/', 'usr', 'local', 'evm')
 
-  def self.die(*args)
-    args.each do |arg|
-      STDERR.print(arg)
-      STDERR.puts
-    end
+  def self.abort(*args)
+    STDERR.puts args.join(' ')
 
     exit 1
   end
 
-  def self.print_usage_and_die
-    die <<-EOS
+  def self.print_usage_and_exit
+    Evm.abort <<-EOS
 USAGE: evm COMMAND [OPTIONS]
 
 Emacs Version Manager

data/recipes/emacs-23.4.rb

@@ -20,7 +20,7 @@ recipe 'emacs-23.4' do
     make 'install'
 
     osx do
-      copy build_path.join('nextstep', 'Emacs.app'), installation_path
+      copy File.join(build_path, 'nextstep', 'Emacs.app'), installation_path
     end
   end
 end

data/recipes/emacs-24.1.rb

@@ -17,7 +17,7 @@ recipe 'emacs-24.1' do
     make 'install'
 
     osx do
-      copy build_path.join('nextstep', 'Emacs.app'), installation_path
+      copy File.join(build_path, 'nextstep', 'Emacs.app'), installation_path
     end
   end
 end

data/recipes/emacs-24.2.rb

@@ -17,7 +17,7 @@ recipe 'emacs-24.2' do
     make 'install'
 
     osx do
-      copy build_path.join('nextstep', 'Emacs.app'), installation_path
+      copy File.join(build_path, 'nextstep', 'Emacs.app'), installation_path
     end
   end
 end

data/recipes/emacs-24.3.rb

@@ -17,7 +17,7 @@ recipe 'emacs-24.3' do
     make 'install'
 
     osx do
-      copy build_path.join('nextstep', 'Emacs.app'), installation_path
+      copy File.join(build_path, 'nextstep', 'Emacs.app'), installation_path
     end
   end
 end

data/recipes/emacs-git-snapshot.rb

@@ -18,7 +18,7 @@ recipe 'emacs-git-snapshot' do
     make 'install'
 
     osx do
-      copy build_path.join('nextstep', 'Emacs.app'), installation_path
+      copy File.join(build_path, 'nextstep', 'Emacs.app'), installation_path
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: evm
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Johan Andersson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-12-07 00:00:00 Z
+date: 2013-12-08 00:00:00 Z
 dependencies: []
 
 description: EVM is a command-line tool that allows you to install multiple Emacs versions.