package_cloud 0.2.33 → 0.2.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09c1d89b6d9533a6974cd926ae0fd37c2baee5ec
-  data.tar.gz: bb9e92a7fb5ea19c67878f928c0ce2a544d79b6d
+  metadata.gz: 642ced8d136425be09627da60884e938d5499574
+  data.tar.gz: 6522da38442c8e0c36889bb34e8a99a8284b97b1
 SHA512:
-  metadata.gz: e37535b42a7e1ecf525cb088f4f7953ff994ee1fbf0f5260b03dd7e1b6664f54535410b4b4ba22bcf5e2b9e7f93b1fc39a7c1067b357f40dc805d4a68333698a
-  data.tar.gz: 3ea8fd07a37b92d58144a87192214ac2d1a73d2b3258f32edbe6efc55876483fba99810eb2e7eb27ce34f7b20151cc87c2de4c2b1ac33e483bccf723fe00bc13
+  metadata.gz: 9628525e042176ea0a32f5793148560f552ee80e60168f426a670b2a3c6c9dc2dab95a33b6cbfa5185ca3916e53968b9b716ee74d8c7d5ef68fd9798cf479bff
+  data.tar.gz: 612870dab5c457616be75a877a7a07b99beed3b3a8fc5fc1192eb52327380545075947dd826eae34204e91c2b535ad5b7d59b2e8e3976451a37fdbbb51108c76

data/lib/package_cloud.rb

@@ -1,5 +1,6 @@
 require "package_cloud/version"
 require "cgi"
+require 'rainbow/ext/string'
 
 module PackageCloud
   autoload :Auth, "package_cloud/auth"

data/lib/package_cloud/cli.rb

@@ -1,4 +1,3 @@
-require "colorize"
 require "thor"
 require "logger"
 require "benchmark"

data/lib/package_cloud/cli/distro.rb

@@ -21,7 +21,7 @@ module PackageCloud
 
           puts "\nIf you don't see your distribution or version here, email us at support@packagecloud.io."
         else
-          puts "No distributions exist for #{package_type}.".red
+          puts "No distributions exist for #{package_type}.".color(:red)
           puts "That either means that we don't support #{package_type} or that it doesn't require a distribution/version."
           exit(1)
         end

data/lib/package_cloud/cli/entry.rb

@@ -32,7 +32,7 @@ module PackageCloud
 
         print "Attempting to yank package at #{repo_name}/#{dist}/#{package_name}..."
         packages = repo.yank(dist, package_name)
-        puts "done!".green
+        puts "done!".color(:green)
       end
 
       desc "push user/repo[/distro/version] /path/to/packages",
@@ -48,7 +48,7 @@ module PackageCloud
           exts = package_files.map { |f| f.split(".").last }.uniq
 
           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)
+            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))
           end
 
           invalid_packages = package_files.select do |f|
@@ -56,11 +56,11 @@ module PackageCloud
           end
 
           if !options.has_key?("skip-file-ext-validation") && invalid_packages.any?
-            message = "I don't know how to push these packages:\n\n".red
+            message = "I don't know how to push these packages:\n\n".color(:red)
             invalid_packages.each do |p|
               message << "  #{p}\n"
             end
-            message << "\npackage_cloud only supports debs, gems, jars, python packages, and rpms.".red
+            message << "\npackage_cloud only supports debs, gems, jars, python packages, and rpms.".color(:red)
             abort(message)
           end
 
@@ -70,7 +70,7 @@ module PackageCloud
             end
 
             if answer != "y"
-              abort("Aborting...".red)
+              abort("Aborting...".color(:red))
             end
           end
 
@@ -135,7 +135,7 @@ module PackageCloud
           begin
             client_repo.create_package(f, dist_id, files, ext)
           rescue RestClient::UnprocessableEntity => e
-            print "error (skipping):\n".yellow
+            print "error (skipping):\n".color(:yellow)
             json = JSON.parse(e.response)
             json.each do |k,v|
               puts "\n\t#{k}: #{v.join(", ")}\n"
@@ -148,7 +148,7 @@ module PackageCloud
           begin
             client_repo.create_package(f, dist_id, files, ext)
           rescue RestClient::UnprocessableEntity => e
-            print "error:\n".red
+            print "error:\n".color(:red)
             json = JSON.parse(e.response)
             json.each do |k,v|
               if v.is_a? String
@@ -173,14 +173,14 @@ module PackageCloud
           files.each do |f|
             filepath = File.join(dir, f["filename"])
             if !File.exists?(filepath)
-              print "Unable to find file name: #{f["filename"]} for source package: #{filepath}\n".red
-              abort("Aborting...".red)
+              print "Unable to find file name: #{f["filename"]} for source package: #{filepath}\n".color(:red)
+              abort("Aborting...".color(:red))
             end
 
             disk_size = File.stat(filepath).size
             if disk_size != f["size"]
-              print "File #{f["filename"]} has size: #{disk_size}, expected: #{f["size"]}\n".red
-              abort("Aborting...".red)
+              print "File #{f["filename"]} has size: #{disk_size}, expected: #{f["size"]}\n".color(:red)
+              abort("Aborting...".color(:red))
             end
 
             print "Found DSC package file #{f["filename"]} for upload\n"

data/lib/package_cloud/cli/master_token.rb

@@ -31,7 +31,7 @@ module PackageCloud
 
         print "Attempting to create token named #{token_name}... "
         resp = repo.create_master_token(token_name)
-        print "success!\n".green
+        print "success!\n".color(:green)
         print "Master token #{resp['name']} with value #{resp['value']} created.\n"
       end
 
@@ -41,7 +41,7 @@ module PackageCloud
         ARGV.clear # otherwise gets explodes
 
         if token_name == "default"
-          abort("You can't delete the default master_token.".red)
+          abort("You can't delete the default master_token.".color(:red))
         end
 
         print "Looking for repository at #{repo_name}... "
@@ -61,12 +61,12 @@ module PackageCloud
           if answer == "y"
             print "Attempting to destroy token named #{token_name}... "
             token.destroy
-            print "success!\n".green
+            print "success!\n".color(:green)
           else
-            puts "Aborting...".red
+            puts "Aborting...".color(:red)
           end
         else
-          puts "Wasn't able to find a token named #{token_name}.".red
+          puts "Wasn't able to find a token named #{token_name}.".color(:red)
           exit(1)
         end
       end

data/lib/package_cloud/cli/read_token.rb

@@ -10,21 +10,21 @@ module PackageCloud
         given_master_token, given_read_token = master_and_read_token.split("/")
 
         if given_master_token.nil? || given_read_token.nil?
-          print "invalid master token and/or read token!\n".red
+          print "invalid master token and/or read token!\n".color(:red)
           exit(127)
         end
 
         master_token = repo.master_tokens.detect { |t| t.name == given_master_token }
 
         if master_token.nil?
-          print "couldn't find master token named #{given_master_token}\n".red
+          print "couldn't find master token named #{given_master_token}\n".color(:red)
           exit(127)
         end
 
         read_token = master_token.read_tokens.detect { |t| t.name == given_read_token }
 
         if read_token.nil?
-          print "couldn't find read token named #{given_read_token} for #{given_master_token}\n".red
+          print "couldn't find read token named #{given_read_token} for #{given_master_token}\n".color(:red)
           exit(127)
         end
 
@@ -36,4 +36,4 @@ module PackageCloud
       end
     end
   end
-end
+end

data/lib/package_cloud/cli/repository.rb

@@ -10,7 +10,7 @@ module PackageCloud
 
         print "Looking for repository at #{repo_name}... "
         repo = client.create_repo(repo_name, options[:private])
-        print "success!\n".green
+        print "success!\n".color(:green)
         puts "Your repository has been created at:"
         puts "    #{repo["url"]}"
       end
@@ -36,7 +36,7 @@ module PackageCloud
            "install user/repo for package_type"
       def install(repo, package_type)
         if Process.uid != 0 && package_type != "gem"
-          abort("You have to run install as root.".red)
+          abort("You have to run install as root.".color(:red))
         end
 
         print "Locating repository at #{repo}... "

data/lib/package_cloud/client.rb

@@ -13,7 +13,7 @@ module PackageCloud
         attrs = JSON.parse(RestClient.get(url))
         attrs.map { |a| Repository.new(a, @config) }
       rescue RestClient::ResourceNotFound => e
-        print "failed!\n".red
+        print "failed!\n".color(:red)
         exit(127)
       end
     end
@@ -24,13 +24,13 @@ module PackageCloud
       begin
         attrs = JSON.parse(RestClient.get(url))
         if attrs["error"] == "not_found"
-          print "failed... Repository #{user}/#{repo} not found!\n".red
+          print "failed... Repository #{user}/#{repo} not found!\n".color(:red)
           exit(127)
         end
 
         Repository.new(attrs, @config)
       rescue RestClient::ResourceNotFound => e
-        print "failed!\n".red
+        print "failed!\n".color(:red)
         exit(127)
       end
     end
@@ -40,7 +40,7 @@ module PackageCloud
       begin
         JSON.parse(RestClient.post(url, :repository => {:name => name, :private => priv == "private" ? "1" : "0"}))
       rescue RestClient::UnprocessableEntity => e
-        print "error!\n".red
+        print "error!\n".color(:red)
         json = JSON.parse(e.response)
         json.each do |k,v|
           puts "\n\t#{k}: #{v.join(", ")}\n"
@@ -55,7 +55,7 @@ module PackageCloud
       begin
         JSON.parse(RestClient.get(url))
       rescue RestClient::ResourceNotFound => e
-        print "failed!\n".red
+        print "failed!\n".color(:red)
         exit(127)
       end
     end
@@ -65,7 +65,7 @@ module PackageCloud
       begin
         JSON.parse(RestClient.get(url))
       rescue RestClient::ResourceNotFound => e
-        print "failed!\n".red
+        print "failed!\n".color(:red)
         exit(127)
       end
     end

data/lib/package_cloud/config_file.rb

@@ -55,7 +55,7 @@ module PackageCloud
           message = "It appears your locale is set to #{default_encoding}, " +
               "please use UTF-8 instead. Run the 'locale' command to get" +
               "more info or e-mail support@packagecloud.io for help"
-          abort(message.red)
+          abort(message.color(:red))
         end
       end
 
@@ -79,7 +79,7 @@ module PackageCloud
       def assert_reasonable_gem_version
         gem_version = Client.new(self).gem_version
         if gem_version["minor"] != MINOR_VERSION
-          abort("This gem is out of date. Please update it!".red)
+          abort("This gem is out of date. Please update it!".color(:red))
         elsif gem_version["patch"] > PATCH_VERSION
           $stderr << "[WARNING] There's a newer version of the package_cloud gem. Install it when you get a chance!\n"
         end

data/lib/package_cloud/repository.rb

@@ -19,7 +19,7 @@ module PackageCloud
         print "success!\n"
         resp["files"]
       rescue RestClient::UnprocessableEntity => e
-        print "error:\n".red
+        print "error:\n".color(:red)
         json = JSON.parse(e.response)
         json.each do |k,v|
           puts "\n\t#{k}: #{v.join(", ")}\n"
@@ -47,7 +47,7 @@ module PackageCloud
                                   :url => url,
                                   :timeout => -1,
                                   :payload => { :package =>  params })
-      print "success!\n".green
+      print "success!\n".color(:green)
     end
 
     def install_script(type)
@@ -68,7 +68,7 @@ module PackageCloud
         resp = RestClient.post(url, :master_token => {:name => name})
         resp = JSON.parse(resp)
       rescue RestClient::UnprocessableEntity => e
-        print "error:\n".red
+        print "error:\n".color(:red)
         json = JSON.parse(e.response)
         json.each do |k,v|
           puts "\n\t#{k}: #{v.join(", ")}\n"
@@ -84,7 +84,7 @@ module PackageCloud
         url = PackageCloud::Util.compute_url(@config.base_url, paths["self"] + "/" + [dist, package_name].compact.join("/"))
         RestClient.delete(url)
       rescue RestClient::ResourceNotFound => e
-        print "error:\n".red
+        print "error:\n".color(:red)
         json = JSON.parse(e.response)
         json.each do |k,v|
           puts "\n\t#{k}: #{v.join(", ")}\n"
@@ -95,7 +95,7 @@ module PackageCloud
     end
 
     def private_human
-      send(:private) ? "private".red : "public".green
+      send(:private) ? "private".color(:red) : "public".color(:green)
     end
   end
 end

data/lib/package_cloud/validator.rb

@@ -96,7 +96,7 @@ module PackageCloud
         answer = get_valid("(y/n)") { |sel| sel == "y" || sel == "n" }
 
         if answer == "y"
-          print "\nContinuing...".green 
+          print "\nContinuing...".color(:green)
           puts " Note that next time you can push directly to #{os_shortcut} by specifying #{shortcut} on the commandline."
           version["id"]
         else

data/lib/package_cloud/version.rb

@@ -1,7 +1,7 @@
 module PackageCloud
   MAJOR_VERSION = "0"
   MINOR_VERSION = "2"
-  PATCH_VERSION = "33"
+  PATCH_VERSION = "35"
 
   VERSION = [MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION].join(".")
 end

data/package_cloud.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "highline", "1.6.20"
   spec.add_runtime_dependency "rest-client", "~> 1.6.7"
   spec.add_runtime_dependency "json_pure", "1.8.1"
-  spec.add_runtime_dependency "colorize", "0.6.0"
+  spec.add_runtime_dependency "rainbow", "2.1.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: package_cloud
 version: !ruby/object:Gem::Version
-  version: 0.2.33
+  version: 0.2.35
 platform: ruby
 authors:
 - Joe Damato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.8.1
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: https://packagecloud.io