s3cp 0.2.0 → 0.2.1

data/History.txt

@@ -1,13 +1,24 @@
-=== 0.2.1 / (Pending)
+=== 0.2.2 / (Pending)
+
+=== 0.2.1 / (2012-02-20)
+
+* Added: Bash completion now supports exclusions through S3CP_EXCLUDES
+         and defaults to excluding keys containing "_$folder$".
+
+* Changed: s3dir and s3ls --delimiter now display both directories and files
 
 === 0.2.0 / (2012-02-20)
 
 * Added: s3stat command to display S3 object properties
+
 * Added: s3dir as a shortcut for "s3ls --delimiter / ..."
          (default to character in S3CP_DELIMITER environment variable or "/" if not defined)
+
 * Added: s3cp defaults can now be set using environment variables
          S3CP_OVERWRITE, S3CP_CHECKSUM, S3CP_RETRIES, S3CP_RETRY_DELAY
+
 * Added: Support for Bash command-line completion of S3 URLs (see below).
+
 * Fixed: Skip checksum verification for S3 objects with invalid MD5's
          (details @ https://forums.aws.amazon.com/message.jspa?messageID=234538)
 

data/lib/s3cp/completion.rb

@@ -38,6 +38,8 @@ debug "url #{url}"
 delimiter = ENV["S3CP_DELIMITER"] || "/"
 debug "delimiter #{delimiter}"
 
+excludes = (ENV["S3CP_EXCLUDES"] || "_$folder$").split(",")
+
 bucket, prefix = S3CP.bucket_and_key(url)
 if bucket == "s3"
   bucket = ""
@@ -56,6 +58,7 @@ debug "recursive #{recursive}"
 debug "dirs_only #{@dirs_only}"
 
 def print_keys(bucket, keys)
+  keys << keys[0] + " " if keys.size == 1 && @dirs_only
   keys.each do |key|
     if @legacy_format
       debug key
@@ -103,6 +106,10 @@ if (prefix && prefix.length > 0) || (url =~ /s3\:\/\/[^\/]+\//) || (url =~ /\:$/
     result = []
   end
 
+  excludes.each do |exclude|
+    result.reject! { |key| key.match(Regexp.escape(exclude)) }
+  end
+
   debug "result1 #{result.inspect}"
 
   # there may be longer matches
@@ -133,6 +140,10 @@ if (prefix && prefix.length > 0) || (url =~ /s3\:\/\/[^\/]+\//) || (url =~ /\:$/
     debug "result2 #{result.inspect}"
   end
 
+  excludes.each do |exclude|
+    result.reject! { |key| key.match(Regexp.escape(exclude)) }
+  end
+
   debug "final #{result.inspect}"
 
   print_keys(bucket, result)

data/lib/s3cp/s3ls.rb

@@ -78,14 +78,18 @@ s3_options["max-keys"] = options[:max_keys] if options[:max_keys] && !options[:d
 s3_options[:delimiter] = options[:delimiter] if options[:delimiter]
 
 @s3.interface.incrementally_list_bucket(@bucket, s3_options) do |page|
-  entries = page[:contents]
+  entries = []
   if options[:delimiter]
-    entries = page[:common_prefixes]
-    entries << page[:contents][0][:key] if page[:contents].length > 0 && entries.length > 0
+    entries << { :key => page[:contents][0][:key] } if page[:contents].length > 0 && entries.length > 0
+    page[:common_prefixes].each do |entry|
+      entries << { :key => entry }
+    end
+    entries << { :key => nil }
   end
+  entries += page[:contents]
   entries.each do |entry|
-    key = "s3://#{@bucket}/#{options[:delimiter] ? entry : entry[:key]}"
-    if options[:long_format]
+    key = entry[:key] ? "s3://#{@bucket}/#{entry[:key]}" : "---"
+    if options[:long_format] && entry[:last_modified] && entry[:size]
       last_modified = DateTime.parse(entry[:last_modified])
       size = entry[:size]
       puts "#{last_modified.strftime(options[:date_format])} #{ "%12d" % size} #{key}"

data/lib/s3cp/version.rb

@@ -1,4 +1,4 @@
 
 module S3CP
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Alex Boisvert