package_cloud 0.3.13 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6d363087603473afe3c1ac11834d158341b1352f22b4659c20dabb7c1122c8c
-  data.tar.gz: 0d214d7769a2437e9416daf4ed76f067ef78e83dae74f77ba5232e5a419cc227
+  metadata.gz: 7137e29274423947660c706e21c9202f53ba02c046928cde787ed48ec06c714c
+  data.tar.gz: faecdd0f26599ff1c6eab2b1a17a31176f7cc281f6104adef446ff3a41f67065
 SHA512:
-  metadata.gz: 79079fca04fb398f2b0a81bdec7c60b403c3cf6328c16f5dd6e2bae5fb7e7c206a29fb2330b76d1c2a3ce0e2629519563302f7906f2c25c6676010394ce71806
-  data.tar.gz: a3387acaa98bbb884dbc37c3bf3345265be42d2904a95beb7558c2dc436b37dcaab714605f9baa30aec008ac7214264b765ea84f4b6285c99378825aa909937f
+  metadata.gz: 3b21cf56b65cad88473a522d0863075c6aa7787945fca30475b919c711bacb58894d4df31a4cd42431a523e6492562b238457439e4cfc9fb628360f2e940d2d5
+  data.tar.gz: d420d301d173518bfb21b02aa9e422b79e3c4e34c1a9503b7ba0df4e008c7781fc67f4e79bb7ae8b53e8faf5aaaf8318644f65ade21ad76801f0534789d40c07

data/README.md

@@ -5,7 +5,7 @@ client, `package_cloud`.
 
 ## Requirements
 
-Only Ruby 2.x and greater is supported, please use version 0.2.45 for Ruby 1.9 support.
+Only Ruby 2.6 and greater is supported, please use version 0.2.45 for Ruby 1.9 support.
 
 ## Overview
 

data/lib/package_cloud/cli/entry.rb

@@ -1,3 +1,6 @@
+require "cgi"
+require "uri"
+
 module PackageCloud
   module CLI
     JAVA_EXTS = ["jar", "aar", "war"]
@@ -103,9 +106,17 @@ module PackageCloud
       option "skip-errors", :type => :boolean,
                             :desc => "Skip errors encountered during a package push and continue pushing the next package."
 
+      option "skip-duplicates", :type => :boolean,
+                                :desc => "Skip packages which already exist and continue pushing the next package."
+
       option "coordinates", :type => :string,
                             :desc => "Specify the exact maven coordinates to use for a JAR. Useful for JARs without coordinates, 'fat JARs', and WARs."
 
+      option "upload-before-push",
+        :type => :boolean,
+        :desc => "Upload package before push",
+        :default => false
+
       def push(repo, package_file, *package_files)
         total_time = Benchmark.measure do
           ARGV.clear # otherwise gets explodes
@@ -173,7 +184,9 @@ module PackageCloud
           $logger.debug("repository lookup request timing: #{measurement}")
 
           package_files.each do |f|
+            url = nil
             files = nil
+            urls = nil
             ext = f.split(".").last
 
             if ext == "dsc"
@@ -181,12 +194,63 @@ module PackageCloud
               files = parse_and_verify_dsc(client_repo, f, dist_id)
             end
 
+            if options["upload-before-push"]
+              print "Uploading #{f}... "
+              upload = client_repo.create_upload
+              begin
+                response = RestClient::Request.execute(
+                  :method => upload.fetch("form").fetch("method", "POST"),
+                  :url => upload.fetch("form").fetch("url"),
+                  :timeout => nil,
+                  :payload => upload.fetch("form").fetch("data", {}).merge(
+                    upload.fetch("form").fetch("file_input") => File.open(f, "r"),
+                  )
+                )
+                url = response.headers.fetch(:location)
+
+                # Amazon S3 uploads return urlencoded keys in the Location
+                # header, and we want to return the decoded object key for
+                # API operations.
+                uri = URI.parse(url)
+                if uri.host.end_with?(".amazonaws.com")
+                  uri.path = CGI.unescape(uri.path)
+                  url = uri.to_s
+                end
+
+                if files
+                  urls = files.map do |file|
+                    response = RestClient::Request.execute(
+                      :method => upload.fetch("form").fetch("method", "POST"),
+                      :url => upload.fetch("form").fetch("url"),
+                      :timeout => nil,
+                      :payload => upload.fetch("form").fetch("data", {}).merge(
+                        upload.fetch("form").fetch("file_input") => File.open(file, "r"),
+                      )
+                    )
+                    source_url = response.headers.fetch(:location)
+                    source_uri = URI.parse(source_url)
+                    if source_uri.host.end_with?(".amazonaws.com")
+                      source_uri.path = CGI.unescape(source_uri.path)
+                      source_url = source_uri.to_s
+                    end
+                    source_url
+                  end
+                end
+              rescue
+                print "error!\n".color(:red)
+                puts $!, *$!.backtrace, $!.response, $!.response.body
+                exit(1)
+              end
+            end
+
             print "Pushing #{f}... "
             measurement = Benchmark.measure do
               if options.has_key?("skip-errors")
-                create_package_skip_errors(client_repo, f, dist_id, files, ext, options["coordinates"])
+                create_package_skip_errors(client_repo, f, url, dist_id, files, urls, ext, options["coordinates"])
+              elsif options.has_key?("skip-duplicates")
+                create_package_skip_duplicates(client_repo, f, url, dist_id, files, urls, ext, options["coordinates"])
               else
-                create_package(client_repo, f, dist_id, files, ext, options["coordinates"])
+                create_package(client_repo, f, url, dist_id, files, urls, ext, options["coordinates"])
               end
             end
             $logger.debug("create package request timing: #{measurement}")
@@ -233,9 +297,9 @@ module PackageCloud
           end
         end
 
-        def create_package_skip_errors(client_repo, f, dist_id, files, ext, coordinates=nil)
+        def create_package_skip_errors(client_repo, f, url, dist_id, files, urls, ext, coordinates=nil)
           begin
-            client_repo.create_package(f, dist_id, files, ext, coordinates=nil)
+            client_repo.create_package(f, url, dist_id, files, urls, ext, coordinates=nil)
           rescue RestClient::UnprocessableEntity => e
             print "error (skipping):\n".color(:yellow)
             json = JSON.parse(e.response)
@@ -246,9 +310,31 @@ module PackageCloud
           end
         end
 
-        def create_package(client_repo, f, dist_id, files, ext, coordinates=nil)
+        def create_package_skip_duplicates(client_repo, f, url, dist_id, files, urls, ext, coordinates=nil)
+          begin
+            client_repo.create_package(f, url, dist_id, files, urls, ext, coordinates=nil)
+          rescue RestClient::UnprocessableEntity => e
+            json = JSON.parse(e.response)
+            if json == { "filename" => ["has already been taken"] }
+              print "skipping, already exists.\n".color(:yellow)
+            else
+              print "error:\n".color(:red)
+              json.each do |k,v|
+                if v.is_a? String
+                  puts "\n\t#{k}: #{v}\n"
+                elsif v.is_a? Array
+                  puts "\n\t#{k}: #{v.join(", ")}\n"
+                end
+              end
+              puts ""
+              exit(1)
+            end
+          end
+        end
+
+        def create_package(client_repo, f, url, dist_id, files, urls, ext, coordinates=nil)
           begin
-            client_repo.create_package(f, dist_id, files, ext, coordinates)
+            client_repo.create_package(f, url, dist_id, files, urls, ext, coordinates)
           rescue RestClient::UnprocessableEntity => e
             print "error:\n".color(:red)
             json = JSON.parse(e.response)

data/lib/package_cloud/client.rb

@@ -59,6 +59,5 @@ module PackageCloud
         exit(127)
       end
     end
-
   end
 end

data/lib/package_cloud/repository.rb

@@ -31,28 +31,59 @@ module PackageCloud
       end
     end
 
-    def create_package(file_path, dist_id, files=nil, filetype=nil, coordinates=nil)
-      file_data = File.new(file_path, 'rb')
+    def create_upload
+      base_url = @config.base_url
+      url = PackageCloud::Util.compute_url(base_url, paths["create_upload"])
+      begin
+        JSON.parse(RestClient.post(url, {}))
+      rescue RestClient::UnprocessableEntity => e
+        print "error!\n".color(:red)
+        json = JSON.parse(e.response)
+        json.each do |k,v|
+          puts "\n\t#{k}: #{v.join(", ")}\n"
+        end
+        puts
+        exit(1)
+      rescue RestClient::ResourceNotFound => e
+        print "failed!\n".color(:red)
+        exit(127)
+      end
+    end
+
+    def create_package(file_path, file_url, dist_id, files=nil, urls=nil, filetype=nil, coordinates=nil)
       base_url = @config.base_url
       url = PackageCloud::Util.compute_url(base_url, paths["create_package"])
-      params = { :package_file => file_data,
-                 :distro_version_id => dist_id }
+      params = {
+        :distro_version_id => dist_id,
+      }
+
+      if file_url
+        params[:url] = file_url
+      else
+        params[:package_file] = File.new(file_path, 'rb')
+      end
 
-     if coordinates
-       params.merge!(:coordinates => coordinates)
-     end
+      if coordinates
+        params[:coordinates] = coordinates
+      end
 
       if filetype == "dsc"
-        file_ios = files.inject([]) do |memo, f|
-          memo << File.new(f, 'rb')
+        if urls
+          params[:source_urls] = urls
+        else
+          params[:source_files] = files.map do |f|
+            File.new(f, 'rb')
+          end
         end
-        params.merge!({:source_files => file_ios})
       end
 
-      RestClient::Request.execute(:method => 'post',
-                                  :url => url,
-                                  :timeout => nil,
-                                  :payload => { :package =>  params })
+      RestClient::Request.execute(
+        :method => 'post',
+        :url => url,
+        :timeout => nil,
+        :payload => { :package =>  params },
+      )
+
       print "success!\n".color(:green)
     end
 

data/lib/package_cloud/version.rb

@@ -1,7 +1,7 @@
 module PackageCloud
   MAJOR_VERSION = "0"
   MINOR_VERSION = "3"
-  PATCH_VERSION = "13"
+  PATCH_VERSION = "15"
 
   VERSION = [MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION].join(".")
 end

data/package_cloud.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |spec|
 
   spec.homepage      = "https://packagecloud.io"
   spec.license       = "MIT"
+  spec.required_ruby_version = ">= 2.6"
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -20,12 +21,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "thor", "~> 1.2"
-  spec.add_runtime_dependency "highline", "~> 2.0.0"
+  spec.add_runtime_dependency "highline", "~> 2.0"
   spec.add_runtime_dependency "rest-client", "~> 2.0"
-  spec.add_runtime_dependency "json_pure", "~> 2.3.0"
-  spec.add_runtime_dependency "rainbow", "2.2.2"
+  spec.add_runtime_dependency "json", "~> 2.9"
+  spec.add_runtime_dependency "abbrev", "~> 0.1"
+  spec.add_runtime_dependency "rainbow", "~> 2.2"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "mdl"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: package_cloud
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.15
 platform: ruby
 authors:
 - Joe Damato
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-06 00:00:00.000000000 Z
+date: 2025-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -53,47 +53,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: json_pure
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: abbrev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +177,7 @@ homepage: https://packagecloud.io
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -171,15 +185,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.5.22
+signing_key: 
 specification_version: 4
 summary: The https://packagecloud.io CLI for uploading Node.js, Debian, RPM, RubyGem,
   Python, and Java packages. Check our website or the RubyDoc documentation for detailed