heroku_san 2.1.0 → 2.1.1

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log (curated)
 
+## v2.1.1
+  * Bug fixes
+  * Changed most Stage methods to call Heroku::Client methods instead of shelling out
+  * Finished integration tests
+
 ## v2.1.0
 
   * Documentation update

data/features/config.feature

@@ -6,6 +6,7 @@ Feature: Command Line
     And I overwrite "Gemfile" with:
       """
       source :rubygems
+      gem 'rails'
       gem 'heroku_san', :path => '../../../.'
       """
 
@@ -28,7 +29,7 @@ Feature: Command Line
     And  the output should contain "staging is shorthand for the Heroku app awesomeapp-staging"
     And  the output should contain "demo is shorthand for the Heroku app awesomeapp-demo"
 
-  Scenario: Config file still accepts the heroku_san format
+  Scenario: Config file still accepts the old heroku_san format
     Given a file named "config/heroku.yml" with:
       """
       apps:

data/features/extended-config.feature

@@ -1,17 +1,32 @@
 Feature: Extended config
 
   Background:
+    Given a directory named "test-config"
+    And I cd to "test-config"
+    And I run `git init .`
+    And a file named "config.yml" with:
+      """
+      production:
+        TEST_REMOTE: 'hello_production'
+      staging:
+        TEST_REMOTE: 'goodbye_staging'
+      """
+    And I run `git add .`
+    And I run `git commit -m 'Initial commit'`
+    And I cd to ".."
     Given I run `rails new heroku_san_test -O`
     And I cd to "heroku_san_test"
     And I overwrite "Gemfile" with:
       """
       source :rubygems
+      gem 'rails'
       gem 'heroku_san', :path => '../../../.'
       """
+    
   Scenario: Config information can be pulled from a separate git repository
     Given a file named "config/heroku.yml" with:
       """
-      config_repo: 'file:///<%= File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', '..', 'features', 'data', 'test-config') %>'
+      config_repo: 'file:///<%= File.join(File.expand_path(File.dirname(__FILE__)), '..', 'test-config') %>'
       production: 
         app: awesomeapp
       staging:
@@ -19,11 +34,10 @@ Feature: Extended config
       demo: 
         app: awesomeapp-demo
       """
-
     When I run `rake --trace all heroku:config:list:local`
 
-    Then the output should contain "production TEST_REMOTE: 'hello_world'"
-    And the output should contain "staging TEST_REMOTE: 'goodbye_world'"
+    Then the output should contain "TEST_REMOTE: hello_production"
+    And the output should contain "TEST_REMOTE: goodbye_staging"
 
   Scenario: Config information can be listed
     Given a file named "config/heroku.yml" with:
@@ -31,38 +45,36 @@ Feature: Extended config
       production:
         app: awesomeapp
         config:
-          TEST_LOCAL: 'hello_world'
+          TEST_LOCAL: 'hello_production'
       staging:
         app: awesomeapp-staging
         config:
-          TEST_LOCAL: 'goodbye_world'
+          TEST_LOCAL: 'goodbye_staging'
       demo:
         app: awesomeapp-demo
       """
-
     When I run `rake --trace all heroku:config:list:local`
 
-    Then the output should contain "production TEST_LOCAL: 'hello_world'"
-    And  the output should contain "staging TEST_LOCAL: 'goodbye_world'"
+    Then the output should contain "TEST_LOCAL: hello_production"
+    And  the output should contain "TEST_LOCAL: goodbye_staging"
 
   Scenario: Config information can be merged between local and remote
     Given a file named "config/heroku.yml" with:
       """
-      config_repo: 'file:///<%= File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', '..', 'features', 'data', 'test-config') %>'
+      config_repo: 'file:///<%= File.join(File.expand_path(File.dirname(__FILE__)), '..', 'test-config') %>'
       production:
         app: awesomeapp
         config:
-          TEST_LOCAL: 'hello_world'
+          TEST_LOCAL: 'hello_production'
       staging:
         app: awesomeapp-staging
         config:
-          TEST_LOCAL: 'goodbye_world'
+          TEST_LOCAL: 'goodbye_staging'
           TEST_REMOTE: 'overridden_by_remote'
       """
-
     When I run `rake --trace all heroku:config:list:local`
 
-    Then the output should contain "production TEST_LOCAL: 'hello_world'"
-    And the output should contain "production TEST_REMOTE: 'hello_world'"
-    And the output should contain "staging TEST_LOCAL: 'goodbye_world'"
-    And the output should contain "staging TEST_REMOTE: 'goodbye_world'"
+    Then the output should contain "TEST_LOCAL: hello_production"
+    And the output should contain "TEST_REMOTE: hello_production"
+    And the output should contain "TEST_LOCAL: goodbye_staging"
+    And the output should contain "TEST_REMOTE: goodbye_staging"

data/features/remote.feature

@@ -1,57 +1,30 @@
-@announce @slow_process
-Feature: Works with Heroku
-
-  Background:
-    Given I run `git clone git://github.com/kmayer/heroku_san_demo.git`
-    And I cd to "heroku_san_demo"
-    And I run `bundle install`
-
-  Scenario: Remote commands
-    When I run `rake demo deploy`
-    Then the output should match /(http:.*-demo.heroku.com deployed to Heroku)|(Everything up-to-date)/
-
-    When I run `rake demo heroku:maintenance_on`
-    Then the output should contain "Maintenance mode enabled."
-    
-    When I run `rake demo restart`
-    Then the output should contain "Restarting processes... done"
-
-    When I run `rake demo heroku:maintenance_off`
-    Then the output should contain "Maintenance mode disabled."
-
-    When I run `rake demo heroku:rake[db:seed]`
-    Then I run `curl -s http://heroku-san-demo-demo.heroku.com/droids.text`
-    And the output should contain "C3PO, Marvin, R2D2, Robby"
+@announce-cmd @slow_process
+Feature: heroku_san can control a project on Heroku
+  WARNING: This WILL create apps on Heroku!
+  You must login with the heroku cli before starting
+  this test; otherwise it will probably hang the first
+  time it tries to do anything with Heroku itself.
+
+  Scenario: Installing on 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 run bundle install
+    Then rake reports that the heroku: tasks are available 
     
-    When I run `rake demo logs`
-    Then the output should contain "Starting process with command `rake db:seed`"
-
-    When I run `git co staging`
-    And I run `rake deploy`
-    Then the output should contain "Defaulting to 'staging' as it matches the current branch"
-    Then the output should match /(http:.*-staging.heroku.com deployed to Heroku)|(Everything up-to-date)/
-    When I run `curl -s http://heroku-san-demo-staging.heroku.com`
-    And the output should contain "Ruby on Rails: Welcome aboard"
-
-    When I run `rake production deploy:force`
-    Then the output should match /^git update-ref refs.heroku_san.deploy \w{40}$/
-    # Runs a before_deploy
-    # Runs an after_deploy
-    # Adds a collaborator
-
-# Given I run `rake heroku:create_config`
-    
-#    When I run `rake demo heroku:create`
-#    Then the output should contain "somthing about the created app"
-#      $ rake all heroku:create
-#      heroku create heroku-san-demo-demo
-#      Creating heroku-san-demo-demo.... done, stack is bamboo-mri-1.9.2
-#      http://heroku-san-demo-demo.heroku.com/ | git@heroku.com:heroku-san-demo-demo.git
-#      Git remote heroku added
-#      heroku create heroku-san-demo-production
-#      Creating heroku-san-demo-production... done, stack is bamboo-mri-1.9.2
-#      http://heroku-san-demo-production.heroku.com/ | git@heroku.com:heroku-san-demo-production.git
-#      heroku create heroku-san-demo-staging
-#      Creating heroku-san-demo-staging... done, stack is bamboo-mri-1.9.2
-#      http://heroku-san-demo-staging.heroku.com/ | git@heroku.com:heroku-san-demo-staging.git
-
+  Scenario: Manipulates the project on Heroku
+    Given I have a new Rails project
+    When I am in the project directory
+    And I add heroku_san to the Gemfile
+    And I run bundle install
+    And I create a new config/heroku.yml file
+    And I create my project on Heroku
+    And I list the remote configuration
+    And I curl the app home page
+    And I configure my project
+    And I turn maintenance on
+    And I deploy my project
+    And I turn maintenance off
+    And I restart my project
+    And I list all apps on Heroku
+    Then heroku_san is green

data/features/step_definitions/remote_steps.rb

@@ -0,0 +1,123 @@
+World(Aruba::Api)
+
+Given /^I have a new Rails project$/ do
+  # template = File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', 'features', 'data', 'template.rb')
+  cmd = "rails new heroku_san_test --quiet --force --database=postgresql --skip-bundle --skip-javascript --skip-test-unit --skip-sprockets" #" --template #{template}"
+  run_simple unescape(cmd)
+end
+
+When /^I am in the project directory$/ do
+    cd '/heroku_san_test'
+end
+
+When /^I add heroku_san to the Gemfile$/ do
+  append_to_file 'Gemfile', <<EOT
+group :development, :test do
+  gem 'heroku_san', :path => '../../../.'
+end
+EOT
+end
+
+When /^I run bundle install$/ do
+  use_clean_gemset 'heroku_san_test'
+  run_simple 'bundle install --quiet'
+  write_file '.rvmrc', "rvm use default@heroku_san_test\n"
+end
+
+Then /^rake reports that the heroku: tasks are available$/ do
+  run_simple 'rake -T heroku:'
+  assert_partial_output 'rake heroku:apps', all_output
+end
+
+When /^I create a new config\/heroku\.yml file$/ do
+  run_simple 'rake heroku:create_config'
+  assert_matching_output %q{Copied example config to ".*.config.heroku.yml"}, all_output
+  assert_matching_output %q{Please edit ".*.config.heroku.yml" with your application's settings.}, all_output
+  overwrite_file 'config/heroku.yml', <<EOT
+---
+test_app:
+EOT
+end
+
+When /^I create my project on Heroku$/ do
+  cmd = 'rake test_app heroku:create'
+  run_simple unescape(cmd)
+  assert_matching_output %q{test_app: Created ([\w-]+)}, all_output
+  output = stdout_from cmd
+  @app = output.match(/test_app: Created ([\w-]+)/)[1]
+  overwrite_file 'config/heroku.yml', <<EOT
+---
+test_app:
+  app: #{@app}
+EOT
+end
+
+When /^I list the remote configuration$/ do
+  cmd = 'rake test_app heroku:config:list'
+  run_simple unescape(cmd)
+  assert_partial_output "APP_NAME: #{@app}", all_output
+  assert_partial_output "URL: #{@app}.heroku.com", all_output
+  output = stdout_from cmd
+  @url = output.match(/\bURL:\s+(.*.heroku.com)\b/)[1]
+  @curl = unescape("curl --silent http://#{@url}")
+end
+
+When /^I curl the app home page$/ do
+  run_simple @curl
+  output = stdout_from @curl
+  assert_partial_output '<h1><strong>Heroku | Welcome to your new app!</strong></h1>', output
+end
+
+When /^I configure my project$/ do
+  overwrite_file 'config/heroku.yml', <<EOT
+---
+test_app:
+  app: #{@app}
+  config:
+    DROIDS: marvin
+EOT
+  cmd = 'rake test_app heroku:config'
+  run_simple unescape(cmd)
+  assert_partial_output 'DROIDS: marvin', all_output
+end
+
+When /^I turn maintenance on$/ do
+  run_simple 'rake test_app heroku:maintenance_on'
+  assert_partial_output 'test_app: Maintenance mode enabled.', all_output
+  run_simple @curl
+  output = stdout_from @curl
+  assert_partial_output '<title>Offline for Maintenance</title>', all_output
+end
+
+When /^I turn maintenance off$/ do
+  run_simple 'rake test_app heroku:maintenance_off'
+  assert_partial_output 'test_app: Maintenance mode disabled.', all_output
+  run_simple @curl + "/droids"
+  assert_partial_output %Q{<code>marvin</code>}, all_output
+end
+
+When /^I restart my project$/ do
+  run_simple 'rake test_app heroku:restart'
+  assert_partial_output 'test_app: Restarted.', all_output
+end
+
+When /^I deploy my project$/ do
+  run_simple 'git init .'
+  run_simple 'rails generate scaffold droids'
+  append_to_file 'app/views/droids/index.html.erb', %Q{\n<div><code><%= ENV['DROIDS'] -%></code></div>\n}
+  run_simple 'git add .'
+  run_simple 'git commit -m "Initial commit"'
+  run_simple 'rake test_app deploy'
+  assert_partial_output "http://#{@app}.heroku.com deployed to Heroku", all_output
+end
+
+When /^I list all apps on Heroku$/ do
+  run_simple 'rake heroku:apps'
+  assert_partial_output "test_app is shorthand for the Heroku app #{@app} located at:", all_output
+  assert_partial_output "git@heroku.com:#{@app}.git", all_output
+  assert_matching_output '@ \w{40} master', all_output
+end
+
+Then /^heroku_san is green$/ do
+  run_simple "heroku apps:destroy #{@app} --confirm #{@app}"
+end

data/features/support/env.rb

@@ -12,6 +12,6 @@ Before do
 end
   
 Before('@slow_process') do
-  @aruba_timeout_seconds = 60  
+  @aruba_timeout_seconds = 180 
   # @aruba_io_wait_seconds = 15
 end

data/heroku_san.gemspec

@@ -22,13 +22,13 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ['>= 2'])
+      s.add_development_dependency(%q<rails>, ['>= 2'])
       s.add_runtime_dependency(%q<heroku>, ['>= 2'])
       s.add_runtime_dependency(%q<rake>)
       s.add_development_dependency(%q<aruba>)
       s.add_development_dependency(%q<cucumber>)
       s.add_development_dependency(%q<rake>)
-      s.add_development_dependency(%q<bundler>, ['~> 1.0'])
+      s.add_development_dependency(%q<bundler>, ['~> 1.1  '])
     else
       s.add_dependency(%q<rails>, ['>= 2'])
       s.add_dependency(%q<heroku>, ['>= 2'])

data/lib/heroku_san/project.rb

@@ -101,6 +101,7 @@ module HerokuSan
     
       # make sure each app has a 'config' section & merge w/extra
       app_settings.keys.each do |name|
+        app_settings[name] ||= {}
         app_settings[name]['config'] ||= {}
         app_settings[name]['config'].merge!(extra_config[name]) if extra_config[name]
       end  

data/lib/heroku_san/stage.rb

@@ -1,3 +1,6 @@
+require 'heroku'
+require 'json'
+
 module HerokuSan
   class Stage
     attr_reader :name
@@ -8,6 +11,10 @@ module HerokuSan
       @options = options
     end
     
+    def heroku
+      Heroku::Auth.client
+    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
@@ -17,7 +24,7 @@ module HerokuSan
     end
     
     def stack
-      @options['stack'] ||= %x"heroku stack --app #{app}".split("\n").select { |b| b =~ /^\* / }.first.gsub(/^\* /, '')
+      @options['stack'] ||= heroku.list_stacks(app).detect{|stack| stack['current']}['name']
     end
     
     def tag
@@ -42,47 +49,55 @@ module HerokuSan
     end
     
     def migrate
-      run 'rake', 'db:migrate'
-      sh_heroku "restart"
+      rake('db:migrate')
+      restart
+    end
+    
+    def rake(*args)
+      run 'rake', args.join(' ')
+      # heroku.rake app, args.join(' ')
     end
 
     def maintenance(action = nil)
       if block_given?
-        sh_heroku "maintenance:on"
+        heroku.maintenance(app, :on)
         begin
           yield
         ensure
-          sh_heroku "maintenance:off"
+          heroku.maintenance(app, :off)
         end
       else
         raise ArgumentError, "Action #{action.inspect} must be one of (:on, :off)", caller if ![:on, :off].include?(action)
-        sh_heroku "maintenance:#{action}"
+        heroku.maintenance(app, action)
       end
     end
     
-    def create
-      sh "heroku apps:create #{app}" + (@options['stack'] ? " --stack #{@options['stack']}" : '')
+    def create # DEPREC?
+      if @options['stack']
+        heroku.create(@options['app'], {:stack => @options['stack']})
+      else
+        heroku.create(@options['app'])
+      end
     end
 
-    def sharing_add(email)
+    def sharing_add(email) # DEPREC?
       sh_heroku "sharing:add #{email.chomp}"
     end
   
-    def sharing_remove(email)
+    def sharing_remove(email) # DEPREC?
       sh_heroku "sharing:remove #{email.chomp}"
     end
   
     def long_config
-      sh_heroku 'config --long'
+      heroku.config_vars(app)
     end
     
-    def push_config(options = {})
-      vars = (options == {} ? config : options).map {|var,value| "#{var}=#{Shellwords.escape(value)}"}.join(' ')
-      sh_heroku "config:add #{vars}"
+    def push_config(options = nil)
+      JSON.parse(heroku.add_config_vars(app, options || config))
     end
 
     def restart
-      sh_heroku 'restart'
+      heroku.ps_restart(app)
     end
   
     def logs(tail = false)

data/lib/heroku_san/version.rb

@@ -1,3 +1,3 @@
 module HerokuSan
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/lib/tasks.rb

@@ -20,7 +20,7 @@ namespace :heroku do
   desc "Creates the Heroku app"
   task :create do
     each_heroku_app do |stage|
-      stage.create
+      puts "#{stage.name}: Created #{stage.create}"
     end
   end
 
@@ -82,7 +82,7 @@ namespace :heroku do
   desc 'Add config:vars to each application.'
   task :config do
     each_heroku_app do |stage|
-      stage.push_config
+      puts y(stage.push_config)
     end
   end
 
@@ -91,7 +91,7 @@ namespace :heroku do
     filename = %Q{#{@heroku_san.config_file.to_s}}
     if @heroku_san.create_config
       puts "Copied example config to #{filename.inspect}"
-      if ENV['EDITOR'].present?
+      if ENV['EDITOR'] && ENV['EDITOR'] != ''
         sh "#{ENV['EDITOR']} #{filename}"
       else
         puts "Please edit #{filename.inspect} with your application's settings."
@@ -109,7 +109,7 @@ namespace :heroku do
         puts command
         config = Hash[`#{command}`.scan(/^(.+?)\s*=>\s*(.+)$/)]
         if config['RACK_ENV'] != stage.name
-          stage.push_config RACK_ENV: stage.name
+          puts stage.push_config RACK_ENV: stage.name
         end
       end
     end
@@ -118,7 +118,7 @@ namespace :heroku do
     task :list do
       each_heroku_app do |stage|
         puts "#{stage.name}:"
-        stage.long_config
+        puts y(stage.long_config)
       end
     end
 
@@ -126,9 +126,8 @@ namespace :heroku do
       desc "Lists local config variables without setting them"
       task :local do
         each_heroku_app do |stage|
-          (stage.config).each do |var, value|
-            puts "#{stage.name} #{var}: '#{value}'"
-          end
+          puts "#{stage.name}:"
+          puts y(stage.config)
         end
       end
     end
@@ -137,7 +136,7 @@ namespace :heroku do
   desc 'Runs a rake task remotely'
   task :rake, [:task] do |t, args|
     each_heroku_app do |stage|
-      stage.run 'rake', args.task
+      puts stage.rake args.task
     end
   end
 
@@ -161,6 +160,7 @@ namespace :heroku do
   task :maintenance do
     each_heroku_app do |stage|
       stage.maintenance :on
+      puts "#{stage.name}: Maintenance mode enabled."
     end
   end
 
@@ -168,6 +168,7 @@ namespace :heroku do
   task :maintenance_on do
     each_heroku_app do |stage|
       stage.maintenance :on
+      puts "#{stage.name}: Maintenance mode enabled."
     end
   end
 
@@ -175,6 +176,7 @@ namespace :heroku do
   task :maintenance_off do
     each_heroku_app do |stage|
       stage.maintenance :off
+      puts "#{stage.name}: Maintenance mode disabled."
     end
   end
 
@@ -227,6 +229,7 @@ namespace :heroku do
   task :restart do
     each_heroku_app do |stage|
       stage.restart
+      puts "#{stage.name}: Restarted."
     end
   end
 

data/spec/heroku_san/project_spec.rb

@@ -6,7 +6,7 @@ describe HerokuSan::Project do
     heroku_san = HerokuSan::Project.new("/u/should/never/get/here")
     heroku_san.all.should == []
   end
-  
+    
   context "using the example config file" do
     let(:heroku_config_file) { File.join(SPEC_ROOT, "fixtures", "example.yml") }
     let(:template_config_file) { 
@@ -14,10 +14,9 @@ describe HerokuSan::Project do
       (File.respond_to? :realpath) ? File.realpath(path) : path
     }
     let(:heroku_san) { HerokuSan::Project.new(heroku_config_file) }
-    
-    it "#all" do
-      heroku_san.all.should =~ %w[production staging demo]
-    end
+    subject { heroku_san }
+        
+    its(:all) { should =~ %w[production staging demo] }
     
     context "using the heroku_san format" do
       let(:heroku_san) { HerokuSan::Project.new(File.join(SPEC_ROOT, "fixtures", "old_format.yml")) }

data/spec/heroku_san/stage_spec.rb

@@ -1,9 +1,15 @@
 require 'spec_helper'
+require 'heroku/client'
 
 describe HerokuSan::Stage do
   include Git
   subject { HerokuSan::Stage.new('production', {"app" => "awesomeapp", "stack" => "bamboo-ree-1.8.7"})}
 
+  before do
+    @heroku_client = mock(Heroku::Client)
+    Heroku::Auth.stub(:client).and_return(@heroku_client)
+  end
+
   context "initializes" do
     subject { HerokuSan::Stage.new('production', 
       {"stack" => "cedar", 
@@ -30,38 +36,29 @@ describe HerokuSan::Stage do
     end
   end
   
-  context "celadon cedar stack has a different API" do
-    describe "#stack" do
-      it "returns the name of the stack from Heroku" do
-        subject = HerokuSan::Stage.new('production', {"app" => "awesomeapp"})
-        subject.should_receive("`").with("heroku stack --app awesomeapp") {
-<<EOT
-  aspen-mri-1.8.6
-* bamboo-mri-1.9.2
-  bamboo-ree-1.8.7
-  cedar (beta)
-EOT
-        }
-        subject.stack.should == 'bamboo-mri-1.9.2'
-      end
-    
-      it "returns the stack name from the config if it is set there" do
-        subject = HerokuSan::Stage.new('production', {"app" => "awesomeapp", "stack" => "cedar"})
-        subject.should_not_receive("`")
-        subject.stack.should == 'cedar'
-      end
+  describe "#stack" do
+    it "returns the name of the stack from Heroku" do
+      subject = HerokuSan::Stage.new('production', {"app" => "awesomeapp"})
+      @heroku_client.should_receive(:list_stacks).with('awesomeapp').
+        and_return { [{'name' => 'other'}, {'name' => 'the-one', 'current' => true}] }
+      subject.stack.should == 'the-one'
     end
-        
-    describe "#run" do
-      it "runs commands using the pre-cedar format" do
-        subject.should_receive(:sh).with("heroku run:rake foo bar bleh --app awesomeapp")
-        subject.run 'rake', 'foo bar bleh'
-      end
-      it "runs commands using the new cedar format" do
-        subject = HerokuSan::Stage.new('production', {"app" => "awesomeapp", "stack" => "cedar"})
-        subject.should_receive(:sh).with("heroku run worker foo bar bleh --app awesomeapp")
-        subject.run 'worker', 'foo bar bleh'
-      end
+  
+    it "returns the stack name from the config if it is set there" do
+      subject = HerokuSan::Stage.new('production', {"app" => "awesomeapp", "stack" => "cedar"})
+      subject.stack.should == 'cedar'
+    end
+  end
+
+  describe "#run" do
+    it "runs commands using the pre-cedar format" do
+      subject.should_receive(:sh).with("heroku run:rake foo bar bleh --app awesomeapp")
+      subject.run 'rake', 'foo bar bleh'
+    end
+    it "runs commands using the new cedar format" do
+      subject = HerokuSan::Stage.new('production', {"app" => "awesomeapp", "stack" => "cedar"})
+      subject.should_receive(:sh).with("heroku run worker foo bar bleh --app awesomeapp")
+      subject.run 'worker', 'foo bar bleh'
     end
   end
 
@@ -89,21 +86,22 @@ EOT
 
   describe "#migrate" do
     it "runs rake db:migrate" do
-      subject.should_receive(:sh).with("heroku run:rake db:migrate --app awesomeapp")
-      subject.should_receive(:sh).with("heroku restart --app awesomeapp")
-      subject.migrate
+      subject.should_receive(:rake).with('db:migrate').and_return 'output:'
+      # @heroku_client.should_receive(:rake).with('awesomeapp', 'db:migrate').and_return "output:"
+      @heroku_client.should_receive(:ps_restart).with('awesomeapp').and_return "restarted"
+      subject.migrate.should == "restarted"
     end
   end
   
   describe "#maintenance" do
     it ":on" do
-      subject.should_receive(:sh).with("heroku maintenance:on --app awesomeapp")
-      subject.maintenance :on
+      @heroku_client.should_receive(:maintenance).with('awesomeapp', :on) {'on'}
+      subject.maintenance(:on).should == 'on'
     end
 
     it ":off" do
-      subject.should_receive(:sh).with("heroku maintenance:off --app awesomeapp")
-      subject.maintenance :off
+      @heroku_client.should_receive(:maintenance).with('awesomeapp', :off) {'off'}
+      subject.maintenance(:off).should == 'off'
     end
     
     it "otherwise raises an ArgumentError" do
@@ -114,21 +112,17 @@ EOT
     
     context "with a block" do
       it "wraps it in a maitenance mode" do
-        subject.should_receive(:sh).with("heroku maintenance:on --app awesomeapp")
-        reactor = mock("Reactor"); reactor.should_receive(:scram).with(:now)
-        subject.should_receive(:sh).with("heroku maintenance:off --app awesomeapp")
-        subject.maintenance do
-          reactor.scram(:now)
-        end
+        reactor = mock("Reactor"); reactor.should_receive(:scram).with(:now).ordered
+        @heroku_client.should_receive(:maintenance).with('awesomeapp', :on).ordered
+        @heroku_client.should_receive(:maintenance).with('awesomeapp', :off).ordered
+        subject.maintenance do reactor.scram(:now) end
       end
       it "ensures that maintenance mode is turned off" do
-        subject.should_receive(:sh).with("heroku maintenance:on --app awesomeapp")
+        @heroku_client.should_receive(:maintenance).with('awesomeapp', :on).ordered
         reactor = mock("Reactor"); reactor.should_receive(:scram).with(:now).and_raise(RuntimeError)
-        subject.should_receive(:sh).with("heroku maintenance:off --app awesomeapp")
+        @heroku_client.should_receive(:maintenance).with('awesomeapp', :off).ordered
         expect {
-          subject.maintenance do
-            reactor.scram(:now)
-          end        
+          subject.maintenance do reactor.scram(:now) end        
         }.to raise_error
       end
     end
@@ -136,14 +130,19 @@ EOT
 
   describe "#create" do
     it "creates an app on heroku" do
-      subject.should_receive(:sh).with("heroku apps:create awesomeapp --stack bamboo-ree-1.8.7")
+      @heroku_client.should_receive(:create).with('awesomeapp', {:stack => 'bamboo-ree-1.8.7'})
       subject.create
     end
     it "uses the default stack if none is given" do
       subject = HerokuSan::Stage.new('production', {"app" => "awesomeapp"})
-      subject.should_receive(:sh).with("heroku apps:create awesomeapp")
+      @heroku_client.should_receive(:create).with('awesomeapp')
       subject.create
     end
+    it "sends a nil app name if none is given (Heroku will generate one)" do
+      subject = HerokuSan::Stage.new('production', {"app" => nil})
+      @heroku_client.should_receive(:create).with(nil).and_return('warm-ocean-9218')
+      subject.create.should == 'warm-ocean-9218'
+    end
   end
   
   describe "#sharing_add" do
@@ -161,24 +160,16 @@ EOT
   end
 
   describe "#long_config" do
-    it "prints out the remote config" do
-      subject.should_receive(:sh).with("heroku config --long --app awesomeapp") {
-<<EOT
-BUNDLE_WITHOUT      => development:test
-DATABASE_URL        => postgres://thnodhxrzn:T0-UwxLyFgXcnBSHmyhv@ec2-50-19-216-194.compute-1.amazonaws.com/thnodhxrzn
-LANG                => en_US.UTF-8
-RACK_ENV            => production
-SHARED_DATABASE_URL => postgres://thnodhxrzn:T0-UwxLyFgXcnBSHmyhv@ec2-50-19-216-194.compute-1.amazonaws.com/thnodhxrzn
-EOT
-      }
-      subject.long_config
+    it "returns the remote config" do
+      @heroku_client.should_receive(:config_vars).with('awesomeapp') { {'A' => 'one', 'B' => 'two'} }
+      subject.long_config.should == { 'A' => 'one', 'B' => 'two' }
     end
   end
 
   describe "#restart" do
     it "restarts an app" do
-      subject.should_receive(:sh).with("heroku restart --app awesomeapp")
-      subject.restart
+      @heroku_client.should_receive(:ps_restart).with('awesomeapp').and_return "restarted"
+      subject.restart.should == 'restarted'
     end
   end
   
@@ -196,16 +187,11 @@ EOT
   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.should_receive(:sh).with("heroku config:add FOO=bar DOG=emu --app awesomeapp")
-      subject.push_config
-    end
-    it "properly escapes variables" do
-      subject = HerokuSan::Stage.new('test', {"app" => "awesomeapp", "config" => {FOO: ' bar\emu bat zebra '}})
-      subject.should_receive(:sh).with("heroku config:add FOO=#{Shellwords.escape(' bar\emu bat zebra ')} --app awesomeapp")
+      @heroku_client.should_receive(:add_config_vars).with('awesomeapp', {:FOO => 'bar', :DOG => 'emu'}).and_return("{}")
       subject.push_config
     end
     it "pushes the options hash" do
-      subject.should_receive(:sh).with("heroku config:add RACK_ENV=magic --app awesomeapp")
+      @heroku_client.should_receive(:add_config_vars).with('awesomeapp', {:RACK_ENV => 'magic'}).and_return("{}")
       subject.push_config(RACK_ENV: 'magic')
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_san
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,22 +12,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-06 00:00:00.000000000Z
+date: 2012-03-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153413220 !ruby/object:Gem::Requirement
+  requirement: &2156274700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *2153413220
+  version_requirements: *2156274700
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &2153412680 !ruby/object:Gem::Requirement
+  requirement: &2156273500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *2153412680
+  version_requirements: *2156273500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153412280 !ruby/object:Gem::Requirement
+  requirement: &2156272240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153412280
+  version_requirements: *2156272240
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2153411640 !ruby/object:Gem::Requirement
+  requirement: &2156270800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153411640
+  version_requirements: *2156270800
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2153411060 !ruby/object:Gem::Requirement
+  requirement: &2156269420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153411060
+  version_requirements: *2156269420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153410400 !ruby/object:Gem::Requirement
+  requirement: &2156268140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,18 +79,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153410400
+  version_requirements: *2156268140
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153409500 !ruby/object:Gem::Requirement
+  requirement: &2156263700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *2153409500
+  version_requirements: *2156263700
 description: Manage multiple Heroku instances/apps for a single Rails app using Rake
 email: elijah.miller@gmail.com
 executables: []
@@ -99,7 +99,6 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .gitignore
-- .gitmodules
 - .rvmrc
 - CHANGELOG.md
 - Gemfile
@@ -113,6 +112,7 @@ files:
 - features/config.feature
 - features/extended-config.feature
 - features/remote.feature
+- features/step_definitions/remote_steps.rb
 - features/support/env.rb
 - heroku_san.gemspec
 - lib/git.rb
@@ -160,6 +160,7 @@ test_files:
 - features/config.feature
 - features/extended-config.feature
 - features/remote.feature
+- features/step_definitions/remote_steps.rb
 - features/support/env.rb
 - spec/fixtures/example.yml
 - spec/fixtures/extended_config.yml

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "features/data/test-config"]
-	path = features/data/test-config
-	url = git://github.com/rahearn/test-credentials.git