package_cloud 0.3.10 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 742e3bad6322b16c1174addee4ee290a0eb880bc3f1150deb5367a0733c49a33
-  data.tar.gz: e3aae0a0e065b9880548d035a835a26eba3b46827a5ac6f579ac5cdc160a4364
+  metadata.gz: ebf04b9bf18aac29f88bcd67e07322fe922359021c004a33975c9dbc110ceb75
+  data.tar.gz: 5e2be465b0f1823b6e1df58b8346f6fb627a3693414b7b7487db21f9bb116945
 SHA512:
-  metadata.gz: 4a3e4cbea1c841372a448cbb87947449410d2b5bbba384239ed14d006b8ee39c055e58003db21a23024607c6703eeb473631c2766021b2899976e0d3aa21297a
-  data.tar.gz: f694739c61f3a63f1c84abb45246c7ae638a3affbb01868c3bb4e2c1aa1a95203e2178ef9d355b78cf38243bc19f014c460f377afbc3352778800e8e7d5bffcf
+  metadata.gz: 3f0f0327922943e4b61848cf815c4fa0ad2352b920e58019f5c0223b4d896af876de7ebfbb570e4cae92a9db4147c7be933a4c1bc48307facf1dba98a092983f
+  data.tar.gz: 5dd52a13fa14a138516612b5adcf672a0feb804689f737f216aeee8e429b852e250cdd42014a9617743d5a9793ace0867d5ab8f3c3381150bf22902bd8f827e9

data/lib/package_cloud/cli/entry.rb

@@ -1,10 +1,10 @@
 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 = []
-    AMBIGUOUS_EXTS = ["tgz", "apk"]
+    AMBIGUOUS_EXTS = ["tgz", "apk", "zip"]
     SUPPORTED_EXTS = JAVA_EXTS + PY_EXTS + ANYFILE_EXTS + AMBIGUOUS_EXTS + ["gem", "deb", "rpm", "dsc"]
 
     class Entry < Base
@@ -107,13 +107,11 @@ module PackageCloud
                             :desc => "Specify the exact maven coordinates to use for a JAR. Useful for JARs without coordinates, 'fat JARs', and WARs."
 
       def push(repo, package_file, *package_files)
-puts "################### push- repo: #{repo.inspect}"
         total_time = Benchmark.measure do
           ARGV.clear # otherwise gets explodes
           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))
@@ -158,7 +156,7 @@ puts "################### push- repo: #{repo.inspect}"
             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_url(repo, package_files)
+            dist_id   = validator.distribution_id_from_repo_url(repo, package_files)
           else
             dist_id   = validator.distribution_id(repo, package_files, exts.first)
           end
@@ -204,17 +202,6 @@ puts "################### push- repo: #{repo.inspect}"
       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'

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

data/lib/package_cloud/validator.rb

@@ -4,11 +4,17 @@ module PackageCloud
       @client = client
     end
 
-    def distribution_id_from_url(repo, filenames)
+    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}"
-    distribution_id(repo, filenames, package_type)
+     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)

data/lib/package_cloud/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: package_cloud
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.12
 platform: ruby
 authors:
 - Joe Damato
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-01 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -163,7 +163,7 @@ homepage: https://packagecloud.io
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -178,8 +178,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.2.28
+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