desi 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bbf6d3d53ed7358dffef0e2431bc331a48efb95
-  data.tar.gz: 22e5876b8ad096baafb0c4a0add1fced2588d9a2
+  metadata.gz: f68fa604db570820065691f9020d4d66b7c53aab
+  data.tar.gz: 2411c64577dc4280f95b95ec10964ef637b8fb15
 SHA512:
-  metadata.gz: fb0d17121ebf72b739d48620c8ee75bc95af65f34da79541620504aa24b6c9f6530f9f82c5691abab1529bc0fdb37990e895ffb4645f0ed1151a3e43d3f0ab86
-  data.tar.gz: 59e50ba2f1f4d71394ea87a1f911ba354ae29e16945fdd70f8e39ef38527f5c4fb9af820800d303480c72b9791e858975e14a801439ee3a951add045949e3e46
+  metadata.gz: ca300972e1b07658e55e37c5dc48c24ca9d7b523e5cc5b857b3097e6de1f33f106cff314d005b3afc6cb7969fadb1f36b92af6e871b5ef746ebd26782c52ebd6
+  data.tar.gz: 3941edfe968d9b5c130cecc451367f7194ea13791a1b9988a80eacd3fb40ad35d57c6986e2b93db6cdb6cc010066f866dd9bbbec090f55757db2a0cf27cabbc6

data/desi.gemspec

@@ -17,6 +17,7 @@ an Elastic Search local install for development purposes.}
   gem.add_dependency "boson"
   gem.add_dependency "cocaine", "~> 0.5.3"
   gem.add_dependency "addressable"
+  gem.add_dependency "semantic", "~> 1.3.0"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"

data/lib/desi/local_install.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require "pathname"
+require "semantic"
 
 module Desi
   class LocalInstall
@@ -26,7 +27,7 @@ module Desi
       end
 
       def version
-        @version ||= /^elasticsearch\-(?<version>.*)$/.match(name.to_s)[:version]
+        @version ||= Semantic::Version.new /^elasticsearch\-(?<version>.*)$/.match(name.to_s)[:version]
       end
 
       def to_s
@@ -39,6 +40,10 @@ module Desi
         name <=> other.name
       end
 
+      def pre_one_zero?
+        @pre_one_zero ||= (version < Semantic::Version.new("1.0.0-alpha"))
+      end
+
       private
 
       def current_symlink
@@ -48,6 +53,12 @@ module Desi
       def current_symlink?
         current_symlink.exist?
       end
+    end # Release
+
+
+    def self.current_release_is_pre_one_zero?
+      current = new.current_release
+      current && current.pre_one_zero?
     end
 
     def initialize(workdir = nil, opts = {})
@@ -80,6 +91,10 @@ module Desi
       Release.all_in(@workdir)
     end
 
+    def current_release
+      releases.find {|r| r.current? }
+    end
+
     def to_path
       @workdir.to_s
     end

data/lib/desi/process_manager.rb

@@ -27,6 +27,7 @@ module Desi
       @host = opts.fetch(:host) { Desi.configuration.server }
       @verbose = opts[:verbose]
       @foreground = opts[:foreground]
+      @background = opts[:background]
       @local_install = LocalInstall.new
       @client = opts.fetch(:http_client_factory, Desi::HttpClient).new(@host)
 
@@ -213,7 +214,7 @@ module Desi
 
     def cluster_ready?
       begin
-        JSON.parse(@client.get('/').body)["ok"]
+        JSON.parse(@client.get('/').body)["status"] == 200
       rescue
         false
       end
@@ -236,11 +237,23 @@ module Desi
     end
 
     def start_command_options
-      ['-p :pidfile', @foreground ? '-f' : nil].compact.join(' ')
+      ['-p :pidfile', foreground_or_background_flag].compact.join(' ')
+    end
+
+    def foreground_or_background_flag
+      if legacy_release?
+        !! @foreground ? '-f' : ''
+      else
+        !! @background ? '-d' : ''
+      end
     end
 
     def foreground?
-      !!@foreground
+      if legacy_release?
+        !! @foreground
+      else
+        ! @background
+      end
     end
 
     def tail_after_start?
@@ -260,5 +273,9 @@ module Desi
       end
     end
 
+    def legacy_release?
+      @legacy_release ||= Desi::LocalInstall.current_release_is_pre_one_zero?
+    end
+
   end
 end

data/lib/desi/runner.rb

@@ -12,7 +12,12 @@ module Desi
     end
 
     def self.start_options
-      option :foreground, type: :boolean, desc: "Run ES in the foreground", default: false
+      if Desi::LocalInstall.current_release_is_pre_one_zero?
+        option :foreground, type: :boolean, desc: "Run ES in the foreground", default: false
+      else
+        option :background, type: :boolean, desc: "Run ES in the background", default: false
+      end
+
       option :tail, type: :boolean, desc: "Run tail after (re)starting", default: false
     end
 

data/lib/desi/upstream.rb

@@ -2,6 +2,7 @@
 
 require "desi/http_client"
 require "json"
+require "semantic"
 
 module Desi
   class Upstream
@@ -34,7 +35,7 @@ module Desi
       protected
 
       def sortable_version
-        version_name.split('.').map {|c| c.to_i }
+        @sortable_version ||= Semantic::Version.new(version.sub(%r{.(beta|alpha|rc)}i, '-\1'))
       end
     end
 

data/lib/desi/version.rb

@@ -1,3 +1,3 @@
 module Desi
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/spec/desi/index_manager_spec.rb

@@ -13,7 +13,7 @@ describe Desi::IndexManager do
 
   def stub_request(method, path, payload)
     http_client.stub(method).with(path).and_return(
-      mock("response", body: JSON.unparse(payload))
+      double("response", body: JSON.unparse(payload))
     )
   end
 

data/spec/desi/upstream_spec.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+require "spec_helper"
+require "desi/upstream"
+
+describe Desi::Upstream::Release do
+  context "sort" do
+    let(:v1) { Desi::Upstream::Release.new("v1.0.0", "") }
+    let(:v09) { Desi::Upstream::Release.new("v0.90.10", "") }
+
+    it "sorts the v1.0.0 before v0.90.10" do
+      expect([v09, v1].sort).to eql([v1, v09])
+    end
+
+    it "sorts 1.0.0.RC2 before 1.0.0" do
+      expect([
+        Desi::Upstream::Release.new("v1.0.0.Beta1", ""),
+        Desi::Upstream::Release.new("v1.0.0.RC2", ""),
+        Desi::Upstream::Release.new("v1.0.0", ""),
+        Desi::Upstream::Release.new("v1.0.0.Beta2", ""),
+        Desi::Upstream::Release.new("v1.0.0.RC1", ""),
+      ].sort).to eql([
+        Desi::Upstream::Release.new("v1.0.0", ""),
+        Desi::Upstream::Release.new("v1.0.0.RC2", ""),
+        Desi::Upstream::Release.new("v1.0.0.RC1", ""),
+        Desi::Upstream::Release.new("v1.0.0.Beta2", ""),
+        Desi::Upstream::Release.new("v1.0.0.Beta1", "")
+        ])
+    end
+  end
+end

data/tasks/console.rake

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+desc "Open a Pry console"
+task :console do
+  require "desi"
+  require "pry"
+  Pry.start
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: desi
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Dominique Rose-Rosette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: boson
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: semantic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +199,9 @@ files:
 - lib/desi/upstream.rb
 - lib/desi/version.rb
 - spec/desi/index_manager_spec.rb
+- spec/desi/upstream_spec.rb
 - spec/spec_helper.rb
+- tasks/console.rake
 - tasks/spec.rake
 - tasks/yard.rake
 homepage: https://github.com/AF83/desi/
@@ -208,11 +224,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.13
 signing_key: 
 specification_version: 4
 summary: A developer tool to quickly set up an Elastic Search local install.
 test_files:
 - spec/desi/index_manager_spec.rb
+- spec/desi/upstream_spec.rb
 - spec/spec_helper.rb
 has_rdoc: