cliaws 1.2.4 → 1.2.5

data/History.txt

@@ -1,3 +1,10 @@
+== 1.2.5 2008-09-15
+
+* More testing for "clis3 put - S3_OBJECT" and "cat x | clis3 put S3_OBJECT" highlighted
+  errors.  Fixed those so now it works for real.
+  WARNING:  "clis3 put - S3_OBJECT" is horribly broken: the stream's size is unknown and
+            reported as 0, and the Amazon servers faithfully create a 0 sized object...
+
 == 1.2.4 2008-09-15
 
 * Released too soon - was missing some testing on clis3 put LOCAL REMOTE

data/Manifest.txt

@@ -23,6 +23,8 @@ tasks/environment.rake
 tasks/website.rake
 test/test_cliaws.rb
 test/test_helper.rb
+vendor/right_http_connection-1.2.1/README.txt
+vendor/right_http_connection-1.2.1/lib/right_http_connection.rb
 website/index.html
 website/index.txt
 website/javascripts/rounded_corners_lite.inc.js

data/bin/clis3

@@ -80,10 +80,13 @@ Main {
       else
         targets = paths.map {|filename| filename.to_s}
         case targets.length
+        when 0
+          source = STDIN
         when 1
           File.open(targets.first, "rb") do |source|
             Cliaws.s3.put(source, s3_object)
           end
+          exit 0
         else
           targets.each do |local_file|
             File.open(local_file, "rb") do |source|
@@ -92,9 +95,8 @@ Main {
               Cliaws.s3.put(source, remote_file)
             end
           end
+          exit 0
         end
-
-        exit 0
       end
 
       raise ArgumentError, "Target is a directory, but input is not a local file -- cannot proceed" if s3_object =~ /\/$/

data/lib/cliaws/s3.rb

@@ -1,6 +1,12 @@
 require "right_aws"
 require "activesupport"
 
+# Load vendor code through RubyGems
+require "right_http_connection"
+
+# Then patch it here
+require File.dirname(__FILE__) + "/../../vendor/right_http_connection-1.2.1/lib/right_http_connection"
+
 module Cliaws
   class S3
     attr_reader :access_key_id, :secret_access_key

data/lib/cliaws/version.rb

@@ -2,7 +2,7 @@ module Cliaws #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 2
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/tasks/deployment.rake

@@ -2,7 +2,7 @@ desc 'Release the website and new gem version'
 task :deploy => [:check_version, :website, :release] do
   puts "Remember to create SVN tag:"
   puts "svn copy svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/trunk " +
-    "svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/tags/REL-#{VERS} "
+  "svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/tags/REL-#{VERS} "
   puts "Suggested comment:"
   puts "Tagging release #{CHANGES}"
 end
@@ -29,6 +29,18 @@ end
 namespace :manifest do
   desc 'Recreate Manifest.txt to include ALL files'
   task :refresh do
-    `rake check_manifest | patch -p0 > Manifest.txt`
+    require "find"
+
+    home = File.expand_path(File.dirname(__FILE__) + "/../") + "/"
+    files = []
+    Find.find(File.dirname(__FILE__) + "/..") do |entry|
+      Find.prune if entry =~ /\.git$/
+      next if File.directory?(entry)
+      files << File.expand_path(entry).sub(home, "")
+    end
+
+    File.open(File.dirname(__FILE__) + "/../Manifest.txt", "w") do |io|
+      io.puts files.sort.join("\n")
+    end
   end
-end
+end

data/vendor/right_http_connection-1.2.1/README.txt

@@ -0,0 +1,3 @@
+== INFORMATION
+
+Patched #request to not crash if the request's body is an IO that doesn't respond_to?(:lstat) and #size.

data/vendor/right_http_connection-1.2.1/lib/right_http_connection.rb

@@ -0,0 +1,117 @@
+#
+# Copyright (c) 2007-2008 RightScale Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+module Rightscale
+  class HttpConnection 
+    def request(request_params, &block)
+      loop do
+        # if we are inside a delay between retries: no requests this time!
+        if error_count > HTTP_CONNECTION_RETRY_COUNT \
+        && error_time + HTTP_CONNECTION_RETRY_DELAY > Time.now
+          @logger.warn("#{err_header} re-raising same error: #{banana_message} " +
+                      "-- error count: #{error_count}, error age: #{Time.now.to_i - error_time.to_i}")  
+          exception = get_param(:exception) || RuntimeError
+          raise exception.new(banana_message)
+        end
+      
+        # try to connect server(if connection does not exist) and get response data
+        begin
+          request_params[:protocol] ||= (request_params[:port] == 443 ? 'https' : 'http')
+          # (re)open connection to server if none exists or params has changed
+          unless @http          && 
+                 @http.started? &&
+                 @server   == request_params[:server] &&
+                 @port     == request_params[:port]   &&
+                 @protocol == request_params[:protocol]
+            start(request_params)
+          end
+          
+          # get response and return it
+          request  = request_params[:request]
+          request['User-Agent'] = get_param(:user_agent) || ''
+
+          # Detect if the body is a streamable object like a file or socket.  If so, stream that
+          # bad boy.
+          if(request.body && request.body.respond_to?(:read))
+            body = request.body
+            request.content_length = if body.respond_to?(:lstat) then
+              body.lstat.size
+            elsif body.respond_to?(:stat) then
+              body.stat.size
+            elsif body.respond_to?(:length) then
+              body.length
+            elsif body.respond_to?(:size) then
+              body.size
+            else
+              raise "Cannot determine request's Content-Length header for #{body.inspect}.  #{body} doesn't respond to #lstat, #stat, #length or #size."
+            end
+            request.body_stream = request.body
+          end
+          response = @http.request(request, &block)
+          
+          error_reset
+          eof_reset
+          return response
+
+        # We treat EOF errors and the timeout/network errors differently.  Both
+        # are tracked in different statistics blocks.  Note below that EOF
+        # errors will sleep for a certain (exponentially increasing) period.
+        # Other errors don't sleep because there is already an inherent delay
+        # in them; connect and read timeouts (for example) have already
+        # 'slept'.  It is still not clear which way we should treat errors
+        # like RST and resolution failures.  For now, there is no additional
+        # delay for these errors although this may change in the future.
+        
+        # EOFError means the server closed the connection on us.
+        rescue EOFError => e
+          @logger.debug("#{err_header} server #{@server} closed connection")
+          @http = nil
+          
+            # if we have waited long enough - raise an exception...
+          if raise_on_eof_exception?
+            exception = get_param(:exception) || RuntimeError
+            @logger.warn("#{err_header} raising #{exception} due to permanent EOF being received from #{@server}, error age: #{Time.now.to_i - eof_time.to_i}")  
+            raise exception.new("Permanent EOF is being received from #{@server}.")
+          else
+              # ... else just sleep a bit before new retry
+            sleep(add_eof)
+          end 
+        rescue Exception => e  # See comment at bottom for the list of errors seen...
+          @http = nil
+          # if ctrl+c is pressed - we have to reraise exception to terminate proggy 
+          if e.is_a?(Interrupt) && !( e.is_a?(Errno::ETIMEDOUT) || e.is_a?(Timeout::Error))
+            @logger.debug( "#{err_header} request to server #{@server} interrupted by ctrl-c")
+            raise
+          elsif e.is_a?(ArgumentError) && e.message.include?('wrong number of arguments (5 for 4)')
+            # seems our net_fix patch was overriden...
+            exception = get_param(:exception) || RuntimeError
+            raise exception.new('incompatible Net::HTTP monkey-patch')
+          end
+          # oops - we got a banana: log it
+          error_add(e.message)
+          @logger.warn("#{err_header} request failure count: #{error_count}, exception: #{e.inspect}")
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cliaws
 version: !ruby/object:Gem::Version 
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Beausoleil"
@@ -65,6 +65,7 @@ extra_rdoc_files:
 - License.txt
 - Manifest.txt
 - README.txt
+- vendor/right_http_connection-1.2.1/README.txt
 - website/index.txt
 files: 
 - .gitignore
@@ -92,6 +93,8 @@ files:
 - tasks/website.rake
 - test/test_cliaws.rb
 - test/test_helper.rb
+- vendor/right_http_connection-1.2.1/README.txt
+- vendor/right_http_connection-1.2.1/lib/right_http_connection.rb
 - website/index.html
 - website/index.txt
 - website/javascripts/rounded_corners_lite.inc.js