package_cloud 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 742e3bad6322b16c1174addee4ee290a0eb880bc3f1150deb5367a0733c49a33
-  data.tar.gz: e3aae0a0e065b9880548d035a835a26eba3b46827a5ac6f579ac5cdc160a4364
+  metadata.gz: 6b5523eccf8d9b23c5a3b222818a680bd585560c2e898bee15a88a7c35b969f0
+  data.tar.gz: ab27f540c2bd98e2a312ad0b8ed34ff036a78b3ef440355d0b65a0812fb2b6a9
 SHA512:
-  metadata.gz: 4a3e4cbea1c841372a448cbb87947449410d2b5bbba384239ed14d006b8ee39c055e58003db21a23024607c6703eeb473631c2766021b2899976e0d3aa21297a
-  data.tar.gz: f694739c61f3a63f1c84abb45246c7ae638a3affbb01868c3bb4e2c1aa1a95203e2178ef9d355b78cf38243bc19f014c460f377afbc3352778800e8e7d5bffcf
+  metadata.gz: 7b7f861f0cebb2a24d4ed81c1119656198638b7b574f2d72fdc07efb68564b42b5b4a850b8980483fcca18cac817ea7c9302803ba439dd755f36e5dfe622269b
+  data.tar.gz: 9034cef17e319ab4e4d962e55e8488d6e3a31df096f38f371bc40c71adbe02f1476401eac44f812e2ebf761be1c41efa95a3c98b20f068d02de782dfa2a61d0c

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/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 = "11"
 
   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.11
 platform: ruby
 authors:
 - Joe Damato
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-01 00:00:00.000000000 Z
+date: 2022-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor