rubberband 0.0.4 → 0.0.5

data/Gemfile

@@ -0,0 +1,11 @@
+source "http://rubygems.org"
+
+gem "patron"
+gem "yajl-ruby"
+
+group :development do
+  gem "shoulda", ">= 0"
+  gem "bundler", "~> 1.0.0"
+  gem "jeweler", "~> 1.5.1"
+  gem "rcov", ">= 0"
+end

data/Gemfile.lock

@@ -0,0 +1,24 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    git (1.2.5)
+    jeweler (1.5.1)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    patron (0.4.10)
+    rake (0.8.7)
+    rcov (0.9.9)
+    shoulda (2.11.3)
+    yajl-ruby (0.7.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0.0)
+  jeweler (~> 1.5.1)
+  patron
+  rcov
+  shoulda
+  yajl-ruby

data/Rakefile

@@ -1,57 +1,48 @@
 require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "rubberband"
-    gem.summary = %Q{An ElasticSearch client.}
-    gem.description = %Q{An ElasticSearch Client with ThriftClient-like failover handling.}
-    gem.email = "grantr@gmail.com"
-    gem.homepage = "http://github.com/grantr/rubberband"
-    gem.authors = ["grantr"]
-    gem.add_dependency "patron"
-    gem.add_dependency "yajl-ruby"
-    gem.add_development_dependency "shoulda"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+require 'jeweler'
+require './lib/elasticsearch/version'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "rubberband"
+  gem.version = ElasticSearch::Version::STRING
+  gem.homepage = "http://github.com/grantr/rubberband"
+  gem.license = "Apache v2.0"
+  gem.summary = %Q{An ElasticSearch client.}
+  gem.description = %Q{An ElasticSearch client with ThriftClient-like failover handling.}
+  gem.email = "grantr@gmail.com"
+  gem.authors = ["grantr"]
 end
+Jeweler::RubygemsDotOrgTasks.new
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
+  test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+require 'rcov/rcovtask'
+Rcov::RcovTask.new do |test|
+  test.libs << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
-  end
-
+  version = ElasticSearch::Version::STRING
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "rubberband #{version}"
   rdoc.rdoc_files.include('README*')

data/lib/elasticsearch/transport/base.rb

@@ -29,6 +29,10 @@ module ElasticSearch
         @encoder ||= @options[:encoder].new
       end
 
+      def all_nodes
+        raise NotImplementedError
+      end
+
       def request(method, operation, params={}, body=nil, headers={})
         raise NotImplementedError
       end

data/lib/elasticsearch/transport/base_protocol.rb

@@ -220,16 +220,6 @@ module ElasticSearch
       include ClusterAdminProtocol
       include ProtocolHelpers
 
-      def all_nodes
-        http_addresses = nodes_info([])["nodes"].collect { |id, node| node["http_address"] }
-        http_addresses.collect! do |a|
-          if a =~ /inet\[.*\/([\d.:]+)\]/
-            $1
-          end
-        end.compact!
-        http_addresses
-      end
-
     end
   end
 end

data/lib/elasticsearch/transport/http.rb

@@ -21,6 +21,16 @@ module ElasticSearch
         @session.headers['User-Agent'] = 'ElasticSearch.rb v0.1'
       end
 
+      def all_nodes
+        http_addresses = nodes_info([])["nodes"].collect { |id, node| node["http_address"] }
+        http_addresses.collect! do |a|
+          if a =~ /inet\[.*\/([\d.:]+)\]/
+            $1
+          end
+        end.compact!
+        http_addresses
+      end
+
       private
 
       def request(method, operation, params={}, body=nil, headers={})

data/lib/elasticsearch/transport/thrift.rb

@@ -42,6 +42,16 @@ module ElasticSearch
         @transport.close rescue nil
       end
 
+      def all_nodes
+        thrift_addresses = nodes_info([])["nodes"].collect { |id, node| node["thrift_address"] }
+        thrift_addresses.collect! do |a|
+          if a =~ /.*\/([\d.:]+)/
+            $1
+          end
+        end.compact!
+        thrift_addresses
+      end
+
       private
 
       def parse_server(server)

data/lib/elasticsearch/version.rb

@@ -0,0 +1,10 @@
+module ElasticSearch
+  module Version
+    MAJOR = 0
+    MINOR = 0
+    PATCH = 5
+    BUILD = nil
+
+    STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
+  end
+end

data/rubberband.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubberband}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["grantr"]
   s.date = %q{2010-12-06}
-  s.description = %q{An ElasticSearch Client with ThriftClient-like failover handling.}
+  s.description = %q{An ElasticSearch client with ThriftClient-like failover handling.}
   s.email = %q{grantr@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -18,11 +18,12 @@ Gem::Specification.new do |s|
     "TODO"
   ]
   s.files = [
+    "Gemfile",
+    "Gemfile.lock",
     "LICENSE",
     "README.rdoc",
     "Rakefile",
     "TODO",
-    "VERSION",
     "lib/elasticsearch.rb",
     "lib/elasticsearch/client.rb",
     "lib/elasticsearch/client/abstract_client.rb",
@@ -44,6 +45,7 @@ Gem::Specification.new do |s|
     "lib/elasticsearch/transport/thrift/elasticsearch_constants.rb",
     "lib/elasticsearch/transport/thrift/elasticsearch_types.rb",
     "lib/elasticsearch/transport/thrift/rest.rb",
+    "lib/elasticsearch/version.rb",
     "lib/rubberband.rb",
     "rubberband.gemspec",
     "test/elasticsearch_test.rb",
@@ -52,6 +54,7 @@ Gem::Specification.new do |s|
     "vendor/elasticsearch/elasticsearch.thrift"
   ]
   s.homepage = %q{http://github.com/grantr/rubberband}
+  s.licenses = ["Apache v2.0"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{An ElasticSearch client.}
@@ -69,15 +72,24 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<patron>, [">= 0"])
       s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<patron>, [">= 0"])
       s.add_dependency(%q<yajl-ruby>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<patron>, [">= 0"])
     s.add_dependency(%q<yajl-ruby>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+    s.add_dependency(%q<rcov>, [">= 0"])
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - grantr
@@ -19,7 +19,6 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: patron
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,10 +28,10 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -42,10 +41,10 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -55,8 +54,52 @@ dependencies:
         - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id003
-description: An ElasticSearch Client with ThriftClient-like failover handling.
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 1
+        version: 1.5.1
+  type: :development
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+description: An ElasticSearch client with ThriftClient-like failover handling.
 email: grantr@gmail.com
 executables: []
 
@@ -67,11 +110,12 @@ extra_rdoc_files:
 - README.rdoc
 - TODO
 files: 
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
 - TODO
-- VERSION
 - lib/elasticsearch.rb
 - lib/elasticsearch/client.rb
 - lib/elasticsearch/client/abstract_client.rb
@@ -93,6 +137,7 @@ files:
 - lib/elasticsearch/transport/thrift/elasticsearch_constants.rb
 - lib/elasticsearch/transport/thrift/elasticsearch_types.rb
 - lib/elasticsearch/transport/thrift/rest.rb
+- lib/elasticsearch/version.rb
 - lib/rubberband.rb
 - rubberband.gemspec
 - test/elasticsearch_test.rb
@@ -101,8 +146,8 @@ files:
 - vendor/elasticsearch/elasticsearch.thrift
 has_rdoc: true
 homepage: http://github.com/grantr/rubberband
-licenses: []
-
+licenses: 
+- Apache v2.0
 post_install_message: 
 rdoc_options: []
 
@@ -113,6 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -2243995552158926682
       segments: 
       - 0
       version: "0"

data/VERSION

@@ -1 +0,0 @@
-0.0.4