heroku_san 4.3.0 → 4.3.1

data/.travis.yml

@@ -1,5 +1,20 @@
 language: ruby
+bundler_args: --without development
+script: "bundle exec rake travis"
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+env:
+  global:
+    - secure: dAxfEdg/7Cb/G9vkrn/ifdvycbXWtK2ey60JMepOxx9v3QyaqoSY3w5G0QB+4+uyOYmHwtif8tnK3Sa8jbBgqhAlXaxqxOT8WmQKYlhSgwWX4lQe4lUM5jkOkfNHRMRaQvCAn27gNAjdIRU7sb2cU/pm64eAFbU01TejJOM7Aow=
+before_install:
+  - wget -qO- https://toolbelt.heroku.com/install-ubuntu.sh | sh
+before_script:
+  - git config --global user.name "Travis CI"
+  - git config --global user.email "travis@example.com"
+  - echo -e "Host heroku.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
+  - ./spec/support/travis-ssh-keygen.sh < /dev/null
+  - heroku keys:add ~/.ssh/id_rsa.pub < /dev/null
+after_script:
+  - ./spec/support/travis-key-cleanup.sh

data/Gemfile

@@ -3,21 +3,27 @@ source 'https://rubygems.org'
 # Specify dependencies in heroku_san.gemspec
 gemspec
 
-group :development do
-  gem 'rails', '>= 2'
-  gem 'rspec'
+group :test do
   gem 'aruba'
+  gem 'bundler', '~> 1.1'
   gem 'cucumber'
+  gem 'godot'
+  gem 'rails', '3.2.7'
   gem 'rake'
-  gem 'bundler', '~> 1.1'
+  gem 'rspec', '~> 2.14'
+  gem 'sqlite3'
+  gem 'pg'
+end
+
+group :development do
   gem 'git-smart'
-  gem 'godot'
   gem 'guard'
-  gem 'rb-inotify', :require => false
-  gem 'rb-fsevent', :require => false
-  gem 'rb-fchange', :require => false
-  gem 'terminal-notifier-guard'
-  gem 'guard-rspec'
   gem 'guard-bundler'
   gem 'guard-cucumber'
+  gem 'guard-rspec'
+  gem 'rb-fchange', :require => false
+  gem 'rb-fsevent', :require => false
+  gem 'rb-inotify', :require => false
+  gem 'terminal-notifier-guard'
+  gem 'travis', '~> 1.5.6'
 end

data/Rakefile

@@ -3,6 +3,8 @@ require 'rubygems'
 require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'cucumber'
+require 'cucumber/rake/task'
 
 desc 'Default: run unit tests.'
 task :default => :spec
@@ -11,3 +13,18 @@ desc "Run all specs"
 RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/**/*_spec.rb'
 end
+
+namespace 'cucumber' do
+  Cucumber::Rake::Task.new(:remote) do |t|
+    t.profile = "remote"
+  end
+
+  Cucumber::Rake::Task.new(:default) do |t|
+    t.profile = "default"
+  end
+end
+
+desc "Run travis test suite"
+task :travis => [:spec, 'cucumber:default', 'cucumber:remote']
+
+# for app in `heroku apps | tail +2`; do heroku apps:destroy --app $app --confirm $app; done

data/features/remote.feature

@@ -8,7 +8,7 @@ Feature: heroku_san can control a project on Heroku
   Scenario: Installs a project
     Given I have a new Rails project
     When I am in the project directory
-    And I add heroku_san to the Gemfile
+    And I add heroku_san to the rails Gemfile
     Then rake reports that the heroku: tasks are available
     
   Scenario: Manipulates a Rails app on Heroku

data/features/shell_execution.feature

@@ -0,0 +1,47 @@
+@slow_process @announce-cmd
+Feature: heroku_san can shell out to heroku without errors
+
+  Scenario: Bundling a ruby 2.0 project
+    Given I run `mkdir -p ruby2test`
+    And I cd to "ruby2test"
+    And I write to "Gemfile" with:
+    """
+      source "https://rubygems.org"
+      ruby '2.0.0'
+      gem 'heroku_san', :path => '../../../.'
+    """
+
+    And I write to "get_heroku_version.rb" with:
+    """
+      #!/usr/bin/env ruby
+
+      puts ENV['RUBY_VERSION']
+
+      ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __FILE__)
+
+      require 'bundler/setup'
+
+      require 'heroku_san'
+
+      api = HerokuSan::API.new
+
+      api.sh('cool_app', 'version')
+    """
+    And I write to "run_in_ruby_2.sh" with:
+    """
+    #!/usr/bin/env bash
+
+    [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
+
+    rvm use 2.0.0
+    bundle install
+
+    ruby get_heroku_version.rb
+    """
+    And I run `chmod +x run_in_ruby_2.sh`
+    And I cleanly run `./run_in_ruby_2.sh`
+    Then the output should contain "heroku-toolbelt"
+    # Fail if we see "Your Ruby version is 1.9.3, but your Gemfile specified 2.0.0"
+    Then the output should not contain "Your Ruby version"
+    Then the output should not contain "your Gemfile specified"
+

data/features/step_definitions/remote_steps.rb

@@ -54,7 +54,7 @@ end
 When /^I add heroku_san to the rails Gemfile$/ do
   overwrite_file 'Gemfile', <<EOT.strip_heredoc
     source 'https://rubygems.org'
-    ruby '1.9.3'
+    ruby '#{ruby_version}'
     gem 'rails', '3.2.7'
     gem 'pg'
     group :development, :test do
@@ -67,7 +67,7 @@ end
 When /^I add heroku_san to the sinatra Gemfile$/ do
   overwrite_file 'Gemfile', <<EOT.strip_heredoc
     source 'https://rubygems.org'
-    ruby '1.9.3'
+    ruby '#{ruby_version}'
     gem 'sinatra'
     group :development, :test do
       gem 'heroku_san', :path => '../../../.'
@@ -87,6 +87,10 @@ When /^I run bundle install$/ do
   run_clean "bundle install"
 end
 
+When /^I cleanly run `([^`]*)`$/ do |cmd|
+  run_clean(cmd)
+end
+
 Then /^rake reports that the heroku: tasks are available$/ do
   output = run_clean 'rake -T heroku:'
   assert_partial_output 'rake heroku:apps', output
@@ -197,13 +201,14 @@ When /^I install an addon$/ do
     test_app:
       app: #{@app}
       addons:
-        - scheduler:standard
+        - heroku-postgresql:dev
+        - pgbackups:plus
 
 END_CONFIG
 
   output = run_clean 'rake test_app heroku:addons'
   # The output should show the new one ...
-  assert_partial_output "scheduler:standard", output
+  assert_partial_output "heroku-postgresql:dev", output
 end
 
 Then /^(?:heroku_san|issue \d+) (?:is green|has been fixed)$/ do
@@ -230,3 +235,7 @@ def overwrite_simple_config_file
     
 EOT
 end
+
+def ruby_version
+  ENV['TRAVIS_RUBY_VERSION'] || '1.9.3'
+end

data/heroku_san.gemspec

@@ -23,23 +23,8 @@ Gem::Specification.new do |s|
   https://toolbelt.heroku.com/
   }
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<heroku-api>, ['>= 0.1.2'])
-      s.add_runtime_dependency(%q<rake>)
-    else
-      s.add_dependency(%q<rails>, ['>= 2'])
-      s.add_dependency(%q<heroku-api>, ['>= 0.1.2'])
-      s.add_dependency(%q<aruba>)
-      s.add_dependency(%q<cucumber>)
-    end
-  else
-    s.add_dependency(%q<rails>, ['>= 2'])
-    s.add_dependency(%q<heroku-api>, ['>= 0.1.2'])
-    s.add_dependency(%q<aruba>)
-    s.add_dependency(%q<cucumber>)
-  end
+  s.add_runtime_dependency("heroku-api", [">= 0.1.2"])
+  s.add_runtime_dependency("json")
+  s.add_runtime_dependency("rake")
 end
 

data/lib/heroku_san/api.rb

@@ -3,7 +3,23 @@ require 'time'
 module HerokuSan
   class API
     def initialize(options = {})
-      @heroku_api = Heroku::API.new(options)
+      @options = options
+      @options[:api_key] ||= auth_token
+      @heroku_api = Heroku::API.new(@options)
+    end
+
+    def sh(app, *command)
+      preflight_check_for_cli
+
+      cmd = (command + ['--app', app]).compact
+
+      show_command = cmd.join(' ')
+      $stderr.puts show_command if @debug
+
+      ok = Bundler.with_clean_env { system "heroku", *cmd }
+
+      status = $?
+      ok or fail "Command failed with status (#{status.exitstatus}): [heroku #{show_command}]"
     end
 
     def method_missing(name, *args)
@@ -15,5 +31,17 @@ module HerokuSan
       $stderr.puts "\nHeroku API ERROR: #{status} (#{msg})\n\n"
       raise error
     end
+
+    private
+
+    def auth_token
+      ENV['HEROKU_API_KEY'] || Bundler.with_clean_env { `heroku auth:token`.chomp }
+    rescue Errno::ENOENT
+      nil
+    end
+
+    def preflight_check_for_cli
+      raise "The Heroku Toolbelt is required for this action. http://toolbelt.heroku.com" if Bundler.with_clean_env { system('heroku version') == nil }
+    end
   end
-end
+end

data/lib/heroku_san/configuration.rb

@@ -4,13 +4,15 @@ module HerokuSan
     attr_accessor :configuration
     attr_accessor :external_configuration
     attr_reader :options
+    attr_reader :stage_factory
 
-    def initialize(configurable)
+    def initialize(configurable, stage_factory = HerokuSan::Stage)
       @config_file = configurable.config_file
       default_options = {
           'deploy' => HerokuSan::Deploy::Rails
       }
       @options = default_options.merge(configurable.options || {})
+      @stage_factory = stage_factory
     end
 
     def parse
@@ -20,7 +22,7 @@ module HerokuSan
     def stages
       configured? or parse
       configuration.inject({}) do |stages, (stage, settings)|
-        stages[stage] = HerokuSan::Stage.new(stage, settings.merge('deploy' => (options[:deploy]||options['deploy'])))
+        stages[stage] = stage_factory.new(stage, settings.merge('deploy' => (options[:deploy]||options['deploy'])))
         stages
       end
     end

data/lib/heroku_san/stage.rb

@@ -2,28 +2,23 @@ require 'heroku-api'
 require 'json'
 require_relative 'application'
 
-MOCK = false unless defined?(MOCK)
-
 module HerokuSan
   class Stage
     include HerokuSan::Git
-    attr_reader :name
-    attr_reader :options
     include HerokuSan::Application
 
+    attr_reader :name, :options, :heroku
+
     def initialize(stage, options = {})
       @name = stage
       @options = options
+      @heroku = options.delete(:api) || HerokuSan::API.new
     end
 
     def ==(other)
       other.name == name && other.options == options
     end
     
-    def heroku
-      @heroku ||= HerokuSan::API.new(:api_key => auth_token, :mock => MOCK)
-    end
-
     def app
       @options['app'] or raise MissingApp, "#{name}: is missing the app: configuration value. I don't know what to access on Heroku."
     end
@@ -49,7 +44,7 @@ module HerokuSan
     end
     
     def run(command, args = nil)
-      sh_heroku "run", command, *args
+      heroku.sh app, "run", command, *args
     end
     
     def push(sha = nil, force = false)
@@ -128,31 +123,11 @@ module HerokuSan
     end
   
     def logs(tail = false)
-      sh_heroku 'logs', (tail ? '--tail' : nil)
+      heroku.sh app, 'logs', (tail ? '--tail' : nil)
     end
     
     def revision
       git_named_rev(git_revision(repo))
     end
-    
-  private
-
-    def auth_token
-      @auth_token ||= (ENV['HEROKU_API_KEY'] || `heroku auth:token`.chomp unless MOCK)
-    end
-
-    def sh_heroku(*command)
-      preflight_check_for_cli
-      cmd = (command + ['--app', app]).compact
-      show_command = cmd.join(' ')
-      $stderr.puts show_command if @debug
-      ok = system "heroku", *cmd
-      status = $?
-      ok or fail "Command failed with status (#{status.exitstatus}): [heroku #{show_command}]"
-    end
-
-    def preflight_check_for_cli
-      raise "The Heroku Toolbelt is required for this action. http://toolbelt.heroku.com" if system('heroku version') == nil
-    end
   end
 end

data/lib/heroku_san/version.rb

@@ -1,3 +1,3 @@
 module HerokuSan
-  VERSION = "4.3.0"
+  VERSION = "4.3.1"
 end

data/spec/heroku_san/api_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 # https://github.com/fastestforward/heroku_san/issues/105
 module HerokuSan
 describe HerokuSan::API do
-  subject(:api) { HerokuSan::API.new(:api_key => 'key', :mock => true)}
+  subject(:api) { HerokuSan::API.new(:api_key => 'key', :double => true)}
   it "is a proxy to the Heroku::API" do
     Heroku::API.any_instance.should_receive(:api_method).with(1, 2, {:arg => 3}) {true}
     api.api_method(1, 2, {:arg => 3}).should be_true
@@ -12,7 +12,7 @@ describe HerokuSan::API do
   it "reports Excon errors in a more human readable format" do
     error_message = 'Name is already taken'
     status_message = '000 Status'
-    response = mock("Response", :body => %Q[{"error":"#{error_message}"}], :headers => {'Status' => status_message})
+    response = double("Response", :body => %Q[{"error":"#{error_message}"}], :headers => {'Status' => status_message})
     Heroku::API.any_instance.should_receive(:api_method).and_raise(Heroku::API::Errors::ErrorWithResponse.new("excon message", response))
 
     $stderr.should_receive(:puts).with("\nHeroku API ERROR: #{status_message} (#{error_message})\n\n")

data/spec/heroku_san/application_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 module HerokuSan
   describe HerokuSan::Application do
-    let(:stage) { HerokuSan::Stage.new('production', {"deploy" => HerokuSan::Deploy::Rails, "app" => "awesomeapp", "stack" => "cedar"}) }
-    let(:response) { stub }
+    let(:stage) { Factory::Stage.build('production', {"deploy" => HerokuSan::Deploy::Rails, "app" => "awesomeapp", "stack" => "cedar"}) }
+    let(:response) { double }
 
     before do
       stage.heroku.stub(:get_ps).with(stage.app) { response }

data/spec/heroku_san/configuration_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper'
 module HerokuSan
 describe HerokuSan::Configuration do
   let(:configurable) { Configurable.new }
-  let(:configuration) { HerokuSan::Configuration.new(configurable) }
+  let(:configuration) { HerokuSan::Configuration.new(configurable, Factory::Stage) }
 
   describe "#stages" do
     it "creates a configuration hash" do
       configuration.configuration = {'production' => {}}
       configuration.stages.should == {
-          'production' => HerokuSan::Stage.new('production', 'deploy' => HerokuSan::Deploy::Rails)
+          'production' => Factory::Stage.build('production', 'deploy' => HerokuSan::Deploy::Rails)
       }
     end
 
@@ -17,7 +17,7 @@ describe HerokuSan::Configuration do
       configurable.options = {'deploy' => HerokuSan::Deploy::Base}
       configuration.configuration = {'production' => {}}
       configuration.stages.should == {
-          'production' => HerokuSan::Stage.new('production', 'deploy' => HerokuSan::Deploy::Base)
+          'production' => Factory::Stage.build('production', 'deploy' => HerokuSan::Deploy::Base)
       }
     end
   end

data/spec/heroku_san/deploy/base_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module HerokuSan
   module Deploy
     describe Base do
-      let(:stage) { HerokuSan::Stage.new('test', {"app" => "awesomeapp", "deploy" => 'HerokuSan::Deploy::Base'}) }
+      let(:stage) { Factory::Stage.build('test', {"app" => "awesomeapp", "deploy" => 'HerokuSan::Deploy::Base'}) }
       
       it "calls push" do
         subject = described_class.new(stage)

data/spec/heroku_san/deploy/rails_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module HerokuSan
   module Deploy
     describe Rails do
-      let(:stage) { HerokuSan::Stage.new('test', {"app" => "awesomeapp", "deploy" => 'HerokuSan::Deploy::Rails'}) }
+      let(:stage) { Factory::Stage.build('test', {"app" => "awesomeapp", "deploy" => 'HerokuSan::Deploy::Rails'}) }
 
       it "calls push, rake db:migrate & restart" do
         subject = described_class.new(stage, {})

data/spec/heroku_san/parser_spec.rb

@@ -54,13 +54,13 @@ describe HerokuSan::Parser do
   end
 
   describe "#merge_external_config" do
-    let(:stages) { [stub(:name => 'production', :config => prod_config), stub(:name => 'staging', :config => staging_config)] }
-    let(:prod_config) { mock('Production Config') }
+    let(:stages) { [double(:name => 'production', :config => prod_config), double(:name => 'staging', :config => staging_config)] }
+    let(:prod_config) { double('Production Config') }
     let(:staging_config) { {'EXTRA' => 'bar'} }
     let(:extras) { {'production' => {'EXTRA' => 'bar'}, 'staging' => {'EXTRA' => 'foo'}} }
 
     context "with no extras" do
-      let(:parseable) { stub :external_configuration => nil }
+      let(:parseable) { double :external_configuration => nil }
 
       it "doesn't change prod_config" do
         prod_config.should_not_receive :merge!
@@ -69,7 +69,7 @@ describe HerokuSan::Parser do
     end
 
     context "with extra" do
-      let(:parseable) { stub :external_configuration => 'config_repos' }
+      let(:parseable) { double :external_configuration => 'config_repos' }
       before(:each) do
         parser.should_receive(:git_clone).with('config_repos', anything)
         parser.should_receive(:parse_yaml).and_return(extras)

data/spec/heroku_san/project_spec.rb

@@ -6,7 +6,7 @@ describe HerokuSan::Project do
   let(:heroku_san) { HerokuSan::Project.new }
   subject { heroku_san }
   before do
-    HerokuSan::Configuration.new(Configurable.new).tap do |config|
+    HerokuSan::Configuration.new(Configurable.new, Factory::Stage).tap do |config|
       config.configuration = {'production' => {}, 'staging' => {}, 'demo' => {}}
       heroku_san.configuration = config
     end

data/spec/heroku_san/stage_spec.rb

@@ -1,21 +1,22 @@
 require 'spec_helper'
 
 module HerokuSan
+  STOCK_CONFIG = {"BUNDLE_WITHOUT"=>"development:test", "LANG"=>"en_US.UTF-8", "RACK_ENV"=>"production"}
+
 describe HerokuSan::Stage do
   include HerokuSan::Git
-  subject { HerokuSan::Stage.new('production', {"deploy" => HerokuSan::Deploy::Rails, "app" => "awesomeapp", "stack" => "cedar"})}
-  STOCK_CONFIG = {"BUNDLE_WITHOUT"=>"development:test", "LANG"=>"en_US.UTF-8", "RACK_ENV"=>"production"}
+  subject { Factory::Stage.build('production', {"deploy" => HerokuSan::Deploy::Rails, "app" => "awesomeapp", "stack" => "cedar"})}
   before do
-    HerokuSan::Stage.any_instance.stub(:preflight_check_for_cli)
+    HerokuSan::API.any_instance.stub(:preflight_check_for_cli)
   end
 
   context "initializes" do
-    subject { HerokuSan::Stage.new('production', 
+    subject { Factory::Stage.build('production',
       {"stack" => "cedar", 
        "app"   => "awesomeapp-demo", 
        "tag"   => "demo/*", 
        "config"=> {"BUNDLE_WITHOUT"=>"development:test"},
-       "addons"=> ['one:addon', 'two:addons'],
+       "addons"=> ['one:addon', 'two:addons']
       })}
 
     its(:name)   { should == 'production' }
@@ -30,7 +31,7 @@ describe HerokuSan::Stage do
   describe "#app" do
     its(:app) { should == 'awesomeapp'}
     context "blank app" do
-      subject { HerokuSan::Stage.new('production') }
+      subject { Factory::Stage.build('production') }
       it "should raise an error" do
         expect { subject.app }.to raise_error(HerokuSan::MissingApp, /production: is missing the app: configuration value\./)
       end
@@ -39,20 +40,20 @@ describe HerokuSan::Stage do
   
   describe "#stack" do
     it "returns the name of the stack from Heroku" do
-      subject = HerokuSan::Stage.new('production', {"app" => "awesomeapp"})
+      subject = Factory::Stage.build('production', {"app" => "awesomeapp"})
       with_app(subject, 'name' => subject.app) do |app_data|
         subject.stack.should == 'bamboo-mri-1.9.2'
       end
     end
   
     it "returns the stack name from the config when it is set there" do
-      subject = HerokuSan::Stage.new('production', {"app" => "awesomeapp", "stack" => "cedar"})
+      subject = Factory::Stage.build('production', {"app" => "awesomeapp", "stack" => "cedar"})
       subject.stack.should == 'cedar'
     end
   end
 
   describe '#addons' do
-    subject { HerokuSan::Stage.new('production', {'addons' => addons}) }
+    subject { Factory::Stage.build('production', {'addons' => addons}) }
     context 'default' do
       let(:addons) { nil }
       its(:addons) { should == [] }
@@ -73,7 +74,7 @@ describe HerokuSan::Stage do
 
   describe "#run" do
     it "runs commands using the new cedar format" do
-      subject.should_receive(:system).with("heroku", "run", "worker foo bar bleh", "--app", "awesomeapp") { true }
+      subject.heroku.should_receive(:system).with("heroku", "run", "worker foo bar bleh", "--app", "awesomeapp") { true }
       subject.run 'worker foo bar bleh'
     end
   end
@@ -123,7 +124,7 @@ describe HerokuSan::Stage do
       class TestDeployStrategy < HerokuSan::Deploy::Base
         def deploy; end
       end
-      subject = HerokuSan::Stage.new('test', {"app" => "awesomeapp", "deploy" => TestDeployStrategy})
+      subject = Factory::Stage.build('test', {"app" => "awesomeapp", "deploy" => TestDeployStrategy})
       it "(custom) calls deploy" do
         TestDeployStrategy.any_instance.should_receive(:deploy)
         subject.deploy
@@ -154,7 +155,7 @@ describe HerokuSan::Stage do
       it "wraps it in a maintenance mode" do
         with_app(subject, 'name' => subject.app) do |app_data|
           subject.heroku.should_receive(:post_app_maintenance).with(subject.app, '1').ordered
-          reactor = mock("Reactor"); reactor.should_receive(:scram).with(:now).ordered
+          reactor = double("Reactor"); reactor.should_receive(:scram).with(:now).ordered
           subject.heroku.should_receive(:post_app_maintenance).with(subject.app, '0').ordered
           
           subject.maintenance {reactor.scram(:now)} 
@@ -164,7 +165,7 @@ describe HerokuSan::Stage do
       it "ensures that maintenance mode is turned off" do
         with_app(subject, 'name' => subject.app) do |app_data|
           subject.heroku.should_receive(:post_app_maintenance).with(subject.app, '1').ordered
-          reactor = mock("Reactor"); reactor.should_receive(:scram).and_raise(RuntimeError)
+          reactor = double("Reactor"); reactor.should_receive(:scram).and_raise(RuntimeError)
           subject.heroku.should_receive(:post_app_maintenance).with(subject.app, '0').ordered
           
           expect do subject.maintenance {reactor.scram(:now)} end.to raise_error
@@ -183,12 +184,12 @@ describe HerokuSan::Stage do
     end
 
     it "creates an app on heroku" do
-      subject = HerokuSan::Stage.new('production')
+      subject = Factory::Stage.build('production')
       (@app = subject.create).should =~ /generated-name-\d+/
     end
 
     it "uses the default stack if none is given" do
-      subject = HerokuSan::Stage.new('production')
+      subject = Factory::Stage.build('production')
       (@app = subject.create).should =~ /generated-name-\d+/
       subject.heroku.get_stack(@app).body.detect{|stack| stack['current']}['name'].should == 'bamboo-mri-1.9.2'
     end
@@ -209,14 +210,14 @@ describe HerokuSan::Stage do
 
   describe "#push_config" do
     it "updates the configuration settings on Heroku" do
-      subject = HerokuSan::Stage.new('test', {"app" => "awesomeapp", "config" => {'FOO' => 'bar', 'DOG' => 'emu'}})
+      subject = Factory::Stage.build('test', {"app" => "awesomeapp", "config" => {'FOO' => 'bar', 'DOG' => 'emu'}})
       with_app(subject, 'name' => subject.app) do |app_data|
         subject.push_config.should == STOCK_CONFIG.merge('FOO' => 'bar', 'DOG' => 'emu')
       end
     end
 
     it "pushes the options hash" do
-      subject = HerokuSan::Stage.new('test', {"app" => "awesomeapp", "config" => {'FOO' => 'bar', 'DOG' => 'emu'}})
+      subject = Factory::Stage.build('test', {"app" => "awesomeapp", "config" => {'FOO' => 'bar', 'DOG' => 'emu'}})
       with_app(subject, 'name' => subject.app) do |app_data|
         subject.push_config('RACK_ENV' => 'magic').should == STOCK_CONFIG.merge('RACK_ENV' => 'magic')
       end
@@ -233,12 +234,12 @@ describe HerokuSan::Stage do
   
   describe "#logs" do
     it "returns log files" do
-      subject.should_receive(:system).with("heroku", "logs", "--app", "awesomeapp") { true }
+      subject.heroku.should_receive(:system).with("heroku", "logs", "--app", "awesomeapp") { true }
       subject.logs
     end
 
     it "tails log files" do
-      subject.should_receive(:system).with("heroku", "logs", "--tail", "--app", "awesomeapp") { true }
+      subject.heroku.should_receive(:system).with("heroku", "logs", "--tail", "--app", "awesomeapp") { true }
       subject.logs(:tail)
     end
   end
@@ -266,7 +267,7 @@ describe HerokuSan::Stage do
   end
 
   describe '#install_addons' do
-    subject { HerokuSan::Stage.new('production', {"app" => "awesomeapp", "stack" => "bamboo-ree-1.8.7", "addons" => %w[custom_domains:basic ssl:piggyback]})}
+    subject { Factory::Stage.build('production', {"app" => "awesomeapp", "stack" => "bamboo-ree-1.8.7", "addons" => %w[custom_domains:basic ssl:piggyback]})}
 
     it "installs the addons" do
       with_app(subject, 'name' => subject.app) do |app_data| 
@@ -276,7 +277,7 @@ describe HerokuSan::Stage do
     end
 
     it "only installs missing addons" do
-      subject = HerokuSan::Stage.new('production', {"app" => "awesomeapp", "stack" => "bamboo-ree-1.8.7", "addons" => %w[shared-database:5mb custom_domains:basic ssl:piggyback]})
+      subject = Factory::Stage.build('production', {"app" => "awesomeapp", "stack" => "bamboo-ree-1.8.7", "addons" => %w[shared-database:5mb custom_domains:basic ssl:piggyback]})
       with_app(subject, 'name' => subject.app) do |app_data| 
         subject.install_addons.map{|a| a['name']}.should include *%w[shared-database:5mb custom_domains:basic ssl:piggyback]
       end

data/spec/spec_helper.rb

@@ -3,8 +3,6 @@ Bundler.setup
 
 SPEC_ROOT = File.dirname(__FILE__)
 
-MOCK = ENV['MOCK'] != 'false'
-
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 Dir[File.join(SPEC_ROOT, "support/**/*.rb")].each {|f| require f}

data/spec/support/factory.rb

@@ -0,0 +1,14 @@
+module Factory
+  class Stage
+    class << self
+      def build(stage, options = {})
+        HerokuSan::Stage.new(
+          stage,
+          options.merge({api: HerokuSan::API.new(:api_key => "MOCK", mock: true)})
+        )
+      end
+
+      alias :new :build
+    end
+  end
+end

data/spec/support/travis-key-cleanup.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+heroku keys:remove travis-${TRAVIS_JOB_ID}@example.com

data/spec/support/travis-ssh-keygen.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+ssh-keygen -f ~/.ssh/id_rsa -C travis-${TRAVIS_JOB_ID}@example.com -N ''

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_san
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api
@@ -30,6 +30,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -71,6 +87,7 @@ files:
 - features/extended-config.feature
 - features/issue_113.feature
 - features/remote.feature
+- features/shell_execution.feature
 - features/step_definitions/remote_steps.rb
 - features/support/env.rb
 - heroku_san.gemspec
@@ -105,8 +122,11 @@ files:
 - spec/heroku_san/project_spec.rb
 - spec/heroku_san/stage_spec.rb
 - spec/spec_helper.rb
+- spec/support/factory.rb
 - spec/support/heroku.rb
 - spec/support/mocks.rb
+- spec/support/travis-key-cleanup.sh
+- spec/support/travis-ssh-keygen.sh
 homepage: http://github.com/fastestforward/heroku_san
 licenses:
 - MIT
@@ -122,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1774718932546341856
+      hash: 364838446742760909
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -141,6 +161,7 @@ test_files:
 - features/extended-config.feature
 - features/issue_113.feature
 - features/remote.feature
+- features/shell_execution.feature
 - features/step_definitions/remote_steps.rb
 - features/support/env.rb
 - spec/fixtures/example.yml
@@ -156,5 +177,8 @@ test_files:
 - spec/heroku_san/project_spec.rb
 - spec/heroku_san/stage_spec.rb
 - spec/spec_helper.rb
+- spec/support/factory.rb
 - spec/support/heroku.rb
 - spec/support/mocks.rb
+- spec/support/travis-key-cleanup.sh
+- spec/support/travis-ssh-keygen.sh