s3cp 0.1.4 → 0.1.5

data/History.txt

@@ -1,4 +1,8 @@
-=== 0.1.5 / (Pending)
+=== 0.1.6 / (Pending)
+
+=== 0.1.5 / 2011-10-17
+
+* Fixed:  All commands now work properly on Ruby 1.8.x
 
 === 0.1.4 / 2011-10-17
 

data/README.md

@@ -24,6 +24,88 @@ All commands support both `s3://bucket/path/to/file` and the legacy `bucket:path
 
 Commands are also TTY-aware;  when run in an interactive shell, their behavior will change.  For example, `s3cat` will launch your favorite `PAGER` or `less` (the default pager) whereas `s3ls` will display N items at a time, where N is the number of display lines on your terminal and pause between pages.
 
+### Usage ###
+
+    $ s3cp
+    s3cp supports 4 copying use cases:
+      1. Copy from local machine to S3
+      2. Copy from S3 to local machine
+      3. Copy from S3 to S3
+      4. Copy from local machine to another path on local machine (for completeness)
+
+    Local to S3:
+      s3cp LOCAL_PATH S3_PATH
+
+    S3 to Local:
+      s3cp S3_PATH LOCAL_PATH
+
+    S3 to S3:
+      s3cp S3_PATH S3_PATH2
+
+    Local to Local:
+      s3cp LOCAL_PATH LOCAL_PATH2
+
+
+    -r, --recursive                  Recursive mode
+
+        --headers 'Header1: Header1Value','Header2: Header2Value'
+                                     Headers to set on the item in S3.
+        e.g.,
+              HTTP headers: 'Content-Type: image/jpg'
+               AMZ headers: 'x-amz-acl: public-read'
+
+        --verbose                    Verbose mode
+        --debug                      Debug mode
+    -h, --help                       Show this message
+
+.
+
+    $ s3ls
+    s3ls [path]
+
+    -l                               Long listing format
+        --date-format FORMAT         Date format (see http://strfti.me/)
+        --verbose                    Verbose mode
+        --rows ROWS                  Rows per page
+    -h, --help                       Show this message
+
+.
+
+    $ s3cat
+    s3cat [path]
+
+        --debug                      Debug mode
+        --tty                        TTY mode
+    -h, --help                       Show this message
+
+.
+
+    $ s3mod
+    s3mod [path] [permission]
+
+    where [permission] is one of:
+
+     * private
+     * authenticated-read
+     * public-read
+     * public-read-write
+
+    -h, --help                       Show this message
+
+.
+
+    $ ./_s3rm
+    s3rm [path]
+
+    -r, --recursive                  Delete S3 keys matching provided prefix.
+    -i, --include REGEX              Delete only S3 objects matching the following regular expression.
+    -x, --exclude REGEX              Do not delete any S3 objects matching provided regular expression.
+    -F, --fail-if-not-exist          Fail if no S3 object match provided key, prefix and/or regex
+    -t, --test                       Only display matching keys; do not actually delete anything.
+        --silent                     Do not display keys as they are deleted.
+        --verbose                    Verbose mode
+    -h, --help                       Show this message
+
 ### Dependencies ###
 
 * highline `>=1.5.1`  (console/terminal size guessing)

data/lib/s3cp/s3cat.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'extensions/kernel' if RUBY_VERSION =~ /1.8/
 require 'right_aws'
 require 'optparse'
 require 'date'

data/lib/s3cp/s3cp.rb

@@ -15,7 +15,7 @@ options[:headers] = []
 
 op = OptionParser.new do |opts|
   opts.banner = <<-BANNER
-    s3cp supports 4 coyping use cases:
+    s3cp supports 4 copying use cases:
       1. Copy from local machine to S3
       2. Copy from S3 to local machine
       3. Copy from S3 to S3
@@ -36,14 +36,21 @@ op = OptionParser.new do |opts|
   BANNER
   opts.separator ''
 
-  opts.on("-h", '--headers \'Header1: Header1Value\',\'Header2: Header2Value\'', Array, "Headers to set on the item in S3.  This can include http headers like \'Content-Type: image/jpg\' or AMZ headers like: \'x-amz-acl: public-read\'" ) do |h|
-    options[:headers] = h
+  opts.on("-r", "--recursive", "Recursive mode") do
+    options[:recursive] = true
   end
 
-  opts.on("-r", "Recursive mode") do
-    options[:recursive] = true
+  opts.separator ""
+
+  opts.on('--headers \'Header1: Header1Value\',\'Header2: Header2Value\'', Array, "Headers to set on the item in S3." ) do |h|
+    options[:headers] = h
   end
 
+  opts.separator "        e.g.,"
+  opts.separator "              HTTP headers: \'Content-Type: image/jpg\'"
+  opts.separator "               AMZ headers: \'x-amz-acl: public-read\'"
+  opts.separator ""
+
   opts.on("--verbose", "Verbose mode") do
     options[:verbose] = true
   end

data/lib/s3cp/s3mod.rb

@@ -1,11 +1,21 @@
-require 'rubygems'  
-require 'right_aws'  
+require 'rubygems'
+require 'extensions/kernel' if RUBY_VERSION =~ /1.8/
+require 'right_aws'
 require 'optparse'
 require 's3cp/utils'
 
 op = OptionParser.new do |opts|
   opts.banner = "s3mod [path] [permission]"
 
+  opts.separator ""
+  opts.separator "where [permission] is one of:"
+  opts.separator ""
+  opts.separator " * private"
+  opts.separator " * authenticated-read"
+  opts.separator " * public-read"
+  opts.separator " * public-read-write"
+  opts.separator ""
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts op
     exit
@@ -19,10 +29,10 @@ if ARGV.size < 2
   exit
 end
 
-def update_permissions(s3, bucket, key, permission)  
+def update_permissions(s3, bucket, key, permission)
   puts "Setting #{permission} on s3://#{bucket}/#{key}"
-  s3.interface.copy(bucket, key, bucket, key, :replace, {"x-amz-acl" => permission })  
-end  
+  s3.interface.copy(bucket, key, bucket, key, :replace, {"x-amz-acl" => permission })
+end
 
 source  = ARGV[0]
 permission = ARGV.last
@@ -32,4 +42,4 @@ raise "Permissions must be one of the following values: #{LEGAL_MODS}" unless LE
 
 @s3 = S3CP.connect()
 bucket,key = S3CP.bucket_and_key(source)
-update_permissions(@s3, bucket, key, permission)  
+update_permissions(@s3, bucket, key, permission)

data/lib/s3cp/version.rb

@@ -1,4 +1,4 @@
 
 module S3CP
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Alex Boisvert