desi 0.2.7 → 0.2.8

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .rvmrc
+.rbenv*

data/lib/desi/downloader.rb

@@ -10,14 +10,14 @@ module Desi
 
     def initialize(opts = {})
       @destination_dir = Pathname(opts.fetch(:destination_dir, Desi::LocalInstall.new))
-      @host = URI(opts.fetch(:host, 'http://cloud.github.com/'))
+      @host = URI(opts.fetch(:host, 'https://nodeload.github.com/'))
       @client = opts.fetch(:http_client_factory, Desi::HttpClient).new(@host)
       @verbose = opts[:verbose]
     end
 
     def download!(version, opts = {})
-      path = "/downloads/elasticsearch/elasticsearch/#{version.archive_name}"
-      destination_name = @destination_dir.join File.basename(version.archive_name)
+      path = "/elasticsearch/elasticsearch/tar.gz/#{version.version_name}"
+      destination_name = @destination_dir.join File.basename(version.filename)
 
       raise "ERROR: File #{destination_name} already present!" if destination_name.exist?
 

data/lib/desi/http_client.rb

@@ -32,7 +32,7 @@ module Desi
         when Net::HTTPSuccess
           response
         when Net::HTTPRedirection
-          fetch(response['location'], limit - 1)
+          get(response['location'], limit - 1)
         else
           raise response.error!
       end

data/lib/desi/index_manager.rb

@@ -8,6 +8,27 @@ module Desi
   # Elastic Search cluster
   class IndexManager
 
+    class Index
+      attr_reader :name, :number_of_documents
+
+      def initialize(name, data)
+        @name = name
+        @number_of_documents = data["docs"]["num_docs"] if data && data["docs"]
+      end
+
+      def to_s
+        @name
+      end
+
+      def inspect
+        "#{@name} (#{@number_of_documents} documents)"
+      end
+
+      def <=>(other)
+        @name <=> other.name
+      end
+    end
+
     # Initializes a Desi::IndexManager instance
     #
     # @param       [#to_hash]  opts                             Hash of extra opts
@@ -53,7 +74,7 @@ module Desi
       @outputter.puts "Indices from host #{@host} matching the pattern #{pattern.inspect}\n\n" if @verbose
 
       list = indices(pattern).sort
-      list.each {|i| @outputter.puts i } if @verbose
+      list.each {|i| @outputter.puts i.inspect } if @verbose
       list
     end
 
@@ -78,7 +99,7 @@ module Desi
 
       indices(Regexp.new(pattern)).each do |index|
         @client.delete("/#{index}")
-        @outputter.puts " * #{index}" if @verbose
+        @outputter.puts " * #{index.inspect}" if @verbose
       end
     end
 
@@ -110,9 +131,9 @@ module Desi
     private
 
     def indices(pattern)
-      JSON.parse(@client.get('/_status').body)["indices"].keys.select {|i|
-              i =~ pattern
-      }
+      JSON.parse(@client.get('/_status').body)["indices"].map {|k, v|
+        Index.new(k, v) if k =~ pattern
+      }.compact
     end
 
     def to_uri(host_string)

data/lib/desi/runner.rb

@@ -31,7 +31,7 @@ module Desi
         releases
       else
         puts "Here are #{limit == 0 ? 'all the' : "the #{limit} latest"} releases"
-        releases.each {|rel| puts " - #{rel.name} (#{rel.release_date})" }
+        releases.each {|rel| puts " - #{rel.name}" }
       end
     end
 

data/lib/desi/upstream.rb

@@ -6,17 +6,17 @@ require "json"
 module Desi
   class Upstream
 
-    class Release < Struct.new(:archive_name, :description, :release_date, :download_url)
+    class Release < Struct.new(:version_name, :download_url)
       def to_s
-        archive_name
+        name
       end
 
       def name
-        @name ||= archive_name.scan(/^(elasticsearch-.*?)\.tar\.gz$/).flatten.first
+        "elasticsearch-#{version}"
       end
 
-      def version
-        @version ||= archive_name.scan(/^elasticsearch-(.*?)\.tar\.gz$/).flatten.first
+      def filename
+        "elasticsearch-#{version}.tar.gz"
       end
 
       def ===(name_or_version)
@@ -24,7 +24,17 @@ module Desi
       end
 
       def <=>(other)
-        other.release_date <=> other.release_date
+        other.sortable_version <=> sortable_version
+      end
+
+      def version
+        version_name.gsub(/^v/, '')
+      end
+
+      protected
+
+      def sortable_version
+        version_name.split('.').map {|c| c.to_i }
       end
     end
 
@@ -33,9 +43,8 @@ module Desi
     end
 
     def releases
-      @releases ||= fetch_releases.
-        select {|v| v['content_type'] == 'application/gzip' }.
-        map {|v| Release.new(v['name'], v['description'], v['created_at'], v['html_url']) }.
+      @releases ||= fetch_tags.
+        map {|v| Release.new(v['name'], v['tarball_url']) }.
         sort
     end
 
@@ -49,8 +58,8 @@ module Desi
 
     private
 
-    def fetch_releases
-      JSON.parse @client.get('/repos/elasticsearch/elasticsearch/downloads').body
+    def fetch_tags
+      JSON.parse @client.get('/repos/elasticsearch/elasticsearch/tags').body
     end
 
   end

data/lib/desi/version.rb

@@ -1,3 +1,3 @@
 module Desi
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/spec/desi/index_manager_spec.rb

@@ -28,13 +28,13 @@ describe Desi::IndexManager do
   describe "#list" do
     context "with no specified pattern" do
       it "returns the names of all indices" do
-        subject.list.should == %w[bar foo]
+        subject.list.map(&:name).should == %w[bar foo]
       end
     end
 
     context "with a pattern" do
       it "returns the matching indices" do
-        subject.list('oo').should == %w[foo]
+        subject.list('oo').map(&:name).should == %w[foo]
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: desi
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: boson
@@ -207,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3293702803258038896
+      hash: 4007543491113843537
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -216,10 +216,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3293702803258038896
+      hash: 4007543491113843537
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A developer tool to quickly set up an Elastic Search local install.