bdsync 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 692f6cf3fe115aa7894fb65d6549438dede5ec6737290da158a10290c3a5f02a
-  data.tar.gz: 5a3ca8c23c7f7e35f18fee6789f1e888d94f1cce86bf9adfafc39ab14fa2e6a8
+  metadata.gz: 154ba1d7d905a71a75e46a44486b22d65af7541d3f5c57db88be6ac84ff4404b
+  data.tar.gz: e913e4bd9cc556ac550bdfeaf7f03840c9f120daf55e17dfa71be03005cd934c
 SHA512:
-  metadata.gz: a24223fd0e493e73af666a2f6427f4e8f822383ca3b30c25f54406fc8e265a1db8bfc6c7ccb0469e82599bc111a2b6f1b5fed47fc5f549398c2ad9a1aacbfe6a
-  data.tar.gz: e4e999f5a136ad3221ea3c4cd096c0adb88fbcbe7bb2fa905cdc634af13abad1c52d0536c5a331921b109cbbee87adaafcb90181905671c77edd375b796d4191
+  metadata.gz: 2802c7ea2a3da89c75e84620b98fc508cb0b34f21a229d7cb4e95f09316c182678fd657d834e040b0fca33a8954b4141099311483665df4f892a945126a48208
+  data.tar.gz: eb1fa9995450d68dbefd9fcfad83f27269b3f3a03691d5a2cce92b8e70ad4c8bb250fa040bff8485dfffb6ccbc5bf8a47350523a318f347addbd934f417f6ce9

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-# Specify your gem's dependencies in bsync.gemspec
+# Specify your gem's dependencies in bdsync.gemspec
 gemspec
 
 gem "rake", "~> 12.0"

data/Gemfile.lock

@@ -1,14 +1,18 @@
 PATH
   remote: .
   specs:
-    bdsync (0.1.1)
+    bdsync (2.0.0)
       colorize (~> 0.8)
+      net-sftp (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     colorize (0.8.1)
     diff-lcs (1.3)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (5.2.0)
     rake (12.3.3)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)

data/README.md

@@ -1,4 +1,4 @@
-# Bsync
+# Bdsync
 
 Bidirectional Synchronization tool for sftp or local file system
 
@@ -7,7 +7,7 @@ Bidirectional Synchronization tool for sftp or local file system
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'bsync'
+gem 'bdsync'
 ```
 
 And then execute:
@@ -16,7 +16,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install bsync
+    $ gem install bdsync
 
 ## Usage
 
@@ -30,7 +30,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/xxjapp/bsync. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/xxjapp/bsync/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/xxjapp/bdsync. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/xxjapp/bdsync/blob/master/CODE_OF_CONDUCT.md).
 
 
 ## License
@@ -39,4 +39,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Bsync project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/xxjapp/bsync/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Bdsync project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/xxjapp/bdsync/blob/master/CODE_OF_CONDUCT.md).

data/{bsync.gemspec → bdsync.gemspec}

@@ -1,20 +1,20 @@
-require_relative 'lib/bsync/version'
+require_relative 'lib/bdsync/version'
 
 Gem::Specification.new do |spec|
     spec.name          = "bdsync"
-    spec.version       = Bsync::VERSION
+    spec.version       = Bdsync::VERSION
     spec.authors       = ["Xia Xiongjun"]
     spec.email         = ["xxjapp@gmail.com"]
 
     spec.summary       = %q{Bidirectional Synchronization tool for sftp or local file system}
     spec.description   = %q{Bidirectional Synchronization tool for sftp or local file system}
-    spec.homepage      = "https://github.com/xxjapp/bsync"
+    spec.homepage      = "https://github.com/xxjapp/bdsync"
     spec.license       = "MIT"
     spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
 
     spec.metadata["homepage_uri"] = spec.homepage
-    spec.metadata["source_code_uri"] = "https://github.com/xxjapp/bsync"
-    spec.metadata["changelog_uri"] = "https://github.com/xxjapp/bsync/releases"
+    spec.metadata["source_code_uri"] = "https://github.com/xxjapp/bdsync"
+    spec.metadata["changelog_uri"] = "https://github.com/xxjapp/bdsync/releases"
 
     # Specify which files should be added to the gem when it is released.
     # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
     spec.require_paths = ["lib"]
 
     spec.add_runtime_dependency "colorize", "~> 0.8"
+    spec.add_runtime_dependency "net-sftp", "~> 2.1"
 end

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "bsync"
+require "bdsync"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/{bsync → bdsync}/core.rb

@@ -1,8 +1,8 @@
-require "bsync/utils"
+require "bdsync/utils"
 require "colorize"
 require "yaml"
 
-module Bsync
+module Bdsync
     class Core
         attr_reader :data_path
 
@@ -13,7 +13,7 @@ module Bsync
             @local_root_path    = params["local_root_path"]
             @remote_root_path   = params["remote_root_path"]
             @infinite_loop      = params["infinite_loop"]
-            @data_path          = "#{Dir.home}/.bsync/#{sync_type}_#{Utils.md5 params.to_s}.yaml"
+            @data_path          = "#{Dir.home}/.bdsync/#{sync_type}_#{Utils.md5 params.to_s}.yaml"
         end
 
         def self.options
@@ -23,32 +23,32 @@ module Bsync
         def synchronize
             # Run only one instance of a Ruby program at the same time - self locking
             # SEE: https://code-maven.com/run-only-one-instance-of-a-script
-            exit if !Utils.try_lock
+            Utils.try_lock {
+                loop {
+                    @old_data = load_data
+                    @data = {}
 
-            loop {
-                @old_data = load_data
-                @data = {}
+                    start_session {
+                        remote_ensure_dir @remote_root_path
+                        local_ensure_dir @local_root_path
 
-                start_session {
-                    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
+                    save_data @data
 
-                break if !@infinite_loop
+                    break if !@infinite_loop
 
-                sleep 1
+                    sleep 1
+                }
             }
         end
 

data/lib/{bsync → bdsync}/lfs.rb

@@ -1,7 +1,7 @@
-require "bsync/core"
+require "bdsync/core"
 require "ostruct"
 
-module Bsync
+module Bdsync
     class Lfs < Core
         def initialize params
             super params, "lfs"

data/lib/{bsync → bdsync}/sftp.rb

@@ -1,6 +1,7 @@
-require "bsync/core"
+require "bdsync/core"
+require "net/sftp"
 
-module Bsync
+module Bdsync
     class Sftp < Core
         def initialize params
             @site   = params["site"]

data/lib/{bsync → bdsync}/utils.rb

@@ -1,6 +1,6 @@
 require "digest"
 
-module Bsync
+module Bdsync
     module Utils
         # Examples:
         #
@@ -27,8 +27,11 @@ module Bsync
             "#{info.captures[0]}:#{info.captures[1]} - #{info.captures[2]}"
         end
 
-        def self.try_lock
-            File.open(__FILE__, 'r').flock(File::LOCK_EX | File::LOCK_NB)
+        def self.try_lock &block
+            File.open(__FILE__, 'r') { |f|
+                return if !f.flock(File::LOCK_EX | File::LOCK_NB)
+                yield
+            }
         end
     end
 end

data/lib/bdsync/version.rb

@@ -0,0 +1,3 @@
+module Bdsync
+    VERSION = "2.0.0"
+end

data/lib/bdsync.rb

@@ -0,0 +1,8 @@
+require "bdsync/lfs"
+require "bdsync/sftp"
+require "bdsync/version"
+
+module Bdsync
+    class Error < StandardError; end
+    # Your code goes here...
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bdsync
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Xia Xiongjun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-26 00:00:00.000000000 Z
+date: 2019-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: net-sftp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: Bidirectional Synchronization tool for sftp or local file system
 email:
 - xxjapp@gmail.com
@@ -40,22 +54,22 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bdsync.gemspec
 - bin/console
 - bin/setup
-- bsync.gemspec
-- lib/bsync.rb
-- lib/bsync/core.rb
-- lib/bsync/lfs.rb
-- lib/bsync/sftp.rb
-- lib/bsync/utils.rb
-- lib/bsync/version.rb
-homepage: https://github.com/xxjapp/bsync
+- lib/bdsync.rb
+- lib/bdsync/core.rb
+- lib/bdsync/lfs.rb
+- lib/bdsync/sftp.rb
+- lib/bdsync/utils.rb
+- lib/bdsync/version.rb
+homepage: https://github.com/xxjapp/bdsync
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/xxjapp/bsync
-  source_code_uri: https://github.com/xxjapp/bsync
-  changelog_uri: https://github.com/xxjapp/bsync/releases
+  homepage_uri: https://github.com/xxjapp/bdsync
+  source_code_uri: https://github.com/xxjapp/bdsync
+  changelog_uri: https://github.com/xxjapp/bdsync/releases
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/bsync/version.rb

@@ -1,3 +0,0 @@
-module Bsync
-    VERSION = "1.0.0"
-end

data/lib/bsync.rb

@@ -1,8 +0,0 @@
-require "bsync/lfs"
-require "bsync/sftp"
-require "bsync/version"
-
-module Bsync
-    class Error < StandardError; end
-    # Your code goes here...
-end