package_cloud 0.2.28 → 0.2.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02d994dda1b1b78f952e161efd99885a92aee2d4
-  data.tar.gz: 6d1583d1f3a3674379575e09299528cb8bd61635
+  metadata.gz: 8ced12075ca5e4f0d8ae967e781c871985ff8f8c
+  data.tar.gz: 47545f8aae344a494c4781c0906de17860e6753b
 SHA512:
-  metadata.gz: 4fb6489dc0f362ac9caef41b1c4f3112c1c7f305d16952fd2dd3e7fa774153a9805a3fc7fa7221c7174fbca0cc9f41e82ae2b067c56345e550d84222fa788de1
-  data.tar.gz: 7fa96e848841b8405de75282dbb5e423fc761c99b2f9c76bc251615502116b8f628afba0cbb82c7c28f7960ca34e99010b5941b2e1e0df1a07dd9915c32a26c5
+  metadata.gz: 513729f4c35a1597098b8ddee56f18c5fa2b84aef17ac7df3bdf29751fcd2c33e04bff8eea21cc98e9f0669155eb00447b1768e201bbbdca5e4789bbfa962c26
+  data.tar.gz: 74b9e5ca7471acd39c537100cf9684e24daf64cd9ed8cff7ad540cd69ece3fb77fdcac9145e07d7897524ced0f1e1adbf01c67f550215eebafee4ea8e6560b2f

data/lib/package_cloud.rb

@@ -11,4 +11,5 @@ module PackageCloud
   autoload :ReadToken, "package_cloud/read_token"
   autoload :Repository, "package_cloud/repository"
   autoload :Validator, "package_cloud/validator"
+  autoload :Util, "package_cloud/util"
 end

data/lib/package_cloud/auth.rb

@@ -5,7 +5,8 @@ module PackageCloud
   module Auth
     class << self
       def get_token(url)
-        JSON.parse(RestClient.get("#{url}/api/v1/token.json"))["token"]
+        url = PackageCloud::Util.compute_url(url, "/api/v1/token.json")
+        JSON.parse(RestClient.get(url))["token"]
       end
     end
   end

data/lib/package_cloud/cli/entry.rb

@@ -169,6 +169,9 @@ module PackageCloud
               print "File #{f["filename"]} has size: #{disk_size}, expected: #{f["size"]}\n".red
               abort("Aborting...".red)
             end
+
+            print "Found DSC package file #{f["filename"]} for upload\n"
+
             file_paths << filepath
           end
           file_paths

data/lib/package_cloud/client.rb

@@ -8,9 +8,9 @@ module PackageCloud
     end
 
     def repositories
-      base_url = @config.base_url
+      url = PackageCloud::Util.compute_url(@config.base_url, "/api/v1/repos.json")
       begin
-        attrs = JSON.parse(RestClient.get("#{base_url}/api/v1/repos.json"))
+        attrs = JSON.parse(RestClient.get(url))
         attrs.map { |a| Repository.new(a, @config) }
       rescue RestClient::ResourceNotFound => e
         print "failed!\n".red
@@ -19,10 +19,10 @@ module PackageCloud
     end
 
     def repository(name)
-      base_url = @config.base_url
       user, repo = name.split("/")
+      url = PackageCloud::Util.compute_url(@config.base_url, "/api/v1/repos/#{user}/#{repo}.json")
       begin
-        attrs = JSON.parse(RestClient.get("#{base_url}/api/v1/repos/#{user}/#{repo}.json"))
+        attrs = JSON.parse(RestClient.get(url))
         if attrs["error"] == "not_found"
           print "failed... Repository #{user}/#{repo} not found!\n".red
           exit(127)
@@ -36,9 +36,9 @@ module PackageCloud
     end
 
     def create_repo(name, priv)
-      base_url = @config.base_url
+      url = PackageCloud::Util.compute_url(@config.base_url, "/api/v1/repos.json")
       begin
-        JSON.parse(RestClient.post("#{base_url}/api/v1/repos.json", :repository => {:name => name, :private => priv == "private" ? "1" : "0"}))
+        JSON.parse(RestClient.post(url, :repository => {:name => name, :private => priv == "private" ? "1" : "0"}))
       rescue RestClient::UnprocessableEntity => e
         print "error!\n".red
         json = JSON.parse(e.response)
@@ -51,9 +51,9 @@ module PackageCloud
     end
 
     def distributions
-      base_url = @config.base_url
+      url = PackageCloud::Util.compute_url(@config.base_url, "/api/v1/distributions.json")
       begin
-        JSON.parse(RestClient.get("#{base_url}/api/v1/distributions.json"))
+        JSON.parse(RestClient.get(url))
       rescue RestClient::ResourceNotFound => e
         print "failed!\n".red
         exit(127)
@@ -61,9 +61,9 @@ module PackageCloud
     end
 
     def gem_version
-      base_url = @config.base_url
+      url = PackageCloud::Util.compute_url(@config.base_url, "/api/v1/gem_version")
       begin
-        JSON.parse(RestClient.get("#{base_url}/api/v1/gem_version"))
+        JSON.parse(RestClient.get(url))
       rescue RestClient::ResourceNotFound => e
         print "failed!\n".red
         exit(127)

data/lib/package_cloud/master_token.rb

@@ -12,7 +12,7 @@ module PackageCloud
     end
 
     def destroy
-      url = @config.base_url + paths["self"]
+      url = PackageCloud::Util.compute_url(@config.base_url, paths["self"])
       RestClient.delete(url)
     end
   end

data/lib/package_cloud/repository.rb

@@ -8,7 +8,7 @@ module PackageCloud
     def parse_dsc(dsc_path, dist_id)
       file_data = File.new(dsc_path, 'rb')
       base_url = @config.base_url
-      url = base_url + paths["package_contents"]
+      url = PackageCloud::Util.compute_url(base_url, paths["package_contents"])
       begin
         resp = RestClient::Request.execute(:method => 'post',
                                            :url => url,
@@ -32,7 +32,7 @@ module PackageCloud
     def create_package(file_path, dist_id, files=nil, filetype=nil)
       file_data = File.new(file_path, 'rb')
       base_url = @config.base_url
-      url = base_url + paths["create_package"]
+      url = PackageCloud::Util.compute_url(base_url, paths["create_package"])
       params = { :package_file => file_data,
                  :distro_version_id => dist_id }
 
@@ -52,17 +52,18 @@ module PackageCloud
 
     def install_script(type)
       url = urls["install_script"].gsub(/:package_type/, type)
+      url = PackageCloud::Util.compute_url(@config.base_url, url)
       RestClient.get(url)
     end
 
     def master_tokens
-      url = @config.base_url + paths["master_tokens"]
+      url = PackageCloud::Util.compute_url(@config.base_url, paths["master_tokens"])
       attrs = JSON.parse(RestClient.get(url))
       attrs.map { |a| MasterToken.new(a, @config) }
     end
 
     def create_master_token(name)
-      url = @config.base_url + paths["create_master_token"]
+      url = PackageCloud::Util.compute_url(@config.base_url, paths["create_master_token"])
       begin
         resp = RestClient.post(url, :master_token => {:name => name})
         resp = JSON.parse(resp)
@@ -79,8 +80,8 @@ module PackageCloud
     end
 
     def yank(dist, package_name)
-      url = @config.base_url + paths["self"] + "/" + [dist, package_name].compact.join("/")
       begin
+        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

data/lib/package_cloud/util.rb

@@ -0,0 +1,15 @@
+module PackageCloud
+  class Util
+    class << self
+      def compute_url(base_url, path)
+        url = base_url + path
+        proxy_uri = URI.parse(url).find_proxy()
+        if proxy_uri
+          RestClient.proxy = proxy_uri.to_s
+        end
+
+        url
+      end
+    end
+  end
+end

data/lib/package_cloud/version.rb

@@ -1,7 +1,7 @@
 module PackageCloud
   MAJOR_VERSION = "0"
   MINOR_VERSION = "2"
-  PATCH_VERSION = "28"
+  PATCH_VERSION = "30"
 
   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.28
+  version: 0.2.30
 platform: ruby
 authors:
 - Joe Damato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -136,6 +136,7 @@ files:
 - lib/package_cloud/object.rb
 - lib/package_cloud/read_token.rb
 - lib/package_cloud/repository.rb
+- lib/package_cloud/util.rb
 - lib/package_cloud/validator.rb
 - lib/package_cloud/version.rb
 - package_cloud.gemspec