s3cp 1.1.33 → 1.1.34

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.1.34 (2013-08-26)
+* Fixed:  "custom_require [TypeError] can't convert nil into String" introduced
+          in v1.1.32.
+
 === 1.1.33 (2013-08-26)
 
 * Added:  New --mkdir option on s3cp allowing to recreate the source directory

data/lib/s3cp/s3cp.rb

@@ -572,7 +572,9 @@ def copy(from, to, options)
         FileUtils.mkdir_p dir unless File.exist? dir
         dest
       else
-        File.join(File.expand_path(to), File.basename(key_from)) if File.directory?(dest)
+        dest = File.expand_path(to)
+        File.join(dest, File.basename(key_from)) if File.directory?(dest)
+        dest
       end
       if !options[:overwrite] && File.exist?(dest)
         $stderr.puts "Skipping #{dest} - already exists."

data/lib/s3cp/version.rb

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

metadata

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