artifactory-gem_import 0.2.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d9422a855958aa038e1c5340c3b247257e7e99ef0f55e7b19a3be59a756fa41
-  data.tar.gz: f3ee7a9613f07d850fe5f6d3f97b6c9ac823cf97676be84e88a0713110e8337f
+  metadata.gz: 57ab4217838b44abf3dde9b5f6e1bd6e6209af40e3cd84dfa9b758c68946cb86
+  data.tar.gz: 3d0b72405f995269769ebeebb9aaacab60b28dcf14dbd00426a7d3b97278b8f7
 SHA512:
-  metadata.gz: 72aacbc2f1176149a6e55f0f08a4000a4bc90eb01e66e123b4fef8557d39236445616ef2249a174d5120a712f64ce1d01b6eaa52727b4bddf9f4b53f4490827e
-  data.tar.gz: 325b64f6d681e3a258ccbc6cff36f28246b53cf6e28c08c5379a572cf93c3b4fc5852c89da69a0dadae46331dcd3803d8e7c7831a741dd71754d5bd13b447ba9
+  metadata.gz: 67c0448e9161b7ac268569b064aadcabd7d79c29ff2e266e9a706807f9a9cfbe77a467aa61b666c7a9a70dfe32705fc62d2862521ceccd74b83047539a949797
+  data.tar.gz: 0b7f11815cb9ac286ea1e3997f7ec44f00b47a5f5f4b7cd986c7b1014af45c81a637f8a21f5067dcd0436b9ca6e4aa1bb4915d316b0014ae552198007ad05d91

data/README.md

@@ -26,18 +26,18 @@ gem 'artifactory-gem_import'
 
 Show gems not already present in the Artifactory.
 ```shell
-$ artifactory-gem-import show-missing --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 show-missing --source-repo https://your-repo.local/private --target-repo https://your-artifactory.local/gems-local --target-repo-access-token <access-token> [--only "+."]
 ```
 
 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 "+."] [--force]
+$ artifactory-gem-import import --source-repo https://your-repo.local/private --target-repo https://your-artifactory.local/gems-local --target-repo-access-token <access-token>  [--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
-$ artifactory-gem-import delete --target-repo https://your-artifactory.local/gems-local --target-repo-api-key <api-key>  [--only "+."]
+$ artifactory-gem-import delete --target-repo https://your-artifactory.local/gems-local --target-repo-access-token <access-token>  [--only "+."]
 ```
 
 Keep in mind that Artifactory needs some time to apply your changes.

data/lib/artifactory/gem_import/cli.rb

@@ -13,7 +13,7 @@ module Artifactory
 
       option :target_repo, required: true, type: :string
 
-      option :target_repo_api_key, required: true, type: :string
+      option :target_repo_access_token, required: true, type: :string
 
       option :only, type: :string, default: ".+"
 
@@ -30,7 +30,7 @@ module Artifactory
 
       option :target_repo, required: true, type: :string
 
-      option :target_repo_api_key, required: true, type: :string
+      option :target_repo_access_token, required: true, type: :string
 
       option :only, type: :string, default: ".+"
 
@@ -45,7 +45,7 @@ module Artifactory
 
       option :target_repo, required: true, type: :string
 
-      option :target_repo_api_key, required: true, type: :string
+      option :target_repo_access_token, required: true, type: :string
 
       option :only, type: :string, default: ".+"
 
@@ -63,7 +63,7 @@ module Artifactory
 
       # option :target_repo, required: true, type: :string
       #
-      # option :target_repo_api_key, required: true, type: :string
+      # option :target_repo_access_token, required: true, type: :string
       #
       # desc "reindex", "Trigger reindexing of the target repo (Artifactory only)."
       # def reindex
@@ -84,7 +84,7 @@ module Artifactory
 
       def target_repo
         GemImport.target_repo url: options[:target_repo],
-                              api_key: options[:target_repo_api_key]
+                              access_token: options[:target_repo_access_token]
       end
     end
   end

data/lib/artifactory/gem_import/gem_specs.rb

@@ -15,13 +15,19 @@ module Artifactory
       end
 
       def get(repo:, only: /.+/)
-        specs = Specs
-          .new(url: repo.specs_url, headers: repo.headers)
-          .specs
-      rescue Net::HTTPClientException, Net::HTTPFatalError, Net::OpenTimeout, SocketError => err
-        raise ClientError, "Could not fetch specs. URL: #{repo.specs_url}, Reason: #{err.message}"
-      else
-        Specs.filter(specs, only: only).sort
+        %i[prerelease_specs_url specs_url]
+          .flat_map { |getter| fetch repo.public_send(getter), repo.headers }
+          .sort
+          .then { |specs| Specs.filter specs, only: only }
+      end
+
+      private_class_method
+
+      def fetch(url, headers)
+        Specs.new(url: url, headers: headers)
+             .specs
+      rescue Zlib::GzipFile::Error, Net::HTTPClientException, Net::HTTPFatalError, Net::OpenTimeout, SocketError => err
+        raise ClientError, "Could not fetch specs. URL: #{url}, Reason: #{err.message}"
       end
     end
   end

data/lib/artifactory/gem_import/repo.rb

@@ -4,7 +4,7 @@ module Artifactory
       attr_reader :url, :headers
 
       def initialize(url:, headers:)
-        @url = url
+        @url     = url
         @headers = headers
       end
 
@@ -12,9 +12,17 @@ module Artifactory
         File.join url, "gems", "/"
       end
 
+      def prerelease_specs_url
+        File.join url, "prerelease_specs.4.8.gz"
+      end
+
       def specs_url
         File.join url, "specs.4.8.gz"
       end
+
+      def latest_specs_url
+        File.join url, "latest_specs.4.8.gz"
+      end
     end
   end
 end

data/lib/artifactory/gem_import/version.rb

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

data/lib/artifactory/gem_import.rb

@@ -8,7 +8,7 @@ require_relative "gem_import/worker"
 
 module Artifactory
   module GemImport
-    Error = Class.new StandardError
+    Error       = Class.new StandardError
     ClientError = Class.new Error
 
     module_function
@@ -32,13 +32,13 @@ module Artifactory
     end
 
     def source_repo(url:)
-      Repo.new url: url,
+      Repo.new url:     url,
                headers: {}
     end
 
-    def target_repo(url:, api_key:)
-      Repo.new url: url,
-               headers: { "X-JFrog-Art-Api" => api_key }
+    def target_repo(url:, access_token:)
+      Repo.new url:     url,
+               headers: { "Authorization" => "Bearer #{access_token}" }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artifactory-gem_import
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Thomas Scholz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-25 00:00:00.000000000 Z
+date: 2025-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Artifactory Gem Import.