paratrooper 1.1.1 → 1.1.2

data/lib/paratrooper/heroku_wrapper.rb

@@ -30,11 +30,23 @@ module Paratrooper
 
     private
     def app_domain_name
-      heroku_api.get_domains(app_name).body.last['domain']
+      if custom_domain_response
+        custom_domain_response['domain']
+      else
+        default_domain_name
+      end
     end
 
     def app_maintenance(flag)
       heroku_api.post_app_maintenance(app_name, flag)
     end
+
+    def default_domain_name
+      heroku_api.get_app(app_name).body['domain_name']['domain']
+    end
+
+    def custom_domain_response
+      @custom_domain_response ||= heroku_api.get_domains(app_name).body.last
+    end
   end
 end

data/lib/paratrooper/version.rb

@@ -1,3 +1,3 @@
 module Paratrooper
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/spec/paratrooper/heroku_wrapper_spec.rb

@@ -62,11 +62,33 @@ describe Paratrooper::HerokuWrapper do
     end
   end
 
-  describe '#app_domain_name' do
-    let(:response) { double(:response, body: [{'domain' => 'APP_URL'}]) }
-    it "calls down to heroku api" do
-      heroku_api.should_receive(:get_domains).with(app_name).and_return(response)
-      wrapper.app_url
+  describe '#app_url' do
+    context 'when custom domains are available' do
+      let(:response) { double(:response, body: [{'domain' => 'APP_URL'}]) }
+
+      it "calls down to heroku api" do
+        heroku_api.should_receive(:get_domains).with(app_name).and_return(response)
+        wrapper.app_url
+      end
+    end
+
+    context 'when custom urls are not available' do
+      let(:response) do
+        double(:response, body: { 'domain_name' => { 'domain' => 'APP_URL' } })
+      end
+
+      let(:domain_response) do
+        double(:domain_response, body: [])
+      end
+
+      before do
+        heroku_api.stub(:get_domains).and_return(domain_response)
+      end
+
+      it "makes call to get default heroku app url" do
+        heroku_api.should_receive(:get_app).with(app_name).and_return(response)
+        expect(wrapper.app_url).to eq('APP_URL')
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paratrooper
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake