packagecloud-ruby 0.2.23 → 1.0.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: fd3b5ac65dd04c314eccc0cc82e9a4990de53896
-  data.tar.gz: 5c04b61e407c71830a627039aa93d2535e735a52
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjcwOGRkNWM5YjU5OTM4ZGYxZDAxYWE3NTA0MDI2NWJjZGZlNzYzYg==
+  data.tar.gz: !binary |-
+    ODNiZWMwMDRiOGY0MmJmNDUxMTIwNGI5ZmQyOGFiOGI2YzQzNmUzNA==
 SHA512:
-  metadata.gz: 0115be00aaf164d67b654680e215f1678f247be29685d49732be3d3335cdae73ae75ba3d1c36303cacad1c1ee3980722b043e0f15f469ebda079628ad97ba3cf
-  data.tar.gz: 0d8621b7cc5eb1e504814129ff1f3a341a1d5dbd2c56dc507288d93659cc2b36359dc2665dca8a6c57cc89527c64b6785d537659a901130fe4e4d7537f15272f
+  metadata.gz: !binary |-
+    MDVlOWM3MDViMTJmNTZiMTRlMjg5NDc4NjUzYTVkN2VmMWIxYWNkZDVlYWEw
+    NWYzNTJmZWU0YzQ2MGI3YTc1MTgzNGZmOGYzYjExMTdjMDM5ZWJhNmI2MmMy
+    MWNhN2JjYjllYWY0NjNmNWYxNmYzNjVkYTg2OWJkZmVmZTI4Y2M=
+  data.tar.gz: !binary |-
+    ZTVkMzQzYTVjMGY0YWM1ODMzMTRhNTNlMDcyNTFlMTUyYTJhZWMxYWY2NGE3
+    Y2VmNjEyNTUxNzdkMThiZWFlY2IxZDIwMjk5ZDlkYzA0YzI3M2RlMjMwZTY2
+    NDYzOTRiOWEwZWYwZDFhMTc2NGRjMTQ2MGU2YmRhYWRmZmNlYWM=

data/README.md

@@ -1,6 +1,6 @@
 ## packagecloud-ruby
 
-![Build Status](https://travis-ci.org/computology/packagecloud-ruby.svg "Build Status")
+![Build Status](https://travis-ci.org/computology/packagecloud-ruby.svg?branch=master "Build Status")
 
 
 Ruby library for communicating with the [packagecloud.io](https://packagecloud.io) API.
@@ -90,7 +90,7 @@ go to your [Account Settings](https://packagecloud.io/api_token) to see your API
 
   ```
 
-  When specifiying your repository name, you should use just the name and not
+  When specifying your repository name, you should use just the name and not
   the fully qualified name (fqname).
 
   For example:
@@ -103,27 +103,25 @@ go to your [Account Settings](https://packagecloud.io/api_token) to see your API
 ### Packages
 
   ```ruby
-  # Create RPM Packages (takes IO object for file)
-  distro_id = @client.find_distribution_id("el/6")
-  rpm_package = Packagecloud::Package.new(open("libcurl-0.1.2.rpm"), distro_id)
+  # Create RPM Packages (can take File, IO, or path argument)
+  rpm_package = Packagecloud::Package.new(:file => "libcurl-0.1.2.rpm")
 
-  # Creating gem Packages (no distribution required)
-  gem_package = Packagecloud::Package.new(open("rails-4.0.0.gem"))
+  # Creating gem Packages using IO (needs :filename passed in)
+  gem_package = Packagecloud::Package.new(:file => io_object, :filename => "rails-4.0.0.gem")
 
   # Creating source Packages
-  distro_id = @client.find_distribution_id("ubuntu/trusty")
   source_files = { "jake_1.0.orig.tar.bz2" => open("/path/jake_1.0.orig.tar.bz2"),
                    "jake_1.0-7.debian.tar.gz" => open("/path/jake_1.0-7.debian.tar.gz") }
-  dsc_package = Packagecloud::Package.new(open("jake_1.0-7.dsc"), distro_id, source_files)
+  dsc_package = Packagecloud::Package.new(:file => "jake_1.0-7.dsc", :source_files => source_files)
 
   # Upload Packages
   @client.put_package("test_repo", gem_package)
-  @client.put_package("test_repo", rpm_package)
-  @client.put_package("test_repo", dsc_package)
+  @client.put_package("test_repo", rpm_package, "el/6")
+  @client.put_package("test_repo", dsc_package, "ubuntu/trusty")
   ```
 
 ## Copyright
 
-Copyright (c) 2014-2015 Computology, LLC
+Copyright (c) 2014-2016 Computology, LLC
 
 See LICENSE.txt for details.

data/lib/packagecloud/client.rb

@@ -6,7 +6,7 @@ require 'packagecloud/connection'
 require 'packagecloud/version'
 
 module Packagecloud
-  SUPPORTED_EXTENSIONS = ["deb", "rpm", "gem", "dsc"]
+  SUPPORTED_EXTENSIONS = ["deb", "dsc", "gem", "rpm", "whl", "zip", "egg", "egg-info", "tar", "bz2", "Z", "gz"]
 
   class UnauthenticatedException < StandardError
     attr_reader :object
@@ -44,7 +44,7 @@ module Packagecloud
     attr_reader :connection
     attr_reader :credentials
 
-    def initialize(credentials, user_agent="default", connection=Connection.new)
+    def initialize(credentials, user_agent="packagecloud-ruby #{Packagecloud::VERSION}", connection=Connection.new)
       @credentials = credentials
       @connection = connection
       @user_agent = user_agent
@@ -56,7 +56,6 @@ module Packagecloud
 
       @excon = Excon.new("#{scheme}://#{token}@#{host}:#{port}")
       assert_valid_credentials
-      assert_compatible_version
     end
 
     def distributions
@@ -116,15 +115,21 @@ module Packagecloud
       parsed_json_result(response)
     end
 
-    def put_package(repo, package)
+    def put_package(repo, package, distro_version_id)
       assert_valid_repo_name(repo)
 
       url = "/api/v1/repos/#{username}/#{repo}/packages.json"
 
       mixed_msg = MIME::Multipart::FormData.new
 
-      if package.distro_version_id != nil
-        mixed_msg.add(MIME::Text.new(package.distro_version_id), "package[distro_version_id]")
+      if distro_version_id != nil
+        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
       end
 
       pkg_data = MIME::Application.new(package.file.read)
@@ -147,7 +152,8 @@ module Packagecloud
       if distros.succeeded
         deb_distros = distro_map distros.response["deb"]
         rpm_distros = distro_map distros.response["rpm"]
-        all_distros = deb_distros.merge(rpm_distros)
+        py_distros = distro_map distros.response["py"]
+        all_distros = deb_distros.merge(rpm_distros).merge(py_distros)
         result = all_distros.select { |distro, id| distro.include?(distro_query) }
         if result.size > 1
           keys = result.map { |x| x.first }.join(' ')
@@ -178,21 +184,6 @@ module Packagecloud
         end
       end
 
-      def assert_compatible_version
-        result = gem_version
-        if result.succeeded
-          if result.response["minor"] != MINOR_VERSION
-            raise GemOutOfDateException.new("This library is out of date, please update it!")
-          elsif result.response["patch"].to_i > PATCH_VERSION.to_i
-            puts "[WARNING] There's a newer version of the packagecloud-ruby library. Update as soon as possible!"
-          end
-        elsif result.response.downcase.include?('unauthenticated')
-          raise UnauthenticatedException.new
-        else
-          raise "Unable to get gem version from API: #{result.response}"
-        end
-      end
-
       def assert_valid_credentials
         result = distributions
         if result.succeeded == false && result.response.downcase.include?('unauthenticated')

data/lib/packagecloud/package.rb

@@ -2,21 +2,29 @@ module Packagecloud
   class Package
 
     attr_reader :file
-    attr_reader :distro_version_id
     attr_accessor :source_files
     attr_reader :filename
+    attr_reader :client
 
-    def initialize(file,
-                   distro_version_id=nil,
-                   source_files={},
-                   filename=rand(2**32).to_s(36))
+    def initialize(options = {})
+      if options[:file].nil?
+        raise ArgumentError, 'file cannot be nil' if file.nil?
+      end
+      if options[:file].is_a? String
+        options[:file] = File.open(options[:file])
+      end
+      if options[:file].is_a? File
+        options[:filename] = File.basename(options[:file].path)
+      end
+      if options[:filename].nil?
+        raise ArgumentError, 'filename cannot be nil' if file.nil?
+      end
 
-      raise ArgumentError, 'file cannot be nil' if file.nil?
-      @file = file
-      @filename = filename
-      @distro_version_id = distro_version_id
-      @source_files = source_files
+      @file = options[:file]
+      @filename = options[:filename]
+      @source_files = options[:source_files] || {}
+      @client = options[:client]
     end
 
   end
-end
+end

data/lib/packagecloud/version.rb

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

data/spec/fixtures/distros.json

@@ -0,0 +1 @@
+{"deb":[{"display_name":"Ubuntu","index_name":"ubuntu","versions":[{"id":1,"display_name":"4.10 Warty Warthog","index_name":"warty","version_number":"4.10"},{"id":2,"display_name":"5.04 Hoary Hedgehog","index_name":"hoary","version_number":"5.04"},{"id":3,"display_name":"5.10 Breezy Badger","index_name":"breezy","version_number":"5.10"},{"id":4,"display_name":"6.06 LTS Dapper Drake","index_name":"dapper","version_number":"6.06"},{"id":5,"display_name":"6.10 Edgy Eft","index_name":"edgy","version_number":"6.10"},{"id":6,"display_name":"7.04 Feisty Fawn","index_name":"feisty","version_number":"7.04"},{"id":7,"display_name":"7.10 Gutsy Gibbon","index_name":"gutsy","version_number":"7.10"},{"id":8,"display_name":"8.04 LTS Hardy Heron","index_name":"hardy","version_number":"8.04"},{"id":9,"display_name":"8.10 Intrepid Ibex","index_name":"intrepid","version_number":"8.10"},{"id":10,"display_name":"9.04 Jaunty Jackalope","index_name":"jaunty","version_number":"9.04"},{"id":11,"display_name":"9.10 Karmic Koala","index_name":"karmic","version_number":"9.10"},{"id":12,"display_name":"10.04 LTS Lucid Lynx","index_name":"lucid","version_number":"10.04"},{"id":13,"display_name":"10.10 Maverick Meerkat","index_name":"maverick","version_number":"10.10"},{"id":14,"display_name":"11.04 Natty Narwhal","index_name":"natty","version_number":"11.04"},{"id":15,"display_name":"11.10 Oneiric Ocelot","index_name":"oneiric","version_number":"11.10"},{"id":16,"display_name":"12.04 LTS Precise Pangolin","index_name":"precise","version_number":"12.04"},{"id":17,"display_name":"12.10 Quantal Quetzal","index_name":"quantal","version_number":"12.10"},{"id":18,"display_name":"13.04 Raring Ringtail","index_name":"raring","version_number":"13.04"},{"id":19,"display_name":"13.10 Saucy Salamander","index_name":"saucy","version_number":"13.10"},{"id":20,"display_name":"14.04 LTS Trusty Tahr","index_name":"trusty","version_number":"14.04"},{"id":142,"display_name":"14.10 Utopic Unicorn","index_name":"utopic","version_number":"14.10"},{"id":148,"display_name":"15.04 Vivid Vervet","index_name":"vivid","version_number":"15.04"},{"id":152,"display_name":"15.10 Wily Werewolf","index_name":"wily","version_number":"15.10"},{"id":165,"display_name":"16.04 LTS Xenial Xerus","index_name":"xenial","version_number":"16.04"}]},{"display_name":"Debian","index_name":"debian","versions":[{"id":21,"display_name":"4.0 etch","index_name":"etch","version_number":"4.0"},{"id":22,"display_name":"5.0 lenny","index_name":"lenny","version_number":"5.0"},{"id":23,"display_name":"6.0 squeeze","index_name":"squeeze","version_number":"6.0"},{"id":24,"display_name":"7 wheezy","index_name":"wheezy","version_number":"7.0"},{"id":25,"display_name":"8 jessie","index_name":"jessie","version_number":"8.0"},{"id":149,"display_name":"9 stretch","index_name":"stretch","version_number":"9.0"},{"id":150,"display_name":"10 buster","index_name":"buster","version_number":"10.0"}]},{"display_name":"Any deb-based distribution.","index_name":"any","versions":[{"id":35,"display_name":"Any version.","index_name":"any","version_number":null}]},{"display_name":"LinuxMint","index_name":"linuxmint","versions":[{"id":157,"display_name":"16 petra","index_name":"petra","version_number":"16"},{"id":158,"display_name":"17 qiana","index_name":"qiana","version_number":"17"},{"id":159,"display_name":"17.1 rebecca","index_name":"rebecca","version_number":"17.1"},{"id":160,"display_name":"17.2 rafaela","index_name":"rafaela","version_number":"17.2"},{"id":161,"display_name":"17.3 rosa","index_name":"rosa","version_number":"17.3"}]},{"display_name":"Raspbian","index_name":"raspbian","versions":[{"id":153,"display_name":"7 wheezy","index_name":"wheezy","version_number":"7.0"},{"id":154,"display_name":"8 jessie","index_name":"jessie","version_number":"8.0"},{"id":155,"display_name":"9 stretch","index_name":"stretch","version_number":"9.0"},{"id":156,"display_name":"10 buster","index_name":"buster","version_number":"10.0"}]},{"display_name":"elementary OS","index_name":"elementaryos","versions":[{"id":162,"display_name":"0.1 jupiter","index_name":"jupiter","version_number":"0.1"},{"id":163,"display_name":"0.2 luna","index_name":"luna","version_number":"0.2"},{"id":164,"display_name":"0.3 freya","index_name":"freya","version_number":"0.3"}]}],"rpm":[{"display_name":"Enterprise Linux","index_name":"el","versions":[{"id":26,"display_name":"Enterprise Linux 5.0","index_name":"5","version_number":"5.0"},{"id":27,"display_name":"Enterprise Linux 6.0","index_name":"6","version_number":"6.0"},{"id":140,"display_name":"Enterprise Linux 7.0","index_name":"7","version_number":"7.0"}]},{"display_name":"Fedora","index_name":"fedora","versions":[{"id":28,"display_name":"14 Laughlin","index_name":"14","version_number":"14.0"},{"id":29,"display_name":"15 Lovelock","index_name":"15","version_number":"15.0"},{"id":30,"display_name":"16 Verne","index_name":"16","version_number":"16.0"},{"id":31,"display_name":"17 Beefy Miracle","index_name":"17","version_number":"17.0"},{"id":32,"display_name":"18 Spherical Cow","index_name":"18","version_number":"18.0"},{"id":33,"display_name":"19 Schrödinger's Cat","index_name":"19","version_number":"19.0"},{"id":34,"display_name":"20 Heisenbug","index_name":"20","version_number":"20.0"},{"id":143,"display_name":"21 Fedora 21","index_name":"21","version_number":"21.0"},{"id":147,"display_name":"22 Fedora 22","index_name":"22","version_number":"22.0"},{"id":151,"display_name":"23 Fedora 23","index_name":"23","version_number":"23.0"}]},{"display_name":"Scientific Linux","index_name":"scientific","versions":[{"id":138,"display_name":"Scientific Linux 5.0","index_name":"5","version_number":"5.0"},{"id":139,"display_name":"Scientific Linux 6.0","index_name":"6","version_number":"6.0"},{"id":141,"display_name":"Scientific Linux 7.0","index_name":"7","version_number":"7.0"}]},{"display_name":"Oracle Linux","index_name":"ol","versions":[{"id":144,"display_name":"Oracle Linux 5.0","index_name":"5","version_number":"5.0"},{"id":145,"display_name":"Oracle Linux 6.0","index_name":"6","version_number":"6.0"},{"id":146,"display_name":"Oracle Linux 7.0","index_name":"7","version_number":"7.0"}]}],"py":[{"display_name":"Python","index_name":"python","versions":[{"id":166,"display_name":"Python"}]}],"dsc":[{"display_name":"Ubuntu","index_name":"ubuntu","versions":[{"id":1,"display_name":"4.10 Warty Warthog","index_name":"warty","version_number":"4.10"},{"id":2,"display_name":"5.04 Hoary Hedgehog","index_name":"hoary","version_number":"5.04"},{"id":3,"display_name":"5.10 Breezy Badger","index_name":"breezy","version_number":"5.10"},{"id":4,"display_name":"6.06 LTS Dapper Drake","index_name":"dapper","version_number":"6.06"},{"id":5,"display_name":"6.10 Edgy Eft","index_name":"edgy","version_number":"6.10"},{"id":6,"display_name":"7.04 Feisty Fawn","index_name":"feisty","version_number":"7.04"},{"id":7,"display_name":"7.10 Gutsy Gibbon","index_name":"gutsy","version_number":"7.10"},{"id":8,"display_name":"8.04 LTS Hardy Heron","index_name":"hardy","version_number":"8.04"},{"id":9,"display_name":"8.10 Intrepid Ibex","index_name":"intrepid","version_number":"8.10"},{"id":10,"display_name":"9.04 Jaunty Jackalope","index_name":"jaunty","version_number":"9.04"},{"id":11,"display_name":"9.10 Karmic Koala","index_name":"karmic","version_number":"9.10"},{"id":12,"display_name":"10.04 LTS Lucid Lynx","index_name":"lucid","version_number":"10.04"},{"id":13,"display_name":"10.10 Maverick Meerkat","index_name":"maverick","version_number":"10.10"},{"id":14,"display_name":"11.04 Natty Narwhal","index_name":"natty","version_number":"11.04"},{"id":15,"display_name":"11.10 Oneiric Ocelot","index_name":"oneiric","version_number":"11.10"},{"id":16,"display_name":"12.04 LTS Precise Pangolin","index_name":"precise","version_number":"12.04"},{"id":17,"display_name":"12.10 Quantal Quetzal","index_name":"quantal","version_number":"12.10"},{"id":18,"display_name":"13.04 Raring Ringtail","index_name":"raring","version_number":"13.04"},{"id":19,"display_name":"13.10 Saucy Salamander","index_name":"saucy","version_number":"13.10"},{"id":20,"display_name":"14.04 LTS Trusty Tahr","index_name":"trusty","version_number":"14.04"},{"id":142,"display_name":"14.10 Utopic Unicorn","index_name":"utopic","version_number":"14.10"},{"id":148,"display_name":"15.04 Vivid Vervet","index_name":"vivid","version_number":"15.04"},{"id":152,"display_name":"15.10 Wily Werewolf","index_name":"wily","version_number":"15.10"},{"id":165,"display_name":"16.04 LTS Xenial Xerus","index_name":"xenial","version_number":"16.04"}]},{"display_name":"Debian","index_name":"debian","versions":[{"id":21,"display_name":"4.0 etch","index_name":"etch","version_number":"4.0"},{"id":22,"display_name":"5.0 lenny","index_name":"lenny","version_number":"5.0"},{"id":23,"display_name":"6.0 squeeze","index_name":"squeeze","version_number":"6.0"},{"id":24,"display_name":"7 wheezy","index_name":"wheezy","version_number":"7.0"},{"id":25,"display_name":"8 jessie","index_name":"jessie","version_number":"8.0"},{"id":149,"display_name":"9 stretch","index_name":"stretch","version_number":"9.0"},{"id":150,"display_name":"10 buster","index_name":"buster","version_number":"10.0"}]},{"display_name":"Any deb-based distribution.","index_name":"any","versions":[{"id":35,"display_name":"Any version.","index_name":"any","version_number":null}]},{"display_name":"LinuxMint","index_name":"linuxmint","versions":[{"id":157,"display_name":"16 petra","index_name":"petra","version_number":"16"},{"id":158,"display_name":"17 qiana","index_name":"qiana","version_number":"17"},{"id":159,"display_name":"17.1 rebecca","index_name":"rebecca","version_number":"17.1"},{"id":160,"display_name":"17.2 rafaela","index_name":"rafaela","version_number":"17.2"},{"id":161,"display_name":"17.3 rosa","index_name":"rosa","version_number":"17.3"}]},{"display_name":"Raspbian","index_name":"raspbian","versions":[{"id":153,"display_name":"7 wheezy","index_name":"wheezy","version_number":"7.0"},{"id":154,"display_name":"8 jessie","index_name":"jessie","version_number":"8.0"},{"id":155,"display_name":"9 stretch","index_name":"stretch","version_number":"9.0"},{"id":156,"display_name":"10 buster","index_name":"buster","version_number":"10.0"}]},{"display_name":"elementary OS","index_name":"elementaryos","versions":[{"id":162,"display_name":"0.1 jupiter","index_name":"jupiter","version_number":"0.1"},{"id":163,"display_name":"0.2 luna","index_name":"luna","version_number":"0.2"},{"id":164,"display_name":"0.3 freya","index_name":"freya","version_number":"0.3"}]}]}

data/spec/package_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+require 'packagecloud'
+
+describe Package do
+  it "should raise for nil file" do
+    expect { Package.new }.to raise_error("file cannot be nil")
+  end
+
+  it "should raise for file that doesn't exist" do
+    expect { Package.new(:file => "hi") }.to raise_error
+  end
+
+  it "should be able to open String file paths" do
+    pkg = Package.new(:file => "spec/fixtures/chewbacca-1.0.0.gem")
+    expect(pkg.filename).to eql("chewbacca-1.0.0.gem")
+  end
+
+  it "should be able to open File objects" do
+    pkg = Package.new(:file => File.open("spec/fixtures/chewbacca-1.0.0.gem"))
+    expect(pkg.filename).to eql("chewbacca-1.0.0.gem")
+  end
+
+  it "should raise if IO object is passed without filename" do
+    fd = IO.sysopen("spec/fixtures/chewbacca-1.0.0.gem", "r")
+    io = IO.new(fd)
+    expect { Package.new(:file => io) }.to raise_error("filename cannot be nil")
+  end
+
+  it "should handle IO object if passed with filename" do
+    fd = IO.sysopen("spec/fixtures/chewbacca-1.0.0.gem", "r")
+    io = IO.new(fd)
+    pkg = Package.new(:file => io, :filename => "chewbacca-1.0.0.gem")
+    expect(pkg.filename).to eql("chewbacca-1.0.0.gem")
+  end
+
+  it "should handle source_files options" do
+    pkg = Package.new(:file => "spec/fixtures/natty_dsc/jake_1.0-7.dsc", :source_files => {"foo" => "bar"})
+    expect(pkg.source_files).to eql({"foo" => "bar"})
+  end
+
+  it "should always have a {} as default for source files" do
+    pkg = Package.new(:file => "spec/fixtures/natty_dsc/jake_1.0-7.dsc", :source_files => nil)
+    expect(pkg.source_files).to be_empty
+  end
+
+end

data/spec/packagecloud_server.rb

@@ -2,7 +2,7 @@
 require 'webrick'
 
 class PackagecloudServer < WEBrick::HTTPServlet::AbstractServlet
-  DISTRIBUTIONS = "{\"deb\":[{\"display_name\":\"Ubuntu\",\"index_name\":\"ubuntu\",\"versions\":[{\"id\":3,\"display_name\":\"5.10 Breezy Badger\",\"index_name\":\"breezy\",\"version_number\":\"5.10\"},{\"id\":4,\"display_name\":\"6.06 LTS Dapper Drake\",\"index_name\":\"dapper\",\"version_number\":\"6.06\"},{\"id\":5,\"display_name\":\"6.10 Edgy Eft\",\"index_name\":\"edgy\",\"version_number\":\"6.10\"},{\"id\":6,\"display_name\":\"7.04 Feisty Fawn\",\"index_name\":\"feisty\",\"version_number\":\"7.04\"},{\"id\":7,\"display_name\":\"7.10 Gutsy Gibbon\",\"index_name\":\"gutsy\",\"version_number\":\"7.10\"},{\"id\":8,\"display_name\":\"8.04 LTS Hardy Heron\",\"index_name\":\"hardy\",\"version_number\":\"8.04\"},{\"id\":2,\"display_name\":\"5.04 Hoary Hedgehog\",\"index_name\":\"hoary\",\"version_number\":\"5.04\"},{\"id\":9,\"display_name\":\"8.10 Intrepid Ibex\",\"index_name\":\"intrepid\",\"version_number\":\"8.10\"},{\"id\":10,\"display_name\":\"9.04 Jaunty Jackalope\",\"index_name\":\"jaunty\",\"version_number\":\"9.04\"},{\"id\":11,\"display_name\":\"9.10 Karmic Koala\",\"index_name\":\"karmic\",\"version_number\":\"9.10\"},{\"id\":12,\"display_name\":\"10.04 LTS Lucid Lynx\",\"index_name\":\"lucid\",\"version_number\":\"10.04\"},{\"id\":13,\"display_name\":\"10.10 Maverick Meerkat\",\"index_name\":\"maverick\",\"version_number\":\"10.10\"},{\"id\":14,\"display_name\":\"11.04 Natty Narwhal\",\"index_name\":\"natty\",\"version_number\":\"11.04\"},{\"id\":15,\"display_name\":\"11.10 Oneiric Ocelot\",\"index_name\":\"oneiric\",\"version_number\":\"11.10\"},{\"id\":16,\"display_name\":\"12.04 LTS Precise Pangolin\",\"index_name\":\"precise\",\"version_number\":\"12.04\"},{\"id\":17,\"display_name\":\"12.10 Quantal Quetzal\",\"index_name\":\"quantal\",\"version_number\":\"12.10\"},{\"id\":18,\"display_name\":\"13.04 Raring Ringtail\",\"index_name\":\"raring\",\"version_number\":\"13.04\"},{\"id\":19,\"display_name\":\"13.10 Saucy Salamander\",\"index_name\":\"saucy\",\"version_number\":\"13.10\"},{\"id\":20,\"display_name\":\"14.04 LTS[66] Trusty Tahr\",\"index_name\":\"trusty\",\"version_number\":\"14.04\"},{\"id\":1,\"display_name\":\"4.10 Warty Warthog\",\"index_name\":\"warty\",\"version_number\":\"4.10\"}]},{\"display_name\":\"Debian\",\"index_name\":\"debian\",\"versions\":[{\"id\":21,\"display_name\":\"4.0 etch\",\"index_name\":\"etch\",\"version_number\":\"4.0\"},{\"id\":25,\"display_name\":\"8 jessie\",\"index_name\":\"jessie\",\"version_number\":\"8.0\"},{\"id\":22,\"display_name\":\"5.0 lenny\",\"index_name\":\"lenny\",\"version_number\":\"5.0\"},{\"id\":23,\"display_name\":\"6.0 squeeze\",\"index_name\":\"squeeze\",\"version_number\":\"6.0\"},{\"id\":24,\"display_name\":\"7 wheezy\",\"index_name\":\"wheezy\",\"version_number\":\"7.0\"}]},{\"display_name\":\"Any deb-based distribution.\",\"index_name\":\"any\",\"versions\":[{\"id\":35,\"display_name\":\"Any version.\",\"index_name\":\"any\",\"version_number\":null}]}],\"rpm\":[{\"display_name\":\"Enterprise Linux\",\"index_name\":\"el\",\"versions\":[{\"id\":26,\"display_name\":\"Enterprise Linux 5.0\",\"index_name\":\"5\",\"version_number\":\"5.0\"},{\"id\":27,\"display_name\":\"Enterprise Linux 6.0\",\"index_name\":\"6\",\"version_number\":\"6.0\"},{\"id\":140,\"display_name\":\"Enterprise Linux 7.0\",\"index_name\":\"7\",\"version_number\":\"7.0\"}]},{\"display_name\":\"Fedora\",\"index_name\":\"fedora\",\"versions\":[{\"id\":28,\"display_name\":\"14 Laughlin\",\"index_name\":\"14\",\"version_number\":\"14.0\"},{\"id\":29,\"display_name\":\"15 Lovelock\",\"index_name\":\"15\",\"version_number\":\"15.0\"},{\"id\":30,\"display_name\":\"16 Verne\",\"index_name\":\"16\",\"version_number\":\"16.0\"},{\"id\":31,\"display_name\":\"17 Beefy Miracle\",\"index_name\":\"17\",\"version_number\":\"17.0\"},{\"id\":32,\"display_name\":\"18 Spherical Cow\",\"index_name\":\"18\",\"version_number\":\"18.0\"},{\"id\":33,\"display_name\":\"19 Schrödinger's Cat\",\"index_name\":\"19\",\"version_number\":\"19.0\"},{\"id\":34,\"display_name\":\"20 Heisenbug\",\"index_name\":\"20\",\"version_number\":\"20.0\"}]},{\"display_name\":\"Scientific Linux\",\"index_name\":\"scientific\",\"versions\":[{\"id\":138,\"display_name\":\"Scientific Linux 5.0\",\"index_name\":\"5\",\"version_number\":\"5.0\"},{\"id\":139,\"display_name\":\"Scientific Linux 6.0\",\"index_name\":\"6\",\"version_number\":\"6.0\"}]}],\"dsc\":[{\"display_name\":\"Ubuntu\",\"index_name\":\"ubuntu\",\"versions\":[{\"id\":3,\"display_name\":\"5.10 Breezy Badger\",\"index_name\":\"breezy\",\"version_number\":\"5.10\"},{\"id\":4,\"display_name\":\"6.06 LTS Dapper Drake\",\"index_name\":\"dapper\",\"version_number\":\"6.06\"},{\"id\":5,\"display_name\":\"6.10 Edgy Eft\",\"index_name\":\"edgy\",\"version_number\":\"6.10\"},{\"id\":6,\"display_name\":\"7.04 Feisty Fawn\",\"index_name\":\"feisty\",\"version_number\":\"7.04\"},{\"id\":7,\"display_name\":\"7.10 Gutsy Gibbon\",\"index_name\":\"gutsy\",\"version_number\":\"7.10\"},{\"id\":8,\"display_name\":\"8.04 LTS Hardy Heron\",\"index_name\":\"hardy\",\"version_number\":\"8.04\"},{\"id\":2,\"display_name\":\"5.04 Hoary Hedgehog\",\"index_name\":\"hoary\",\"version_number\":\"5.04\"},{\"id\":9,\"display_name\":\"8.10 Intrepid Ibex\",\"index_name\":\"intrepid\",\"version_number\":\"8.10\"},{\"id\":10,\"display_name\":\"9.04 Jaunty Jackalope\",\"index_name\":\"jaunty\",\"version_number\":\"9.04\"},{\"id\":11,\"display_name\":\"9.10 Karmic Koala\",\"index_name\":\"karmic\",\"version_number\":\"9.10\"},{\"id\":12,\"display_name\":\"10.04 LTS Lucid Lynx\",\"index_name\":\"lucid\",\"version_number\":\"10.04\"},{\"id\":13,\"display_name\":\"10.10 Maverick Meerkat\",\"index_name\":\"maverick\",\"version_number\":\"10.10\"},{\"id\":14,\"display_name\":\"11.04 Natty Narwhal\",\"index_name\":\"natty\",\"version_number\":\"11.04\"},{\"id\":15,\"display_name\":\"11.10 Oneiric Ocelot\",\"index_name\":\"oneiric\",\"version_number\":\"11.10\"},{\"id\":16,\"display_name\":\"12.04 LTS Precise Pangolin\",\"index_name\":\"precise\",\"version_number\":\"12.04\"},{\"id\":17,\"display_name\":\"12.10 Quantal Quetzal\",\"index_name\":\"quantal\",\"version_number\":\"12.10\"},{\"id\":18,\"display_name\":\"13.04 Raring Ringtail\",\"index_name\":\"raring\",\"version_number\":\"13.04\"},{\"id\":19,\"display_name\":\"13.10 Saucy Salamander\",\"index_name\":\"saucy\",\"version_number\":\"13.10\"},{\"id\":20,\"display_name\":\"14.04 LTS[66] Trusty Tahr\",\"index_name\":\"trusty\",\"version_number\":\"14.04\"},{\"id\":1,\"display_name\":\"4.10 Warty Warthog\",\"index_name\":\"warty\",\"version_number\":\"4.10\"}]},{\"display_name\":\"Debian\",\"index_name\":\"debian\",\"versions\":[{\"id\":21,\"display_name\":\"4.0 etch\",\"index_name\":\"etch\",\"version_number\":\"4.0\"},{\"id\":25,\"display_name\":\"8 jessie\",\"index_name\":\"jessie\",\"version_number\":\"8.0\"},{\"id\":22,\"display_name\":\"5.0 lenny\",\"index_name\":\"lenny\",\"version_number\":\"5.0\"},{\"id\":23,\"display_name\":\"6.0 squeeze\",\"index_name\":\"squeeze\",\"version_number\":\"6.0\"},{\"id\":24,\"display_name\":\"7 wheezy\",\"index_name\":\"wheezy\",\"version_number\":\"7.0\"}]},{\"display_name\":\"Any deb-based distribution.\",\"index_name\":\"any\",\"versions\":[{\"id\":35,\"display_name\":\"Any version.\",\"index_name\":\"any\",\"version_number\":null}]}]}"
+  DISTRIBUTIONS = File.read("spec/fixtures/distros.json")
   PACKAGE_CONTENTS = "{\"files\":[{\"filename\":\"jake_1.0.orig.tar.bz2\",\"size\":1108,\"md5sum\":\"a7a309b55424198ee98abcb8092d7be0\"},{\"filename\":\"jake_1.0-7.debian.tar.gz\",\"size\":1571,\"md5sum\":\"0fa5395e95ddf846b419e96575ce8044\"}]}"
   GEM_VERSION = "{\"major\":\"0\",\"minor\":\"2\",\"patch\":\"1\"}"
   REPO = '{"name": "test_repo","created_at": "2014-08-30T03:51:37.000Z","url": "https://packagecloud.io/joedamato/test_repo","last_push_human": "about 2 months ago","package_count_human": "4 packages","private": true,"fqname": "joedamato/test_repo"}'

data/spec/packagecloud_spec.rb

@@ -25,7 +25,7 @@ describe Packagecloud do
   end
 
   it "should have a VERSION constant" do
-    subject.const_get('VERSION').should_not be_empty
+    expect(subject.const_get('VERSION')).to_not be_empty
   end
 
   it "GET api/v1/distributions.json" do
@@ -42,11 +42,30 @@ describe Packagecloud do
   end
 
   it "POST debian package /api/v1/repos/joedamato/test_repo/packages.json" do
-    deb = File.dirname(__FILE__) + '/fixtures/libampsharp2.0-cil_2.0.4-1_all.deb'
-    size = File.size(deb)
-    package = Package.new(open(deb), 22)
+    path = "spec/fixtures/libampsharp2.0-cil_2.0.4-1_all.deb"
+    size = File.size(path)
+    package = Package.new(:file => path)
 
-    result = @client.put_package("test_repo", package)
+    result = @client.put_package("test_repo", package, 22)
+    expect(result.succeeded).to be_truthy
+
+    #assert content type is set correctly
+    expect($request.content_type).to include("boundary=")
+    expect($request.content_type).to include("multipart/form-data")
+
+    # assert body is at least bigger than fixture file
+    expect($request.content_length > size).to be_truthy
+  end
+
+  it "POST debian package /api/v1/repos/joedamato/test_repo/packages.json with string distro_version_id" do
+    allow(@client).to receive(:find_distribution_id).and_return(3)
+    path = "spec/fixtures/libampsharp2.0-cil_2.0.4-1_all.deb"
+    size = File.size(path)
+    package = Package.new(:file => path)
+
+    result = @client.put_package("test_repo", package, "ubuntu/breezy")
+
+    expect(@client).to have_received(:find_distribution_id)
     expect(result.succeeded).to be_truthy
 
     #assert content type is set correctly
@@ -70,10 +89,9 @@ describe Packagecloud do
     jake_debian_size = File.size(jake_debian)
     combined_size = dsc_size + jake_orig_size + jake_debian_size
 
-    #TODO consider opening IO objects automatically for paths
-    package = Package.new(open(dsc), 22, source_packages)
+    package = Package.new(:file => dsc, :source_files => source_packages)
 
-    result = @client.put_package("test_repo", package)
+    result = @client.put_package("test_repo", package, 22)
     expect(result.succeeded).to be_truthy
 
     #assert content type is set correctly
@@ -85,9 +103,9 @@ describe Packagecloud do
   end
 
   it "POST /api/v1/repos/joedamato/test_repo/packages/contents.json" do
-    dsc = File.dirname(__FILE__) + '/fixtures/natty_dsc/jake_1.0-7.dsc'
+    dsc = 'spec/fixtures/natty_dsc/jake_1.0-7.dsc'
     size = File.size(dsc)
-    package = Package.new(open(dsc))
+    package = Package.new(:file => dsc)
 
     result = @client.package_contents("test_repo", package)
     expect(result.succeeded).to be_truthy
@@ -155,31 +173,6 @@ describe Packagecloud do
     end.to raise_error(InvalidUsernameException)
   end
 
-  it "should raise if api has advanced too far" do
-    current = Packagecloud::MINOR_VERSION
-    Packagecloud::MINOR_VERSION = "1"
-    credentials = Credentials.new("joedamato", "test_token")
-    connection = Connection.new("http", "localhost", 8000)
-
-    expect {
-      Client.new(credentials, "test_client", connection)
-    }.to raise_error(GemOutOfDateException)
-    # Set this back to current
-    Packagecloud::MINOR_VERSION = current
-  end
-
-  it "should suggest upgrading if patch version is higher" do
-    current = Packagecloud::PATCH_VERSION
-    Packagecloud::PATCH_VERSION = "0"
-    credentials = Credentials.new("joedamato", "test_token")
-    connection = Connection.new("http", "localhost", 8000)
-    $stdout.should_receive(:write).with("[WARNING] There's a newer version of the packagecloud-ruby library. Update as soon as possible!")
-    $stdout.should_receive(:write).with("\n")
-    Client.new(credentials, "test_client", connection)
-    # Set this back to current
-    Packagecloud::PATCH_VERSION = current
-  end
-
   it "invalid credentials should raise unauthenticated exception" do
     credentials = Credentials.new("joedamato", "test_tafdfasoken")
     connection = Connection.new("http", "localhost", 8000)
@@ -199,6 +192,11 @@ describe Packagecloud do
       expect(id).to be(3)
     end
 
+    it "should find python" do
+      id = @client.find_distribution_id("python")
+      expect(id).to be(166)
+    end
+
     it "should return nil for invalid distro" do
       id = @client.find_distribution_id("ubuasdalsdntu/breezy")
       expect(id).to be_nil

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: packagecloud-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 1.0.1
 platform: ruby
 authors:
 - Joe Damato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.40'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.40'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: mime
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 description: library for interacting with packagecloud.io
@@ -156,11 +156,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".document"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- ".yardopts"
+- .document
+- .gitignore
+- .rspec
+- .travis.yml
+- .yardopts
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -174,10 +174,12 @@ files:
 - lib/packagecloud/version.rb
 - packagecloud-ruby.gemspec
 - spec/fixtures/chewbacca-1.0.0.gem
+- spec/fixtures/distros.json
 - spec/fixtures/libampsharp2.0-cil_2.0.4-1_all.deb
 - spec/fixtures/natty_dsc/jake_1.0-7.debian.tar.gz
 - spec/fixtures/natty_dsc/jake_1.0-7.dsc
 - spec/fixtures/natty_dsc/jake_1.0.orig.tar.bz2
+- spec/package_spec.rb
 - spec/packagecloud_server.rb
 - spec/packagecloud_spec.rb
 - spec/spec_helper.rb
@@ -191,27 +193,28 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: library for interacting with packagecloud.io
 test_files:
 - spec/fixtures/chewbacca-1.0.0.gem
+- spec/fixtures/distros.json
 - spec/fixtures/libampsharp2.0-cil_2.0.4-1_all.deb
 - spec/fixtures/natty_dsc/jake_1.0-7.debian.tar.gz
 - spec/fixtures/natty_dsc/jake_1.0-7.dsc
 - spec/fixtures/natty_dsc/jake_1.0.orig.tar.bz2
+- spec/package_spec.rb
 - spec/packagecloud_server.rb
 - spec/packagecloud_spec.rb
 - spec/spec_helper.rb
-has_rdoc: