dpl 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6bbfb94ff725ea7532c2291f601afd4507bece0
-  data.tar.gz: bbf52c38299e4205b9340b242ff1f4c28235d1a8
+  metadata.gz: e8ce5f9a80d877ef54d0b978e067c5945fa01cdd
+  data.tar.gz: 963dc3b41ee3b5be2c3b0b0e4ecf2e2de182cdf7
 SHA512:
-  metadata.gz: ac76b03568e99c06dd3ea3cba2cc3ed5113de198e3cb23669aba2251384b2a6d71acea6947d5ab9251d722c6967c410d58e66bfb2baedb8ac80faba19f0b098e
-  data.tar.gz: 8fb70d1e14c0f71d1879b0696e4c173e7c7ec3b524a69f78c4edc3474b2453813acc189a2477dc31afe1d216d9cbb8d287fe1bcc844519b20e5e547faa4b1a8b
+  metadata.gz: 7d8c4ce8261517c073aa5619eb522d376c86353601269a25dddf8fec9d1ab9b299fd8cd38ddc47b1a69b8b8f8e639e77b369de65b18f2ed3ae0dd85be0330b0f
+  data.tar.gz: d786c47810ddebd60dd1a55a32846a534f76060bbe36179ce3fe9c4a7821b1c23bb83fc958f0b8e10674498b44d235748848042ad128f0d0e96b69740c6ed332

data/.travis.yml

@@ -4,5 +4,5 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - jruby
-  - rbx
+  - jruby-18mode
+  - rbx-18mode

data/dpl.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.require_path          = 'lib'
   s.required_ruby_version = '>= 1.8.7'
 
-  s.add_development_dependency 'rspec', '~> 2.13.0'
+  s.add_development_dependency 'rspec'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'simplecov'
 end

data/lib/dpl/provider/heroku/anvil.rb

@@ -41,6 +41,8 @@ module DPL
             ::Anvil.headers["X-Heroku-User"] = user
             ::Anvil.headers["X-Heroku-App"]  = option(:app)
             ::Anvil::Engine.build "."
+          rescue ::Anvil::Builder::BuildError => e
+            raise Error, "deploy failed, anvil build error: #{e.message}"
           end
         end
 

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

data/spec/cli_spec.rb

@@ -17,7 +17,7 @@ describe DPL::CLI do
 
   describe :run do
     example "triggers deploy" do
-      provider = stub('provider')
+      provider = double('provider')
       DPL::Provider.should_receive(:new).and_return(provider)
       provider.should_receive(:deploy)
 

data/spec/provider/heroku_spec.rb

@@ -9,13 +9,13 @@ describe DPL::Provider::Heroku do
 
   describe :api do
     it 'accepts an api key' do
-      api = stub(:api)
+      api = double(:api)
       ::Heroku::API.should_receive(:new).with(:api_key => "foo").and_return(api)
       provider.api.should be == api
     end
 
     it 'accepts a user and a password' do
-      api = stub(:api)
+      api = double(:api)
       provider.options.update(:user => "foo", :password => "bar")
       ::Heroku::API.should_receive(:new).with(:user => "foo", :password => "bar").and_return(api)
       provider.api.should be == api
@@ -24,9 +24,9 @@ describe DPL::Provider::Heroku do
 
   context "with fake api" do
     let :api do
-      stub "api",
-        :get_user => stub("get_user", :body => { "email" => "foo@bar.com" }),
-        :get_app  => stub("get_app",  :body => { "name"  => "example", "git_url" => "GIT URL" })
+      double "api",
+        :get_user => double("get_user", :body => { "email" => "foo@bar.com" }),
+        :get_app  => double("get_app",  :body => { "name"  => "example", "git_url" => "GIT URL" })
     end
 
     before do
@@ -76,7 +76,7 @@ describe DPL::Provider::Heroku do
 
     describe :run do
       example do
-        data = stub("data", :body => { "rendezvous_url" => "rendezvous url" })
+        data = double("data", :body => { "rendezvous_url" => "rendezvous url" })
         api.should_receive(:post_ps).with("example", "that command", :attach => true).and_return(data)
         Rendezvous.should_receive(:start).with(:url => "rendezvous url")
         provider.run("that command")

data/spec/provider/openshift_spec.rb

@@ -9,7 +9,7 @@ describe DPL::Provider::Openshift do
 
   describe :api do
     it 'accepts a user and a password' do
-      api = stub(:api)
+      api = double(:api)
       provider.options.update(:user => "foo", :password => "bar")
       ::RHC::Rest::Client.should_receive(:new).with(:user => "foo", :password => "bar", :server => "openshift.redhat.com").and_return(api)
       provider.api.should be == api
@@ -18,14 +18,14 @@ describe DPL::Provider::Openshift do
 
   context "with api" do
     let :api do
-      stub "api",
-        :user => stub(:login => "foo@bar.com"),
-        :find_application => stub(:name => "example", :git_url => "git://something"),
-        :add_key => stub
+      double "api",
+        :user => double(:login => "foo@bar.com"),
+        :find_application => double(:name => "example", :git_url => "git://something"),
+        :add_key => double
     end
     let :app do
-      stub "app",
-        :restart => stub
+      double "app",
+        :restart => double
     end
 
     before do

data/spec/provider_spec.rb

@@ -5,8 +5,7 @@ describe DPL::Provider do
   let(:example_provider) { Class.new(described_class)}
   subject(:provider) { example_provider.new(DummyContext.new, :app => 'example', :key_name => 'foo', :run => ["foo", "bar"]) }
 
-  before { described_class.const_set(:Example, example_provider) }
-  after { described_class.send(:remove_const, :Example) }
+  before { stub_const "DPL::Provider::Example", example_provider }
 
   describe :new do
     example { described_class.new(DummyContext.new, :provider => "example") .should be_an(example_provider) }
@@ -64,7 +63,7 @@ describe DPL::Provider do
     end
 
     example "does not need key" do
-      provider.stub(:needs_key?, false)
+      provider.stub(:needs_key? => false)
       provider.deploy
     end
   end
@@ -91,4 +90,31 @@ describe DPL::Provider do
       provider.log("foo")
     end
   end
+
+  describe :shell do
+    example do
+      example_provider.should_receive(:system).with("command")
+      example_provider.shell("command")
+    end
+  end
+
+  describe :npm_g do
+    example do
+      example_provider.context.should_receive(:shell).with("npm install -g foo")
+      example_provider.npm_g("foo")
+    end
+  end
+
+  describe :run do
+    example do
+      provider.should_receive(:error).with("running commands not supported")
+      provider.run "blah"
+    end
+  end
+
+  describe :error do
+    example do
+      expect { provider.error("Foo") }.to raise_error("Foo")
+    end
+  end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-20 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement