desi 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b98c15f9345db0d206dbbca070cd26a8ac27e0de
-  data.tar.gz: f936ffc1f630948d6e2763ec159832d54880d36f
+  metadata.gz: ca6a85c9fea92581a05bf10fa46540fbb77458fe
+  data.tar.gz: 55517b9b24c7e2965e9ab78b03b43a4582f841f6
 SHA512:
-  metadata.gz: d04dfd7fc401493e4c7a306dce74835bef06300cc3089c3cae2d2e2ae76866b394146fe44d1bd1c981177dc157a0b1b987a6c72626e1ac12c13714b4d36f7143
-  data.tar.gz: e5e6a8ce10d3d9e8e78e502284decc1a26356d51f88e1856d28873de819c1f739ec005cbeea509f4c8c68bbf01b06eb69dd054f6636c4ed0a59970f89eb5df94
+  metadata.gz: 0a6c23cda7bc27a2cb405051c371d437acdb5a99f2d57a25ffeda9024175cd14ef7f4bd489d8beb0532f4d4190e7cad22d6f0df914dddb44ade39abcbefb952e
+  data.tar.gz: c8fbbb9c547362f1a13512f366b254b850d573dde67b3ee70d03febbc755c7f3d4c8dda638565741299647f59c081e2541071b599c2be861f0ac0d612758c2f5

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 .ruby-version
 .ruby-gemset
 tags
+.envrc

data/.travis.yml

@@ -2,3 +2,4 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.1

data/lib/desi/local_install.rb

@@ -27,7 +27,7 @@ module Desi
       end
 
       def version
-        @version ||= Semantic::Version.new(/^elasticsearch\-(?<version>.*)$/.match(name.to_s)[:version])
+        @version ||= Semantic::Version.new(version_number)
       end
 
       def to_s
@@ -57,8 +57,14 @@ module Desi
       def current_symlink?
         current_symlink.exist?
       end
-    end # Release
 
+      # Ugly hack to get around elasticsearch's flakey semver naming
+      # (e.g. `1.4.0.Beta1` instead of `1.4.0-beta1`)
+      def version_number
+        /^elasticsearch\-(?<version>.*)$/.match(name.to_s)[:version].
+          sub(/\.(alpha|beta)/i, '-\1')
+      end
+    end # Release
 
     def self.current_release_is_pre_one_zero?
       current = new.current_release

data/lib/desi/process_manager.rb

@@ -229,6 +229,7 @@ module Desi
     end
 
     def perform_start
+      check_java_presence!
       puts "ES will be launched in the foreground" if foreground?
 
       Cocaine::CommandLine.new(@local_install.launcher.to_s, *start_command_options).
@@ -272,5 +273,11 @@ module Desi
       @legacy_release ||= Desi::LocalInstall.current_release_is_pre_one_zero?
     end
 
+    def check_java_presence!
+      Cocaine::CommandLine.new("which java").run
+    rescue Cocaine::ExitStatusError
+      warn "Could not find 'java' executable in your path. Are you sure it is installed on your system?"
+      exit 1
+    end
   end
 end

data/lib/desi/version.rb

@@ -1,3 +1,3 @@
 module Desi
-  VERSION = "0.6.8"
+  VERSION = "0.6.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: desi
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Dominique Rose-Rosette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: boson
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A developer tool to quickly set up an Elastic Search local install.