s3rsync 0.1.7 → 0.1.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODljYTc3YjZjNjNjYzhjNTU2YzdiMGNmZDhlY2I4M2UyNzE2NDBhZg==
+    NGMzOTY2MTdlNGFmMWFiMWU1NmViOTdmZjVjMTk3NzY5YmUyODUzZQ==
   data.tar.gz: !binary |-
-    Njc0MWNlN2JmZGYyYzE5NjJmZWJmYjczOGZiOTlmNTk3NjJiZjU0YQ==
+    NWJiNWY5NDg5NDU2Y2I3MmI1ZjkwNDRmYjhiMjlmOGE5ODI0NGIwOA==
 SHA512:
   metadata.gz: !binary |-
-    ZWNlZTg2NDk1MDhmZDBlOTNiZGRjNWQ1OTIwMTFmMDkzYmFmOGNjMjllMGQx
-    ZmQwNGFkMTZjYWFiYWU0ZWIzMjRlZDE3YjZkMGY4MDVlZDc1MWNjMDAyYzJh
-    MDBiNmFhYjhlNzc2MDRhYTEyOTE4MmJlNGE4MjA1NjIxYTNjMDE=
+    ZjQxOGYwMWMxYWY0ZmM0MTkwMDJhMmNlYjA5MjczOTgzOGVhZmU3ZDI3Mzk3
+    YjE0Njk2NzQ0YWI1YzlhZmM3YjMxOWY4NTFkMmEzOGJhOWU0YzY3YzI2OTA4
+    N2M4NDI2YTY4MGEzZGMzYjcyZDc3MzY2YTE4N2NkZTllZTExMGQ=
   data.tar.gz: !binary |-
-    ZDkyYWFjMzY4ZGUyMjkyNTI0M2I3YjlkZmY0YzBhZjY4YjNjODk5Yjc2MTVj
-    N2RmYjRhZDc3N2IwMDJiNzE4ODZlNmY0ZjExMzQyMzQ0NDkxZmNjMDNkZDZk
-    MzkzMjlkM2EzZWY3YWZkNDk5NmYwOTk4Njc2N2M5YmYwOGIxYWM=
+    Nzg3N2NiOTBmNGZjMzBmOWRmZWU4M2JhZGIyZWMyYWNkMWRjMjE2M2IxNGY2
+    NzFhNDNjNDliNzJhNTI3MTcyYjZjODI4NzA0YjBlOTM2YTE3OWNkNDZjNzQ2
+    ZjdkZmE1NTg2YTczOTRlNmIwNjU3MjgwYmY1YTAyN2IzZWM3MGY=

data/lib/s3rsync/cli.rb

@@ -10,6 +10,7 @@ module S3Rsync
       method_option :'log-path', :aliases => "-l"
       method_option :'dry-run', :aliases => "-d", :type => :boolean, :default => false
       method_option :'make-public', :aliases => "-m", :type => :boolean, :default => false
+      method_option :'enable-lock', :aliases => "-e", :type => :boolean, :default => false
     end
     
     desc "upload", "sync from local to s3"

data/lib/s3rsync/sync.rb

@@ -16,6 +16,7 @@ module S3Rsync
       @params[:s3cmd_conf]  = @params[:config_path].sub('.json', '_s3rsync.conf')
       @params[:dry_run]     = opt['dry-run']
       @params[:make_public] = opt['make-public']
+      @params[:enable_lock] = opt['enable-lock']
       @log.debug "@params[:config_path]: #{@params[:config_path]}"
       begin
         conf = JSON.parse File.read(@params[:config_path])
@@ -68,18 +69,23 @@ module S3Rsync
     def run(mode = :upload)
       init_s3cmd_conf
       
-      if !Dir.exists?(@params[:path])
-        @log.error "Local dir not exist on disk: #{@params[:path]}"
+      valid_file_upload = (mode == :upload && File.exists?(@params[:path])) 
+      if !Dir.exists?(@params[:path]) && !valid_file_upload
+        @log.error "Local dir or file not exist on disk: #{@params[:path]}"
         return 4
       end
       
-      sync_locations = "#{@params[:path]}/ s3://#{@params[:s3_bucket]}/#{@params[:s3_prefix]}#{@params[:path]}/"
+      @params[:path] += '/' if Dir.exists?(@params[:path])
+      sync_locations = "#{@params[:path]} s3://#{@params[:s3_bucket]}/#{@params[:s3_prefix]}#{@params[:path]}"
       @log.debug "original sync_locations: #{sync_locations}"
-      lockfile = get_lock(mode)
-      @log.debug "lockfile: #{lockfile.inspect}"
-      if lockfile.locked?
-        @log.warn "lock file found, exiting: #{lockfile.inspect}"
-        return 5
+      
+      if @params[:enable_lock]
+        lockfile = get_lock(mode)
+        @log.debug "lockfile: #{lockfile.inspect}"
+        if lockfile.locked?
+          @log.warn "lock file found, exiting: #{lockfile.inspect}"
+          return 5
+        end
       end
       
       if mode == :download
@@ -90,7 +96,7 @@ module S3Rsync
       
       sync_output = 1
       begin
-        lockfile.lock
+        lockfile.lock if @params[:enable_lock]
         s3cmd_args = {}
         s3cmd_args['-c']            = @params[:s3cmd_conf]
         s3cmd_args['--dry-run']     = '' if @params[:dry_run]
@@ -106,7 +112,7 @@ module S3Rsync
         sync_output = 1
         @log.error "something wrong while trying to run the sync: #{e.inspect}"
       ensure
-        lockfile.unlock
+        lockfile.unlock if @params[:enable_lock]
       end
       
       if (sync_output == 1) || sync_output.downcase.include?('error')

data/lib/s3rsync/version.rb

@@ -1,3 +1,3 @@
 module S3rsync
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/spec/sync_spec.rb

@@ -12,6 +12,7 @@ describe S3Rsync::Sync do
         'config-path' => 'test_json_conf_path.json',
         'dry-run'     => false,
         'make-public' => false,
+        'enable-lock' => false,
       }
     }
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3rsync
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - idevops