s3cp 1.1.25 → 1.1.26

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.1.26 (2013-03-21)
+
+* Fixed:  Prevent crash if $terminal.output_rows can't be determined in s3ls/s3tree.
+          Depending on the platform, a warning such as:  "stty: standard input:
+          Inappropriate ioctl for device" may be displayed instead.
+
 === 1.1.25 (2013-03-19)
 
 * Changed:  Don't display progress bar during upload to S3 unless $stdout.isatty

data/lib/s3cp/s3ls.rb

@@ -20,7 +20,7 @@ require 's3cp/utils'
 # Parse arguments
 options = {}
 options[:date_format] = ENV['S3CP_DATE_FORMAT'] || '%x %X'
-options[:rows_per_page] = ($terminal.output_rows - 1) if $stdout.isatty
+options[:rows_per_page] = ($terminal.output_rows - 1) if $stdout.isatty rescue nil
 options[:precision] = 0
 
 op = OptionParser.new do |opts|

data/lib/s3cp/s3tree.rb

@@ -19,7 +19,7 @@ require 's3cp/utils'
 
 # Parse arguments
 options = {}
-options[:rows_per_page] = ($terminal.output_rows - 1) if $stdout.isatty
+options[:rows_per_page] = ($terminal.output_rows - 1) if $stdout.isatty rescue nil
 options[:delimiter] = ENV["S3CP_DELIMITER"] || "/"
 options[:max_depth] = 9999999
 

data/lib/s3cp/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 39
   prerelease: 
   segments: 
   - 1
   - 1
-  - 25
-  version: 1.1.25
+  - 26
+  version: 1.1.26
 platform: ruby
 authors: 
 - Alex Boisvert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-19 00:00:00 Z
+date: 2013-03-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement