package_cloud 0.3.09 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 826f31e8a6707526bd6f82609c43677b162464688596785a338be6f7a35acf44
-  data.tar.gz: '096e57c694454dda57219d8ca2b79e63b58d46ce4711176e745518c33ed62d7d'
+  metadata.gz: 6b5523eccf8d9b23c5a3b222818a680bd585560c2e898bee15a88a7c35b969f0
+  data.tar.gz: ab27f540c2bd98e2a312ad0b8ed34ff036a78b3ef440355d0b65a0812fb2b6a9
 SHA512:
-  metadata.gz: bb785da285b810f8b6bebe17354a9f782ec5afa4c36acc32a74628908ef332003b07af77cef3db5a4c550a939bce529bc4320dcc98dc28beb4af4ef4fec8a442
-  data.tar.gz: 1aa70e22f8d994b0f0a5a2324d534a7c25f02d60e76d8298b4eb0307ecd915a4a72fb45ce0c7e6d4350c68b9db4b7c4eb20b87fc0142b11446beac2c5c5c6265
+  metadata.gz: 7b7f861f0cebb2a24d4ed81c1119656198638b7b574f2d72fdc07efb68564b42b5b4a850b8980483fcca18cac817ea7c9302803ba439dd755f36e5dfe622269b
+  data.tar.gz: 9034cef17e319ab4e4d962e55e8488d6e3a31df096f38f371bc40c71adbe02f1476401eac44f812e2ebf761be1c41efa95a3c98b20f068d02de782dfa2a61d0c

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"
@@ -111,7 +112,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 +130,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 +155,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
@@ -199,17 +202,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'

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