s3cp 1.1.37 → 1.1.38

data/History.txt

@@ -1,6 +1,18 @@
-=== 1.1.36 (2013-08-26)
+=== 1.1.38 (2014-06-11)
+
+* Added new --storage-class option to `s3ls` that displays the backing
+  storage class (STANDARD/GLACIER).
+
+* Upgrade to aws-sdk ~> 1.36.2
+
+=== 1.1.37 (2013-08-26)
+
 * Fixed regression introduced in v1.1.33.
 
+=== 1.1.36 (2013-08-26)
+
+* Don't use; regression introduced in v1.1.33.
+
 === 1.1.35 (2013-08-26)
 
 * Don't use; regression introduced in v1.1.33.

data/lib/s3cp/#Untitled-3#

@@ -0,0 +1,2 @@
+data_collector/year=2013/month=12/day=11/hour=00/domU-12-31-39-09-7A-C1_data_collector_1386721026136.log.gz
+

data/lib/s3cp/s3cat.rb

@@ -39,11 +39,11 @@ op = OptionParser.new do |opts|
     options[:edit] = edit
   end
 
-  opts.on("--head SIZE", "Download only 'head' part of the file mode, e.g. 4KB, 1024B, 2GB") do |size|
+  opts.on("--head SIZE", "Download only 'head' part of the file, e.g. 4KB, 1024B, 2GB") do |size|
     options[:head] = S3CP.size_in_bytes(size)
   end
 
-  opts.on("--tail SIZE", "Download only 'tail' part of the file mode, e.g. 4KB, 1024B, 2GB") do |size|
+  opts.on("--tail SIZE", "Download only 'tail' part of the file, e.g. 4KB, 1024B, 2GB") do |size|
     options[:tail] = S3CP.size_in_bytes(size)
   end
 

data/lib/s3cp/s3ls.rb

@@ -63,6 +63,11 @@ op = OptionParser.new do |opts|
     options[:precision] = precision.to_i
   end
 
+  opts.on("--storage-class", "Display storage class (implies -l long listing format)") do
+    options[:storage_class] = true
+    options[:long_format] = true
+  end
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts op
     exit
@@ -114,7 +119,8 @@ S3CP.standard_exception_handling(options) do
         size = entry.content_length
         size = S3CP.format_filesize(size, :unit => options[:unit], :precision => options[:precision])
         size = ("%#{7 + options[:precision]}s " % size)
-        puts "#{entry.last_modified.strftime(options[:date_format])} #{size} #{key}"
+        storage = options[:storage_class] ? (" %-9s" % entry.storage_class) : ""
+        puts "#{entry.last_modified.strftime(options[:date_format])} #{size}#{storage} #{key}"
       else
         puts key
       end
@@ -136,7 +142,7 @@ S3CP.standard_exception_handling(options) do
         break if display.call(entry)
       end
     else
-      Struct.new("S3Entry", :key, :last_modified, :content_length)
+      Struct.new("S3Entry", :key, :last_modified, :content_length, :storage_class)
 
       s3_options = Hash.new
       s3_options[:bucket_name] = @bucket
@@ -148,7 +154,7 @@ S3CP.standard_exception_handling(options) do
       begin
         response = @s3.client.list_objects(s3_options)
         response[:contents].each do |object|
-          entry = Struct::S3Entry.new(object[:key], object[:last_modified], object[:size].to_i)
+          entry = Struct::S3Entry.new(object[:key], object[:last_modified], object[:size].to_i, object[:storage_class])
           stop = display.call(entry)
           break if stop
         end

data/lib/s3cp/version.rb

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

metadata

@@ -1,137 +1,132 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: s3cp
-version: !ruby/object:Gem::Version 
-  hash: 89
+version: !ruby/object:Gem::Version
+  version: 1.1.38
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 37
-  version: 1.1.37
 platform: ruby
-authors: 
+authors:
 - Alex Boisvert
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-08-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2014-06-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: extensions
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        version: "0.6"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :runtime
   prerelease: false
-  requirement: *id001
-  name: extensions
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
-  requirement: *id002
-  name: highline
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 1
-        - 8
-        - 3
-        version: 1.8.3
+      - !ruby/object:Gem::Version
+        version: 1.36.2
   type: :runtime
   prerelease: false
-  requirement: *id003
-  name: aws-sdk
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 10
-        - 0
+      - !ruby/object:Gem::Version
+        version: 1.36.2
+- !ruby/object:Gem::Dependency
+  name: progressbar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.10.0
   type: :runtime
   prerelease: false
-  requirement: *id004
-  name: progressbar
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 5
-        - 10
+      - !ruby/object:Gem::Version
         version: 1.5.10
   type: :runtime
   prerelease: false
-  requirement: *id005
-  name: nokogiri
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
+        version: 1.5.10
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
   prerelease: false
-  requirement: *id006
-  name: rspec
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
-  requirement: *id007
-  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 description: 
-email: 
+email:
 - alex.boisvert@gmail.com
-executables: 
+executables:
 - s3buckets
 - s3cat
 - s3cp
@@ -148,81 +143,72 @@ executables:
 - s3tree
 - s3up
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - History.txt
-files: 
-- lib/s3cp.rb
-- lib/s3cp/s3cat.rb
-- lib/s3cp/s3tree.rb
-- lib/s3cp/#Untitled-5#
-- lib/s3cp/s3ls.rb
-- lib/s3cp/s3du.rb
+files:
 - lib/s3cp/s3mod.rb
+- lib/s3cp/s3du.rb
+- lib/s3cp/utils.rb
+- lib/s3cp/s3cp.rb
+- lib/s3cp/#Untitled-3#
 - lib/s3cp/completion.rb
 - lib/s3cp/s3buckets.rb
-- lib/s3cp/version.rb
-- lib/s3cp/s3cp.rb
-- lib/s3cp/s3stat.rb
+- lib/s3cp/s3cat.rb
+- lib/s3cp/s3up.rb
 - lib/s3cp/version.rb~
-- lib/s3cp/utils.rb
-- lib/s3cp/s3lifecycle.rb
+- lib/s3cp/version.rb
 - lib/s3cp/s3rm.rb
-- lib/s3cp/s3up.rb
+- lib/s3cp/#Untitled-5#
+- lib/s3cp/s3lifecycle.rb
+- lib/s3cp/s3ls.rb
+- lib/s3cp/s3tree.rb
+- lib/s3cp/s3stat.rb
+- lib/s3cp.rb
 - History.txt
 - README.md
-- bin/s3edit~
-- bin/s3dir
-- bin/s3mv
-- bin/s3cat
-- bin/s3ls
+- bin/s3cp
 - bin/s3edit
-- bin/s3buckets
+- bin/s3cat
+- bin/s3cp_complete
+- bin/s3du
 - bin/s3tree
+- bin/s3buckets
+- bin/tmp
+- bin/s3mv
+- bin/s3edit~
 - bin/s3mod
+- bin/s3rm
 - bin/s3up
-- bin/s3cp_complete
-- bin/s3du
-- bin/s3cp
+- bin/s3ls
 - bin/s3lifecycle
-- bin/s3rm
 - bin/s3stat
-- bin/tmp
+- bin/s3dir
 homepage: 
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -928131621574859925
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Amazon S3 tools to, e.g., list, copy, delete S3 files
 test_files: []
-