dpl 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cecca7ef24d3f361ec9223717864de564b32774
-  data.tar.gz: 72503b1ab9b7fcc3ce7cd62978e66cd8c06df987
+  metadata.gz: 478f6fafe432230c66b9452ba5072588ea0f9dc1
+  data.tar.gz: 45db3d5e7a930300a7a8779e084976c29548929d
 SHA512:
-  metadata.gz: fae71f0cced6af6138be71f8e3b4aeb2740f408a1a6aa853448ae8ddd7a6a55747fd56d3895fbd85ee97cdc2a2f27865843c2656ddc8f4925615f39347143b6d
-  data.tar.gz: e7329ad282929d20b658605bd545c2cf890a31a2df5b9fd8cca0f552cf5d3267c89eed3844fb08baf336f5b4edd744ebcb852eceee5c7beda59fbb2f5898eded
+  metadata.gz: bc6991fc24f3249decd6ceb3bd5fb584e14f5dce4304411b188222153702310c5fc0edfd162887ffd8fdf02630c9a50fc4a78fc48c502b2bede6da03ba9f4a6b
+  data.tar.gz: 7b3045f1eaabb9bf25f5706cc46d2aa2df5b63b3fd498868e226d4f45ddc1d2bc9344ec5f4534101c52f4bc2bb5e3b2489df75550f63d983f246ed709c0c8354

data/Gemfile

@@ -4,6 +4,7 @@ gemspec
 group :heroku do
   gem 'rendezvous'
   gem 'heroku-api'
+  gem 'anvil-cli'
 end
 
 group :openshift do

data/dpl.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'json'
 end

data/lib/dpl/provider.rb

@@ -64,37 +64,47 @@ module DPL
       end
     end
 
+    def should_deploy?
+      (not options[:tags_only] or has_tag?)
+    end
+
+    def has_tag?
+      context.shell('git describe --exact-match')
+      $?.success?
+    end
+
     def deploy
       rm_rf ".dpl"
       mkdir_p ".dpl"
-
-      context.fold("Preparing deploy") do
-        check_auth
-        check_app
-
-        if needs_key?
-          create_key(".dpl/id_rsa")
-          setup_key(".dpl/id_rsa.pub")
-          setup_git_ssh(".dpl/git-ssh", ".dpl/id_rsa")
+      if should_deploy?
+        context.fold("Preparing deploy") do
+          check_auth
+          check_app
+
+          if needs_key?
+            create_key(".dpl/id_rsa")
+            setup_key(".dpl/id_rsa.pub")
+            setup_git_ssh(".dpl/git-ssh", ".dpl/id_rsa")
+          end
+
+          cleanup
         end
 
-        cleanup
-      end
-
-      context.fold("Deploying application") { push_app }
+        context.fold("Deploying application") { push_app }
 
-      Array(options[:run]).each do |command|
-        if command == 'restart'
-          context.fold("Restarting application") { restart }
-        else
-          context.fold("Running %p" % command) { run(command) }
+        Array(options[:run]).each do |command|
+          if command == 'restart'
+            context.fold("Restarting application") { restart }
+          else
+            context.fold("Running %p" % command) { run(command) }
+          end
         end
       end
-    ensure
-      if needs_key?
-        remove_key rescue nil
+      ensure
+        if needs_key?
+          remove_key rescue nil
+        end
       end
-    end
 
     def sha
       @sha ||= ENV['TRAVIS_COMMIT'] || `git rev-parse HEAD`.strip

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

@@ -2,6 +2,8 @@ module DPL
   class Provider
     module Heroku
       class Anvil < Git
+        HEROKU_BUILDPACKS = ['ruby', 'nodejs', 'clojure', 'python', 'java', 'gradle', 'grails', 'scala', 'play']
+        HEROKU_BUILDPACK_PREFIX = "https://github.com/heroku/heroku-buildpack-"
         requires 'anvil-cli', :load => 'anvil/engine'
         requires 'excon' # comes with heroku
         requires 'json'
@@ -40,7 +42,10 @@ module DPL
           @slug_url ||= begin
             ::Anvil.headers["X-Heroku-User"] = user
             ::Anvil.headers["X-Heroku-App"]  = option(:app)
-            ::Anvil::Engine.build "."
+            if HEROKU_BUILDPACKS.include? options[:buildpack]
+              options[:buildpack] = HEROKU_BUILDPACK_PREFIX + options[:buildpack]
+            end
+            ::Anvil::Engine.build ".", :buildpack => options[:buildpack]
           rescue ::Anvil::Builder::BuildError => e
             raise Error, "deploy failed, anvil build error: #{e.message}"
           end
@@ -52,4 +57,4 @@ module DPL
       end
     end
   end
-end
+end

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

data/spec/provider/heroku_anvil_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+require 'anvil'
+require 'heroku-api'
+require 'excon'
+require 'dpl/provider/heroku'
+
+describe DPL::Provider::Heroku do
+  subject :provider do
+    described_class.new(DummyContext.new, :app => 'example', :api_key => 'foo', :strategy => 'anvil', :buildpack => 'git://some-buildpack.git')
+  end
+
+  describe :api do
+    it 'accepts an api key' do
+      api = double(:api)
+      lambda { provider.api }.should_not raise_error
+    end
+
+    it 'raises an error if an api key is not present' do
+      provider.options.delete :api_key
+      lambda { provider.api }.should raise_error(DPL::Error)
+    end
+  end
+
+  context "with fake api" do
+    let :api do
+      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
+      ::Heroku::API.should_receive(:new).and_return(api)
+      provider.api
+    end
+
+    describe :push_app do
+      example do
+        response = double :response
+        response.stub(:status => 202)
+        response.stub(:headers => {'Location' => '/blah'})
+
+        second_response = double :second_response
+        second_response.stub(:status => 200)
+
+        provider.stub(:slug_url => "http://slug-url")
+
+        ENV.should_receive(:[]).with('TRAVIS_COMMIT').and_return('123')
+        ::Excon.should_receive(:post).with(provider.release_url,
+                                        :body => {"slug_url" => "http://slug-url", "description" => "Deploy 123 via Travis CI" }.to_json,
+                                         :headers => {"Content-Type" => 'application/json', 'Accept' => 'application/json'}).and_return(response)
+
+        ::Excon.should_receive(:get).with("https://:#{provider.options[:api_key]}@cisaurus.heroku.com/blah").and_return(second_response)
+        provider.push_app
+      end
+    end
+
+    describe :slug_url do
+
+      before(:each) do
+        headers = double(:headers)
+        ::Anvil.should_receive(:headers).at_least(:twice).and_return(headers)
+        headers.should_receive(:[]=).at_least(:once).with('X-Heroku-User', "foo@bar.com")
+        headers.should_receive(:[]=).at_least(:once).with('X-Heroku-App', "example")
+      end
+
+      example "with full buildpack url" do
+        ::Anvil::Engine.should_receive(:build).with(".", :buildpack=>"git://some-buildpack.git")
+        provider.slug_url
+      end
+
+      example "with buildpack name expansion" do
+        DPL::Provider::Heroku::Anvil::HEROKU_BUILDPACKS.each do |b|
+          provider.options.update(:buildpack => b)
+          ::Anvil::Engine.should_receive(:build).with(".", :buildpack=>described_class::Anvil::HEROKU_BUILDPACK_PREFIX + b)
+          provider.slug_url
+        end
+      end
+    end
+  end
+end

data/spec/provider/{heroku_spec.rb → heroku_git_spec.rb}

@@ -102,4 +102,4 @@ describe DPL::Provider::Heroku do
       end
     end
   end
-end
+end

data/spec/provider_spec.rb

@@ -132,4 +132,19 @@ describe DPL::Provider do
       expect { provider.error("Foo") }.to raise_error("Foo")
     end
   end
+
+  describe :has_tag? do
+    example do
+      provider.context.should_receive(:shell).with('git describe --exact-match')
+      provider.has_tag?
+    end
+  end
+
+  describe :should_deploy? do
+    example "tags_only with tag" do
+      provider.options[:tags_only] = true
+      provider.should_receive(:has_tag?).and_return(true)
+      provider.should_deploy?.should be == true
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: deploy tool abstraction for clients
 email: konstantin.mailinglists@googlemail.com
 executables:
@@ -84,7 +98,8 @@ files:
 - notes/heroku.md
 - spec/cli_spec.rb
 - spec/provider/dotcloud_spec.rb
-- spec/provider/heroku_spec.rb
+- spec/provider/heroku_anvil_spec.rb
+- spec/provider/heroku_git_spec.rb
 - spec/provider/openshift_spec.rb
 - spec/provider_spec.rb
 - spec/spec_helper.rb
@@ -115,7 +130,8 @@ summary: deploy tool
 test_files:
 - spec/cli_spec.rb
 - spec/provider/dotcloud_spec.rb
-- spec/provider/heroku_spec.rb
+- spec/provider/heroku_anvil_spec.rb
+- spec/provider/heroku_git_spec.rb
 - spec/provider/openshift_spec.rb
 - spec/provider_spec.rb
 - spec/spec_helper.rb