gitbulk 0.0.2.134791 → 0.0.4.364358

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5c03ef62e25a53ea023523a020655f3423dd251029f88b58dd00cb651f4944a
-  data.tar.gz: da52e5cd6b838ed7da24705dd755e2cf3998c23bf7d11b083b11ad353c7ea6bc
+  metadata.gz: e29dea4cfdce01915173810d85d40b352c9ad90be8312befb8ea3b40673205f4
+  data.tar.gz: 9b726814f608faf38e9b0f7df3db4f8568e7aae7d73c5eb3c60ddaa13103dd86
 SHA512:
-  metadata.gz: 7f6d48f0dbcfd87fddcb8ef42d5e062ab3c8e6379b33ae2ec0f952ec3371ac9014f03933cf6775907b9539a6acfc9d805dde60637eb8e29e0d17c8eba35a8637
-  data.tar.gz: dfb6b8e5a04cd428357f13796b75537657786c21cd35a1845a53243bd43108abed24288030b3cc525fa9bdf8a193e708be9d7ff634595ee8594744d9bb84d53c
+  metadata.gz: da3884065254794978673213083d3d6a5a17133dae0fb240a4dff886c45ccb7cbe7903fbaba29a07c6bed12fc79a83bde2cb2d19bc6989d2c6f0a81dab57dcdb
+  data.tar.gz: 6420e17a0df2cfc7eed470aea3f83a0f6188b23c4f26780ae3ee2a53694a64fe7f066379195629358a2b8a37ef380fdc8675b5a6360b4154b0dfcc34800aad10

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    gitbulk (0.0.2.134791)
-      activesupport (~> 6.0)
+    gitbulk (0.0.4)
+      activesupport
       colorize
       fileutils
       json
@@ -13,93 +13,117 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (8.1.3)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      json
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    addressable (2.8.9)
+      public_suffix (>= 2.0.2, < 8.0)
     ansi (1.5.0)
-    ast (2.4.2)
-    colorize (0.8.1)
-    concurrent-ruby (1.2.2)
-    crack (0.4.5)
+    ast (2.4.3)
+    base64 (0.3.0)
+    bigdecimal (4.0.1)
+    colorize (1.1.0)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
+    crack (1.0.1)
+      bigdecimal
       rexml
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    fileutils (1.7.1)
-    hashdiff (1.0.1)
-    i18n (1.12.0)
+    diff-lcs (1.6.2)
+    docile (1.4.1)
+    drb (2.2.3)
+    fileutils (1.8.0)
+    hashdiff (1.2.1)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
-    minitest (5.18.0)
-    parallel (1.22.1)
-    parser (3.2.1.1)
+    json (2.19.3)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    minitest (6.0.2)
+      drb (~> 2.0)
+      prism (~> 1.5)
+    parallel (1.27.0)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
-    public_suffix (5.0.1)
+      racc
+    prism (1.9.0)
+    public_suffix (7.0.5)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.7.0)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rake (13.3.1)
+    regexp_parser (2.11.3)
+    rexml (3.4.4)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.4)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.48.1)
+    rubocop (1.86.0)
       json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.26.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.0)
-      parser (>= 3.2.1.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.49.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
     ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-console (0.9.1)
+    simplecov-console (0.9.5)
       ansi
       simplecov
       terminal-table
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
-    thor (1.2.1)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
+    thor (1.5.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
-    uri (0.12.1)
-    webmock (3.18.1)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
+    uri (1.1.1)
+    webmock (3.26.2)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    yaml (0.2.1)
-    zeitwerk (2.6.7)
+    yaml (0.4.0)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 2.2, >= 2.2.1)
+  bundler
   gitbulk!
   rake
   rspec
@@ -110,4 +134,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.2.33
+  4.0.7

data/bin/gitbulk

@@ -25,6 +25,7 @@ Gitbulk::Util.setup
 
 @opts = {
   dryrun:    ENV.fetch('GITBULK_DRYRUN', 'false').to_bool,
+  twoway:    ENV.fetch('GITBULK_TWOWAY', 'false').to_bool,
   config:    ENV.fetch('GITBULK_CONFIG', './gitbulk.yml'),
   log_level: ENV.fetch('LOG_LEVEL', ::Logger::INFO)
 }
@@ -37,6 +38,11 @@ parser = OptionParser.new do |o|
     @opts[:config] = File.expand_path(path.strip)
   end
 
+  o.on('--twoway',
+       'ENV[GITBULK_TWOWAY]'.ljust(25) + 'Experimental using https://github.com/it3xl/git-repo-sync') do
+    @opts[:twoway] = true
+  end
+
   o.on('--dryrun',
        'ENV[GITBULK_DRYRUN]'.ljust(25) + 'Dry Run') do
     @opts[:dryrun] = true
@@ -68,17 +74,45 @@ Dir.chdir(config['workdir']) do |_dir|
 
     logger.info "Mirroring: #{git.inspect}".colorize(:green)
 
-
-    Gitbulk::Util.within_repo(git, logger: logger) do |_name|
-      repo['mirrors'].shuffle.each do |mirror|
-        logger.info "Pushing to #{mirror}".colorize(:blue)
-
-        # cmd = "git push --mirror #{mirror}"
-        cmd = "git push --all #{mirror}"
-        if @opts[:dryrun]
-          logger.tagged('DRYRUN') { logger.info cmd }
-        else
-          Gitbulk::Util.cmd!(cmd)
+    if @opts[:twoway]
+      spec = Gem::Specification.find_by_name("gitbulk")
+      gem_root = spec.gem_dir
+      syncer_home = File.join(gem_root, "lib", "git-repo-sync")
+      syncer = "git-sync.sh"
+      ENV['PATH'] = "#{ENV['PATH']}:#{syncer_home}"
+      logger.tagged('TWOWAY'.colorize(:red)) do
+        repo['mirrors'].shuffle.each do |mirror|
+          name = Gitbulk::Util.name_slug(git) + '_' + Gitbulk::Util.name_slug(mirror)
+          cmd = "git_sync_project_folder=#{Gitbulk::Util.name_slug(name)} url_a=#{git} url_b=#{mirror} git-sync.sh"
+          allcmd = "git push origin_b --all"
+          tagscmd = "git push origin_b --tags"
+          if @opts[:dryrun]
+            logger.tagged('DRYRUN') { logger.info cmd }
+            logger.tagged('DRYRUN') { logger.info allcmd }
+            logger.tagged('DRYRUN') { logger.info tagscmd }
+          else
+            logger.info cmd
+            Gitbulk::Util.cmd!(cmd)
+            Dir.chdir("#{syncer_home}/sync-projects/#{name}/sync_repo") do |_dir|
+              Gitbulk::Util.cmd!(allcmd)
+              Gitbulk::Util.cmd!(tagscmd)
+            end
+          end
+        end
+      end
+    else
+      # generic way
+      Gitbulk::Util.within_repo(git, logger: logger) do |_name|
+        repo['mirrors'].shuffle.each do |mirror|
+          logger.info "Pushing to #{mirror}".colorize(:blue)
+
+          # cmd = "git push --mirror #{mirror}"
+          cmd = "git push --all #{mirror}"
+          if @opts[:dryrun]
+            logger.tagged('DRYRUN') { logger.info cmd }
+          else
+            Gitbulk::Util.cmd!(cmd)
+          end
         end
       end
     end

data/gitbulk.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new 'gitbulk' do |spec|
   spec.executables   = spec.files.grep(%r{^bin/gitbulk}) {|f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 2.2', '>= 2.2.1'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec_junit_formatter'
@@ -29,7 +29,7 @@ Gem::Specification.new 'gitbulk' do |spec|
   spec.add_development_dependency 'simplecov-console'
   spec.add_development_dependency 'webmock'
   
-  spec.add_runtime_dependency 'activesupport', '~> 6.0'
+  spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'colorize'
   spec.add_runtime_dependency 'json'
   spec.add_runtime_dependency 'thor'

data/lib/gitbulk/utils.rb

@@ -49,6 +49,10 @@ module Gitbulk
         end
       end
 
+      def name_slug(git)
+        git.downcase.gsub(/\W+/, '_')
+      end
+
       def cmd!(cmd, capture: false, logger: $logger)
         $cmdnum ||= 0
         $cmdnum += 1

data/lib/gitbulk/version.rb

@@ -2,7 +2,7 @@
 
 module Gitbulk
 
-  VERSION = '0.0.2'
+  VERSION = '0.0.4'
 
 end
 

data/lib/gitbulk.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'logger'
 require 'active_support'
 require_relative 'gitbulk/version'
 require_relative 'gitbulk/utils'

metadata

@@ -1,35 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: gitbulk
 version: !ruby/object:Gem::Version
-  version: 0.0.2.134791
+  version: 0.0.4.364358
 platform: ruby
 authors:
 - Samoilenko Yuri
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-04 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -132,16 +125,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -251,7 +244,6 @@ licenses:
 metadata:
   homepage_uri: https://github.com/RnD-Soft/gitbulk
   source_code_uri: https://github.com/RnD-Soft/gitbulk
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -266,8 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Gitbulk is cli for mirroring many git repositories at once
 test_files: []