elasticshell 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/elasticshell/client.rb

@@ -20,7 +20,7 @@ module Elasticshell
     end
 
     def safely verb, params={}, options={}, body=''
-      request(verb, params, options.merge(:safely => true))
+      request(verb, params, options.merge(:safely => true), body)
     end
 
     def request verb, params={}, options={}, body=''
@@ -46,8 +46,8 @@ module Elasticshell
 
     def connect servers, first_attempt=false
       string  = servers.join(' ')
-      Elasticshell.debug("Attempting to connect to #{string} ...")         if first_attempt
-      raise ClientError.new("Timed out or failed to connect to #{string}") if servers.empty?
+      Elasticshell.debug("Attempting to connect to #{string} ...")           if first_attempt
+      raise ClientError.new("Timed out or failed to connect to any servers") if servers.empty?
       begin
         server = servers.shift
         timeout(5) do

data/lib/elasticshell/commands/request.rb

@@ -15,7 +15,7 @@ module Elasticshell
       end
 
       def perform_request!
-        self.response = shell.client.safely(request[:verb], {:op => request[:path].gsub(/^\//,'') }, request[:query_options].merge(:log => shell.log_requests?), request[:body])
+        self.response = shell.client.request(request[:verb], {:op => request[:path].gsub(/^\//,'') }, request[:query_options].merge(:log => shell.log_requests?), request[:body])
       end
 
       def pipe?

data/lib/elasticshell/commands/request_parser.rb

@@ -29,10 +29,6 @@ module Elasticshell
           self.raw = command.shell.input.gsub(/ (?:\||>).*$/,'')
         end
 
-        def strip_file_redirect!
-          self.raw = command.shell.input.gsub(/ >.*$/,'')
-        end
-        
         def split_verb_and_request!
           if raw =~ Regexp.new("^(#{verb_re})\s+(.+)$", true)
             self.verb, self.request_string = canonicalize_verb($1), $2

data/spec/elasticshell/commands/request_spec.rb

@@ -8,50 +8,50 @@ describe Commands::Request do
   end
 
   it "should recognize a simple request" do
-    @shell.client.should_receive(:safely).with("GET", { :op => "_simple" }, kind_of(Hash), "").and_return('{}')
+    @shell.client.should_receive(:request).with("GET", { :op => "_simple" }, kind_of(Hash), "").and_return('{}')
     @shell.eval_line("_simple")
   end
 
   it "should recognize a simple request with a different verb" do
-    @shell.client.should_receive(:safely).with("POST", { :op => "_simple" }, kind_of(Hash), "").and_return('{}')
+    @shell.client.should_receive(:request).with("POST", { :op => "_simple" }, kind_of(Hash), "").and_return('{}')
     @shell.eval_line("POST _simple")
   end
 
   it "should recognize a request with an absolute path" do
-    @shell.client.should_receive(:safely).with("GET", { :op => "some/thing" }, kind_of(Hash), "").and_return('{}')
+    @shell.client.should_receive(:request).with("GET", { :op => "some/thing" }, kind_of(Hash), "").and_return('{}')
     @shell.eval_line("/some/thing")
   end
 
   it "should recognize a request with a query string" do
-    @shell.client.should_receive(:safely).with("GET", { :op => "_simple" }, {"foo" => "bar", "baz" => "booz what", :log => true}, "").and_return('{}')
+    @shell.client.should_receive(:request).with("GET", { :op => "_simple" }, {"foo" => "bar", "baz" => "booz what", :log => true}, "").and_return('{}')
     @shell.eval_line("_simple?foo=bar&baz=booz+what")
   end
 
   it "should recognize a request with an inline body" do
-    @shell.client.should_receive(:safely).with("POST", { :op => "_simple" }, kind_of(Hash), "{}").and_return('{}')
+    @shell.client.should_receive(:request).with("POST", { :op => "_simple" }, kind_of(Hash), "{}").and_return('{}')
     @shell.eval_line("POST _simple {}")
   end
 
   it "should recognize a request with a body read from a local file" do
     File.should_receive(:exist?).with("/some/file.json").and_return(true)
     File.should_receive(:read).with("/some/file.json").and_return("{}")
-    @shell.client.should_receive(:safely).with("GET", { :op => "_simple" }, kind_of(Hash), "{}").and_return('{}')
+    @shell.client.should_receive(:request).with("GET", { :op => "_simple" }, kind_of(Hash), "{}").and_return('{}')
     @shell.eval_line("_simple /some/file.json")
   end
 
   it "should recognize a request with a body read from STDIN" do
     @shell.input_stream.stub!(:gets).and_return("{}")
-    @shell.client.should_receive(:safely).with("GET", { :op => "_simple" }, kind_of(Hash), "{}").and_return('{}')
+    @shell.client.should_receive(:request).with("GET", { :op => "_simple" }, kind_of(Hash), "{}").and_return('{}')
     @shell.eval_line("_simple -")
   end
 
   it "should be able to pipe the output of a request to Ruby inline" do
-    @shell.client.should_receive(:safely).with("GET", { :op => "_simple" }, kind_of(Hash), "").and_return('{}')
+    @shell.client.should_receive(:request).with("GET", { :op => "_simple" }, kind_of(Hash), "").and_return('{}')
     @shell.eval_line("_simple | response")
   end
 
   it "should be able to pipe the output of a request to a RIPL session" do
-    @shell.client.should_receive(:safely).with("GET", { :op => "_simple" }, kind_of(Hash), "").and_return('{}')
+    @shell.client.should_receive(:request).with("GET", { :op => "_simple" }, kind_of(Hash), "").and_return('{}')
     require 'ripl'
     Ripl.should_receive(:start)
     @shell.eval_line("_simple |")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticshell
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -187,7 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3786860425467706238
+      hash: -3702363232636425021
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: