s3cp 1.1.32 → 1.1.33

data/History.txt

@@ -1,4 +1,4 @@
-=== 1.1.32 (2013-08-26)
+=== 1.1.33 (2013-08-26)
 
 * Added:  New --mkdir option on s3cp allowing to recreate the source directory
           structure from any point in the source path(s).
@@ -39,6 +39,10 @@
           Note: The --mkdir option is currently only valid when copying from S3
           to the local filesystem.
 
+=== 1.1.32 (2013-08-26)
+
+* Bad release (released from dirty repository checkout). Do not use.
+
 === 1.1.31 (2013-05-16)
 
 * Fixed:  Passing ACLs to s3cp using --header 'x-amz-acl: public-read' was broken

data/lib/s3cp/s3cat.rb

@@ -31,12 +31,8 @@ op = OptionParser.new do |opts|
     options[:debug] = true
   end
 
-  opts.on("--tty", "Force TTY mode") do
-    options[:tty] = true
-  end
-
-  opts.on("--no-tty", "Disable TTY mode") do
-    options[:tty] = false
+  opts.on("--tty", "TTY mode") do |tty|
+    options[:tty] = tty
   end
 
   opts.on("--edit", "Edit mode") do |edit|

data/lib/s3cp/s3ls.rb

@@ -17,36 +17,10 @@
 
 require 's3cp/utils'
 
-require "rubygems"
-require "highline/system_extensions"
-
-def silence_streams(*streams)
-  on_hold = streams.collect { |stream| stream.dup }
-  streams.each do |stream|
-    stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
-    stream.sync = true
-  end
-  yield
-ensure
-  streams.each_with_index do |stream, i|
-    stream.reopen(on_hold[i])
-  end
-end
-
-silence_streams(STDERR) do
-  p "size: " + HighLine::SystemExtensions.terminal_size.inspect
-end
-
 # Parse arguments
 options = {}
 options[:date_format] = ENV['S3CP_DATE_FORMAT'] || '%x %X'
-#options[:rows_per_page] = ($terminal.output_rows - 1) if $stdout.isatty rescue nil
-silence_streams(STDERR) do
-  if termsize = HighLine::SystemExtensions.terminal_size
-    options[:rows_per_page] = termsize[0]
-  end
-end
-
+options[:rows_per_page] = ($terminal.output_rows - 1) if $stdout.isatty rescue nil
 options[:precision] = 0
 
 op = OptionParser.new do |opts|

data/lib/s3cp/version.rb

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

data/lib/s3cp/version.rb~

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: 83
+  hash: 81
   prerelease: 
   segments: 
   - 1
   - 1
-  - 32
-  version: 1.1.32
+  - 33
+  version: 1.1.33
 platform: ruby
 authors: 
 - Alex Boisvert