s3cp 1.1.3 → 1.1.4

data/History.txt

@@ -1,4 +1,11 @@
-=== 1.1.3 (Pending)
+=== 1.1.4 (2012-09-11)
+
+* Fixed:  Command-line completion that was broken since 1.1.0 (after aws-sdk migration)
+
+* Fixed:  s3-to-s3 copy that was broken since 1.1.0 (after aws-sdk migration)
+
+
+=== 1.1.3 (2012-09-05)
 
 * Fixed:   s3-to-s3 copy command failed with error message:
            `s3_to_s3': undefined local variable or method `s3_' for #<Object:0x7f333b239298> (NameError)

data/lib/s3cp/completion.rb

@@ -15,15 +15,8 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'rubygems'
-require 'extensions/kernel' if RUBY_VERSION =~ /1.8/
-require 'right_aws'
-require 'optparse'
-require 'date'
-require 'highline/import'
-require 'tempfile'
-
 require 's3cp/utils'
+require 'tempfile'
 
 cmd_line = ENV['COMP_LINE']
 position = ENV['COMP_POINT'].to_i
@@ -115,13 +108,11 @@ if (prefix && prefix.length > 0) || (url =~ /s3\:\/\/[^\/]+\//) || (url =~ /\:$/
 
   # try directory first
   dir_options = Hash.new
-  dir_options[:prefix] = prefix
   dir_options[:delimiter] = delimiter
   begin
-    @s3.interface.incrementally_list_bucket(bucket, dir_options) do |page|
-      entries = page[:common_prefixes]
-      entries << page[:contents][0][:key] if page[:contents].length > 0 && entries.length > 0
-      result = entries
+    result = []
+    @s3.buckets[bucket_from].objects.with_prefix(prefix).as_tree(:delimier => options[:delimiter], :append => false).children.each do |entry|
+      result << entry.key
     end
   rescue => e
     debug "exception #{e}"
@@ -137,22 +128,18 @@ if (prefix && prefix.length > 0) || (url =~ /s3\:\/\/[^\/]+\//) || (url =~ /\:$/
   # there may be longer matches
   if (result.size == 0) || (result.size == 1)
     prefix = result[0] if result.size == 1
-    file_options = Hash.new
-    file_options[:prefix] = prefix
-    file_options["max-keys"] = 100
+    s3_options = Hash.new
+    s3_options[:limit] = 1000
     short_keys = Hash.new
     all_keys = []
     begin
-      @s3.interface.incrementally_list_bucket(bucket, file_options) do |page|
-        entries = page[:contents]
-        entries.each do |entry|
-          key = entry[:key]
-          pos = prefix.length-1
-          pos += 1 while pos+1 < key.length && key[pos+1].chr == delimiter
-          short_key = key[0..pos]
-          short_keys[short_key] = key
-          all_keys << key
-        end
+      @s3.buckets[bucket].objects.with_prefix(prefix).each(s3_options) do |entry|
+        key = entry.key
+        pos = prefix.length-1
+        pos += 1 while pos+1 < key.length && key[pos+1].chr == delimiter
+        short_key = key[0..pos]
+        short_keys[short_key] = key
+        all_keys << key
       end
     rescue => e
       debug "exception #{e}"
@@ -173,8 +160,7 @@ else
   # complete bucket name
   bucket ||= url
   begin
-    buckets = @s3.interface.list_all_my_buckets()
-    bucket_names = buckets.map { |b| b[:name] }
+    bucket_names = @s3.buckets.to_a.map(&:name)
     matching = bucket_names.select { |b| b =~ /^#{bucket}/ }
     print_buckets(matching)
   rescue => e

data/lib/s3cp/s3cp.rb

@@ -458,8 +458,8 @@ def copy(from, to, options)
   when :s3_to_s3
     if options[:recursive]
       keys = []
-      @s3.interface.incrementally_list_bucket(bucket_from, :prefix => key_from) do |page|
-        page[:contents].each { |entry| keys << entry[:key] }
+      @s3.buckets[bucket_from].objects.with_prefix(key_from).each do |entry|
+        keys << entry.key
       end
       keys.each do |key|
         if match(key)
@@ -488,8 +488,8 @@ def copy(from, to, options)
   when :s3_to_local
     if options[:recursive]
       keys = []
-      @s3.interface.incrementally_list_bucket(bucket_from, :prefix => key_from) do |page|
-        page[:contents].each { |entry| keys << entry[:key] }
+      @s3.buckets[bucket_from].objects.with_prefix(key_from).each do |entry|
+        keys << entry.key
       end
       keys.each do |key|
         if match(key)

data/lib/s3cp/version.rb

@@ -16,5 +16,5 @@
 # the License.
 
 module S3CP
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Alex Boisvert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-05 00:00:00 Z
+date: 2012-09-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false