evm 0.3.1 → 0.3.2

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA512: 
+  metadata.gz: d4a8494ee071fee5509d4692b9bb84bb8e39c6be61cb3a683d1afd5a94b8482ffa6c739c7ee3800806c32286f0058b57e0371462b0756b7cf46104b8d2515215
+  data.tar.gz: cac76fa89278a8dfcd185c9e58e3ed7c4feef5ad559653eea438dc8247d6c820914d108b34d797c316352f74a1157301070f1d3221edce6e98af8f174358e7cc
+SHA1: 
+  metadata.gz: 716a9ceae8fe0ae1edf1aba9f5e4a39457e280be
+  data.tar.gz: adf61af29e3016845aba38c72a2eeaadcd4d2627

data/bin/emacs

@@ -4,7 +4,7 @@ $: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'evm'
 
-package = Evm::Package.current
+arguments = ARGV.map { |argument| "'#{argument}'" }
 
-system = Evm::System.new(package.bin.to_s)
-system.run(ARGV)
+system = Evm::System.new(Evm::Package.current.bin.to_s)
+system.run(*arguments)

data/lib/evm/builder.rb

@@ -14,10 +14,26 @@ module Evm
         yield
       end
 
-      def tar_gz(name)
-        tar_file = Evm::TarFile.new(name)
-        tar_file.download!
-        tar_file.extract!
+      def git(url)
+        git_repo = Evm::Git.new(build_path)
+        if git_repo.exist?
+          git_repo.pull
+        else
+          git_repo.clone(url)
+        end
+      end
+
+      def tar_gz(url)
+        tar_file_path = builds_path.join(@name + '.tar.gz')
+
+        remote_file = Evm::RemoteFile.new(url)
+        remote_file.download(tar_file_path) do |progress|
+          progress_bar.set(progress)
+        end
+        progress_bar.done
+
+        tar_file = Evm::TarFile.new(tar_file_path)
+        tar_file.extract(builds_path)
       end
 
       def osx(&block)
@@ -37,6 +53,10 @@ module Evm
         yield
       end
 
+      def autogen
+        run_command './autogen.sh'
+      end
+
       def configure
         run_command './configure', *@options
       end
@@ -45,12 +65,20 @@ module Evm
         run_command 'make', target
       end
 
+      def builds_path
+        Evm.local.join('tmp')
+      end
+
       def build_path
-        Evm.local.join('tmp', @name)
+        builds_path.join(@name)
+      end
+
+      def installations_path
+        Evm.local
       end
 
       def installation_path
-        Evm.local.join(@name)
+        installations_path.join(@name)
       end
 
       def platform_name
@@ -63,6 +91,10 @@ module Evm
 
       private
 
+      def progress_bar
+        @progress_bar ||= Evm::ProgressBar.new
+      end
+
       def run_command(command, *args)
         Dir.chdir(build_path) do
           system = Evm::System.new(command)

data/lib/evm/cli.rb

@@ -7,6 +7,10 @@ module Evm
         options[:force] = !!argv.delete('--force')
       end
 
+      if argv.include?('--use')
+        options[:use] = !!argv.delete('--use')
+      end
+
       if argv.include?('--help') || argv.include?('-h')
         Evm.print_usage_and_die
       end
@@ -15,10 +19,13 @@ module Evm
 
       begin
         const = Evm::Command.const_get(command.capitalize)
-        const.new(argument, options)
-      rescue NameError
+      rescue NameError => exception
         Evm.die "No such command: #{command}"
-      rescue Evm::Exception => exception
+      end
+
+      begin
+        const.new(argument, options)
+      rescue => exception
         Evm.die exception.message
       end
     end

data/lib/evm/command/install.rb

@@ -17,6 +17,10 @@ module Evm
         else
           package.install!
 
+          if options[:use]
+            package.use!
+          end
+
           STDOUT.puts "Successfully installed #{package_name}"
         end
       end

data/lib/evm/git.rb

@@ -0,0 +1,29 @@
+module Evm
+  class Git
+    def initialize(path)
+      @path = path
+    end
+
+    def exist?
+      @path.exist?
+    end
+
+    def clone(url)
+      git 'clone', url, @path.to_s
+    end
+
+    def pull
+      Dir.chdir(@path.to_s) do
+        git 'pull'
+      end
+    end
+
+
+    private
+
+    def git(*args)
+      @git ||= Evm::System.new('git')
+      @git.run(*args)
+    end
+  end
+end

data/lib/evm/package.rb

@@ -14,10 +14,6 @@ module Evm
       path.exist?
     end
 
-    def path
-      Evm.local.join(@name)
-    end
-
     def bin
       if Evm::Os.osx? && path.join('Emacs.app').exist?
         path.join('Emacs.app', 'Contents', 'MacOS', 'Emacs')
@@ -33,11 +29,19 @@ module Evm
     end
 
     def install!
+      unless path.exist?
+        path.mkdir
+      end
+
+      unless tmp_path.exist?
+        tmp_path.mkdir
+      end
+
       Evm::Builder.new(recipe).build!
     end
 
     def uninstall!
-      path.rmtree
+      path.rmtree if path.exist?
 
       if current?
         Package.current_file.delete
@@ -52,6 +56,14 @@ module Evm
       Evm::Recipe.find(@name)
     end
 
+    def path
+      Evm.local.join(@name)
+    end
+
+    def tmp_path
+      Evm.local.join('tmp')
+    end
+
     class << self
       def current_file
         Evm.local.join('current')

data/lib/evm/progress_bar.rb

@@ -0,0 +1,37 @@
+module Evm
+  class ProgressBar
+    COLUMNS = 100
+
+    def initialize
+      @started = false
+    end
+
+    def set(progress)
+      progress = progress.to_i
+
+      if progress < 0 || progress > 100
+        raise "Invalid progress #{progress}, must be between 0 and 100"
+      end
+
+      unless @started
+        puts
+        @started = true
+      end
+
+      print "\e[1A"
+      print "\e[K"
+      print '['
+      print '-' * progress
+      print ' ' * (COLUMNS - progress)
+      print ']'
+      print ' '
+      print progress
+      print '%'
+      puts
+    end
+
+    def done
+      set 100
+    end
+  end
+end

data/lib/evm/remote_file.rb

@@ -0,0 +1,61 @@
+require 'uri'
+require 'thread'
+require 'net/http'
+
+module Evm
+  class RemoteFile
+    def initialize(url)
+      @url = url
+    end
+
+    def download(path, &block)
+      return if path.exist?
+
+      file = File.open(path, 'w')
+
+      thread = Thread.new do
+        this = Thread.current
+        body = this[:body] = []
+
+        request @url do |response|
+          length = this[:length] = response['Content-Length'].to_i
+
+          response.read_body do |fragment|
+            body << fragment
+
+            this[:done] = (this[:done] || 0) + fragment.length
+            this[:progress] = this[:done].quo(length) * 100
+          end
+        end
+
+        file.write(body.join)
+      end
+
+      until thread.join(1)
+        yield thread[:progress]
+      end
+
+      file.close
+    end
+
+    private
+
+    def request(url, &block)
+      uri = URI.parse(url)
+
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.request_get(uri.path) do |response|
+        case response
+        when Net::HTTPSuccess
+          block.call(response)
+        when Net::HTTPRedirection
+          request response['location'] do |response|
+            block.call(response)
+          end
+        else
+          response.error!
+        end
+      end
+    end
+  end
+end

data/lib/evm/tar_file.rb

@@ -1,51 +1,18 @@
-require 'open-uri'
-
 module Evm
   class TarFile
-    def initialize(name)
-      @name = name
-    end
-
-    def download!
-      unless tars_path.exist?
-        tars_path.mkdir
-      end
-
-      unless tar_path.exist?
-        File.open(tar_path, 'wb') do |write_file|
-          open(url, 'rb') do |read_file|
-            write_file.write(read_file.read)
-          end
-        end
-      end
+    def initialize(tar_file)
+      @tar_file = tar_file
     end
 
-    def extract!
-      unless builds_path.exist?
-        builds_path.mkdir
-      end
-
-      system = Evm::System.new('tar')
-      system.run('-xzf', tar_path.to_s, '-C', builds_path.to_s)
+    def extract(extract_to)
+      tar '-xzf', @tar_file.to_s, '-C', extract_to.to_s
     end
 
-
     private
 
-    def url
-      "https://s3.amazonaws.com/emacs-evm/#{@name}"
-    end
-
-    def tars_path
-      Evm.local.join('tars')
-    end
-
-    def tar_path
-      tars_path.join(@name)
-    end
-
-    def builds_path
-      Evm.local.join('tmp')
+    def tar(*args)
+      @tar ||= Evm::System.new('tar')
+      @tar.run(*args)
     end
   end
 end

data/lib/evm.rb

@@ -46,4 +46,7 @@ require 'evm/command'
 require 'evm/exception'
 require 'evm/builder'
 require 'evm/tar_file'
+require 'evm/remote_file'
 require 'evm/system'
+require 'evm/progress_bar'
+require 'evm/git'

data/recipes/emacs-23.4-bin.rb

@@ -1,7 +1,7 @@
 recipe 'emacs-23.4-bin' do
-  tar_gz 'emacs-23.4-%s.tar.gz' % platform_name
+  tar_gz 'http://s3.amazonaws.com/emacs-evm/emacs-23.4-%s.tar.gz' % platform_name
 
   install do
-    copy build_path, installation_path
+    copy build_path, installations_path
   end
 end

data/recipes/emacs-23.4.rb

@@ -1,5 +1,5 @@
-recipe 'emacs-24.3' do
-  tar_gz 'emacs-24.3.tar.gz'
+recipe 'emacs-23.4' do
+  tar_gz 'http://ftpmirror.gnu.org/emacs/emacs-23.4.tar.gz'
 
   osx do
     option '--with-ns'

data/recipes/emacs-24.1-bin.rb

@@ -1,7 +1,7 @@
 recipe 'emacs-24.1-bin' do
-  tar_gz 'emacs-24.1-%s.tar.gz' % platform_name
+  tar_gz 'http://s3.amazonaws.com/emacs-evm/emacs-24.1-%s.tar.gz' % platform_name
 
   install do
-    copy build_path, installation_path
+    copy build_path, installations_path
   end
 end

data/recipes/emacs-24.1.rb

@@ -1,5 +1,5 @@
 recipe 'emacs-24.1' do
-  tar_gz 'emacs-24.1.tar.gz'
+  tar_gz 'http://ftpmirror.gnu.org/emacs/emacs-24.1.tar.gz'
 
   osx do
     option '--with-ns'

data/recipes/emacs-24.2-bin.rb

@@ -1,7 +1,7 @@
 recipe 'emacs-24.2-bin' do
-  tar_gz 'emacs-24.2-%s.tar.gz' % platform_name
+  tar_gz 'http://s3.amazonaws.com/emacs-evm/emacs-24.2-%s.tar.gz' % platform_name
 
   install do
-    copy build_path, installation_path
+    copy build_path, installations_path
   end
 end

data/recipes/emacs-24.2.rb

@@ -1,5 +1,5 @@
 recipe 'emacs-24.2' do
-  tar_gz 'emacs-24.2.tar.gz'
+  tar_gz 'http://ftpmirror.gnu.org/emacs/emacs-24.2.tar.gz'
 
   osx do
     option '--with-ns'

data/recipes/emacs-24.3-bin.rb

@@ -1,7 +1,7 @@
 recipe 'emacs-24.3-bin' do
-  tar_gz 'emacs-24.3-%s.tar.gz' % platform_name
+  tar_gz 'http://s3.amazonaws.com/emacs-evm/emacs-24.3-%s.tar.gz' % platform_name
 
   install do
-    copy build_path, installation_path
+    copy build_path, installations_path
   end
 end

data/recipes/emacs-24.3.rb

@@ -1,5 +1,5 @@
 recipe 'emacs-24.3' do
-  tar_gz 'emacs-24.3.tar.gz'
+  tar_gz 'http://ftpmirror.gnu.org/emacs/emacs-24.3.tar.gz'
 
   osx do
     option '--with-ns'

data/recipes/emacs-git-snapshot.rb

@@ -0,0 +1,24 @@
+recipe 'emacs-git-snapshot' do
+  git 'http://git.savannah.gnu.org/r/emacs.git'
+
+  osx do
+    option '--with-ns'
+    option '--without-x'
+    option '--without-dbus'
+  end
+
+  linux do
+    option '--prefix', installation_path
+  end
+
+  install do
+    autogen
+    configure
+    make 'bootstrap'
+    make 'install'
+
+    osx do
+      copy build_path.join('nextstep', 'Emacs.app'), installation_path
+    end
+  end
+end

metadata

@@ -1,40 +1,45 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: evm
-version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  version: 0.3.2
 platform: ruby
-authors:
+authors: 
 - Johan Andersson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-01 00:00:00.000000000 Z
+
+date: 2013-12-07 00:00:00 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:
+executables: 
 - evm
 - emacs
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
+- lib/evm.rb
 - lib/evm/builder.rb
 - lib/evm/cli.rb
+- lib/evm/command.rb
 - lib/evm/command/bin.rb
 - lib/evm/command/install.rb
 - lib/evm/command/list.rb
 - lib/evm/command/uninstall.rb
 - lib/evm/command/use.rb
-- lib/evm/command.rb
 - lib/evm/exception.rb
+- lib/evm/git.rb
 - lib/evm/os.rb
 - lib/evm/package.rb
+- lib/evm/progress_bar.rb
 - lib/evm/recipe.rb
+- lib/evm/remote_file.rb
 - lib/evm/system.rb
 - lib/evm/tar_file.rb
-- lib/evm.rb
 - recipes/emacs-23.4-bin.rb
 - recipes/emacs-23.4.rb
 - recipes/emacs-24.1-bin.rb
@@ -43,31 +48,34 @@ files:
 - recipes/emacs-24.2.rb
 - 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
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - &id001 
+    - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id001
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Emacs Version Manager
 test_files: []
+