desi 0.2.1 → 0.2.2

data/README.md

@@ -31,6 +31,21 @@ It can be used both as a command-line tool and as a library.
 
 ## Examples (command-line and Ruby)
 
+### Installing Elastic Search
+
+ ```bash
+ $ # The latest version will be installed by default
+ $ desi install
+ * No release specified, will fetch latest.
+ * fetching release elasticsearch-0.19.9.tar.gz
+ […]
+
+ $ # You can also give a specific release name
+ $ desi install 0.19.6 # ("v0.19.6" or "elasticsearch-0.19.6" would also work)
+ * fetching release elasticsearch-0.19.6.tar.gz
+ […]
+ ```
+
 ### Get the list of locally installed releases
 
 The current version is the one symlinked to `$HOME/elasticsearch/current`, that

data/lib/desi/downloader.rb

@@ -16,8 +16,8 @@ module Desi
     end
 
     def download!(version, opts = {})
-      path = "/downloads/elasticsearch/elasticsearch/#{version.name}"
-      destination_name = @destination_dir.join File.basename(version.name)
+      path = "/downloads/elasticsearch/elasticsearch/#{version.archive_name}"
+      destination_name = @destination_dir.join File.basename(version.archive_name)
 
       raise "ERROR: File #{destination_name} already present!" if destination_name.exist?
 

data/lib/desi/http_client.rb

@@ -8,8 +8,8 @@ module Desi
 
   class HttpClient
 
-    def initialize(host_string)
-      @uri = to_uri(host_string)
+    def initialize(host)
+      @uri = to_uri(host)
 
       case @uri.scheme
       when 'https'
@@ -52,15 +52,8 @@ module Desi
     private
 
     def to_uri(host_string)
-      scheme, host, port = ['http', '127.0.0.1', 9200]
-
-      %r{(?<scheme>(https?|))(?:\:\/\/|)(?<host>[^:]*?):?(?<port>\d*)/?$}.match(host_string) do |m|
-        scheme = m[:scheme] unless m[:scheme].empty?
-        host = m[:host] unless m[:host].empty?
-        port = m[:port] unless m[:port].empty?
-      end
-
-      Addressable::URI.new(scheme: scheme, host: host, port: port)
+      host_string = "http://#{host_string}" unless host_string.to_s =~ %r[^https?://]
+      URI(host_string)
     end
   end
 

data/lib/desi/index_manager.rb

@@ -24,7 +24,7 @@ module Desi
     #
     # @api public
     def initialize(opts = {})
-      @host = opts.fetch(:host, 'http://127.0.0.1:9200')
+      @host = to_uri(opts.fetch(:host, 'http://127.0.0.1:9200'))
       @verbose = opts[:verbose]
       @outputter = opts.fetch(:outputter, Kernel)
       @client = opts.fetch(:http_client_factory, Desi::HttpClient).new(@host)
@@ -115,5 +115,17 @@ module Desi
       }
     end
 
+    def to_uri(host_string)
+      scheme, host, port = ['http', '127.0.0.1', 9200]
+
+      %r{(?<scheme>(https?|))(?:\:\/\/|)(?<host>[^:]*?):?(?<port>\d*)/?$}.match(host_string.to_s) do |m|
+        scheme = m[:scheme] unless m[:scheme].empty?
+        host = m[:host] unless m[:host].empty?
+        port = m[:port] unless m[:port].empty?
+      end
+
+      "#{scheme}://#{host}:#{port}"
+    end
+
   end
 end

data/lib/desi/installer.rb

@@ -9,13 +9,14 @@ module Desi
     def initialize(archive, opts = {})
       @verbose = opts[:verbose]
       @archive = archive.to_s
-      @local_install = Desi::LocalInstall.new(opts[:destination_dir])
+      @local_install = Desi::LocalInstall.new(opts[:destination_dir], verbose: @verbose)
     end
 
     def install!
       extract! unless extracted?
       install_config_file
       update_symlink!
+      remove_archive!
     end
 
     def extracted?
@@ -32,13 +33,7 @@ module Desi
 
 
     def update_symlink!
-      unless @local_install.current_dir.symlink?
-        raise "Mmmm!! #{@local_install.current_dir} is not a symlink!"
-      end
-
-      puts " * Updating #{@local_install.current_dir} symlink" if @verbose
-      FileUtils.remove(@local_install.current_dir)
-      FileUtils.ln_sf(release_dir, @local_install.current_dir)
+      @local_install.update_current_to(release_dir)
     end
 
     def config_file
@@ -67,6 +62,10 @@ module Desi
       end
     end
 
+    def remove_archive!
+      FileUtils.rm @archive
+    end
+
     def release_dir
       @release_dir ||= Pathname(@local_install).join(File.basename(@archive, '.tar.gz'))
     end

data/lib/desi/local_install.rb

@@ -51,8 +51,10 @@ module Desi
       end
     end
 
-    def initialize(workdir = nil)
+    def initialize(workdir = nil, opts = {})
+      @verbose = opts[:verbose]
       @workdir = Pathname(File.expand_path(workdir || DEFAULT_DIR))
+      create!
     end
 
     def exists?
@@ -63,6 +65,14 @@ module Desi
       @workdir.join('current')
     end
 
+    def update_current_to(release_dir)
+      current_dir_must_be_nil_or_symlink!
+
+      puts " * Updating #{@local_install.current_dir} symlink" if @verbose
+      FileUtils.remove(current_dir) if current_dir.exist?
+      FileUtils.ln_sf(release_dir, current_dir)
+    end
+
     def create!
       FileUtils.mkdir_p @workdir
     end
@@ -86,5 +96,13 @@ module Desi
     def launcher
       current_dir.join('bin', 'elasticsearch')
     end
+
+    private
+
+    def current_dir_must_be_nil_or_symlink!
+      if current_dir.exist? && ! current_dir.symlink?
+        raise "Mmmm!! #{current_dir} is not a symlink!"
+      end
+    end
   end
 end

data/lib/desi/upstream.rb

@@ -6,9 +6,21 @@ require "json"
 module Desi
   class Upstream
 
-    class Release < Struct.new(:name, :description, :release_date, :download_url)
+    class Release < Struct.new(:archive_name, :description, :release_date, :download_url)
       def to_s
-        self.name
+        archive_name
+      end
+
+      def name
+        @name ||= archive_name.scan(/^(elasticsearch-.*?)\.tar\.gz$/).flatten.first
+      end
+
+      def version
+        @version ||= archive_name.scan(/^elasticsearch-(.*?)\.tar\.gz$/).flatten.first
+      end
+
+      def ===(name_or_version)
+        name_or_version == version || name_or_version == name || name_or_version == "v#{version}"
       end
     end
 
@@ -27,8 +39,8 @@ module Desi
       releases.first
     end
 
-    def find_release(name)
-      releases.detect {|r| r.name == name || r.version == name }
+    def find_release(name_or_version)
+      releases.detect {|r| r === name_or_version }
     end
 
     private

data/lib/desi/version.rb

@@ -1,3 +1,3 @@
 module Desi
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/desi/index_manager_spec.rb

@@ -125,9 +125,9 @@ describe Desi::IndexManager do
     let(:factory_for_remote_host) { double("http_client_factory") }
 
     it "sends the other host's url to initialize the client" do
-      factory_for_remote_host.should_receive(:new).with("http://foobar.com")
+      factory_for_remote_host.should_receive(:new).with("http://foobar.com:9400")
 
-      described_class.new(host: "http://foobar.com", http_client_factory: factory_for_remote_host)
+      described_class.new(host: "http://foobar.com:9400", http_client_factory: factory_for_remote_host)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: desi
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2012-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: boson
@@ -206,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3454323007955509059
+      hash: 65546366130698177
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3454323007955509059
+      hash: 65546366130698177
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24