s3cp 1.1.0.pre.3 → 1.1.0

data/History.txt

@@ -1,3 +1,11 @@
+=== 1.1.0 / (2012-08-22)
+
+* First stable release using the aws-sdk gem.  No changes from 1.1.0.pre.4.
+
+=== 1.1.0.pre.4 / (2012-08-22)
+
+* Fixed:    s3dir was not correctly displaying directories
+
 === 1.1.0.pre.3 / (2012-08-22)
 
 * Fixed:    s3cp >5GB file uploads (Peter Tan)

data/lib/s3cp/s3ls.rb

@@ -90,10 +90,17 @@ end
 
 keys = 0
 rows = 0
+directories = true
 
 begin
   display = lambda do |entry|
-    key = entry.key ? "s3://#{@bucket}/#{entry.key}" : "---"
+    # add '---' separator line between directories and files
+    if options[:delimiter] && directories && entry.is_a?(AWS::S3::Tree::LeafNode)
+      directories = false
+      puts "---"
+    end
+
+    key = "s3://#{@bucket}/#{entry.respond_to?(:key) ? entry.key : entry.prefix}"
     if options[:long_format] && entry.last_modified && entry.content_length
       size = entry.content_length
       size = S3CP.format_filesize(size, :unit => options[:unit], :precision => options[:precision])
@@ -104,21 +111,19 @@ begin
     end
     rows += 1
     keys += 1
+    response = ''
     if options[:rows_per_page] && (rows % options[:rows_per_page] == 0)
       begin
         print "Continue? (Y/n) "
         response = STDIN.gets.chomp.downcase
       end until response == 'n' || response == 'y' || response == ''
-      exit if response == 'n'
     end
+    (response == 'n')
   end
 
   if options[:delimiter]
     @s3.objects.with_prefix(@key).as_tree(:delimier => options[:delimiter], :append => false).children.each do |entry|
-      if entry.leaf?
-        entry = @s3.objects[entry.key]
-        break if display.call(entry)
-      end
+      break if display.call(entry)
     end
   else
     s3_options = Hash.new

data/lib/s3cp/s3up.rb

@@ -15,6 +15,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+require 's3cp/version'
 require 's3cp/utils'
 require 'tempfile'
 

data/lib/s3cp/version.rb

@@ -16,5 +16,5 @@
 # the License.
 
 module S3CP
-  VERSION = "1.1.0.pre.3"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: 3125656313
-  prerelease: 6
+  hash: 19
+  prerelease: 
   segments: 
   - 1
   - 1
   - 0
-  - pre
-  - 3
-  version: 1.1.0.pre.3
+  version: 1.1.0
 platform: ruby
 authors: 
 - Alex Boisvert