s3sync 2.0.0 → 2.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8737f906e6e83042d2edb667c33705fe96f24bbd
+  data.tar.gz: c0d333e0b488014eb6e2273933019ba0ec58c9fb
+SHA512:
+  metadata.gz: d94b3ec845ed9e48966045120a8c2292e5df64852c71d50eb3f0dec8d32e46d31082d8fd2380c7225aa856b98673cd20a02e119f2396aeaed5e6b5eb35490196
+  data.tar.gz: 3d22969a836de20ad4326ad5a134b3a221fa26a573ea4e0424186f6effb69ad63c7800f40fb49fecfc6ab616d306de489d54fd9c88b0edaf0c91042e6c413f12

data/lib/s3sync/cli.rb

@@ -63,6 +63,32 @@ module S3Sync
         u.join ''
       end
 
+      def execute(args)
+        # Connecting to amazon
+        s3 = AWS::S3.new
+
+        # From the command line
+        key, file = args
+
+        # Parsing the bucket name
+        bucket = nil
+        bucket, key = key.split(':') if key
+
+        # Running our custom method inside of the command class, taking care
+        # of the common errors here, saving duplications in each command;
+        begin
+          run s3, bucket, key, file, args
+        rescue AWS::S3::Errors::AccessDenied
+          raise FailureFeedback.new("Access Denied")
+        rescue AWS::S3::Errors::NoSuchBucket
+          raise FailureFeedback.new("There's no bucket named `#{bucket}'")
+        rescue AWS::S3::Errors::NoSuchKey
+          raise FailureFeedback.new("There's no key named `#{key}' in the bucket `#{bucket}'")
+        rescue AWS::S3::Errors::Base => exc
+          raise FailureFeedback.new("Error: `#{exc.message}'")
+        end
+      end
+
       protected
 
       def parse_acl(opt)
@@ -432,40 +458,7 @@ END
       cmd.add_command CmdParse::HelpCommand.new
       cmd.add_command CmdParse::VersionCommand.new
 
-      # Defining the `execute` method as a closure, so we can forward the
-      # arguments needed to run the instance of the chosen command.
-      CmdParse::Command.class_eval do
-        define_method :execute, lambda { |args|
-
-          # Connecting to amazon
-          s3 = AWS::S3.new(
-            :access_key_id => conf[:AWS_ACCESS_KEY_ID],
-            :secret_access_key => conf[:AWS_SECRET_ACCESS_KEY],
-          )
-
-          # From the command line
-          key, file = args
-
-          # Parsing the bucket name
-          bucket = nil
-          bucket, key = key.split(':') if key
-
-          # Running our custom method inside of the command class, taking care
-          # of the common errors here, saving duplications in each command;
-          begin
-            run s3, bucket, key, file, args
-          rescue AWS::S3::Errors::AccessDenied
-            raise FailureFeedback.new("Access Denied")
-          rescue AWS::S3::Errors::NoSuchBucket
-            raise FailureFeedback.new("There's no bucket named `#{bucket}'")
-          rescue AWS::S3::Errors::NoSuchKey
-            raise FailureFeedback.new("There's no key named `#{key}' in the bucket `#{bucket}'")
-          rescue AWS::S3::Errors::Base => exc
-            raise FailureFeedback.new("Error: `#{exc.message}'")
-          end
-        }
-      end
-
+      # Boom! Execute it
       cmd.parse
     end
 

data/lib/s3sync/config.rb

@@ -63,7 +63,7 @@ module S3Sync
         if File.exists? path
           config = YAML.load_file path
           config.each_pair do |key, value|
-            self[key.upcase.to_sym] = value
+            self[key.upcase.to_s] = value
           end
           return
         end
@@ -83,13 +83,12 @@ module S3Sync
       paths_checked = read_from_file
       read_from_env
 
+      # Update the environment with the latest values
+      ENV.update(self.to_hash)
+
       # Checking which variables we have
       not_found = []
 
-      REQUIRED_VARS.each {|v|
-        not_found << v if self[v].nil?
-      }
-
       # Cleaning possibly empty env var from CONFIG_PATH
       paths = (paths_checked || CONFIG_PATHS).select {|e| !e.empty?}
       raise NoConfigFound.new(not_found, paths) if not_found.count > 0

data/lib/s3sync/sync.rb

@@ -111,6 +111,16 @@ module S3Sync
 
     def list_files
       nodes = {}
+
+      # Create the directory if it does not exist
+      if not File.exists?(@source)
+        FileUtils.mkdir_p(@source)
+        return nodes
+      end
+
+      # The path declared in `@source` exists, yay! Now we need read
+      # the whole directory and add all the readable files to the
+      # `nodes` hash.
       Find.find(@source) do |file|
         begin
           st = File.stat file        # Might fail
@@ -331,6 +341,7 @@ module S3Sync
     end
 
     def download_files destination, source, list
+      puts list
       list.each {|e|
         path = File.join destination.path, e.path
 
@@ -344,10 +355,23 @@ module S3Sync
           # Making sure this new file will have a safe shelter
           FileUtils.mkdir_p File.dirname(path)
 
-          # Downloading and saving the files
-          File.open(path, 'wb') do |file|
-            obj.read do |chunk|
-              file.write chunk
+          # in some cases the s3 object will have a trailing '/' indicating
+          # a folder (this behavior noticed when the s3 folder is
+          # created by Transmit)
+          if path[-1] == '/'
+            FileUtils.mkdir_p path
+          else
+            # Downloading and saving the files
+            File.open(path, 'wb') do |file|
+              begin
+                obj.read do |chunk|
+                  file.write chunk
+                end
+              rescue AWS::Core::Http::NetHttpHandler::TruncatedBodyError => e
+                $stderr.puts "WARNING: (retryable) TruncatedBodyError occured, retrying in a second #{file.basename}"
+                sleep 1
+                retry
+              end
             end
           end
         end

data/lib/s3sync/version.rb

@@ -23,5 +23,5 @@
 # THE SOFTWARE.
 
 module S3Sync
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,142 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: s3sync
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.0.1
 platform: ruby
 authors:
 - Lincoln de Sousa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cmdparse
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Tool belt for managing your S3 buckets
@@ -158,33 +127,26 @@ files:
 homepage: https://github.com/clarete/s3sync
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1067117693450592295
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1067117693450592295
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: s3sync is a library that aggregates a good range of features for managing
   your Amazon S3 buckets. It also provides basic interactive client
 test_files: []