s3rsync 0.1.6 → 0.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjEyMWZhMDA1MDdmNTRkYWI4MjllMjhkMmQxZmFkMGRjMzVmOWQ1ZQ==
+    ODljYTc3YjZjNjNjYzhjNTU2YzdiMGNmZDhlY2I4M2UyNzE2NDBhZg==
   data.tar.gz: !binary |-
-    OTcyYzAyMjg1YWRhYTFhYzI3NjYwMTdjNmRiMTA4YTAyMjVlN2M5Zg==
+    Njc0MWNlN2JmZGYyYzE5NjJmZWJmYjczOGZiOTlmNTk3NjJiZjU0YQ==
 SHA512:
   metadata.gz: !binary |-
-    MzM5OGE1MGRiYjhkYjZhOWU4OTk2MGE1MDBlMWU5YWM5ZTNkNTg3NmQzM2E3
-    OGM5OWZlZGIxN2U3ZGE4ZGNkN2FiNGI5ZmZiMjJhMjRkNzM5NjBmZWUwMzMz
-    NTUwZTc1NjU0NWVmY2M0MjYzYTc5ZGZiYzAwYmY3ODkxMzY1NDM=
+    ZWNlZTg2NDk1MDhmZDBlOTNiZGRjNWQ1OTIwMTFmMDkzYmFmOGNjMjllMGQx
+    ZmQwNGFkMTZjYWFiYWU0ZWIzMjRlZDE3YjZkMGY4MDVlZDc1MWNjMDAyYzJh
+    MDBiNmFhYjhlNzc2MDRhYTEyOTE4MmJlNGE4MjA1NjIxYTNjMDE=
   data.tar.gz: !binary |-
-    YzZjMmFhNTE5OTI2NzdlNjdkMjg4MTZhMTcxZDhmNzFlMTYxZWQ3OGNmODc3
-    M2VhZTgwYTUyOGY4ZGU0MzI0NzMwYTdhODcxNGM1NzIxNmMxMWJkNGE1MDk3
-    ODk3YmQzM2FmMDA1MGE1YTllY2M5MWY4NTY4MTI1OWM3MTRkYTU=
+    ZDkyYWFjMzY4ZGUyMjkyNTI0M2I3YjlkZmY0YzBhZjY4YjNjODk5Yjc2MTVj
+    N2RmYjRhZDc3N2IwMDJiNzE4ODZlNmY0ZjExMzQyMzQ0NDkxZmNjMDNkZDZk
+    MzkzMjlkM2EzZWY3YWZkNDk5NmYwOTk4Njc2N2M5YmYwOGIxYWM=

data/lib/s3rsync/base.rb

@@ -35,10 +35,10 @@ module S3Rsync
       success_exec = $?.success?
       @log.info "cmd_out: #{cmd_out}"
       @log.debug "success_exec: #{success_exec}"
-    
+      
       valid_content = valid_out_pattern.nil? ? true : !cmd_out.match(/#{valid_out_pattern}/).nil?
       @log.debug "valid_content: #{valid_content}"
-    
+      
       error_exit "Not successful execution or not valid_content! out: #{cmd_out}" if (!success_exec || !valid_content)
       cmd_out
     end

data/lib/s3rsync/sync.rb

@@ -10,7 +10,7 @@ module S3Rsync
       @log = init_logger(opt['log-path'])
       @log.debug "opt: #{opt.inspect}"
       @params = {}
-      @params[:path]        = opt['path'].chomp('/')
+      @params[:path]        = File.expand_path(opt['path'])
       @params[:s3_prefix]   = opt['s3-prefix']
       @params[:config_path] = opt['config-path']
       @params[:s3cmd_conf]  = @params[:config_path].sub('.json', '_s3rsync.conf')
@@ -73,8 +73,7 @@ module S3Rsync
         return 4
       end
       
-      base_dir_name = @params[:path].split('/').last
-      sync_locations = "#{@params[:path]}/ s3://#{@params[:s3_bucket]}/#{@params[:s3_prefix]}/#{base_dir_name}/"
+      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}"

data/lib/s3rsync/version.rb

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

data/spec/sync_spec.rb

@@ -5,7 +5,7 @@ include Helpers
 
 describe S3Rsync::Sync do
   context 'sync is successfull' do
-    let(:opt) { 
+    let(:opt) {
       {
         'path'        => '/parent_test_dir/test_dir',
         's3-prefix'   => 's3rsync',
@@ -15,14 +15,14 @@ describe S3Rsync::Sync do
       }
     }
     
-    let(:json_conf) { 
+    let(:json_conf) {
       {
         'env.static.s3.bucket'      => 'test-bucket',
         'env.static.s3.key.user'    => 'test_access_key',
         'env.static.s3.key.secret'  => 'test_secret_key',
       } 
     }
-      
+    
     let(:s3_conf_path) { opt['config-path'].sub('.json', '_s3rsync.conf') }
     let(:base_sync_path) { opt['path'].split('/').last }
     let(:common_args) { ['-c', s3_conf_path].join(' ') }
@@ -48,7 +48,7 @@ describe S3Rsync::Sync do
     end
     
     it "uploads dir" do
-      cmd = "s3cmd #{common_args} sync #{opt['path']}/ s3://#{json_conf['env.static.s3.bucket']}/#{opt['s3-prefix']}/#{base_sync_path}/"
+      cmd = "s3cmd #{common_args} sync #{opt['path']}/ s3://#{json_conf['env.static.s3.bucket']}/#{opt['s3-prefix']}#{opt['path']}/"
       allow_any_instance_of(S3Rsync::Sync).to receive(:pass_cli).with(cmd).and_return('Success')
       
       sync = S3Rsync::Sync.new(opt)
@@ -56,7 +56,7 @@ describe S3Rsync::Sync do
     end
     
     it "downloads dir" do
-      cmd = "s3cmd #{common_args} sync s3://#{json_conf['env.static.s3.bucket']}/#{opt['s3-prefix']}/#{base_sync_path}/ #{opt['path']}/"
+      cmd = "s3cmd #{common_args} sync s3://#{json_conf['env.static.s3.bucket']}/#{opt['s3-prefix']}#{opt['path']}/ #{opt['path']}/"
       allow_any_instance_of(S3Rsync::Sync).to receive(:pass_cli).with(cmd).and_return('Success')
       
       sync = S3Rsync::Sync.new(opt)

metadata

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