package_cloud 0.2.19 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 714e745b9a9a3698fb86a59f64455c4b272f1b38
-  data.tar.gz: 7b5b6d09fe216197229df265c29dd636d094d774
+  metadata.gz: 2c0bb5c1a5dd0a5b2fb88d991e59bab6ccce8554
+  data.tar.gz: 5619e3ec3060eafa464a436a767a75641b70e5e2
 SHA512:
-  metadata.gz: c7ce9a358a39ddbb6b55531686634998f23eceb45a94d1707166c6eb66c29c79e49898ea99689359221ffae7c86915a2a1c5346a1294ebef9cc3b670bb7ce598
-  data.tar.gz: 843fee7ac66f99a4d58bb8d3b256e47508e86094f1ff02a787e48f342380a44774008c9392121c63b000c3dc3d17f6023479eb0c38cf5dbfaa1ffe9017e308c1
+  metadata.gz: 147e37c0ee59d977a5bb4ccdb06b7462f44c27882546d741740106557971f96107ba8ea24f0503ac2b9fae3565601518812971b9da6ff63cccbfd041653b6377
+  data.tar.gz: 77a12451e17c30770a191300a2b5c8c0a551858a9e3d66260822a5e1182c5e3c2e653882b8fe8ed0232588912d3f9709c211926e2c97cb8be65b7f2d5014be4c

data/lib/package_cloud/cli.rb

@@ -1,8 +1,10 @@
 require "colorize"
 require "thor"
+require "logger"
+require "benchmark"
 
 module PackageCloud
-  module CLI 
+  module CLI
     autoload :Distro,      "package_cloud/cli/distro"
     autoload :Entry,       "package_cloud/cli/entry"
     autoload :MasterToken, "package_cloud/cli/master_token"
@@ -12,9 +14,18 @@ module PackageCloud
     class Base < Thor
       class_option "config"
       class_option "url"
+      class_option "verbose"
 
       private
         def config
+          $logger = ::Logger.new(STDOUT)
+          $verbose = !!options[:verbose]
+          if $verbose
+            $logger.level = ::Logger::DEBUG
+            $logger.debug("verbose mode enabled")
+          else
+            $logger.level = ::Logger::WARN
+          end
           @config ||= begin
             ConfigFile.new(options[:config] || "~/.packagecloud",
                          options[:url] || "https://packagecloud.io").tap(&:read_or_create)

data/lib/package_cloud/cli/distro.rb

@@ -4,7 +4,11 @@ module PackageCloud
       desc "list package_type",
            "list available distros and versions for package_type"
       def list(package_type)
-        distros = client.distributions[package_type]
+        distros = nil
+        measurement = Benchmark.measure {
+          distros = client.distributions[package_type]
+        }
+        $logger.debug("distro list request timing: #{measurement}")
         if distros
           puts "Listing distributions for #{package_type}:"
           distros.each do |distro|

data/lib/package_cloud/cli/entry.rb

@@ -40,60 +40,70 @@ module PackageCloud
       option "skip-file-ext-validation", :type => :boolean
       option "yes", :type => :boolean
       def push(repo, package_file, *package_files)
-        ARGV.clear # otherwise gets explodes
-        package_files << package_file
-
-        exts = package_files.map { |f| f.split(".").last }.uniq
+        total_time = Benchmark.measure do
+          ARGV.clear # otherwise gets explodes
+          package_files << package_file
 
-        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.".red)
-        end
-
-        invalid_packages = package_files.select do |f|
-          !["gem", "deb", "rpm", "dsc"].include?(f.split(".").last)
-        end
+          exts = package_files.map { |f| f.split(".").last }.uniq
 
-        if !options.has_key?("skip-file-ext-validation") && invalid_packages.any?
-          message = "I don't know how to push these packages:\n\n".red
-          invalid_packages.each do |p|
-            message << "  #{p}\n"
+          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.".red)
           end
-          message << "\npackage_cloud only supports debs, gems, and rpms.".red
-          abort(message)
-        end
 
-        if !options.has_key?("yes") && exts.first == "gem" && package_files.length > 1
-          answer = get_valid("Are you sure you want to push #{package_files.length} packages? (y/n)") do |s|
-            s == "y" || s == "n"
+          invalid_packages = package_files.select do |f|
+            !["gem", "deb", "rpm", "dsc"].include?(f.split(".").last)
           end
 
-          if answer != "y"
-            abort("Aborting...".red)
+          if !options.has_key?("skip-file-ext-validation") && invalid_packages.any?
+            message = "I don't know how to push these packages:\n\n".red
+            invalid_packages.each do |p|
+              message << "  #{p}\n"
+            end
+            message << "\npackage_cloud only supports debs, gems, and rpms.".red
+            abort(message)
           end
-        end
 
-        validator = Validator.new(client)
-        dist_id   = validator.distribution_id(repo, package_files, exts.first)
+          if !options.has_key?("yes") && exts.first == "gem" && package_files.length > 1
+            answer = get_valid("Are you sure you want to push #{package_files.length} packages? (y/n)") do |s|
+              s == "y" || s == "n"
+            end
 
-        # strip os/dist
-        repo = repo.split("/")[0..1].join("/")
+            if answer != "y"
+              abort("Aborting...".red)
+            end
+          end
 
-        print "Looking for repository at #{repo}... "
-        repo = client.repository(repo)
-        print "success!\n"
+          validator = Validator.new(client)
+          dist_id   = validator.distribution_id(repo, package_files, exts.first)
 
-        package_files.each do |f|
-          files = nil
-          ext = f.split(".").last
+          # strip os/dist
+          split_repo = repo.split("/")[0..1].join("/")
 
-          if ext == "dsc"
-            print "Checking source package #{f}... "
-            files = parse_and_verify_dsc(repo, f, dist_id)
+          print "Looking for repository at #{split_repo}... "
+          client_repo = nil
+          measurement = Benchmark.measure do
+            client_repo = client.repository(split_repo)
           end
+          print "success!\n"
+          $logger.debug("repository lookup request timing: #{measurement}")
+
+          package_files.each do |f|
+            files = nil
+            ext = f.split(".").last
 
-          print "Pushing #{f}... "
-          repo.create_package(f, dist_id, files, ext)
+            if ext == "dsc"
+              print "Checking source package #{f}... "
+              files = parse_and_verify_dsc(client_repo, f, dist_id)
+            end
+
+            print "Pushing #{f}... "
+            measurement = Benchmark.measure do
+              client_repo.create_package(f, dist_id, files, ext)
+            end
+            $logger.debug("create package request timing: #{measurement}")
+          end
         end
+        $logger.debug("push command total timing: #{total_time}")
       end
 
       desc "version",

data/lib/package_cloud/repository.rb

@@ -12,7 +12,7 @@ module PackageCloud
       begin
         resp = RestClient::Request.execute(:method => 'post',
                                            :url => url,
-                                           :timeout => -1,
+                                           :timeout => nil,
                                            :payload => { :package => {:package_file      => file_data,
                                                                       :distro_version_id => dist_id}})
         resp = JSON.parse(resp)
@@ -46,7 +46,7 @@ module PackageCloud
       begin
         RestClient::Request.execute(:method => 'post',
                                     :url => url,
-                                    :timeout => -1,
+                                    :timeout => nil,
                                     :payload => { :package =>  params })
         print "success!\n".green
       rescue RestClient::UnprocessableEntity => e

data/lib/package_cloud/version.rb

@@ -1,7 +1,7 @@
 module PackageCloud
   MAJOR_VERSION = "0"
   MINOR_VERSION = "2"
-  PATCH_VERSION = "19"
+  PATCH_VERSION = "20"
 
   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.2.19
+  version: 0.2.20
 platform: ruby
 authors:
 - Joe Damato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: https://packagecloud.io