evm 0.6.1 → 0.9.0

data/lib/evm/command.rb

@@ -6,6 +6,7 @@ end
 require 'evm/command/install'
 require 'evm/command/uninstall'
 require 'evm/command/use'
+require 'evm/command/disuse'
 require 'evm/command/list'
 require 'evm/command/bin'
-require 'evm/command/help'
+require 'evm/command/config'

data/lib/evm/command/bin.rb

@@ -1,8 +1,8 @@
 module Evm
   module Command
     class Bin
-      def initialize(package_name = nil, options = {})
-        if package_name
+      def initialize(argv, options = {})
+        if (package_name = argv[0])
           package = Evm::Package.find(package_name)
         else
           package = Evm::Package.current

data/lib/evm/command/config.rb

@@ -0,0 +1,19 @@
+module Evm
+  module Command
+    class Config
+      def initialize(argv, options = {})
+        type, value = argv
+
+        unless Evm::CONFIG_TYPES.include?(type.to_sym)
+          raise Evm::Exception, "Invalid config type: #{type}"
+        end
+
+        if value
+          Evm.config[type] = value
+        end
+
+        STDOUT.puts(Evm.config[type])
+      end
+    end
+  end
+end

data/lib/evm/command/disuse.rb

@@ -0,0 +1,15 @@
+module Evm
+  module Command
+    class Disuse
+      def initialize(argv, options = {})
+        package = Evm::Package.current
+
+        if package
+          package.disuse!
+        else
+          raise Evm::Exception.new('No package currently selected')
+        end
+      end
+    end
+  end
+end

data/lib/evm/command/install.rb

@@ -1,7 +1,9 @@
 module Evm
   module Command
     class Install
-      def initialize(package_name, options = {})
+      def initialize(argv, options = {})
+        package_name = argv[0]
+
         unless package_name
           raise Evm::Exception.new('The install command requires an argument')
         end

data/lib/evm/command/list.rb

@@ -1,7 +1,7 @@
 module Evm
   module Command
     class List
-      def initialize(*args)
+      def initialize(*)
         packages = Evm::Package.all
         packages.each do |package|
           if package.current?

data/lib/evm/command/uninstall.rb

@@ -1,7 +1,9 @@
 module Evm
   module Command
     class Uninstall
-      def initialize(package_name, options = {})
+      def initialize(argv, options = {})
+        package_name = argv[0]
+
         unless package_name
           raise Evm::Exception.new('The uninstall command requires an argument')
         end

data/lib/evm/command/use.rb

@@ -1,7 +1,9 @@
 module Evm
   module Command
     class Use
-      def initialize(package_name, options = {})
+      def initialize(argv, options = {})
+        package_name = argv[0]
+
         unless package_name
           raise Evm::Exception.new('The use command requires an argument')
         end

data/lib/evm/config.rb

@@ -0,0 +1,43 @@
+require 'json'
+
+module Evm
+  class Config
+    def initialize(config_file, defaults = {})
+      @config_file = config_file
+      @defaults = defaults
+    end
+
+    def [](type)
+      config[type.to_s] || begin
+        default = @defaults.find { |key, value| key.to_s == type.to_s }
+        default[1] if default
+      end
+    end
+
+    def []=(type, value)
+      write(config.merge(type.to_s => value))
+    end
+
+
+    private
+
+    def config
+      if File.exist?(@config_file)
+        contents = File.read(@config_file)
+        if contents.empty?
+          {}
+        else
+          JSON.parse(contents)
+        end
+      else
+        {}
+      end
+    end
+
+    def write(config = {})
+      File.open(@config_file, 'w') do |file|
+        file.write(config.to_json)
+      end
+    end
+  end
+end

data/lib/evm/git.rb

@@ -23,7 +23,7 @@ module Evm
 
     def git(*args)
       @git ||= Evm::System.new('git')
-      @git.run(*args)
+      @git.run(*args, '--depth=1')
     end
   end
 end

data/lib/evm/package.rb

@@ -2,8 +2,9 @@ module Evm
   class Package
     attr_reader :name
 
-    def initialize(name)
+    def initialize(name, options = {})
       @name = name
+      @file = options[:file] || File
     end
 
     def current?
@@ -23,9 +24,24 @@ module Evm
     end
 
     def use!
-      FileUtils.ln_sf(bin, Evm::EVM_EMACS_PATH)
-      unless File.symlink?(Evm::EMACS_PATH)
-        FileUtils.ln_sf(Evm::EVM_EMACS_PATH, Evm::EMACS_PATH)
+      delete_shims!
+      [Evm::EMACS_PATH, Evm::EVM_EMACS_PATH].each do |bin_path|
+        @file.open(bin_path, 'w') do |file|
+          file.puts("#!/bin/bash\nexec \"#{bin}\" \"$@\"")
+        end
+        @file.chmod(0755, bin_path)
+      end
+      Evm.config[:current] = name
+    end
+
+    def disuse!
+      delete_shims!
+      Evm.config[:current] = nil
+    end
+
+    def delete_shims!
+      [Evm::EMACS_PATH, Evm::EVM_EMACS_PATH].each do |bin_path|
+        @file.delete(bin_path) if @file.exists?(bin_path)
       end
     end
 
@@ -60,20 +76,17 @@ module Evm
     end
 
     def path
-      File.join(Evm::LOCAL_PATH, @name)
+      File.join(Evm.config[:path], @name)
     end
 
     def tmp_path
-      File.join(Evm::LOCAL_PATH, 'tmp')
+      File.join(Evm.config[:path], 'tmp')
     end
 
     class << self
       def current
-        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
+        if (name = Evm.config[:current])
+          find(name)
         end
       end
 
@@ -93,5 +106,7 @@ module Evm
         end
       end
     end
+
+    private :delete_shims!
   end
 end

data/lib/evm/remote_file.rb

@@ -1,64 +1,18 @@
-require 'uri'
-require 'thread'
-require 'net/http'
-require 'openssl'
+require 'open-uri'
 
 module Evm
   class RemoteFile
-    def initialize(url)
+    def initialize(url, options = {})
       @url = url
+      @options = options
+      @file = options[:file] ||= File
+      @uri = options[:uri] ||= URI
     end
 
-    def download(path, &block)
-      return if File.exist?(path)
-
-      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)
-      if uri.scheme == 'https'
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-      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!
+    def download(path)
+      unless @file.exist?(path)
+        @file.open(path, 'w') do |file|
+          file.write(@uri.parse(@url).read)
         end
       end
     end

data/lib/evm/tar_file.rb

@@ -6,7 +6,7 @@ module Evm
 
     def extract(extract_to, name = nil)
       args = []
-      args << '-xzf'
+      args << '-xf'
       args << @tar_file
       args << '-C'
 

data/spec/evm/builder_spec.rb

@@ -0,0 +1,209 @@
+require 'spec_helper'
+
+describe Evm::Builder do
+  describe Evm::Builder::Dsl do
+    before do
+      @tar_gz_url = 'http://domain.com/foo.tar.gz'
+      @git_url = 'git://domain.com/emacs.git'
+
+      @dsl = Evm::Builder::Dsl.new
+      allow(@dsl).to receive(:path).and_return('/path/to')
+    end
+
+    describe '#tar_gz' do
+      it 'should download and extract tar' do
+        tar_file_path = '/tmp/evm/tmp/name.tar.gz'
+
+        remote_file = double('remote_file')
+        expect(remote_file).to receive(:download).with(tar_file_path)
+
+        expect(Evm::RemoteFile).to receive(:new).with(@tar_gz_url).and_return(remote_file)
+
+        tar_file = double('tar_file')
+        expect(tar_file).to receive(:extract).with('/tmp/evm/tmp', 'name')
+
+        expect(Evm::TarFile).to receive(:new).with(tar_file_path).and_return(tar_file)
+
+        expect(FileUtils).to receive(:mkdir).with('/tmp/evm/tmp/name')
+
+        @dsl.recipe 'name' do
+          @dsl.tar_gz(@tar_gz_url)
+        end
+      end
+    end
+
+    describe '#git' do
+      before do
+        @git_repo = double('git_repo')
+        allow(@git_repo).to receive(:exist?).and_return(true)
+        allow(@git_repo).to receive(:clone)
+        allow(@git_repo).to receive(:pull)
+
+        allow(Evm::Git).to receive(:new).and_return(@git_repo)
+      end
+
+      it 'should pull if exist' do
+        allow(@git_repo).to receive(:exist?).and_return(true)
+        expect(@git_repo).to receive(:pull)
+
+        @dsl.recipe 'name' do
+          @dsl.git(@git_url)
+        end
+      end
+
+      it 'should clone if not exist' do
+        allow(@git_repo).to receive(:exist?).and_return(false)
+        expect(@git_repo).to receive(:clone).with(@git_url)
+
+        @dsl.recipe 'name' do
+          @dsl.git(@git_url)
+        end
+      end
+    end
+
+    describe '#osx' do
+      it 'should yield if osx' do
+        allow(Evm::Os).to receive(:osx?).and_return(true)
+
+        expect { |block|
+          @dsl.osx(&block)
+        }.to yield_control
+      end
+
+      it 'should not yield if not osx' do
+        allow(Evm::Os).to receive(:osx?).and_return(false)
+
+        expect { |block|
+          @dsl.osx(&block)
+        }.not_to yield_control
+      end
+    end
+
+    describe '#linux' do
+      it 'should yield if linux' do
+        allow(Evm::Os).to receive(:linux?).and_return(true)
+
+        expect { |block|
+          @dsl.linux(&block)
+        }.to yield_control
+      end
+
+      it 'should not yield if not linux' do
+        allow(Evm::Os).to receive(:linux?).and_return(false)
+
+        expect { |block|
+          @dsl.linux(&block)
+        }.not_to yield_control
+      end
+    end
+
+    describe '#option' do
+      it 'should add option without value' do
+        @dsl.option '--foo'
+        expect(@dsl.instance_variable_get('@options')).to eq(['--foo'])
+      end
+
+      it 'should add option with value' do
+        @dsl.option '--foo', 'bar'
+        expect(@dsl.instance_variable_get('@options')).to eq(['--foo', 'bar'])
+      end
+
+      it 'should add multiple options' do
+        @dsl.option '--foo'
+        @dsl.option '--foo', 'bar'
+        @dsl.option '--bar', 'baz'
+        @dsl.option '--qux'
+        expect(@dsl.instance_variable_get('@options')).to eq(['--foo', '--foo', 'bar', '--bar', 'baz', '--qux'])
+      end
+    end
+
+    describe '#install' do
+      it 'should yield' do
+        expect { |block|
+          @dsl.install(&block)
+        }.to yield_control
+      end
+    end
+
+    describe '#autogen' do
+      it 'should run make command with target' do
+        expect(@dsl).to receive(:run_command).with('./autogen.sh')
+        @dsl.autogen
+      end
+    end
+
+    describe '#configure' do
+      it 'should configure when no options' do
+        expect(@dsl).to receive(:run_command).with('./configure')
+        @dsl.configure
+      end
+
+      it 'should configure when single option' do
+        expect(@dsl).to receive(:run_command).with('./configure', '--foo', 'bar')
+        @dsl.option '--foo', 'bar'
+        @dsl.configure
+      end
+
+      it 'should configure when multiple options' do
+        expect(@dsl).to receive(:run_command).with('./configure', '--foo', 'bar', '--baz')
+        @dsl.option '--foo', 'bar'
+        @dsl.option '--baz'
+        @dsl.configure
+      end
+    end
+
+    describe '#make' do
+      it 'should run make command with target' do
+        expect(@dsl).to receive(:run_command).with('make', 'foo')
+        @dsl.make('foo')
+      end
+    end
+
+    describe '#build_path' do
+      it 'should return package build path' do
+        @dsl.recipe 'name' do
+          expect(@dsl.build_path).to eq('/tmp/evm/tmp/name')
+        end
+      end
+    end
+
+    describe '#builds_path' do
+      it 'should return package builds path' do
+        @dsl.recipe 'name' do
+          expect(@dsl.builds_path).to eq('/tmp/evm/tmp')
+        end
+      end
+    end
+
+    describe '#installation_path' do
+      it 'should return package installation path' do
+        @dsl.recipe 'name' do
+          expect(@dsl.installation_path).to eq('/tmp/evm/name')
+        end
+      end
+    end
+
+    describe '#installations_path' do
+      it 'should return package installations path' do
+        @dsl.recipe 'name' do
+          expect(@dsl.installations_path).to eq('/tmp/evm')
+        end
+      end
+    end
+
+    describe '#platform_name' do
+      it 'should platform name' do
+        allow(Evm::Os).to receive(:platform_name).and_return(:foo)
+
+        expect(@dsl.platform_name).to eq(:foo)
+      end
+    end
+
+    describe '#copy' do
+      it 'copies all files recursively and preserves file attributes' do
+        expect(@dsl).to receive(:run_command).with('cp -a from to')
+        @dsl.copy 'from', 'to'
+      end
+    end
+  end
+end