heroku_san 1.2.3 → 1.3.0

data/heroku_san.gemspec

@@ -2,11 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{heroku_san}
-  s.version = "1.2.3"
+
+  s.version = "1.3.0"
+  s.date = %q{2011-11-07}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Elijah Miller", "Glenn Roberts", "Ryan Ahearn"]
-  s.date = %q{2011-08-19}
   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/glennr/heroku_san}

data/lib/heroku_san/tasks.rb

@@ -56,7 +56,7 @@ namespace :heroku do
   desc "Creates the Heroku app"
   task :create do
     each_heroku_app do |name, app, repo|
-      sh "heroku create #{app}"
+      sh "heroku create #{app} #{("--stack " + stack(app)) if stack(app)}"
     end
   end
 
@@ -196,7 +196,7 @@ namespace :heroku do
   desc 'Runs a rake task remotely'
   task :rake, :task do |t, args|
     each_heroku_app do |name, app, repo|
-      sh "heroku rake --app #{app} #{args[:task]}"
+      sh "heroku #{run_or_rake(app)} #{args[:task]}"
     end
   end
 
@@ -272,7 +272,11 @@ end
 desc "Opens a remote console"
 task :console do
   each_heroku_app do |name, app, repo|
-    sh "heroku console --app #{app}"
+    if stack_is_cedar?(app)
+      sh "heroku run --app #{app} console"
+    else
+      sh "heroku console --app #{app}"
+    end
   end
 end
 
@@ -353,7 +357,12 @@ def each_heroku_app
       app = @app_settings[name]['app']
       config = @app_settings[name]['config'] || {}
       config.merge!(@extra_config[name]) if (@extra_config && @extra_config[name])
-      yield(name, app, "git@heroku.com:#{app}.git", config)
+      if @app_settings[name].has_key? 'repo'
+        repo = @app_settings[name]['repo']
+      else
+        repo = "git@heroku.com:#{app}.git"
+      end
+      yield(name, app, repo, config)
     end
     puts
   else
@@ -381,10 +390,30 @@ def push(commit, repo)
 end
 
 def migrate(app)
-  sh "heroku rake --app #{app} db:migrate"
+  sh "heroku #{run_or_rake(app)} db:migrate"
   sh "heroku restart --app #{app}"
 end
 
 def maintenance(app, action)
   sh "heroku maintenance:#{action} --app #{app}"
 end
+
+# `heroku rake foo` has been superseded by `heroku run rake foo` on cedar
+def run_or_rake(app)
+  if stack_is_cedar?(app)
+    "run --app #{app} rake"
+  else
+    "rake --app #{app}"
+  end
+end
+
+def stack_is_cedar?(app)
+  stack(app) =~ /^cedar/
+end
+
+def stack(app)
+  @app_settings.values.detect { |s| s['app'] == app }.tap do |settings|
+    @stack = (settings['stack'] || (/^\* (.*)/.match `heroku stack --app #{app}`)[1] rescue nil)
+  end
+  @stack
+end

data/lib/templates/heroku.example.yml

@@ -3,16 +3,19 @@
 # 
 # <heroku_san shorthand name>:
 #   app: <Heroku app name>
+#   stack: <Heroku stack, optional>
 #   config:
 #     - <Heroku config:var name>: <Heroku config:var value>
 #
 production: 
   app: awesomeapp
+  stack: bamboo-ree-1.8.7
   config:
     BUNDLE_WITHOUT: "development:test"
     GOOGLE_ANALYTICS: "UA-12345678-1"
 
 staging:
+  stack: cedar
   app: awesomeapp-staging
   config: &default
     BUNDLE_WITHOUT: "development:test"

metadata

@@ -1,104 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: heroku_san
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 1.3.0
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 3
-  version: 1.2.3
 platform: ruby
-authors: 
+authors:
 - Elijah Miller
 - Glenn Roberts
 - Ryan Ahearn
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-19 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-07 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70239580705520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: heroku
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70239580705520
+- !ruby/object:Gem::Dependency
+  name: heroku
+  requirement: &70239580704340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70239580704340
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &70239580700620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        version: "3"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: aruba
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70239580700620
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: &70239580699940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70239580699940
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &70239580654620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *70239580654620
 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.rdoc
-files: 
+files:
 - .gitignore
 - .gitmodules
 - .rvmrc
@@ -115,41 +91,34 @@ files:
 - lib/heroku_san/tasks.rb
 - lib/tasks/heroku.rake
 - lib/templates/heroku.example.yml
-has_rdoc: true
 homepage: http://github.com/glennr/heroku_san
 licenses: []
-
 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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -81552674531593559
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A bunch of useful Rake tasks for managing your Heroku apps
-test_files: 
+test_files:
 - features/command_line.feature
 - features/extended-config.feature
 - features/support/env.rb