heroploy 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 105eedfe09a02a9d37fa4f51a66a85be998488ab
-  data.tar.gz: eb15f7c1627dc9cfdef4f6531aaf675f145b7bbe
+  metadata.gz: 43d2a2c41a7f6cf4df2a3bd702909a8f3187e86b
+  data.tar.gz: d38defbf1034e876710827b2df4f389f4775e614
 SHA512:
-  metadata.gz: a3357bd2d6a57371ed2b33609baf2b867debdd1fa3798df6dbd89628f028cb5c8110333e08f4868cb06c464dd034af4d37f03f3f498598a2490944b41849554c
-  data.tar.gz: 5f8b1062cab707cd0c540810f07c6df7919d6a51ab3eed7fed078ed0627bbde45d6edd19b9dce2372763c9ee520ca4e468763b8d6431b8190a178cf560bcc40f
+  metadata.gz: fc5fd21d2bdd1642f9c5c1abc145072b07d7744df3b51d76be6a9d17562bf1e325accadbd4536910f4538d15fa1974b238d543f54387ec74197f9dc05f80bc10
+  data.tar.gz: c34743eeda303b04f3865f83f1efdb8951df103b086c0d2dbda6b7280c5e174a0fb2eb97244fed6eb5a2a705b9acd167ee24f6014008de52e94f660163ba692a

data/README.md

@@ -35,6 +35,8 @@ If you're running Rails, you can use this generator to add an example config fil
 Here's an example ```heroploy.yml``` file:
 
 ```yaml
+travis_repo: my-travis-user/my-travis-repo
+
 environments:
   development:
     app: my-development-app
@@ -52,6 +54,7 @@ environments:
       pushed: true
       branch: master
       staged: true
+      travis: true
 ```
 
 This file:
@@ -59,7 +62,7 @@ This file:
 * Describes ```development```, ```staging``` and ```production``` deployment rules for three Heroku apps (named ```my-development-app```, ```my-staging-app``` and ```my-production-app``` on Heroku).
 * Allows any branch to be pushed directly to ```development```.
 * Only allows ```master``` to be pushed to ```staging```, and requires all changes to have first been pushed to ```origin```.
-* Only allows deployment to ```production``` if the changes have first been staged on ```staging```.
+* Only allows deployment to ```production``` if the changes have first been staged on ```staging``` and the Travis build is passing.
 
 To deploy to one of these environments, run ```rake heroploy:<environment>:deploy```.  For example:
 

data/heroploy.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "bundler", "~> 1.3"
+  spec.add_dependency "travis", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rails"
   spec.add_development_dependency "rspec"

data/lib/heroploy/commands/checks.rb

@@ -1,3 +1,5 @@
+require 'travis'
+
 module Heroploy
   module Commands
     module Checks
@@ -37,6 +39,13 @@ module Heroploy
           end
         end
       end
+      
+      def check_travis(branch_name, travis_repo_name)
+        travis_repo = Travis::Repository.find(travis_repo_name)
+        unless travis_repo.branch(branch_name).green?
+          raise "Failing Travis build for branch #{branch_name}"
+        end
+      end
     end
   end
 end

data/lib/heroploy/config/deployment_config.rb

@@ -6,6 +6,7 @@ require 'heroploy/config/remote_config'
 module Heroploy
   module Config
     class DeploymentConfig
+      attr_accessor :travis_repo
       attr_accessor :environments
       attr_accessor :shared_env
       attr_accessor :remote_configs
@@ -15,6 +16,7 @@ module Heroploy
       end
 
       def initialize(attrs = {})
+        @travis_repo = attrs['travis_repo']
         unless attrs['environments'].nil?
           @environments = attrs['environments'].map { |name, env_attrs| Environment.new(name, env_attrs) }
         end

data/lib/heroploy/config/environment_checks.rb

@@ -4,12 +4,14 @@ module Heroploy
       attr_accessor :pushed
       attr_accessor :branch
       attr_accessor :staged
+      attr_accessor :travis
       
       def initialize(attrs = {})
         attrs ||= {}
         @pushed = attrs['pushed']
         @branch = attrs['branch']
         @staged = attrs['staged'] == true ? 'staging' : attrs['staged']
+        @travis = attrs['travis']
       end  
     end
   end

data/lib/heroploy/tasks/check_task_lib.rb

@@ -30,6 +30,7 @@ module Heroploy
         define_branch_check
         define_staged_check
         define_config_check
+        define_travis_check
         define_all_check
       end
     
@@ -82,6 +83,16 @@ module Heroploy
         end
         @defined_tasks << :config
       end
+      
+      def define_travis_check
+        if env_config.checks.travis then
+          desc "check the travis build for the current branch"
+          task :travis do
+            check_travis(current_branch, deploy_config.travis_repo)
+          end
+          @defined_tasks << :travis
+        end
+      end
     
       def define_all_check
         desc "do all the checks for #{env_config.name}"

data/lib/heroploy/version.rb

@@ -1,3 +1,3 @@
 module Heroploy
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/factories.rb

@@ -3,23 +3,27 @@ FactoryGirl.define do
     pushed false
     staged false
     branch nil
+    travis false
     
     trait :development do
       pushed false
       staged false
       branch nil
+      travis false
     end
     
     trait :staging do
       pushed true
       staged false
       branch 'master'
+      travis true
     end
     
     trait :production do
       pushed true
       staged true
       branch 'master'
+      travis true
     end
   end
   
@@ -36,6 +40,8 @@ FactoryGirl.define do
   end
   
   factory :deployment_config, :class => Heroploy::Config::DeploymentConfig do
+    travis_repo "my-travis-user/my-travis-repo"
+
     environments {
       [
         build(:environment, :development),
@@ -44,4 +50,20 @@ FactoryGirl.define do
       ]
     }
   end
+  
+  factory :travis_build, :class => Travis::Client::Build do
+    [:passed, :failed].each do |t|
+      trait t do
+        after(:build) do |build|
+          build.state = t.to_s
+        end
+      end
+    end
+  
+    initialize_with { Travis::Client::Build.new(Travis::Client::Session.new, 123) }
+  end
+  
+  factory :travis_repo, :class => Travis::Client::Repository do
+    initialize_with { Travis::Client::Repository.new(Travis::Client::Session.new, 123) }
+  end
 end

data/spec/lib/heroploy/commands/checks_spec.rb

@@ -136,4 +136,31 @@ describe Heroploy::Commands::Checks do
       end
     end    
   end
+  
+  describe "#check_travis" do
+    let(:travis_repo_name) { 'travis/repo' }
+    let(:travis_repo) { build(:travis_repo) }
+    
+    before { Travis::Repository.stub(:find).and_return(travis_repo) }
+    
+    context "if the build is failing for the given branch" do
+      let(:failed_build) { build(:travis_build, :failed) }
+      before { expect(travis_repo).to receive(:branch).and_return(failed_build) }
+      
+      it "raises an error" do
+        expect{
+          commands.check_travis('my-branch', 'travis/repo')
+        }.to raise_error("Failing Travis build for branch my-branch")
+      end
+    end
+    
+    context "if the build is passing for the given branch" do
+      let(:passed_build) { build(:travis_build, :passed) }
+      before { expect(travis_repo).to receive(:branch).and_return(passed_build) }
+      
+      it "executes successfully" do
+        commands.check_travis('my-branch', 'travis/repo')
+      end
+    end
+  end
 end

data/spec/lib/heroploy/config/deployment_config_spec.rb

@@ -5,6 +5,7 @@ describe Heroploy::Config::DeploymentConfig do
   
   let(:attrs) do
     {
+      'travis_repo' => 'travis/my-repo',
       'environments' => {
         'staging' => {},
         'production' => {
@@ -30,6 +31,10 @@ describe Heroploy::Config::DeploymentConfig do
       its('shared_env.required') { should eq(['my-var']) }
       its('shared_env.variables') { should eq({'my-var' => 'some-value'}) }
     end
+    
+    context "it initializes the travis repo" do
+      its(:travis_repo) { should eq('travis/my-repo') }
+    end
   end
   
   describe "#[]" do

data/spec/lib/heroploy/config/environment_checks_spec.rb

@@ -6,19 +6,21 @@ describe Heroploy::Config::EnvironmentChecks do
       let(:pushed) { true }
       let(:branch_name) { 'my-branch' }
       let(:staging_env_name) { 'my-staging-environment' }
-      let(:attrs) { {'pushed' => pushed, 'branch' => branch_name, 'staged' => staging_env_name} }
+      let(:travis) { true }
+      let(:attrs) { {'pushed' => pushed, 'branch' => branch_name, 'staged' => staging_env_name, 'travis' => travis} }
       
       subject(:environment_checks) { Heroploy::Config::EnvironmentChecks.new(attrs) }
 
       its(:pushed) { should eq(pushed) }
       its(:branch) { should eq(branch_name) }
       its(:staged) { should eq(staging_env_name) }
+      its(:travis) { should eq(travis) }
     end
     
     context "if no staging environment name is given" do
       subject(:environment_checks) { Heroploy::Config::EnvironmentChecks.new({'staged' => true}) }
       
-      it "assumed the staging environment is called 'staging'" do
+      it "assumes the staging environment is called 'staging'" do
         expect(environment_checks.staged).to eq('staging')
       end
     end

data/spec/lib/heroploy/tasks/check_all_spec.rb

@@ -41,10 +41,24 @@ describe "check:all" do
     its(:prerequisites) { should include('branch') }
   end
   
-  context "if checks.staged is not set" do
+  context "if checks.branch is not set" do
     before { environment.checks.branch = nil }
     include_context "rake"
     
     its(:prerequisites) { should_not include('branch') }
   end
+  
+  context "if checks.travis is set" do
+    before { environment.checks.travis = true }
+    include_context "rake"
+    
+    its(:prerequisites) { should include('travis') }
+  end
+  
+  context "if checks.travis is not set" do
+    before { environment.checks.travis = nil }
+    include_context "rake"
+    
+    its(:prerequisites) { should_not include('travis') }
+  end
 end

data/spec/lib/heroploy/tasks/check_config_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe "check:config" do
+  it "should have a spec" do
+    pending 'need to tidy up shared context for rake tasks and add specs for this'
+  end
+end

data/spec/lib/heroploy/tasks/check_travis_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe "check:travis" do
+  let(:environment) { build(:environment, :production) }
+  include_context "rake"
+  
+  it "invokes :check_travis" do
+    Heroploy::Tasks::CheckTaskLib.any_instance.stub(:current_branch).and_return("my-branch")
+    
+    expect_any_instance_of(Heroploy::Tasks::CheckTaskLib).to receive(:check_travis)
+      .with("my-branch", "my-travis-user/my-travis-repo")
+    
+    task.invoke
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroploy
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - John Brunton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: travis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -157,9 +171,11 @@ files:
 - spec/lib/heroploy/config/shared_env_spec.rb
 - spec/lib/heroploy/tasks/check_all_spec.rb
 - spec/lib/heroploy/tasks/check_branch_spec.rb
+- spec/lib/heroploy/tasks/check_config_spec.rb
 - spec/lib/heroploy/tasks/check_pushed_spec.rb
 - spec/lib/heroploy/tasks/check_remote_spec.rb
 - spec/lib/heroploy/tasks/check_staged_spec.rb
+- spec/lib/heroploy/tasks/check_travis_spec.rb
 - spec/spec_helper.rb
 - spec/support/customer_matchers/environment_matcher.rb
 - spec/support/helpers/deploy_config_helper.rb
@@ -204,9 +220,11 @@ test_files:
 - spec/lib/heroploy/config/shared_env_spec.rb
 - spec/lib/heroploy/tasks/check_all_spec.rb
 - spec/lib/heroploy/tasks/check_branch_spec.rb
+- spec/lib/heroploy/tasks/check_config_spec.rb
 - spec/lib/heroploy/tasks/check_pushed_spec.rb
 - spec/lib/heroploy/tasks/check_remote_spec.rb
 - spec/lib/heroploy/tasks/check_staged_spec.rb
+- spec/lib/heroploy/tasks/check_travis_spec.rb
 - spec/spec_helper.rb
 - spec/support/customer_matchers/environment_matcher.rb
 - spec/support/helpers/deploy_config_helper.rb