artifactory-gem_import 0.1.4 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 923dacc8ce0822ff906ab58f5337a353ef721973d8f21027c41a09283ec22739
-  data.tar.gz: 572c64c0775fa74eaf75e8e28da7d2785df295d9ade73dbc0929127d942f0b0b
+  metadata.gz: 1d9422a855958aa038e1c5340c3b247257e7e99ef0f55e7b19a3be59a756fa41
+  data.tar.gz: f3ee7a9613f07d850fe5f6d3f97b6c9ac823cf97676be84e88a0713110e8337f
 SHA512:
-  metadata.gz: 37ac19b8ec112112420e3c7b20aa3d83c09b3becb7827e6eda014057a6e07981f23b47a6dec2cdc73ba01cf3354e1fb10cea61ca01790b704bea7677f9d6d71a
-  data.tar.gz: b75ca485d06ad417690fc13d9c82f02afd4fffad390cb044f004ad529804768cf3577586c285111657fca4b449f3c0b4400a96ba0fd426dc8e94abcaf7d39dbe
+  metadata.gz: 72aacbc2f1176149a6e55f0f08a4000a4bc90eb01e66e123b4fef8557d39236445616ef2249a174d5120a712f64ce1d01b6eaa52727b4bddf9f4b53f4490827e
+  data.tar.gz: 325b64f6d681e3a258ccbc6cff36f28246b53cf6e28c08c5379a572cf93c3b4fc5852c89da69a0dadae46331dcd3803d8e7c7831a741dd71754d5bd13b447ba9

data/README.md

@@ -12,7 +12,7 @@ to you e.g. as part of the CI/CD pipeline when releasing gems.
 
 ## How it works
 - it diffs the specs.4.8.gz of both repositories
-- it down- and uploads the missing gems only
+- it down- and uploads the missing gems
 - it verifies the MD5 hash of the uploaded gem file with the cached one
 - it deletes the uploaded gem if the checksums do not match
 
@@ -31,8 +31,9 @@ $ artifactory-gem-import show-missing --source-repo https://your-repo.local/priv
 
 Import gems into the Artifactory.
 ```shell
-$ artifactory-gem-import import --source-repo https://your-repo.local/private --target-repo https://your-artifactory.local/gems-local --target-repo-api-key <api-key>  [--only "+."]
+$ artifactory-gem-import import --source-repo https://your-repo.local/private --target-repo https://your-artifactory.local/gems-local --target-repo-api-key <api-key>  [--only "+."] [--force]
 ```
+Using `--force` uploads gems even if already present in the target repo instead of skipping them.
 
 Delete gems from the Artifactory. It will NOT remove the `rubygems-update` gem as it seems to be needed to keep the gem repository working. 
 ```shell

data/artifactory-gem_import.gemspec

@@ -1,31 +1,31 @@
 require_relative "lib/artifactory/gem_import/version"
 
 Gem::Specification.new do |spec|
-  spec.name = "artifactory-gem_import"
+  spec.name    = "artifactory-gem_import"
   spec.version = Artifactory::GemImport::VERSION
   spec.authors = ["Thomas Scholz"]
-  spec.email = ["thomas.scholz@rubyapps.ch"]
+  spec.email   = ["thomas.scholz@rubyapps.ch"]
 
-  spec.summary = %q{Artifactory Gem Import.}
-  spec.description = %q{Artifactory Gem Import for importing gems from existing Gem Repo into a new Artifactory Gem Repo.}
-  spec.homepage = "https://github.com/tscholz/artifactory-gem_import"
+  spec.summary               = %q{Artifactory Gem Import.}
+  spec.description           = %q{Artifactory Gem Import for importing gems from existing Gem Repo into a new Artifactory Gem Repo.}
+  spec.homepage              = "https://github.com/tscholz/artifactory-gem_import"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
-  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["homepage_uri"]    = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = "#{spec.homepage}/CHANGELOG.md"
+  spec.metadata["changelog_uri"]   = "#{spec.homepage}/CHANGELOG.md"
 
   # 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.
-  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
+  spec.files         = Dir.chdir(File.expand_path("..", __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "httparty", "~> 0.18"
+  spec.add_dependency "httparty", "~> 0.21"
   spec.add_dependency "thor", "~> 1.0"
 end

data/lib/artifactory/gem_import/cli.rb

@@ -17,12 +17,15 @@ module Artifactory
 
       option :only, type: :string, default: ".+"
 
+      option :force, type: :boolean, default: false
+
       desc "import", "Copy gems from the source repo into the target repo."
 
       def import
         say GemImport.import! source_repo: source_repo,
                               target_repo: target_repo,
-                              only: options[:only]
+                              only: options[:only],
+                              force: options[:force]
       end
 
       option :target_repo, required: true, type: :string
@@ -58,6 +61,15 @@ module Artifactory
         say gems.count
       end
 
+      # option :target_repo, required: true, type: :string
+      #
+      # option :target_repo_api_key, required: true, type: :string
+      #
+      # desc "reindex", "Trigger reindexing of the target repo (Artifactory only)."
+      # def reindex
+      #   GemImport.reindex! repo: target_repo
+      # end
+
       desc "version", "Show version information"
 
       def version

data/lib/artifactory/gem_import/gems/uploader.rb

@@ -1,4 +1,5 @@
 require "digest"
+require "json"
 
 module Artifactory
   module GemImport

data/lib/artifactory/gem_import/version.rb

@@ -1,5 +1,5 @@
 module Artifactory
   module GemImport
-    VERSION = "0.1.4"
+    VERSION = "0.2.2"
   end
 end

data/lib/artifactory/gem_import/worker/importer.rb

@@ -5,12 +5,13 @@ module Artifactory
   module GemImport
     module Worker
       class Importer < Base
-        attr_reader :source_repo, :target_repo, :only
+        attr_reader :source_repo, :target_repo, :only, :force
 
-        def initialize(source_repo:, target_repo:, only: /.+/)
+        def initialize(source_repo:, target_repo:, only: /.+/, force: false)
           @source_repo = source_repo
           @target_repo = target_repo
-          @only = only
+          @only        = only
+          @force       = force
         end
 
         def import!
@@ -42,9 +43,13 @@ module Artifactory
         end
 
         def missing_gems
-          @missing_gems ||= GemSpecs.missing_gems source_repo: source_repo,
-                                                  target_repo: target_repo,
-                                                  only: only
+          @missing_gems ||= if force
+                              GemSpecs.get repo: source_repo, only: only
+                            else
+                              GemSpecs.missing_gems source_repo: source_repo,
+                                                    target_repo: target_repo,
+                                                    only:        only
+                            end
         end
 
         def download(gem)

data/lib/artifactory/gem_import.rb

@@ -13,9 +13,9 @@ module Artifactory
 
     module_function
 
-    def import!(source_repo:, target_repo:, only: /.+/)
+    def import!(source_repo:, target_repo:, only: /.+/, force: false)
       Worker::Importer
-        .new(source_repo: source_repo, target_repo: target_repo, only: only)
+        .new(source_repo: source_repo, target_repo: target_repo, only: only, force: force)
         .import!
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artifactory-gem_import
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.2
 platform: ruby
 authors:
 - Thomas Scholz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2024-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.5.14
 signing_key:
 specification_version: 4
 summary: Artifactory Gem Import.