dpl 1.4.5 → 1.4.6.travis.116.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 737d464b323069d049838684641f25f24ad9f9d4
-  data.tar.gz: 1b9356942f9dc8d7bc93fc4c2d18a48ff72c2a45
+  metadata.gz: 83c74c4405a28aeffd2d4aa3312c817b288f163e
+  data.tar.gz: 5a49eef346c0dcedf588c15e0ba852c14a59688d
 SHA512:
-  metadata.gz: 2a3716fad16983a7fbf44f27a079ff820eebb4998d6c8feffc7505548cd03e56dcd332c94c8c8b7b871da232dd5c2ee0566c14ced06b6ced73d682c8968f462e
-  data.tar.gz: e29b87655b973922bdddeb4e722d760a929e00de1ea465221798537953c336afa8bddc539daf2cc791bc624bb742b5e655cd7af02d34a8338a355b417750b888
+  metadata.gz: 8d2167a2e9fbb8bac38f09e130a93b8ad1a9e7574d732dbcf4de1f8a45e9c270580912b274b22aee723526f1e0dc8e9f7ac88398b6e27193a96837ef59165dc9
+  data.tar.gz: b2f36258e6a786fb104fd9bf78e49e8f11f3829dfb71c76eea3cefa4ac01bced886a6bc53eb3c265716eca632b4d50a0dda5eed19e6824ea8856925f0c3d3f1c

data/.travis.yml

@@ -1,8 +1,16 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - jruby-18mode
-  - rbx-18mode
+- 1.8.7
+- 1.9.2
+- 1.9.3
+- 2.0.0
+- jruby-18mode
+- rbx-18mode
+deploy:
+  provider: rubygems
+  api_key:
+    secure: ZmZoDL1tilWvQrqRWDm2K4xQ5Grt9eRJzYVZPLANR0P1TM5BJBLk+UhWCWCPkkDVIBWMa5ANsiFYBxtH65Lw+uqMztSpVusk0l0LQXZGv9jMpT9445A8008U3vvfS0ke7IG8Q4bMAC7Sd6VGaiHDyZC7zmNvnqMpmVX7ShcgBME=
+  gem: dpl
+  on:
+    repo: rkh/dpl
+    ruby: 2.0.0

data/dpl.gemspec

@@ -20,4 +20,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'json'
+
+  # prereleases from Travis CI
+  s.version = s.version.to_s.succ + ".travis.#{ENV['TRAVIS_JOB_NUMBER']}" if ENV['CI']
 end

data/lib/dpl/provider/cloudcontrol.rb

@@ -23,21 +23,21 @@ module DPL
 
       def check_app
         response = api_call('GET', "/app/#{ app_name }/deployment/#{ dep_name }")
-        raise 'ERROR: application check failed' if response.code != '200'
+        error('application check failed') if response.code != '200'
         @repository = JSON.parse(response.body)["branch"]
       end
 
       def setup_key(file)
         data = { 'key' => File.read(file).chomp }
         response = api_call('POST', "/user/#{ user['username'] }/key", JSON.dump(data))
-        raise 'ERROR: adding key failed' if response.code != '200'
+        error('adding key failed') if response.code != '200'
         key = JSON.parse response.body
         @ssh_key_id = key['key_id']
       end
 
       def remove_key
         response = api_call('DELETE', "/user/#{ user['username']}/key/#{ @ssh_key_id }")
-        raise 'ERROR: key removal failed' if response.code != '204'
+        error('key removal failed') if response.code != '204'
       end
 
       def push_app
@@ -52,7 +52,7 @@ module DPL
           request = Net::HTTP::Post.new '/token/'
           request.basic_auth options[:email], options[:password]
           response = @http.request(request)
-          raise 'ERROR: authorization failed' if response.code != '200'
+          error('authorization failed') if response.code != '200'
           return JSON.parse response.body
         end
 
@@ -79,13 +79,13 @@ module DPL
         def deploy_app
           data = {'version' => -1}
           response = api_call('PUT', "/app/#{ app_name }/deployment/#{ dep_name }", JSON.dump(data))
-          raise 'ERROR: deployment failed' if response.code != '200'
+          error('deployment failed - the deployment is already deploying') if response.code != '200'
         end
 
         def user
           if @user.nil?
             response = api_call('GET', '/user/')
-            raise 'ERROR: can not find the user' if response.code != '200'
+            error('can not find the user') if response.code != '200'
             users = JSON.parse response.body
             @user = users[0]
           end

data/spec/provider/cloudcontrol_spec.rb

@@ -37,7 +37,7 @@ describe DPL::Provider::CloudControl do
 
     it 'on deployment not found' do
       provider.should receive(:api_call).and_return double(:code => '410')
-      expect { provider.check_app }.to raise_error 'ERROR: application check failed'
+      expect { provider.check_app }.to raise_error(DPL::Error)
     end
   end
 
@@ -61,7 +61,7 @@ describe DPL::Provider::CloudControl do
     it 'on api failure' do
       provider.should receive(:api_call).with('POST', '/user/foo_user/key', '{"key":"foo_key"}').and_return double(:code => '401')
 
-      expect { provider.setup_key 'file' }.to raise_error 'ERROR: adding key failed'
+      expect { provider.setup_key 'file' }.to raise_error(DPL::Error)
     end
   end
 
@@ -78,7 +78,7 @@ describe DPL::Provider::CloudControl do
 
     it 'on api failure' do
       provider.should receive(:api_call).with('DELETE', '/user/foo_user/key/foo_key_id').and_return double(:code => '410')
-      expect { provider.remove_key }.to raise_error 'ERROR: key removal failed'
+      expect { provider.remove_key }.to raise_error(DPL::Error)
     end
   end
 
@@ -112,7 +112,7 @@ describe DPL::Provider::CloudControl do
 
         expect do
           provider.instance_eval { get_token }
-        end.to raise_error 'ERROR: authorization failed'
+        end.to raise_error(DPL::Error)
       end
     end
 
@@ -165,7 +165,7 @@ describe DPL::Provider::CloudControl do
         provider.should receive(:api_call).with('PUT', '/app/foo_app/deployment/default', '{"version":-1}').and_return double(:code => '410')
         expect do
           provider.instance_eval { deploy_app }
-        end.to raise_error 'ERROR: deployment failed'
+        end.to raise_error(DPL::Error)
       end
     end
 
@@ -184,7 +184,7 @@ describe DPL::Provider::CloudControl do
 
         expect do
           provider.instance_eval { user }
-        end.to raise_error 'ERROR: can not find the user'
+        end.to raise_error(DPL::Error)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6.travis.116.4
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-18 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -123,23 +123,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: deploy tool
-test_files:
-- spec/cli_spec.rb
-- spec/provider/cloudcontrol_spec.rb
-- spec/provider/dotcloud_spec.rb
-- spec/provider/heroku_anvil_spec.rb
-- spec/provider/heroku_git_spec.rb
-- spec/provider/openshift_spec.rb
-- spec/provider/rubygems_spec.rb
-- spec/provider_spec.rb
-- spec/spec_helper.rb
-has_rdoc: 
+test_files: []