packagecloud-ruby 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ddc9a00293db9b63f62dc1f235d796eba163e06
-  data.tar.gz: 2914de09c42e1e43620d7914af98604c1038137a
+  metadata.gz: a9095e6773299c93c30bd9b05416c83192fd8af6
+  data.tar.gz: 323bc2ea63c909b749908429fcff9148e2829516
 SHA512:
-  metadata.gz: f373acfcc22dd73d1049c0a8b94d81bd8fc8baf16bf66b836fd7de2aa274ff04368471e2cb961af7e981058babe83cd07305b6e21d744913cdc9b5a52999d456
-  data.tar.gz: 94f4c775eed2d0b108542dedbdb3487c0078be8e5336e203851d022dde5aaafd8265239e2db4dd3198f95a4ff39fdaf4ee4a8a00eb804192d4efbaf414f270c0
+  metadata.gz: d2c1f929e8d8eaee339271079a6ee28c1cf9746be3316999d92cae321e0cc91006694aab66285b2343546763f5618846324fcd18ac3f8d0ea43bef9912bd6823
+  data.tar.gz: 44dceaa0f8b89b9e5de3397fa8dc196ffdf350b2b5c76c4dea40647d1245d4868f085c51828cb1be96c1a182b4256179991cc9d1aee420311e72f25fd0e715c8

data/.travis.yml

@@ -1,3 +1,4 @@
+sudo: false
 language: ruby
 rvm:
   - 1.8.7

data/lib/packagecloud/client.rb

@@ -87,8 +87,12 @@ module Packagecloud
       parsed_json_result(response)
     end
 
-    def package_contents(repo, package)
+    def package_contents(repo, package, distro_version_id=nil)
       assert_valid_repo_name(repo)
+      if distro_version_id.nil?
+        raise "No distribution supplied for package_contents!"
+      end
+
       url = "/api/v1/repos/#{username}/#{repo}/packages/contents.json"
 
       mixed_msg = MIME::Multipart::FormData.new
@@ -98,6 +102,14 @@ module Packagecloud
       pkg_data.headers.set('Content-Transfer-Encoding', 'binary')
       mixed_msg.add(pkg_data, "package[package_file]", package.filename)
 
+      if distro_version_id.is_a? String
+        distro_version = find_distribution_id(distro_version_id)
+        raise "Cannot find distribution: #{distro_version_id}" if distro_version.nil?
+        mixed_msg.add(MIME::Text.new(distro_version), "package[distro_version_id]")
+      else
+        mixed_msg.add(MIME::Text.new(distro_version_id), "package[distro_version_id]")
+      end
+
       response = multipart_post(url, mixed_msg)
 
       parsed_json_result(response)

data/lib/packagecloud/version.rb

@@ -1,7 +1,7 @@
 module Packagecloud
   MAJOR_VERSION = "1"
   MINOR_VERSION = "0"
-  PATCH_VERSION = "4"
+  PATCH_VERSION = "5"
 
   VERSION = [MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION].join(".")
 end

data/packagecloud-ruby.gemspec

@@ -18,14 +18,15 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_runtime_dependency 'excon', '~> 0.40'
-  gem.add_runtime_dependency 'multi_json', '~> 1.0'
   gem.add_runtime_dependency 'json_pure', '~> 1'
+  gem.add_runtime_dependency 'multi_json', '~> 1.0'
   gem.add_runtime_dependency 'mime', '~> 0.4'
 
   gem.add_development_dependency 'bundler', '~> 1.0'
   gem.add_development_dependency 'rake', '~> 0.8'
   gem.add_development_dependency 'rspec', '~> 2.4'
   gem.add_development_dependency 'simplecov', '~> 0.9'
+  gem.add_development_dependency 'json', '1.8.3'
   gem.add_development_dependency 'rubygems-tasks', '~> 0.2'
   gem.add_development_dependency 'yard', '~> 0.8'
 end

data/spec/packagecloud_spec.rb

@@ -4,20 +4,24 @@ require 'packagecloud_server'
 require 'packagecloud'
 require 'webrick'
 
+@server = Thread.start do
+  server = WEBrick::HTTPServer.new(:Port => 8000)
+  server.mount "/", PackagecloudServer
+  trap "INT" do
+    server.shutdown
+  end
+  server.start
+end
+
+until @server.status == "sleep" do
+  puts "waiting for server to start..."
+end
+
 describe Packagecloud do
 
   include Packagecloud
 
   before(:all) do
-    @server = Thread.start do
-      server = WEBrick::HTTPServer.new(:Port => 8000)
-      server.mount "/", PackagecloudServer
-      trap "INT" do
-        server.shutdown
-      end
-      server.start
-    end
-
     credentials = Credentials.new("joedamato", "test_token")
     connection = Connection.new("http", "localhost", 8000)
 
@@ -134,7 +138,7 @@ describe Packagecloud do
     size = File.size(dsc)
     package = Package.new(:file => dsc)
 
-    result = @client.package_contents("test_repo", package)
+    result = @client.package_contents("test_repo", package, 99999)
     expect(result.succeeded).to be_truthy
     expect(result.response["files"]).not_to be_empty
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packagecloud-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Joe Damato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.40'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: json_pure
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: mime
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement