heroku_san 3.0.4 → 4.0.0

data/.gitignore

@@ -4,5 +4,4 @@ pkg
 Thumbs.db
 tmp
 .idea/**
-Gemfile.lock
 *.swp

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change log (curated)
 
+## v4.0.0
+
+  * Remove dependency on sunsetted 'heroku' gem. Add external dependency
+    on Heroku Toolbelt, instead.
+  * Deprecate Stage#rake, Stage#sharing_add and Stage#sharing_remove
+  * Closes #104
+  * Closes #107
+  * Closes #108
+  * Thanks to sworbel for the pull request (#104)
+
 ## v3.0.4
 
   * Documentation syntax highlighting and formatting.
@@ -81,4 +91,4 @@
 
 ## v1.3.0
 
-N/A
+N/A

data/Gemfile.lock

@@ -0,0 +1,132 @@
+PATH
+  remote: .
+  specs:
+    heroku_san (4.0.0)
+      activesupport
+      heroku-api (>= 0.1.2)
+      rake
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.1)
+      actionpack (= 3.2.1)
+      mail (~> 2.4.0)
+    actionpack (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.1)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
+      builder (~> 3.0.0)
+    activerecord (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+      arel (~> 3.0.0)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+    activesupport (3.2.1)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    aruba (0.5.0)
+      childprocess (= 0.2.3)
+      cucumber (>= 1.1.1)
+      ffi (>= 1.0.11)
+      rspec-expectations (>= 2.7.0)
+    builder (3.0.4)
+    childprocess (0.2.3)
+      ffi (~> 1.0.6)
+    colorize (0.5.8)
+    cucumber (1.2.1)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
+      json (>= 1.4.6)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    excon (0.16.7)
+    ffi (1.0.11)
+    gherkin (2.11.5)
+      json (>= 1.4.6)
+    git-smart (0.1.9)
+      colorize
+    godot (0.1.0)
+    heroku-api (0.3.5)
+      excon (~> 0.16.1)
+    hike (1.2.1)
+    i18n (0.6.0)
+    journey (1.0.3)
+    json (1.7.5)
+    mail (2.4.1)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.17.2)
+    multi_json (1.1.0)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.2.1)
+      actionmailer (= 3.2.1)
+      actionpack (= 3.2.1)
+      activerecord (= 3.2.1)
+      activeresource (= 3.2.1)
+      activesupport (= 3.2.1)
+      bundler (~> 1.0)
+      railties (= 3.2.1)
+    railties (3.2.1)
+      actionpack (= 3.2.1)
+      activesupport (= 3.2.1)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    sprockets (2.1.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.31)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aruba
+  bundler (~> 1.1)
+  cucumber
+  git-smart
+  godot
+  heroku_san!
+  rails (>= 2)
+  rake
+  rspec

data/README.md

@@ -2,6 +2,7 @@
 Helpful rake tasks for Heroku.
 
 [![Build Status](https://secure.travis-ci.org/fastestforward/heroku_san.png)](http://travis-ci.org/fastestforward/heroku_san)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/fastestforward/heroku_san)
 
 ## Install
 
@@ -144,6 +145,7 @@ A full list of tasks provided:
   rake heroku:remotes               # Add git remotes for all apps in this project
   rake heroku:restart               # Restarts remote servers
   rake heroku:share                 # Adds a collaborator (asks for email)
+  rake heroku:shell                 # Opens a bash shell within app
   rake heroku:unshare               # Removes a collaborator (asks for email)
   rake heroku:stage:all             # Select all Heroku apps for later command
 ```
@@ -161,6 +163,7 @@ Frequently used tasks are aliased into the global namespace:
   task :migrate       => 'heroku:db:migrate'
   task :logs          => 'heroku:logs:default'
   task 'logs:tail'    => 'heroku:logs:tail'
+  task 'shell'        => 'heroku:shell'
 ```
 
 ## Links

data/Rakefile

@@ -1,8 +1,9 @@
-require 'bundler'
+#!/usr/bin/env rake
+require 'rubygems'
+require 'bundler/setup'
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-Bundler::GemHelper.install_tasks
-
 desc 'Default: run unit tests.'
 task :default => :spec
 

data/features/remote.feature

@@ -1,4 +1,4 @@
-@announce-cmd @slow_process
+@slow_process @announce-cmd
 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
@@ -9,8 +9,7 @@ Feature: heroku_san can control a 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
-    Then rake reports that the heroku: tasks are available 
+    Then rake reports that the heroku: tasks are available
     
   Scenario: Manipulates a Rails app on Heroku
     Given I have a new Rails project
@@ -20,7 +19,6 @@ Feature: heroku_san can control a project on Heroku
     And I run bundle install
     And I generate a new config 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
@@ -41,7 +39,6 @@ Feature: heroku_san can control a project on Heroku
     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

data/features/step_definitions/remote_steps.rb

@@ -1,49 +1,50 @@
 World(Aruba::Api)
 require 'active_support/core_ext/string/strip'
+require 'godot'
 
 Given /^I have a new Rails project$/ do
   cmd = "rails new test_app --quiet --force --database=postgresql --skip-bundle --skip-javascript --skip-test-unit --skip-sprockets"
-  run_simple unescape(cmd)
+  run_clean unescape(cmd)
 end
 
 Given /^I have a new Sinatra project$/ do
   create_dir 'test_app/config'
-  write_file 'test_app/app.rb', <<EOT.strip_heredoc
+  write_file 'test_app/app.rb', <<-EOT.strip_heredoc
     require 'sinatra'
 
     get '/' do
       'Hello, world.'
     end
-EOT
+  EOT
 
-  write_file 'test_app/config.ru', <<EOT.strip_heredoc
+  write_file 'test_app/config.ru', <<-EOT.strip_heredoc
     require './app'
     run Sinatra::Application
-EOT
+  EOT
 
-  write_file 'test_app/Gemfile', <<EOT.strip_heredoc
+  write_file 'test_app/Gemfile', <<-EOT.strip_heredoc
     source 'http://rubygems.org'
     gem 'sinatra'
-EOT
+  EOT
 
-  write_file 'test_app/Rakefile', <<EOT.strip_heredoc
+  write_file 'test_app/Rakefile', <<-EOT.strip_heredoc
     require "bundler/setup"
     require "heroku_san"
     config_file = File.join(File.expand_path(File.dirname(__FILE__)), 'config', 'heroku.yml')
     HerokuSan.project = HerokuSan::Project.new(config_file, :deploy => HerokuSan::Deploy::Sinatra)
     load "heroku_san/tasks.rb"
-EOT
+  EOT
 
 end
 
 When /^I am in the project directory$/ do
   cd '/test_app'
-  run_simple 'git init .'
+  run_clean 'git init .'
 end
 
-When /^I commit any changes with "(.*)"$/ do |message|
-  run_simple 'git add .'
-  run_simple "git commit -m '#{message}'"
+When /^I commit .* changes with "(.*)"$/ do |message|
+  run_clean 'git add .'
+  run_clean "git commit -m '#{message}'"
 end
 
 When /^I add heroku_san to the Gemfile$/ do
@@ -54,35 +55,41 @@ When /^I add heroku_san to the Gemfile$/ do
 EOT
 end
 
+def run_clean(cmd)
+  Bundler.with_clean_env do
+    ENV['NOEXEC'] = 'skip'
+    run_simple cmd
+  end
+end
+
 When /^I run bundle install$/ do
-  use_clean_gemset 'heroku_san_test'
-  run_simple 'bundle install --quiet'
+  run_clean "bundle install"
 end
 
 Then /^rake reports that the heroku: tasks are available$/ do
-  run_simple 'bundle exec rake -T heroku:'
-  output = stdout_from 'bundle exec rake -T heroku:'
+  run_clean 'rake -T heroku:'
+  output = stdout_from 'rake -T heroku:'
   assert_partial_output 'rake heroku:apps', output
 end
 
 When /^I generate a new config file$/ do
-  run_simple 'bundle exec rails generate heroku_san'
-  output = stdout_from 'bundle exec rails generate heroku_san'
+  run_clean 'rails generate heroku_san'
+  output = stdout_from 'rails generate heroku_san'
   assert_partial_output 'create  config/heroku.yml', output
   overwrite_simple_config_file
 end
 
 When /^I create a new config\/heroku\.yml file$/ do
-  run_simple 'bundle exec rake heroku:create_config'
-  output = stdout_from 'bundle exec rake heroku:create_config'
+  run_clean 'rake heroku:create_config'
+  output = stdout_from 'rake heroku:create_config'
   assert_matching_output %q{Copied example config to ".*.config.heroku.yml"}, output
   assert_matching_output %q{Please edit ".*.config.heroku.yml" with your application's settings.}, output
   overwrite_simple_config_file
 end
 
 When /^I create my project on Heroku$/ do
-  cmd = 'bundle exec rake test_app heroku:create'
-  run_simple unescape(cmd)
+  cmd = 'rake test_app heroku:create'
+  run_clean unescape(cmd)
   output = stdout_from cmd
   assert_matching_output %q{test_app: Created ([\w-]+)}, output
   
@@ -95,21 +102,8 @@ When /^I create my project on Heroku$/ do
 EOT
 end
 
-When /^I list the remote configuration$/ do
-  cmd = 'bundle exec rake test_app heroku:config:list'
-  run_simple unescape(cmd)
-  output = stdout_from cmd
-  assert_partial_output "APP_NAME: #{@app}", output
-  assert_partial_output "URL: #{@app}.heroku.com", output
-  
-  @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
+  Godot.match("#{@app}.herokuapp.com", 80, %r{<h1><strong>Heroku | Welcome to your new app!</strong></h1>}).should be, "Heroku didn't spin up a new app"
 end
 
 When /^I configure my project$/ do
@@ -121,38 +115,36 @@ When /^I configure my project$/ do
         DROIDS: marvin
 
 EOT
-  cmd = 'bundle exec rake test_app heroku:config'
-  run_simple cmd
+  cmd = 'rake test_app heroku:config'
+  run_clean cmd
   output = stdout_from cmd
   assert_partial_output 'DROIDS: marvin', output
 end
 
 When /^I turn maintenance on$/ do
-  run_simple 'bundle exec rake test_app heroku:maintenance_on'
-  output = stdout_from 'bundle exec rake test_app heroku:maintenance_on'
+  run_clean 'rake test_app heroku:maintenance_on'
+  output = stdout_from 'rake test_app heroku:maintenance_on'
   assert_partial_output 'test_app: Maintenance mode enabled.', output
-  
-  run_simple @curl
-  output = stdout_from @curl
-  assert_partial_output '<title>Offline for Maintenance</title>', output
+
+  Godot.match("#{@app}.herokuapp.com", 80, %r{<title>Offline for Maintenance</title>}).should be, "App is not offline"
 end
 
 When /^I turn maintenance off$/ do
-  run_simple 'bundle exec rake test_app heroku:maintenance_off'
-  output = stdout_from 'bundle exec rake test_app heroku:maintenance_off'
+  run_clean 'rake test_app heroku:maintenance_off'
+  output = stdout_from 'rake test_app heroku:maintenance_off'
   assert_partial_output 'test_app: Maintenance mode disabled.', output
   assert_app_is_running
 end
 
 When /^I restart my project$/ do
-  run_simple 'bundle exec rake test_app heroku:restart'
-  output = stdout_from 'bundle exec rake test_app heroku:restart'
+  run_clean 'rake test_app heroku:restart'
+  output = stdout_from 'rake test_app heroku:restart'
   assert_partial_output 'test_app: Restarted.', output
   assert_app_is_running
 end
 
 When /^I generate a scaffold$/ do
-  run_simple 'bundle exec rails generate scaffold droid'
+  run_clean 'rails generate scaffold droid'
   append_to_file 'app/views/droids/index.html.erb', %Q{\n<div><code><%= ENV['DROIDS'] -%></code></div>\n}
 end
 
@@ -166,16 +158,16 @@ EOT
 end
 
 When /^I deploy my project$/ do
-  run_simple 'bundle exec rake test_app deploy'
-  assert_partial_output "http://#{@app}.heroku.com deployed to Heroku", all_output
+  run_clean 'rake test_app deploy'
+  assert_partial_output "http://#{@app}.herokuapp.com deployed to Heroku", all_output
 end
 
 When /^I list all apps on Heroku$/ do
   sha = in_current_dir do
     `git rev-parse HEAD`.chomp
   end
-  run_simple 'bundle exec rake heroku:apps'
-  output = stdout_from 'bundle exec rake heroku:apps'
+  run_clean 'rake heroku:apps'
+  output = stdout_from 'rake heroku:apps'
   assert_partial_output "test_app is shorthand for the Heroku app #{@app} located at:", output
   assert_partial_output "git@heroku.com:#{@app}.git", output
   assert_partial_output "@ #{sha} master", output
@@ -191,24 +183,22 @@ When /^I install an addon$/ do
 
 END_CONFIG
 
-  run_simple 'bundle exec rake test_app heroku:addons'
-  output = stdout_from 'bundle exec rake test_app heroku:addons'
-  # The output should show the default addons...
-  assert_partial_output "shared-database:5mb", output
-  # ... and the new one ...
+  run_clean 'rake test_app heroku:addons'
+  output = stdout_from 'rake test_app heroku:addons'
+  # The output should show the new one ...
   assert_partial_output "deployhooks:campfire", output
   # ... with a note about needing to configure it.
   assert_partial_output "https://api.heroku.com/myapps/#{@app}/addons/deployhooks:campfire", output
 end
 
 Then /^heroku_san is green$/ do
-  run_simple "bundle exec heroku apps:destroy #{@app} --confirm #{@app}"
+  run_clean "heroku apps:destroy #{@app} --confirm #{@app}"
 end
 
 def assert_app_is_running
-  run_simple @curl + "/droids"
-  output = stdout_from @curl + "/droids"
-  assert_partial_output %Q{<code>marvin</code>}, output
+  vladimir = Godot.new("#{@app}.herokuapp.com", 80)
+  vladimir.timeout = 30
+  vladimir.match(%r{<code>marvin</code>}, 'droids').should be, "http://#{@app}.herokuapp.com/droids are not the droids I'm looking for"
 end
 
 def overwrite_simple_config_file
@@ -217,4 +207,4 @@ def overwrite_simple_config_file
     test_app: 
     
 EOT
-end
+end

data/heroku_san.gemspec

@@ -11,37 +11,41 @@ Gem::Specification.new do |s|
   s.description = %q{Manage multiple Heroku instances/apps for a single Rails app using Rake}
   s.email = %q{elijah.miller@gmail.com}
   s.homepage = %q{http://github.com/fastestforward/heroku_san}
+  s.license = "MIT"
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
   s.extra_rdoc_files = ["README.md"]
   s.rubygems_version = %q{1.6.1}
-  s.summary = %q{A bunch of useful Rake tasks for managing your Heroku apps}
+  s.summary = %q{
+  A bunch of useful Rake tasks for managing your Heroku apps.
+  NOTE: The Heroku Toolbelt must be installed to use this gem.
+  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_development_dependency(%q<rails>, ['>= 2'])
-      s.add_runtime_dependency(%q<heroku>, ['>= 2'])
       s.add_runtime_dependency(%q<heroku-api>, ['>= 0.1.2'])
       s.add_runtime_dependency(%q<rake>)
       s.add_runtime_dependency('activesupport')
+      s.add_development_dependency(%q<rails>, ['>= 2'])
+      s.add_development_dependency(%q<rspec>)
       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.1  '])
       s.add_development_dependency('git-smart')
+      s.add_development_dependency('godot')
     else
       s.add_dependency(%q<rails>, ['>= 2'])
-      s.add_dependency(%q<heroku>, ['>= 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>, ['>= 2'])
     s.add_dependency(%q<heroku-api>, ['>= 0.1.2'])
     s.add_dependency(%q<aruba>)
     s.add_dependency(%q<cucumber>)

data/lib/heroku_san/deploy/rails.rb

@@ -6,7 +6,7 @@ module HerokuSan
       def deploy
         # TODO: Add announce/logger
         super
-        @stage.rake('db:migrate')
+        @stage.run('rake db:migrate')
         @stage.restart
       end
     end

data/lib/heroku_san/stage.rb

@@ -1,8 +1,8 @@
-require 'heroku'
-require 'heroku/api'
+require 'heroku-api'
 require 'json'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/hash/slice'
 
 MOCK = false unless defined?(MOCK)
 
@@ -20,7 +20,7 @@ module HerokuSan
     end
     
     def heroku
-      @heroku ||= Heroku::API.new(:api_key => ENV['HEROKU_API_KEY'] || Heroku::Auth.api_key, :mock => MOCK)
+      @heroku ||= Heroku::API.new(:api_key => auth_token, :mock => MOCK)
     end
 
     def app
@@ -48,10 +48,10 @@ module HerokuSan
     end
     
     def run(command, args = nil)
-      if stack =~ /cedar/
-        sh_heroku "run #{command} #{args}"
+      if stack !~ /aspen|bamboo/
+        sh_heroku "run", command, *args
       else
-        sh_heroku "run:#{command} #{args}"
+        sh_heroku "run:#{command}", *args
       end
     end
     
@@ -61,7 +61,7 @@ module HerokuSan
     end
     
     def migrate
-      rake('db:migrate')
+      run('rake db:migrate')
       restart
     end
     
@@ -69,10 +69,9 @@ module HerokuSan
       strategy = @options['deploy'].new(self, commit, force)
       strategy.deploy
     end
-    
+
     def rake(*args)
-      run 'rake', args.join(' ')
-      # heroku.rake app, args.join(' ')
+      raise HerokuSan::Deprecated.new("use Stage#run instead")
     end
 
     def maintenance(action = nil)
@@ -90,20 +89,20 @@ module HerokuSan
     end
     
     def create
-      params = Hash[@options.select{|k,v| %w[app stack].include? k}].stringify_keys
+      params = @options.slice('app', 'stack').stringify_keys
       params['name'] = params.delete('app')
       response = heroku.post_app(params)
       response.body['name']
     end
 
     def sharing_add(email) # DEPREC?
-      sh_heroku "sharing:add #{email.chomp}"
+      raise HerokuSan::Deprecated
     end
-  
+
     def sharing_remove(email) # DEPREC?
-      sh_heroku "sharing:remove #{email.chomp}"
+      raise HerokuSan::Deprecated
     end
-  
+
     def long_config
       heroku.get_config_vars(app).body
     end
@@ -138,9 +137,18 @@ module HerokuSan
     end
     
   private
-  
-    def sh_heroku(command)
-      sh "heroku #{command} --app #{app}"
+
+    def auth_token
+      @auth_token ||= (ENV['HEROKU_API_KEY'] || `heroku auth:token`.chomp unless MOCK)
+    end
+
+    def sh_heroku(*command)
+      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
   end
 end

data/lib/heroku_san/tasks.rb

@@ -42,24 +42,12 @@ namespace :heroku do
     end
   end
 
-  desc 'Adds a collaborator (asks for email)'
   task :share do
-    print "Email address of collaborator to add: "
-    $stdout.flush
-    email = $stdin.gets
-    each_heroku_app do |stage|
-      stage.sharing_add email
-    end
+    raise HerokuSan::Deprecated
   end
 
-  desc 'Removes a collaborator (asks for email)'
   task :unshare do
-    print "Email address of collaborator to remove: "
-    $stdout.flush
-    email = $stdin.gets
-    each_heroku_app do |stage|
-      stage.sharing_remove email
-    end
+    raise HerokuSan::Deprecated
   end
 
   desc 'Lists configured apps'
@@ -119,7 +107,6 @@ namespace :heroku do
 
   desc 'Creates an example configuration file'
   task :create_config do
-    # FIXME: sh "rails generate heroku_san"
     filename = %Q{#{HerokuSan.project.config_file.to_s}}
     if HerokuSan.project.create_config
       puts "Copied example config to #{filename.inspect}"
@@ -172,7 +159,7 @@ namespace :heroku do
   desc 'Runs a rake task remotely'
   task :rake, [:task] do |t, args|
     each_heroku_app do |stage|
-      puts stage.rake args.task
+      puts stage.run "rake #{args.task}"
     end
   end
 

data/lib/heroku_san/version.rb

@@ -1,3 +1,3 @@
 module HerokuSan
-  VERSION = "3.0.4"
+  VERSION = "4.0.0"
 end

data/spec/bugs/issue_105_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+# https://github.com/fastestforward/heroku_san/issues/105
+
+=begin
+Expected(202) <=> Actual(422 Unprocessable Entity)
+  request => {:connect_timeout=>60, :headers=>{"Accept"=>"application/json", "Accept-Encoding"=>"gzip", "Authorization"=>"Basic OjUwZTc4NjgxZDhmYzcxZDI3Yzc5ZTM3MTZhNDk3Nzk1MzU2Mzk4ZTM=", "User-Agent"=>"heroku-rb/0.1.8", "X-Heroku-API-Version"=>"3", "X-Ruby-Version"=>"1.9.2", "X-Ruby-Platform"=>"x86_64-darwin10.8.0", "Host"=>"api.heroku.com:443", "Content-Length"=>0}, :instrumentor_name=>"excon", :mock=>false, :read_timeout=>60, :retry_limit=>4, :ssl_ca_file=>"/Users/kmayer/.rvm/gems/ruby-1.9.2-p320/gems/excon-0.13.4/data/cacert.pem", :ssl_verify_peer=>true, :write_timeout=>60, :host=>"api.heroku.com", :path=>"/apps", :port=>"443", :query=>{"app[name]"=>"stark-window-5734"}, :scheme=>"https", :expects=>202, :method=>:post}
+  response => #<Excon::Response:0x00000100e07288 @body="{\"error\":\"Name is already taken\"}", @headers={"Cache-Control"=>"no-cache", "Content-Type"=>"application/json; charset=utf-8", "Date"=>"Sun, 29 Jul 2012 19:24:33 GMT", "Server"=>"nginx/1.0.14", "Status"=>"422 Unprocessable Entity", "Strict-Transport-Security"=>"max-age=500", "X-RateLimit-Limit"=>"486", "X-RateLimit-Remaining"=>"485", "X-RateLimit-Reset"=>"1343589933", "X-Runtime"=>"426", "Content-Length"=>"33", "Connection"=>"keep-alive"}, @status=422>
+=end
+
+describe "Handle Excon exceptions" do
+  it "should report the error in a more readable format"
+end

data/spec/heroku_san/deploy/rails_spec.rb

@@ -8,7 +8,7 @@ module HerokuSan
       it "calls push, rake db:migrate & restart" do
         subject = described_class.new(stage, {})
         stage.should_receive(:push) { "pushed" } # "mock" super
-        stage.should_receive(:rake).with('db:migrate') { "migrated" }
+        stage.should_receive(:run).with('rake db:migrate') { "migrated" }
         stage.should_receive(:restart) { "restarted" }
         subject.deploy
       end

data/spec/heroku_san/stage_spec.rb

@@ -1,13 +1,9 @@
 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"})}
+  subject { HerokuSan::Stage.new('production', {"app" => "awesomeapp", "stack" => "cedar"})}
   STOCK_CONFIG = {"BUNDLE_WITHOUT"=>"development:test", "LANG"=>"en_US.UTF-8", "RACK_ENV"=>"production"}
-  before do
-    Heroku::Auth.stub(:api_key) { 'API_KEY' }
-  end
 
   context "initializes" do
     subject { HerokuSan::Stage.new('production', 
@@ -73,13 +69,13 @@ describe HerokuSan::Stage do
 
   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'
+      subject = HerokuSan::Stage.new('production', {"app" => "awesomeapp", "stack" => "aspen"})
+      subject.should_receive(:system).with("heroku", "run:rake foo bar bleh", "--app", "awesomeapp") { true }
+      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'
+      subject.should_receive(:system).with("heroku", "run", "worker foo bar bleh", "--app", "awesomeapp") { true }
+      subject.run 'worker foo bar bleh'
     end
   end
 
@@ -108,7 +104,7 @@ describe HerokuSan::Stage do
   describe "#migrate" do
     it "runs rake db:migrate" do
       with_app(subject, 'name' => subject.app) do |app_data|
-        subject.should_receive(:rake).with('db:migrate').and_return 'output:'
+        subject.should_receive(:run).with('rake db:migrate').and_return 'output:'
         subject.migrate.should == "restarted"
       end
     end
@@ -192,24 +188,10 @@ describe HerokuSan::Stage do
     end    
     it "uses the stack from the config" do
       (@app = subject.create).should == 'awesomeapp'
-      subject.heroku.get_stack(@app).body.detect{|stack| stack['current']}['name'].should == 'bamboo-ree-1.8.7'
+      subject.heroku.get_stack(@app).body.detect{|stack| stack['current']}['name'].should == 'cedar'
     end
   end
   
-  describe "#sharing_add" do
-    it "add collaborators" do
-      subject.should_receive(:sh).with("heroku sharing:add email@example.com --app awesomeapp")
-      subject.sharing_add 'email@example.com'
-    end
-  end
-
-  describe "#sharing_remove" do
-    it "removes collaborators" do
-      subject.should_receive(:sh).with("heroku sharing:remove email@example.com --app awesomeapp")
-      subject.sharing_remove 'email@example.com'
-    end
-  end
-
   describe "#long_config" do
     it "returns the remote config" do
       with_app(subject, 'name' => subject.app) do |app_data|
@@ -228,11 +210,11 @@ describe HerokuSan::Stage do
   
   describe "#logs" do
     it "returns log files" do
-      subject.should_receive(:sh).with("heroku logs --app awesomeapp")
+      subject.should_receive(:system).with("heroku", "logs", "--app", "awesomeapp") { true }
       subject.logs
     end
     it "tails log files" do
-      subject.should_receive(:sh).with("heroku logs --tail --app awesomeapp")
+      subject.should_receive(:system).with("heroku", "logs --tail", "--app", "awesomeapp") { true }
       subject.logs(:tail)
     end
   end

metadata

@@ -1,10 +1,15 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: heroku_san
-version: !ruby/object:Gem::Version
-  version: 3.0.4
+version: !ruby/object:Gem::Version 
+  hash: 63
   prerelease: 
+  segments: 
+  - 4
+  - 0
+  - 0
+  version: 4.0.0
 platform: ruby
-authors:
+authors: 
 - Elijah Miller
 - Glenn Roberts
 - Ryan Ahearn
@@ -12,183 +17,183 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
+
+date: 2012-11-09 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 1
+        - 2
+        version: 0.1.2
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: heroku
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2'
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
   name: heroku-api
-  requirement: !ruby/object:Gem::Requirement
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-  type: :runtime
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-- !ruby/object:Gem::Dependency
+  type: :runtime
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  type: :runtime
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        version: "2"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  name: rails
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
   type: :development
+  name: rspec
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+  name: aruba
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
   name: cucumber
-  requirement: !ruby/object:Gem::Requirement
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  type: :development
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  type: :development
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
+  type: :development
   name: git-smart
-  requirement: !ruby/object:Gem::Requirement
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  type: :development
+  name: godot
+  requirement: *id011
 description: Manage multiple Heroku instances/apps for a single Rails app using Rake
 email: elijah.miller@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.md
-files:
+files: 
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
-- autotest/discover.rb
 - cucumber.yml
 - examples/auto_tagger.rake
 - examples/deploy_strategies.md
@@ -213,6 +218,7 @@ files:
 - lib/railtie.rb
 - lib/tasks/heroku.rake
 - lib/templates/heroku.example.yml
+- spec/bugs/issue_105_spec.rb
 - spec/fixtures/example.yml
 - spec/fixtures/extended_config.yml
 - spec/fixtures/old_format.yml
@@ -225,38 +231,45 @@ files:
 - spec/spec_helper.rb
 - spec/support/heroku.rb
 homepage: http://github.com/fastestforward/heroku_san
-licenses: []
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -3097599512133406407
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: A bunch of useful Rake tasks for managing your Heroku apps
-test_files:
+summary: "A bunch of useful Rake tasks for managing your Heroku apps. NOTE: The Heroku Toolbelt must be installed to use this gem. https://toolbelt.heroku.com/"
+test_files: 
 - features/config.feature
 - features/extended-config.feature
 - features/remote.feature
 - features/step_definitions/remote_steps.rb
 - features/support/env.rb
+- spec/bugs/issue_105_spec.rb
 - spec/fixtures/example.yml
 - spec/fixtures/extended_config.yml
 - spec/fixtures/old_format.yml

data/autotest/discover.rb

@@ -1 +0,0 @@
-Autotest.add_discovery { "rspec2" }