package_cloud 0.3.09 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 826f31e8a6707526bd6f82609c43677b162464688596785a338be6f7a35acf44
-  data.tar.gz: '096e57c694454dda57219d8ca2b79e63b58d46ce4711176e745518c33ed62d7d'
+  metadata.gz: d491d33c62c74e03dde03e4befd3275b54e7ce3e534745b5fc6499dbb6616aab
+  data.tar.gz: ded90eb0fedeea5494ed879fef5d53b2e9ca80f3f39533e625129bbe38013feb
 SHA512:
-  metadata.gz: bb785da285b810f8b6bebe17354a9f782ec5afa4c36acc32a74628908ef332003b07af77cef3db5a4c550a939bce529bc4320dcc98dc28beb4af4ef4fec8a442
-  data.tar.gz: 1aa70e22f8d994b0f0a5a2324d534a7c25f02d60e76d8298b4eb0307ecd915a4a72fb45ce0c7e6d4350c68b9db4b7c4eb20b87fc0142b11446beac2c5c5c6265
+  metadata.gz: 9d32155e5a921709dce335ac92cc013322c10cbf1e77c9612628094aa0fb6a4f69f1ce07136677ac271c10880d09e9a1ad05fa598b98a8dbed3c036700294195
+  data.tar.gz: 5922fd817b64d24facc5a23139f1a7165f7ba9fa8718a7c127e93f9f44cea9441605441be0ceaa0d6be996af4d4d10318d144b4debd46b3b0a99cb88ba72ea76

data/lib/package_cloud/cli/entry.rb

@@ -1,10 +1,11 @@
 module PackageCloud
   module CLI
     JAVA_EXTS = ["jar", "aar", "war"]
-    PY_EXTS = ["gz", "bz2", "z", "tar", "egg-info", "zip", "whl", "egg"]
+    PY_EXTS = ["gz", "bz2", "z", "tar", "egg-info", "whl", "egg"]
     ANYFILE_EXTS = ["asc"]
-    NODE_EXTS = ["tgz"]
-    SUPPORTED_EXTS = JAVA_EXTS + PY_EXTS + ANYFILE_EXTS + NODE_EXTS + ["gem", "deb", "rpm", "dsc", "apk"]
+    NODE_EXTS = []
+    AMBIGUOUS_EXTS = ["tgz", "apk", "zip"]
+    SUPPORTED_EXTS = JAVA_EXTS + PY_EXTS + ANYFILE_EXTS + AMBIGUOUS_EXTS + ["gem", "deb", "rpm", "dsc"]
 
     class Entry < Base
       desc "repository SUBCMD ...ARGS", "manage repositories"
@@ -102,6 +103,9 @@ 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."
 
@@ -111,7 +115,6 @@ module PackageCloud
           package_files << package_file
 
           exts = package_files.map { |f| f.split(".").last }.uniq
-          exts = handle_special_exts(repo, exts)
 
           if package_files.length > 1 && exts.length > 1
             abort("You can't push multiple packages of different types at the same time.\nFor example, use *.deb to push all your debs at once.".color(:red))
@@ -130,7 +133,8 @@ module PackageCloud
             invalid_packages.each do |p|
               message << "  #{p}\n"
             end
-            message << "\npackage_cloud only supports node.js, deb, gem, java, python, or rpm packages".color(:red)
+            message << "\npackage_cloud only supports node.js, deb, gem, java, python, "\
+                       "rpm, alpine, helm, anyfile (.zip, .asc) packages".color(:red)
             abort(message)
           end
 
@@ -154,6 +158,8 @@ module PackageCloud
           elsif JAVA_EXTS.include?(exts.first.downcase)
             abort_if_snapshot!(package_files)
             dist_id   = validator.distribution_id(repo, package_files, 'jar')
+          elsif AMBIGUOUS_EXTS.include?(exts.first.downcase)
+            dist_id   = validator.distribution_id_from_repo_url(repo, package_files)
           else
             dist_id   = validator.distribution_id(repo, package_files, exts.first)
           end
@@ -182,6 +188,8 @@ module PackageCloud
             measurement = Benchmark.measure do
               if options.has_key?("skip-errors")
                 create_package_skip_errors(client_repo, f, dist_id, files, ext, options["coordinates"])
+              elsif options.has_key?("skip-duplicates")
+                create_package_skip_duplicates(client_repo, f, dist_id, files, ext, options["coordinates"])
               else
                 create_package(client_repo, f, dist_id, files, ext, options["coordinates"])
               end
@@ -199,17 +207,6 @@ module PackageCloud
       end
 
       private
-        def handle_special_exts(repo, exts)
-          exts.map do |elem|
-            case elem
-            when 'apk'
-              elem = repo.include?("alpine") ? "alpine" : elem
-            else
-              elem
-            end
-          end
-        end
-
         def expand_dist_shortcut(dist)
           case dist
           when 'java'
@@ -254,6 +251,28 @@ module PackageCloud
           end
         end
 
+        def create_package_skip_duplicates(client_repo, f, dist_id, files, ext, coordinates=nil)
+          begin
+            client_repo.create_package(f, dist_id, files, 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, dist_id, files, ext, coordinates=nil)
           begin
             client_repo.create_package(f, dist_id, files, ext, coordinates)
@@ -282,7 +301,7 @@ module PackageCloud
           file_paths = []
           files.each do |f|
             filepath = File.join(dir, f["filename"])
-            if !File.exists?(filepath)
+            if !File.exist?(filepath)
               print "Unable to find file name: #{f["filename"]} for source package: #{filepath}\n".color(:red)
               abort("Aborting...".color(:red))
             end

data/lib/package_cloud/config_file.rb

@@ -62,14 +62,24 @@ module PackageCloud
 
       def login_from_console
         e     = ask("Email:")
+        puts "If you signed up via social login (Github, Bitbucket etc.), and/or do not have a password, input: NIL"
         p     = ask("Password:") { |q| q.echo = false }
 
-        begin
-          PackageCloud::Auth.get_token(base_url(e, p))
-        rescue RestClient::Unauthorized => e
-          puts "Sorry, but we couldn't find you. Give it another try."
-          login_from_console
+        if p == "NIL"
+          puts "Copy your API Token from https://packagecloud.io/api_token and input below."
+          puts "(Note: An incorrectly inputted token will require deletion of the incorrectly generated $HOME/.packagecloud config file before rerunning the last command.)"
+          api_token = ask("Your API Token:") { |q| q.echo = false }
+        else
+          begin
+            api_token = PackageCloud::Auth.get_token(base_url(e, p))
+          rescue RestClient::Unauthorized => e
+            puts "Sorry, but we couldn't find you. Give it another try."
+            puts "(Or skip the login? Go to https://packagecloud.io/api_token to see instructions on downloading your $HOME/.packagecloud config file.)"
+            login_from_console
+          end
         end
+
+        return api_token
       end
 
       def write
@@ -86,7 +96,7 @@ module PackageCloud
       ## config where the url is used verbatim as the key, instead of "url",
       ## this attempts to fix the config file
       def fix_config_file!
-        if File.exists?(@filename) && File.writable?(@filename)
+        if File.exist?(@filename) && File.writable?(@filename)
           attrs = JSON.parse(File.read(@filename))
           if !attrs.has_key?("url")
             ## overwrite the config file if "url" key not found

data/lib/package_cloud/validator.rb

@@ -4,6 +4,19 @@ module PackageCloud
       @client = client
     end
 
+    def distribution_id_from_repo_url(repo, filenames)
+      _,_,dist_sel,ver_sel = repo.split("/")
+     package_type = dist_sel
+     puts "ambiguous extensions, so using repo url to deduce package_type, package_type: #{package_type}".color(:red)
+
+     # NOTE: The distributions pulled from API uses "py" (package_type) as key for "python"
+     #       so we need to map "python" to "py"
+     #       See PackageCloud::Validator#distributions
+     package_type = package_type == "python" ? "py": package_type
+
+     distribution_id(repo, filenames, package_type)
+    end
+
     def distribution_id(repo, filenames, package_type)
       if distributions[package_type]
         _,_,dist_sel,ver_sel = repo.split("/")

data/lib/package_cloud/version.rb

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

data/package_cloud.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "json_pure", "~> 2.3.0"
   spec.add_runtime_dependency "rainbow", "2.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,34 @@
 --- !ruby/object:Gem::Specification
 name: package_cloud
 version: !ruby/object:Gem::Version
-  version: 0.3.09
+  version: 0.3.14
 platform: ruby
 authors:
 - Joe Damato
 autorequire:
 bindir: bin
-cert_chain: []
-date: 2022-07-15 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDKDCCAhCgAwIBAgIBAjANBgkqhkiG9w0BAQsFADA6MQ0wCwYDVQQDDARzajI2
+  MRQwEgYKCZImiZPyLGQBGRYEc2oyNjETMBEGCgmSJomT8ixkARkWA2NvbTAeFw0y
+  MzA3MTIwODU1NTFaFw0yNDA3MTEwODU1NTFaMDoxDTALBgNVBAMMBHNqMjYxFDAS
+  BgoJkiaJk/IsZAEZFgRzajI2MRMwEQYKCZImiZPyLGQBGRYDY29tMIIBIjANBgkq
+  hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsr60Eo/ttCk8GMTMFiPr3GoYMIMFvLak
+  xSmTk9YGCB6UiEePB4THSSA5w6IPyeaCF/nWkDp3/BAam0eZMWG1IzYQB23TqIM0
+  1xzcNRvFsn0aQoQ00k+sj+G83j3T5OOV5OZIlu8xAChMkQmiPd1NXc6uFv+Iacz7
+  kj+CMsI9YUFdNoU09QY0b+u+Rb6wDYdpyvN60YC30h0h1MeYbvYZJx/iZK4XY5zu
+  4O/FL2ChjL2CPCpLZW55ShYyrzphWJwLOJe+FJ/ZBl6YXwrzQM9HKnt4titSNvyU
+  KzE3L63A3PZvExzLrN9u09kuWLLJfXB2sGOlw3n9t72rJiuBr3/OQQIDAQABozkw
+  NzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU99dfRjEKFyczTeIz
+  m3ZsDWrNC80wDQYJKoZIhvcNAQELBQADggEBAHplXTmXnsLZKl6th6Twlbpl3iBl
+  7aRpOrLc7g8WIEirjiWlYZXjhdG6XoiIQAQtV3XniQ6npRPw7Np8AhSR1LOlvbOs
+  hEdArvs/OZy9cN7fQNduZFK1dkbYCF4waBTycsQFvrzcJzRmjhS9BJd0rroetldo
+  nmPzAzlAl9rIOQC/c763FVfdbPQu+mxcj4JCfVElUzxK+4igyB6SFMckMPSZIJbi
+  cxvXzM34LVue8vISlf/2VKpawD3kQinfo1I53MP3Hv3EihDc4p14E4hdAILtHd5r
+  k6d9rkvRe0/YFTLB1hzK6scdAUcD91NOylY8s4cypQv/mk+OTbQ9+Xy7tyU=
+  -----END CERTIFICATE-----
+date: 2023-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -84,16 +104,16 @@ dependencies:
   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
@@ -178,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.16
 signing_key:
 specification_version: 4
 summary: The https://packagecloud.io CLI for uploading Node.js, Debian, RPM, RubyGem,

metadata.gz.sig

@@ -0,0 +1,2 @@
+(S-3���	�]C�Q�޽�%�].�*m��5W��R��E�!�M��cm��1.=���ܹ���\,uw�P�7p,"a�l�'
+�ؔ�z���k)��}����p�D��#� ����FQ�f��.�\17�[Z��_�~�����y�b��C�3��a,V}z|릈��_1�Z���iJ7m��9]*��+�Yլ��hnOX�wȍ��w�d��(��h����"��Έ)l|���.��Ӫ�ӈ΋f���8���k��Qt'$