package_cloud 0.3.00 → 0.3.02

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7b7267e4072d89dfb7b37402fab0562c751942f
-  data.tar.gz: 5bf8178c9882d9bc6cb27d10f3ed579f89ee1917
+  metadata.gz: a53ac5d579105b8fa81aad30b5da73057ebea78e
+  data.tar.gz: 05def5f60f2367cd5bf1136b93280e6165e18a4c
 SHA512:
-  metadata.gz: 05aa38f73f717f09eb5c3463f8c81aa1d19a9fa2ca3c2b88fbc3a8ccc1c853bba0735c7926ffa6a059d62ed9bc27208bb8f1e4b64ae9a40e4a59254bc5a75c14
-  data.tar.gz: d9670c97b42e3b8bc4decfa718fd284859937aaaad2175a0747b4673d797cf1443704808a9e38d2bba248e9b550b424fe6da083ce8cf072d997e49397c7cacad
+  metadata.gz: b0f41df24be0a738ed0cd5c255c6a184449690189357b81ace3a9c7c41edc860db7c7ba13da643822d79be27d0cc122050ce4f6d8fe84fb896738678dce159f6
+  data.tar.gz: 0b4dc62bfe2f6e13e5f5956a067b065b88966160dd5120d05a07336e9015b72cd110632fc164e1e2a68663856d1b9007e9c4b4e01baeb809874f5737b86a4db1

data/README.md

@@ -9,8 +9,8 @@ Only Ruby 2.x and greater is supported, please use version 0.2.45 for Ruby 1.9 s
 ## Overview
 The `package_cloud` command line client allows you to easily:
 
-* Create Debian, RPM, RubyGem, Python, and Maven package repositories on [packagecloud](https://packagecloud.io).
-* Upload Debian, RPM, RubyGem, Python, and Java JAR/WAR packages to your repositories.
+* Create Node.js, Debian, RPM, RubyGem, Python, and Maven package repositories on [packagecloud](https://packagecloud.io).
+* Upload Node.js, Debian, RPM, RubyGem, Python, and Java JAR/WAR/AAR packages to your repositories.
 * [Delete packages](https://packagecloud.io/docs#yank_pkg).
 * [Promote packages](https://packagecloud.io/docs#promote_pkg) between repositories.
 * Upload a package signing GPG key.
@@ -84,7 +84,7 @@ uploading. See the examples that follow for more information.
 Please note that packages will be available for download via the packagecloud web UI
 immediately after they are uploaded, but they will not necessarily be
 available for installation via a package manager immediately. This is because
-our system rengenerates the repository metadata needed by package managers as a
+our system regenerates the repository metadata needed by package managers as a
 background job on our system. Jobs are added to a queue and processed.
 Processing time depends on the number of packages in your repository and the
 number of reindex jobs in front of yours.
@@ -174,7 +174,7 @@ If you'd like to upload a Python egg despite this, you can do so by running:
 $ package_cloud push example-user/example-repository/python /tmp/example.egg
 ```
 
-#### Uploading a Java JAR or WAR package
+#### Uploading a Java JAR, WAR, or AAR package
 
 You can upload a Java JAR package found at the path `/tmp/example.jar` by
 running:
@@ -195,6 +195,14 @@ coordinates manually on the command line:
 $ package_cloud push example-user/example-repository/java/maven2 /tmp/example.jar --coordinates=com.mygroup:packagename:1.0.2
 ```
 
+#### Uploading a Node.js package
+
+To upload a Node.js package located at `/tmp/test-1.0.0.tgz` to a packagecloud NPM registry called `example-user/example-repository`:
+
+```
+$ package_cloud push example-user/example-repository/node /tmp/example-1.0.tgz
+```
+
 #### Additional options
 
 There are a few additional options you can use to fine tune package upload for
@@ -251,7 +259,7 @@ metadata.
 
 #### Deleting an RPM package
 
-You can delete an RPM package named `example-1.0-1.x86_64.rpm' that was
+You can delete an RPM package named `example-1.0-1.x86_64.rpm` that was
 uploaded for CentOS 6 from the repository `example-repository` owned by
 the user `example-user` by running the following command:
 
@@ -282,7 +290,7 @@ You can delete a Python package named `example-1.0.1.whl` from the repository
 command:
 
 ```
-$ package_cloud yank example-user/example-repository example-1.0.1.whl
+$ package_cloud yank example-user/example-repository/python example-1.0.1.whl
 ```
 
 This will delete the package and trigger a reindex of the repository's metadata.
@@ -291,17 +299,36 @@ Python eggs and sdists can be deleted in a similar manner.
 
 #### Deleting a Java package
 
-You can delete a Java package named `example-1.0.3.jar` from the repository
+You can delete a Java package named `example-1.0.3.jar` with the group `com.groupid` from the repository
 `example-repository` owned by the user `example-user` by running the following
 command:
 
 ```
-$ package_cloud yank example-user/example-repository example-1.0.3.jar
+$ package_cloud yank example-user/example-repository/java com.groupid/example-1.0.3.jar
 ```
 
 This will delete the package and trigger a reindex of the repository's
 metadata. WARs can be deleted in a similar manner.
 
+#### Deleting a Node.js package
+
+You can delete a Node.js package named `example-1.0.tgz` from the NPM registry
+`example-repository` owned by the user `example-user` by running the following
+command:
+
+```
+$ package_cloud yank example-user/example-repository/node example-1.0.tgz
+```
+
+If the package has a scope, you can delete it by passing the scope like so:
+
+```
+$ package_cloud yank example-user/example-repository/node @scoped-user/example-1.0.tgz
+```
+
+This will delete the package and trigger a reindex of the registry's
+metadata.
+
 ### GPG Keys
 
 Some package managers use [GPG keys](https://packagecloud.io/docs#gpg)
@@ -372,6 +399,19 @@ named `repo2`, you would issue the following command:
 $ package_cloud promote example-user/repo1/ubuntu/xenial example_1.0-1_amd64.deb example-user/repo2
 ```
 
+If the package has a scope (Node.js packages), you can promote it by including the scope like so:
+
+```
+$ package_cloud promote example-user/repo1/node @scoped-user/example-1.0.tgz example-user/repo2
+```
+
+If the package has a group (Java packages), you can promote it by including the group like so:
+
+```
+$ package_cloud promote example-user/repo1/java com.groupid/jake-2.3.jar example-user/repo2
+```
+
+
 After the package is moved, a reindex will be triggered for both `repo1` and
 `repo2`.
 

data/lib/package_cloud/cli/entry.rb

@@ -1,5 +1,10 @@
 module PackageCloud
   module CLI
+    JAVA_EXTS = ["jar", "aar", "war"]
+    PY_EXTS = ["gz", "bz2", "z", "tar", "egg-info", "zip", "whl", "egg"]
+    NODE_EXTS = ["tgz"]
+    SUPPORTED_EXTS = JAVA_EXTS + PY_EXTS + NODE_EXTS + ["gem", "deb", "rpm", "dsc"]
+
     class Entry < Base
       desc "repository SUBCMD ...ARGS", "manage repositories"
       subcommand "repository", Repository
@@ -16,13 +21,13 @@ module PackageCloud
       desc "gpg_key SUBCMD ...ARGS", "manage GPG keys"
       subcommand "gpg_key", GpgKey
 
-      desc "promote user/repo[/distro/version] package_name user/destination_repo",
+      desc "promote user/repo[/distro/version] [@scope/]package_name user/destination_repo",
            "promotes a package from user/repo [in dist/version] to user/destination_repo [also in dist/version]"
       def promote(source_repo_desc, package_name, dest_repo_desc)
         repo_name = source_repo_desc.split("/")[0..1].join("/")
         dist = source_repo_desc.split("/")[2..3].join("/")
 
-        dest_repo_name = dest_repo_desc.split("/")[0..1].join("/")
+        dest_repo_name = expand_dist_shortcut(dest_repo_desc.split("/")[0..1].join("/"))
 
         if dist == "" && package_name =~ /\.gem$/
           dist = "gems"
@@ -36,19 +41,25 @@ module PackageCloud
         repo = client.repository(dest_repo_desc)
         print "success!\n"
 
-        print "Attempting to promote #{repo_name}/#{dist}/#{package_name} to #{dest_repo_name}..."
-        packages = src_repo.promote(dist, package_name, dest_repo_name)
+        if package_name.include?('@')
+          print "Attempting to promote scoped package #{repo_name}/#{dist} #{package_name} to #{dest_repo_name}..."
+          scope, unscoped_package_name = package_scope(package_name)
+          packages = src_repo.promote(dist, unscoped_package_name, dest_repo_name, scope)
+        else
+          print "Attempting to promote #{repo_name}/#{dist}/#{package_name} to #{dest_repo_name}..."
+          packages = src_repo.promote(dist, package_name, dest_repo_name)
+        end
         puts "done!".color(:green)
       end
 
-      desc "yank user/repo[/distro/version] package_name",
+      desc "yank user/repo[/distro/version] [@scope/]package_name",
            "yank package from user/repo [in dist/version]"
       def yank(repo_desc, package_name)
         ARGV.clear # otherwise gets explodes
 
         # strip os/dist
         repo_name = repo_desc.split("/")[0..1].join("/")
-        dist = repo_desc.split("/")[2..3].join("/")
+        dist = expand_dist_shortcut(repo_desc.split("/")[2..3].join("/"))
 
         if dist == "" && package_name =~ /\.gem$/
           dist = "gems"
@@ -58,8 +69,14 @@ module PackageCloud
         repo = client.repository(repo_desc)
         print "success!\n"
 
-        print "Attempting to yank package at #{repo_name}/#{dist}/#{package_name}..."
-        packages = repo.yank(dist, package_name)
+        if package_name.include?('@')
+          scope, unscoped_package_name = package_scope(package_name)
+          print "Attempting to yank scoped package at #{repo_name}/#{dist} #{package_name}..."
+          repo.yank(dist, unscoped_package_name, scope)
+        else
+          print "Attempting to yank package at #{repo_name}/#{dist}/#{package_name}..."
+          repo.yank(dist, package_name)
+        end
         puts "done!".color(:green)
       end
 
@@ -90,10 +107,10 @@ module PackageCloud
           end
 
           invalid_packages = package_files.select do |f|
-            !["gem", "deb", "rpm", "dsc", "gz", "bz2", "z", "tar", "egg-info", "zip", "whl", "egg", "jar", "aar"].include?(f.split(".").last.downcase)
+            !SUPPORTED_EXTS.include?(f.split(".").last.downcase)
           end
 
-          if ["jar", "aar"].include?(exts.first.downcase) && options.has_key?("coordinates")
+          if JAVA_EXTS.include?(exts.first.downcase) && options.has_key?("coordinates")
             puts "Using coordinates #{options["coordinates"].color(:yellow)}"
           end
 
@@ -102,7 +119,7 @@ module PackageCloud
             invalid_packages.each do |p|
               message << "  #{p}\n"
             end
-            message << "\npackage_cloud only supports debs, gems, jars, python packages, and rpms.".color(:red)
+            message << "\npackage_cloud only supports node.js, deb, gem, java, python, or rpm packages".color(:red)
             abort(message)
           end
 
@@ -117,9 +134,11 @@ module PackageCloud
           end
 
           validator = Validator.new(client)
-          if ["gz", "bz2", "z", "tar", "egg-info", "zip", "whl", "egg"].include?(exts.first.downcase)
+          if PY_EXTS.include?(exts.first.downcase)
             dist_id   = validator.distribution_id(repo, package_files, 'py')
-          elsif ["jar", "aar"].include?(exts.first.downcase)
+          elsif NODE_EXTS.include?(exts.first.downcase)
+            dist_id   = validator.distribution_id(repo, package_files, 'node')
+          elsif JAVA_EXTS.include?(exts.first.downcase)
             abort_if_snapshot!(package_files)
             dist_id   = validator.distribution_id(repo, package_files, 'jar')
           else
@@ -167,6 +186,29 @@ module PackageCloud
       end
 
       private
+        def expand_dist_shortcut(dist)
+          case dist
+          when 'java'
+            'java/maven2'
+          when 'python'
+            'python/1'
+          when 'node'
+            'node/1'
+          else
+            dist
+          end
+        end
+
+        def package_scope(package_name)
+          name_parts = package_name.split('/')
+          if name_parts.size != 2 || !package_name.include?('@')
+            abort("Could not determine scope for '#{package_name}', it should look like: @my-scope/package-1.0.tgz".color(:red))
+          end
+          scope = name_parts[0]
+          unscoped_package_name = name_parts[1]
+          [scope, unscoped_package_name]
+        end
+
         def abort_if_snapshot!(files)
           if files.any? { |file| file.include?("-SNAPSHOT")  }
             abort("SNAPSHOT uploads are not supported by the CLI, please use Maven instead: https://packagecloud.io/docs#wagon-instructions")

data/lib/package_cloud/repository.rb

@@ -130,10 +130,14 @@ module PackageCloud
       resp
     end
 
-    def promote(dist, package_name, dest_repo_name)
+    def promote(dist, package_name, dest_repo_name, scope=nil)
       begin
         url = PackageCloud::Util.compute_url(@config.base_url, paths["self"] + "/" + [dist, package_name, "promote.json"].compact.join("/"))
-        resp = RestClient.post(url, :destination => dest_repo_name)
+        resp = if scope
+          RestClient.post(url, destination: dest_repo_name, scope: scope)
+        else
+          RestClient.post(url, destination: dest_repo_name)
+        end
         resp = JSON.parse(resp)
       rescue RestClient::ResourceNotFound => e
         print "error:\n".color(:red)
@@ -146,10 +150,14 @@ module PackageCloud
       end
     end
 
-    def yank(dist, package_name)
+    def yank(dist, package_name, scope=nil)
       begin
         url = PackageCloud::Util.compute_url(@config.base_url, paths["self"] + "/" + [dist, package_name].compact.join("/"))
-        RestClient.delete(url)
+        if scope
+          RestClient.delete(url, params: { scope: scope })
+        else
+          RestClient.delete(url)
+        end
       rescue RestClient::ResourceNotFound => e
         print "error:\n".color(:red)
         json = JSON.parse(e.response)

data/lib/package_cloud/validator.rb

@@ -8,10 +8,8 @@ module PackageCloud
       if distributions[package_type]
         _,_,dist_sel,ver_sel = repo.split("/")
 
-        if dist_sel == "python"
-          dist = distributions[package_type].detect { |d| d["index_name"] == dist_sel }
-          dist["versions"].first["id"]
-        elsif dist_sel == "java"
+        # These are all 'single version' distros
+        if (dist_sel == "python" || dist_sel == "java" || dist_sel == "node")
           dist = distributions[package_type].detect { |d| d["index_name"] == dist_sel }
           dist["versions"].first["id"]
         elsif dist_sel && ver_sel

data/lib/package_cloud/version.rb

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

data/package_cloud.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = PackageCloud::VERSION
   spec.authors       = ["Joe Damato"]
   spec.email         = ["support@packagecloud.io"]
-  spec.description   = %q{The https://packagecloud.io CLI for uploading Debian, RPM, RubyGem, Python, and Java packages. Check our website or the RubyDoc documentation for detailed information.}
-  spec.summary       = %q{The https://packagecloud.io CLI for uploading Debian, RPM, RubyGem, Python, and Java packages. Check our website or the RubyDoc documentation for detailed information.}
+  spec.description   = %q{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 information.}
+  spec.summary       = %q{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 information.}
 
   spec.homepage      = "https://packagecloud.io"
   spec.license       = "MIT"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: package_cloud
 version: !ruby/object:Gem::Version
-  version: 0.3.00
+  version: 0.3.02
 platform: ruby
 authors:
 - Joe Damato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2017-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -108,8 +108,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: The https://packagecloud.io CLI for uploading Debian, RPM, RubyGem, Python,
-  and Java packages. Check our website or the RubyDoc documentation for detailed information.
+description: 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
+  information.
 email:
 - support@packagecloud.io
 executables:
@@ -166,6 +167,7 @@ rubyforge_project:
 rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: The https://packagecloud.io CLI for uploading Debian, RPM, RubyGem, Python,
-  and Java packages. Check our website or the RubyDoc documentation for detailed information.
+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
+  information.
 test_files: []