elasticsearch-node 0.6.0 → 0.7.0

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 rvm:
+  - 1.8.7
   - 1.9.2
   - 1.9.3
   - jruby-19mode
 env:
   - ES_VERSION=0.18.7
-  - ES_VERSION=0.19.1
+  - ES_VERSION=0.19.2
 before_script: "bin/install_elasticsearch"

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+# Changelog
+
+## Version 0.7.0
+
+- Added windows compatibility
+- Added compatibility for Rubies without Kernel.spawn
+
+## Version 0.6.0
+
+- Initial release

data/README.md

@@ -83,11 +83,6 @@ Please be aware that this library does not add any `at_exit`-hooks to your appli
 
     at_exit { node.close }
 
-## Flaws
-
-* No windows support at the moment.
-* No 1.8 support at the moment.
-
 ### License
 
 See `COPYING.md` for all details.

data/bin/install_elasticsearch

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-es_version = ENV['ES_VERSION'] || "0.19.1"
+es_version = ENV['ES_VERSION'] || "0.19.2"
 
 puts "Installing elasticsearch-#{es_version}. 
 To install a different version, specify it using the ES_VERSION environment variable.

data/elasticsearch-node.gemspec

@@ -13,10 +13,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "elasticsearch-node"
 
-  s.files         = (
-                      `git ls-files`.split("\n") + 
-                      Dir["elasticsearch/{bin,config,lib,README.textile,NOTICE.txt,LICENSE.txt}"]
-                    ).uniq
+  s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]

data/lib/elasticsearch-node/external.rb

@@ -14,26 +14,25 @@ module ElasticSearch
 
         commandline = opts.map {|opt,value| "-Des.#{opt}=#{value}" }.join(" ")
 
-        capture_ip_and_port do
-          self.pid = Kernel.spawn("#{Node.binary} -f #{commandline}", :out => :out, :err => :err)
+        if Kernel.respond_to? :spawn
+          capture_ip_and_port do
+            self.pid = Kernel.spawn("#{Node.binary} -f #{commandline}", :out => :out, :err => :err)
+          end
+        else
+          process = IO.popen("#{Node.binary} -f #{commandline}", "r")
+          parse_ip_and_port(process)
+          start_slurper(process)
+          self.pid = process.pid
         end
 
         super(opts)
       end
 
       def port
-        unless @port
-          parse_ip_and_port
-        end
-
         @port
       end
 
       def ip
-        unless @ip
-          parse_ip_and_port
-        end
-
         @ip
       end
 
@@ -68,6 +67,21 @@ module ElasticSearch
 
           $stdout.reopen(old_stdout)
         end
+
+        def parse_ip_and_port(process)
+          process.each do |line|
+            $stdout << line
+            if line =~ /\[http\s*\].*\/(.*):([0-9]+)/
+              @ip = $1
+              @port = Integer($2)
+              break
+            end
+          end
+        end
+
+        def start_slurper(process)
+          Thread.new { process.each { |line| $stdout << line } }
+        end
     end
   end
 end

data/lib/elasticsearch-node/version.rb

@@ -1,5 +1,5 @@
 module Elsearch
   module Node
-    VERSION = "0.6.0"
+    VERSION = "0.7.0"
   end
 end

data/lib/elasticsearch-node.rb

@@ -4,17 +4,21 @@ require 'elasticsearch-node/client_provider'
 module ElasticSearch 
   module Node
     attr_accessor :version
-    
+
     def self.root(*args)
       File.join(File.dirname(__FILE__), "..", *args)
     end
-  
+
     def self.path
       File.expand_path(File.join(root, "elasticsearch-#{version}"))
     end
-    
+
     def self.binary
-      File.join(path, 'bin', 'elasticsearch')
+      if self.windows?
+        File.join(path, 'bin', 'elasticsearch.bat')
+      else
+        File.join(path, 'bin', 'elasticsearch')
+      end
     end
 
     def self.version
@@ -24,17 +28,22 @@ module ElasticSearch
     def self.lib
       File.join(path, 'lib')
     end
-    
+
     def self.config(name)
       root('configs', name.to_s, "config")
     end
-    
+
     def self.default_config(name)
       ENV["ES_JAVA_OPTS"] = "-Des.path.conf=#{self.config(name)}"
     end
-    
+
     def self.version
-      @version || ENV["ES_VERSION"] || "0.19.1"
+      @version || ENV["ES_VERSION"] || "0.19.2"
+    end
+
+    def self.windows?
+      require 'rbconfig'
+      RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-node
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-01 00:00:00.000000000Z
+date: 2012-04-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riot
-  requirement: &2165532760 !ruby/object:Gem::Requirement
+  requirement: &2152180140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165532760
+  version_requirements: *2152180140
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &2165532100 !ruby/object:Gem::Requirement
+  requirement: &2152172260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165532100
+  version_requirements: *2152172260
 description: Helper gem to install and start an elasticsearch node
 email:
 - florian.gilcher@asquera.de
@@ -43,6 +43,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - COPYING.md
 - Gemfile
 - README.md
@@ -51,7 +52,6 @@ files:
 - configs/testing/config/elasticsearch.yml
 - configs/testing/config/logging.yml
 - elasticsearch-node.gemspec
-- fetch_es.rb
 - lib/elasticsearch-node.rb
 - lib/elasticsearch-node/client_provider.rb
 - lib/elasticsearch-node/embedded.rb

data/fetch_es.rb

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-es_version = ENV['ES_VERSION'] || "0.19.1"
-
-`curl https://github.com/downloads/elasticsearch/elasticsearch/elasticsearch-#{es_version}.tar.gz -L -o elasticsearch.tar.gz`
-`tar xvf elasticsearch.tar.gz`
-#mv elasticsearch-$ES_VERSION elasticsearch
-File.unlink "elasticsearch-#{es_version}.tar.gz"