bdsync 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1aeb789488a7670229fa4a2934989b606fa2ef25434ff47e43f3ac3e427dfd8a
-  data.tar.gz: e9ddef916d834bb0bd04b2bb390eba73563ba9e54780100bddf060a04b610650
+  metadata.gz: 6fa64e8243c110577ac96c4266d21f3d7f2f1a2035644d83e52fc6e61db86ac3
+  data.tar.gz: bbd68644aa5817c438992b5e70ba0ab5622e3f8dc2cfa5c0ef3e9a0572d030fc
 SHA512:
-  metadata.gz: fc8b863ee0ad9ef4ba5f5a6e84e1fe5ee4d9aaf807448a25c7cad0d74450a201fdeb10676a325810b6550b1dfd4b8cd95e925a6f982ba75b2fad1e1d8eada2a0
-  data.tar.gz: 141a974e6ad5187e5509f769a7f5bd2b644b0bb908748cde83cb3e492a83bafab02d1d8ea746ff9d2692f9ebbbb8be1d84f5c197f37ed7fa77ac4e3abaec568d
+  metadata.gz: db7bc9a4be128150de8920f014c12cbc3533fdafb1d978945b058e0c9816edc04bf0eabcbaa7f85d412275fcf4958ffc333f22a939955eb792c3514e7c9dbe7c
+  data.tar.gz: f4550efd06ec82dc092345711e5310bf3b03f8c9271df6c31c43b6c060fc13f0f3608ab32f34c9ab63dcc29e6250959dedfe6afd105f0a98fda1b529f97cffa6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bdsync (2.2.0)
+    bdsync (2.3.0)
       colorize (~> 0.8)
       net-sftp (~> 2.1)
 

data/lib/bdsync/core.rb

@@ -28,20 +28,18 @@ module Bdsync
                     @old_data = load_data
                     @data = {}
 
-                    start_session {
-                        remote_ensure_dir @remote_root_path
-                        local_ensure_dir @local_root_path
+                    remote_ensure_dir @remote_root_path
+                    local_ensure_dir @local_root_path
 
-                        puts "\n==== traverse_remote_path ===="
-                        traverse_remote_path @remote_root_path
+                    puts "\n==== traverse_remote_path ===="
+                    traverse_remote_path @remote_root_path
 
-                        # merge @data to @old_data, and clear @data
-                        @old_data.merge! @data
-                        @data     = {}
+                    # merge @data to @old_data, and clear @data
+                    @old_data.merge! @data
+                    @data     = {}
 
-                        puts "\n==== traverse_local_path ===="
-                        traverse_local_path @local_root_path
-                    }
+                    puts "\n==== traverse_local_path ===="
+                    traverse_local_path @local_root_path
 
                     save_data @data
 
@@ -52,10 +50,6 @@ module Bdsync
             }
         end
 
-        def start_session &block
-            fail NotImplementedError, "A subclass class must be able to #{__method__}!"
-        end
-
         def load_data
             puts "\nload #{@data_path}"
             YAML.load_file @data_path

data/lib/bdsync/lfs.rb

@@ -11,10 +11,6 @@ module Bdsync
             Core.options
         end
 
-        def start_session &block
-            yield
-        end
-
         # yield object like this
         # {
         #   name:
@@ -93,5 +89,10 @@ module Bdsync
         def get_remote_file_md5 path
             Utils.file_md5 path
         end
+
+        # for test
+        def create_remote_file remote_path, content
+            File.write remote_path, content
+        end
     end
 end

data/lib/bdsync/sftp.rb

@@ -1,11 +1,13 @@
 require "bdsync/core"
 require "net/sftp"
+require "tempfile"
 
 module Bdsync
     class Sftp < Core
         def initialize params
             @site   = params["site"]
             @user   = params["user"]
+            @sftp   = Net::SFTP.start(@site, @user)
 
             super params, "sftp"
         end
@@ -14,19 +16,17 @@ module Bdsync
             Core.options + ["site:", "user:"]
         end
 
-        def start_session &block
-            Net::SFTP.start(@site, @user) { |sftp|
-                @sftp = sftp
-                yield
-            }
-        end
-
         def remote_dir_foreach remote_path
             @sftp.dir.foreach(remote_path) { |entry|
                 yield entry
             }
         end
 
+        # Return
+        # OpenStruct.new(
+        #     directory?:
+        #     mtime:
+        # )
         def remote_get_object remote_path
             @sftp.lstat! remote_path
         rescue Net::SFTP::StatusException
@@ -61,8 +61,25 @@ module Bdsync
         end
 
         def remote_remove_dir remote_path
-            puts "#{Utils.caller_info 1} sftp.session.exec! rm -rf #{remote_path}".white
-            @sftp.session.exec! "rm -rf #{remote_path}"
+            puts "#{Utils.caller_info 1} remote_remove_dir #{remote_path}".white
+
+            remote = remote_get_object remote_path
+            return if !remote || !remote.directory?
+
+            remote_dir_foreach(remote_path) { |entry|
+                next if [".", ".."].include? entry.name
+
+                path = "#{remote_path}/#{entry.name}"
+                remote = entry.attributes
+
+                if remote.directory?
+                    remote_remove_dir path
+                else
+                    remote_remove_file path
+                end
+            }
+
+            @sftp.rmdir! remote_path
         end
 
         def remote_rename remote_path, new_remote_path
@@ -88,5 +105,20 @@ module Bdsync
             res = @sftp.session.exec! "md5sum #{remote_path}"
             res.split[0]
         end
+
+        # for test
+        def create_remote_file remote_path, content
+            tmpfile = Tempfile.new 'sftp.rb-create_remote_file-'
+
+            begin
+                tmpfile.write content
+                tmpfile.flush
+                
+                @sftp.upload! tmpfile.path, remote_path
+            ensure
+                tmpfile.close
+                tmpfile.unlink  # deletes the temp file
+            end
+        end
     end
 end

data/lib/bdsync/version.rb

@@ -1,3 +1,3 @@
 module Bdsync
-    VERSION = "2.2.0"
+    VERSION = "2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bdsync
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Xia Xiongjun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2020-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize