heroku-api 0.3.1 → 0.3.2

data/changelog.txt

@@ -1,3 +1,10 @@
+0.3.2 08/01/2012
+================
+
+don't request v3 apis
+first pass at ssl_endpoints support (no mocks yet)
+bump excon dep
+
 0.3.1 07/20/2012
 ================
 

data/heroku-api.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'excon', '~>0.15.4'
+  s.add_runtime_dependency 'excon', '~>0.15.5'
 
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'rake'

data/lib/heroku/api.rb

@@ -26,6 +26,7 @@ require "heroku/api/login"
 require "heroku/api/logs"
 require "heroku/api/processes"
 require "heroku/api/releases"
+require "heroku/api/ssl_endpoints"
 require "heroku/api/stacks"
 require "heroku/api/user"
 
@@ -48,7 +49,6 @@ module Heroku
         #'Accept-Language'       => 'en-US, en;q=0.8',
         'Authorization'         => "Basic #{Base64.encode64(user_pass).gsub("\n", '')}",
         'User-Agent'            => "heroku-rb/#{Heroku::API::VERSION}",
-        'X-Heroku-API-Version'  => '3',
         'X-Ruby-Version'        => RUBY_VERSION,
         'X-Ruby-Platform'       => RUBY_PLATFORM
       }.merge(options[:headers])

data/lib/heroku/api/ssl_endpoints.rb

@@ -0,0 +1,62 @@
+module Heroku
+  class API
+
+    # DELETE /apps/:app/ssl-endpoint/:cname
+    def delete_ssl_endpoint(app, cname)
+      request(
+        :expects  => 200,
+        :method   => :delete,
+        :path     => "/apps/#{app}/ssl-endpoints/#{escape(cname)}"
+      )
+    end
+
+    # GET /apps/:app/ssl-endpoint/:cname
+    def get_ssl_endpoint(app, cname)
+      request(
+        :expects  => 200,
+        :method   => :get,
+        :path     => "/apps/#{app}/ssl-endpoints/#{escape(cname)}"
+      )
+    end
+
+    # GET /apps/:app/ssl-endpoints
+    def get_ssl_endpoints(app)
+      request(
+        :expects  => 200,
+        :method   => :get,
+        :path     => "/apps/#{app}/ssl-endpoints"
+      )
+    end
+
+    # POST /apps/:app/ssl-endpoints
+    def post_ssl_endpoint(app, pem, key)
+      request(
+        :expects  => 200,
+        :method   => :post,
+        :path     => "/apps/#{app}/ssl-endpoints",
+        :query     => { 'key' => key, 'pem' => pem }
+      )
+    end
+
+    # POST /apps/:app/ssl-endpoints/:cname/rollback
+    def post_ssl_endpoint_rollback(app, cname)
+      request(
+        :expects  => 200,
+        :method   => :post,
+        :path     => "/apps/#{app}/ssl-endpoints/#{escape(cname)}/rollback"
+      )
+    end
+
+    # PUT /apps/:app/ssl-endpoints/:cname
+    def put_ssl_endpoint(app, cname, pem, key)
+      request(
+        :expects  => 200,
+        :method   => :put,
+        :path     => "/apps/#{app}/ssl-endpoints/#{escape(cname)}",
+        :query     => { 'key' => key, 'pem' => pem }
+      )
+    end
+
+  end
+end
+

data/lib/heroku/api/version.rb

@@ -1,5 +1,5 @@
 module Heroku
   class API
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

data/test/data/server.crt

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDPDCCAiQCCQCh/jTWfdrzuDANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJV
+UzEPMA0GA1UEChMGSGVyb2t1MR4wHAYDVQQDExVnZWVtdXMgKFdlc2xleSBCZWFy
+eSkxIDAeBgkqhkiG9w0BCQEWEXdlc2xleUBoZXJva3UuY29tMB4XDTEyMDczMDIy
+MTkzMFoXDTEzMDczMDIyMTkzMFowYDELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkhl
+cm9rdTEeMBwGA1UEAxMVZ2VlbXVzIChXZXNsZXkgQmVhcnkpMSAwHgYJKoZIhvcN
+AQkBFhF3ZXNsZXlAaGVyb2t1LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAOLKtOae7E8zilNDZfdrg943Q6UOpV9+0i/LHR38vMcgbWJ1KO/ei/d7
+i0Ei6krOJjrLcxZH4ixxSRTHeKv8iYqH+IUXnDAxoLSi64/0xrCo+EQibDWx7dFy
+zgDqE2CCsf9LJmU3O2gshiTnuyZPyxAHumDp9uyf56T1L3tCyjTyjagigkxOcR9/
+Hff7aV1Emtu4pQvza2mFIxL8PA2FYm850dHQod3TtSrL+HtUZOxS4wBZD6Pw+3vA
+i0jemuFXBszgwDQl0zF1zQ8u1dQmo5PETr8Swnx7LN7G/BauUZ3iXt91M83kE0Pw
+tFNIAAVvajUFDi42jWdOBwXQE7XlEdUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+3K5EOBNclZzlrrGU+vrawhoERPGShMDqA8Xqk7wXnYFhtj/3432+SRxSfrNEatqD
++lTdSdzERvJBWXHX5xJyu2GmenMNbA4WleqUKPhCXjyCz7dPUUp5hYNcCeAFENYl
+6MJX0NNrfgRLC8guWseerCAosPAr7Tw4SjMLYVl2yakV5O4e3E5rwazFOr15aMN/
+oUp0RjkkgqqVCNua2zwXk23OSnqO+quKSbpmjRI5e00qFyp70n0T3+ODl+1GFczJ
+iTPDEBkW7A4q/lNMlKful7kEeEOhRXfXoGwoSVracDD/bBngXKu0Epgv8LzQVQkK
+IZf1KG3pPS7kiGgk31G4Wg==
+-----END CERTIFICATE-----

data/test/data/server.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA4sq05p7sTzOKU0Nl92uD3jdDpQ6lX37SL8sdHfy8xyBtYnUo
+796L93uLQSLqSs4mOstzFkfiLHFJFMd4q/yJiof4hRecMDGgtKLrj/TGsKj4RCJs
+NbHt0XLOAOoTYIKx/0smZTc7aCyGJOe7Jk/LEAe6YOn27J/npPUve0LKNPKNqCKC
+TE5xH38d9/tpXUSa27ilC/NraYUjEvw8DYVibznR0dCh3dO1Ksv4e1Rk7FLjAFkP
+o/D7e8CLSN6a4VcGzODANCXTMXXNDy7V1Cajk8ROvxLCfHss3sb8Fq5RneJe33Uz
+zeQTQ/C0U0gABW9qNQUOLjaNZ04HBdATteUR1QIDAQABAoIBAQCJDqPgs65v9t/j
+jdmzeuBIjPFucLl0SrpPc9p24uRbGrfARrmkrMO9noX7qVQaPRdRdN5qWqrO3O+j
+hSDiH04n0CBanngfj/5k7AicCPuCi7rtwjfPA2aLq2vflZZ8Pr+/XvUnOgfG3xF6
+gCjT8GjxmRoDs6EsQz7ErAAz55s3/zJjYp25bauULPML9/KVNaGM87ynAK+2NEki
+QEBydo/BzxtuMYu/sUPd1eAj1UyIVW+h6K01H0xmU5Vx2xD/+prHcYidTzFPyDWz
+3A96Yj9xl8QuiF9h8st919ot80I0V8LOjJ0yuCpNq3Qu9zV6OHW+SPRkYrUQf6o3
+6Mty5zQJAoGBAPS1R6MY7B1yO+OkLTY1ibAzmdK/G6pvFNC/dbl5VFfTgxi4sjth
+Sg44jd1Ttd/LnqQ4SQBRXm/UI3CxoYsF6BQFG8WDdQ+Kn1wB9SzBQl+bz/KYUBbQ
+r/mwWW9F91aavz8NAALIjRk3wz+PtN4aV2M7BOlEmVxHVQ8K3piqEZI3AoGBAO1B
+yGQ8Uh9VxFnghqgJY2gWPXLq4ju3sef+16nSVvS0+ypOq55w3uXX8zfa9riKyTau
+J4QIJYGtYR9dVWyn3mp2F7AesL9Qk5+g3q6hMpFGamaiL+GaEbjfKWjxdp1EC6qs
+LwYHYuo9DrCkApbPnFoHpbaOYPQ+BhxzdVFYNaZTAoGBAKQVCbvq8ieseUviwg4f
+R/vGHdaaHkrhwOtX9fAv0sYxJS5madw3GBkBAt7tSn6NYgprU0fLR69kZ38hHFjD
+1SHXaw+9XbjWEpT3GxavX3oMWBsq1kj2FYkvHkjmeTqw+Jumc+Np5nKKWXk9OuHS
+d9YptNlVDiA6FGbJuwhSwQVxAoGAcB0qzbr3b5k+3N3No/AzykbgKMK3v1Jxvlhd
+nwEnWCGBop9kV82sdt5SL23IMrJanP007R5QYvQENicLq/mzj4lYbkBCc1VnPQJu
+2ASSebXVp8QybiA5CaxizBV2YKB8Bt2wpt+srVXG8E/AbXWTw7Njal3jkOcSSjWB
+FbxiNcMCgYApDMoIJRshdDUbnAmHBiejBxAbyrnhjs5LIklDb3R5OBm2OdgtpDPX
+OEQVS9jHW2rBsLKHTi5bqFfVV1UsIH0nw3aTj4qhEzlVwoGIrrkKN5HG0TK991Y+
+nMZF5DpWRpXGilpBqD3ZYExmDvPW8DkvxCSH7O2tuaAMg9djm/wyzw==
+-----END RSA PRIVATE KEY-----

data/test/test_helper.rb

@@ -5,8 +5,17 @@ gem 'minitest' # ensure we are using the gem version
 require 'minitest/autorun'
 require 'time'
 
+DATA_PATH = File.expand_path("#{File.dirname(__FILE__)}/data")
 MOCK = ENV['MOCK'] != 'false'
 
+def data_server_crt
+  @data_server_crt ||= File.read(File.join(DATA_PATH, 'server.crt'))
+end
+
+def data_server_key
+  @data_server_key ||= File.read(File.join(DATA_PATH, 'server.key'))
+end
+
 def heroku
   # ENV['HEROKU_API_KEY'] used for :api_key
   Heroku::API.new(:mock => MOCK)

data/test/test_ssl_endpoints.rb

@@ -0,0 +1,125 @@
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
+
+class TestSslEndpoints < MiniTest::Unit::TestCase
+
+  def test_delete_ssl_endpoint
+    skip if MOCK
+    with_app do |app_data|
+      heroku.post_addon(app_data['name'], 'ssl:endpoint')
+      ssl_endpoint_data = heroku.post_ssl_endpoint(app_data['name'], data_server_crt, data_server_key).body
+
+      response = heroku.delete_ssl_endpoint(app_data['name'], ssl_endpoint_data['cname'])
+
+      assert_equal(' ', response.body)
+      assert_equal(200, response.status)
+    end
+  end
+
+  def test_delete_ssl_endpoint_app_not_found
+    skip if MOCK
+    assert_raises(Heroku::API::Errors::NotFound) do
+      heroku.delete_ssl_endpoint(random_name, 'key')
+    end
+  end
+
+  def test_get_ssl_endpoint
+    skip if MOCK
+    with_app do |app_data|
+      heroku.post_addon(app_data['name'], 'ssl:endpoint')
+      ssl_endpoint_data = heroku.post_ssl_endpoint(app_data['name'], data_server_crt, data_server_key).body
+
+      response = heroku.get_ssl_endpoint(app_data['name'], ssl_endpoint_data['cname'])
+
+      data = response.body['ssl_cert']
+      assert_equal(false, data['ca_signed?'])
+      assert_equal(true, data['self_signed?'])
+      assert_equal(['geemus (wesley beary)'], data['cert_domains'])
+      assert_equal('2013/07/30 15:19:30 -0700', data['expires_at'])
+      assert_equal('/C=US/O=Heroku/CN=geemus (Wesley Beary)/emailAddress=wesley@heroku.com', data['issuer'])
+      assert_equal('2012/07/30 15:19:30 -0700', data['starts_at'])
+      assert_equal('/C=US/O=Heroku/CN=geemus (Wesley Beary)/emailAddress=wesley@heroku.com', data['subject'])
+      assert_equal(200, response.status)
+    end
+  end
+
+  def test_get_ssl_endpoints
+    skip if MOCK
+    with_app do |app_data|
+      heroku.post_addon(app_data['name'], 'ssl:endpoint')
+      heroku.post_ssl_endpoint(app_data['name'], data_server_crt, data_server_key)
+
+      response = heroku.get_ssl_endpoints(app_data['name'])
+
+      data = response.body.first['ssl_cert']
+      assert_equal(false, data['ca_signed?'])
+      assert_equal(true, data['self_signed?'])
+      assert_equal(['geemus (wesley beary)'], data['cert_domains'])
+      assert_equal('2013/07/30 15:19:30 -0700', data['expires_at'])
+      assert_equal('/C=US/O=Heroku/CN=geemus (Wesley Beary)/emailAddress=wesley@heroku.com', data['issuer'])
+      assert_equal('2012/07/30 15:19:30 -0700', data['starts_at'])
+      assert_equal('/C=US/O=Heroku/CN=geemus (Wesley Beary)/emailAddress=wesley@heroku.com', data['subject'])
+      assert_equal(200, response.status)
+    end
+  end
+
+  def test_post_ssl_endpoint
+    skip if MOCK
+    with_app do |app_data|
+      heroku.post_addon(app_data['name'], 'ssl:endpoint')
+
+      response = heroku.post_ssl_endpoint(app_data['name'], data_server_crt, data_server_key)
+
+      data = response.body['ssl_cert']
+      assert_equal(false, data['ca_signed?'])
+      assert_equal(true, data['self_signed?'])
+      assert_equal(['geemus (wesley beary)'], data['cert_domains'])
+      assert_equal('2013/07/30 15:19:30 -0700', data['expires_at'])
+      assert_equal('/C=US/O=Heroku/CN=geemus (Wesley Beary)/emailAddress=wesley@heroku.com', data['issuer'])
+      assert_equal('2012/07/30 15:19:30 -0700', data['starts_at'])
+      assert_equal('/C=US/O=Heroku/CN=geemus (Wesley Beary)/emailAddress=wesley@heroku.com', data['subject'])
+      assert_equal(200, response.status)
+    end
+  end
+
+  def test_post_ssl_endpoint_rollback
+    skip if MOCK
+    with_app do |app_data|
+      heroku.post_addon(app_data['name'], 'ssl:endpoint')
+      ssl_endpoint_data = heroku.post_ssl_endpoint(app_data['name'], data_server_crt, data_server_key).body
+      heroku.put_ssl_endpoint(app_data['name'], ssl_endpoint_data['cname'], data_server_crt, data_server_key)
+
+      response = heroku.post_ssl_endpoint_rollback(app_data['name'], ssl_endpoint_data['cname'])
+
+      data = response.body['ssl_cert']
+      assert_equal(false, data['ca_signed?'])
+      assert_equal(true, data['self_signed?'])
+      assert_equal(['geemus (wesley beary)'], data['cert_domains'])
+      assert_equal('2013/07/30 15:19:30 -0700', data['expires_at'])
+      assert_equal('/C=US/O=Heroku/CN=geemus (Wesley Beary)/emailAddress=wesley@heroku.com', data['issuer'])
+      assert_equal('2012/07/30 15:19:30 -0700', data['starts_at'])
+      assert_equal('/C=US/O=Heroku/CN=geemus (Wesley Beary)/emailAddress=wesley@heroku.com', data['subject'])
+      assert_equal(200, response.status)
+    end
+  end
+
+  def test_put_ssl_endpoint
+    skip if MOCK
+    with_app do |app_data|
+      heroku.post_addon(app_data['name'], 'ssl:endpoint')
+      ssl_endpoint_data = heroku.post_ssl_endpoint(app_data['name'], data_server_crt, data_server_key).body
+
+      response = heroku.put_ssl_endpoint(app_data['name'], ssl_endpoint_data['cname'], data_server_crt, data_server_key)
+
+      data = response.body['ssl_cert']
+      assert_equal(false, data['ca_signed?'])
+      assert_equal(true, data['self_signed?'])
+      assert_equal(['geemus (wesley beary)'], data['cert_domains'])
+      assert_equal('2013/07/30 15:19:30 -0700', data['expires_at'])
+      assert_equal('/C=US/O=Heroku/CN=geemus (Wesley Beary)/emailAddress=wesley@heroku.com', data['issuer'])
+      assert_equal('2012/07/30 15:19:30 -0700', data['starts_at'])
+      assert_equal('/C=US/O=Heroku/CN=geemus (Wesley Beary)/emailAddress=wesley@heroku.com', data['subject'])
+      assert_equal(200, response.status)
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-api
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &70353003020620 !ruby/object:Gem::Requirement
+  requirement: &70119193362320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.4
+        version: 0.15.5
   type: :runtime
   prerelease: false
-  version_requirements: *70353003020620
+  version_requirements: *70119193362320
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70353003019420 !ruby/object:Gem::Requirement
+  requirement: &70119193360480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353003019420
+  version_requirements: *70119193360480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70353003016440 !ruby/object:Gem::Requirement
+  requirement: &70119193355000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353003016440
+  version_requirements: *70119193355000
 description: Ruby Client for the Heroku API
 email:
 - wesley@heroku.com
@@ -89,10 +89,13 @@ files:
 - lib/heroku/api/mock/user.rb
 - lib/heroku/api/processes.rb
 - lib/heroku/api/releases.rb
+- lib/heroku/api/ssl_endpoints.rb
 - lib/heroku/api/stacks.rb
 - lib/heroku/api/user.rb
 - lib/heroku/api/vendor/okjson.rb
 - lib/heroku/api/version.rb
+- test/data/server.crt
+- test/data/server.key
 - test/test_addons.rb
 - test/test_apps.rb
 - test/test_collaborators.rb
@@ -105,6 +108,7 @@ files:
 - test/test_logs.rb
 - test/test_processes.rb
 - test/test_releases.rb
+- test/test_ssl_endpoints.rb
 - test/test_stacks.rb
 - test/test_user.rb
 homepage: http://github.com/heroku/heroku.rb
@@ -121,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2286072111782090869
+      hash: -2298175570851415714
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -130,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2286072111782090869
+      hash: -2298175570851415714
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15
@@ -138,6 +142,8 @@ signing_key:
 specification_version: 3
 summary: Ruby Client for the Heroku API
 test_files:
+- test/data/server.crt
+- test/data/server.key
 - test/test_addons.rb
 - test/test_apps.rb
 - test/test_collaborators.rb
@@ -150,5 +156,6 @@ test_files:
 - test/test_logs.rb
 - test/test_processes.rb
 - test/test_releases.rb
+- test/test_ssl_endpoints.rb
 - test/test_stacks.rb
 - test/test_user.rb