heroku_san 1.1.0 → 1.2.0

data/.gitignore

@@ -0,0 +1,8 @@
+.bundle
+doc
+pkg
+Thumbs.db
+tmp
+
+Gemfile.lock
+*.swp

data/.gitmodules

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

data/.rvmrc

@@ -0,0 +1 @@
+rvm @heroku_san --create

data/Gemfile

@@ -0,0 +1,4 @@
+source :rubygems
+
+# Specify dependencies in heroku_san.gemspec
+gemspec

data/Rakefile

@@ -1,22 +1,5 @@
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "heroku_san"
-    gem.summary = %Q{A bunch of useful Rake tasks for managing your Heroku apps}
-    gem.description = %Q{Manage multiple Heroku instances/apps for a single Rails app using Rake}
-    gem.email = "elijah.miller@gmail.com"
-    gem.homepage = "http://github.com/glennr/heroku_san"
-    gem.authors = ["Elijah Miller", "Glenn Roberts"]
-    gem.files = Dir["{lib}/**/*", "VERSION", "LICENSE", "CHANGELOG", "TODO", "README.rdoc", "Rakefile"]
-    gem.extra_rdoc_files = []
-    gem.add_dependency("heroku")
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 desc 'Default: build gem.'
 task :default => :build

data/features/command_line.feature

@@ -0,0 +1,47 @@
+Feature: Command Line
+
+  Scenario: Config file can be formatted like Rails' database.yml
+    Given I run `rails new heroku_san_test -O`
+    And I cd to "heroku_san_test"
+    And I overwrite "Gemfile" with:
+      """
+      source :rubygems
+      gem 'heroku_san', :path => '../../../.'
+      """
+    Given a file named "config/heroku.yml" with:
+      """
+      production: 
+        app: awesomeapp
+      staging:
+        app: awesomeapp-staging
+      demo: 
+        app: awesomeapp-demo
+      """
+
+    When I run `rake heroku:apps:local`
+
+    Then the output should contain "production is shorthand for the Heroku app awesomeapp"
+    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
+    Given I run `rails new heroku_san_test -O`
+    And I cd to "heroku_san_test"
+    And I overwrite "Gemfile" with:
+      """
+      source :rubygems
+      gem 'heroku_san', :path => '../../../.'
+      """
+    Given a file named "config/heroku.yml" with:
+      """
+      apps:
+        production: awesomeapp
+        staging: awesomeapp-staging
+        demo: awesomeapp-demo
+      """
+
+    When I run `rake heroku:apps:local`
+
+    Then the output should contain "production is shorthand for the Heroku app awesomeapp"
+    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"

data/features/extended-config.feature

@@ -0,0 +1,81 @@
+Feature: Extended config
+
+  Scenario: Config information can be pulled from a separate git repository
+    Given I run `rails new heroku_san_test -O`
+    And I cd to "heroku_san_test"
+    And I overwrite "Gemfile" with:
+      """
+      source :rubygems
+      gem 'heroku_san', :path => '../../../.'
+      """
+    Given a file named "config/heroku.yml" with:
+      """
+      config_repo: 'file:///<%= File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', '..', 'features', 'data', 'test-config') %>'
+      production: 
+        app: awesomeapp
+      staging:
+        app: awesomeapp-staging
+      demo: 
+        app: awesomeapp-demo
+      """
+
+    When I run `rake 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'"
+
+  Scenario: Config information can be listed
+    Given I run `rails new heroku_san_test -O`
+    And I cd to "heroku_san_test"
+    And I overwrite "Gemfile" with:
+      """
+      source :rubygems
+      gem 'heroku_san', :path => '../../../.'
+      """
+    Given a file named "config/heroku.yml" with:
+      """
+      production:
+        app: awesomeapp
+        config:
+          TEST_LOCAL: 'hello_world'
+      staging:
+        app: awesomeapp-staging
+        config:
+          TEST_LOCAL: 'goodbye_world'
+      demo:
+        app: awesomeapp-demo
+      """
+
+    When I run `rake 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'"
+
+  Scenario: Config information can be merged between local and remote
+    Given I run `rails new heroku_san_test -O`
+    And I cd to "heroku_san_test"
+    And I overwrite "Gemfile" with:
+      """
+      source :rubygems
+      gem 'heroku_san', :path => '../../../.'
+      """
+    Given a file named "config/heroku.yml" with:
+      """
+      config_repo: 'file:///<%= File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', '..', 'features', 'data', 'test-config') %>'
+      production:
+        app: awesomeapp
+        config:
+          TEST_LOCAL: 'hello_world'
+      staging:
+        app: awesomeapp-staging
+        config:
+          TEST_LOCAL: 'goodbye_world'
+          TEST_REMOTE: 'overridden_by_remote'
+      """
+
+    When I run `rake 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'"

data/features/support/env.rb

@@ -0,0 +1,8 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
+
+require 'aruba/cucumber'
+
+# ensure test-config submodule has been cloned
+unless File.readable? File.join(File.dirname(__FILE__), '..', 'data', 'test-config', 'config.yml')
+  `git submodule init && git submodule update`
+end

data/heroku_san.gemspec

@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{heroku_san}
+  s.version = "1.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Elijah Miller", "Glenn Roberts"]
+  s.date = %q{2011-03-14}
+  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}
+  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.rdoc"]
+  s.rubygems_version = %q{1.6.1}
+  s.summary = %q{A bunch of useful Rake tasks for managing your Heroku apps}
+
+  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<rails>, ['>= 2'])
+      s.add_runtime_dependency(%q<heroku>)
+      s.add_development_dependency(%q<rails>, ['>= 3'])
+      s.add_development_dependency(%q<aruba>)
+      s.add_development_dependency(%q<cucumber>)
+    else
+      s.add_dependency(%q<rails>, ['>= 2'])
+      s.add_dependency(%q<heroku>)
+      s.add_dependency(%q<aruba>)
+      s.add_dependency(%q<cucumber>)
+    end
+  else
+    s.add_dependency(%q<rails>, ['>= 2'])
+    s.add_dependency(%q<heroku>)
+    s.add_dependency(%q<aruba>)
+    s.add_dependency(%q<cucumber>)
+  end
+end
+

data/lib/heroku_san/tasks.rb

@@ -18,6 +18,27 @@ if @app_settings.has_key? 'apps'
   end
 end
 
+@config_repo = @app_settings.delete('config_repo')
+def retrieve_configuration
+  unless @config_repo.nil?
+    #load external config
+    require 'tmpdir'
+    tmp_config_dir = Dir.mktmpdir
+    tmp_config_file = File.join tmp_config_dir, 'config.yml'
+    sh "git clone #{@config_repo} #{tmp_config_dir}"
+    @extra_config = 
+      if File.exists?(tmp_config_file)
+        if defined?(ERB)
+          YAML.load(ERB.new(File.read(tmp_config_file)).result)
+        else
+          YAML.load_file(tmp_config_file)
+        end
+      else
+        {}
+      end
+  end
+end
+
 (@app_settings.keys || []).each do |name|
   desc "Select #{name} Heroku app for later commands"
   task name do
@@ -86,12 +107,30 @@ namespace :heroku do
   desc 'Lists configured apps'
   task :apps => :all do
     each_heroku_app do |name, app, repo|
-      puts "#{name} is shorthand for the Heroku app #{app} located at:"
-      puts "  #{repo}"
+      puts  "#{name} is shorthand for the Heroku app #{app} located at:"
+      puts  "  #{repo}"
+      print "  @ "
+      rev = `git ls-remote -h #{repo}`.split(' ').first
+      if rev.blank?
+        puts 'not deployed'
+      else
+        puts `git name-rev #{rev}`
+      end
       puts
     end
   end
 
+  namespace :apps do
+    desc 'Lists configured apps without hitting heroku'
+    task :local => :all do
+      each_heroku_app do |name, app, repo|
+        puts "#{name} is shorthand for the Heroku app #{app} located at:"
+        puts "  #{repo}"
+        puts
+      end
+    end
+  end
+
   desc 'Add proper RACK_ENV to each application'
   task :rack_env => :all do
     each_heroku_app do |name, app, repo|
@@ -118,12 +157,35 @@ namespace :heroku do
 
   desc 'Add config:vars to each application.'
   task :config do
+    retrieve_configuration
     each_heroku_app do |name, app, repo, config|
       (config).each do |var, value|
         sh "heroku config:add --app #{app} #{var}=#{value}"
       end
     end
   end
+
+  namespace :config do
+    desc "Lists config variables as set on Heroku"
+    task :list do
+      each_heroku_app do |name, app|
+        puts "#{name}:"
+        sh "heroku config --app #{app} --long"
+      end
+    end
+
+    namespace :list do
+      desc "Lists local config variables without setting them"
+      task :local do
+        retrieve_configuration
+        each_heroku_app do |name, app, repo, config|
+          (config).each do |var, value|
+            puts "#{name} #{var}: '#{value}'"
+          end
+        end
+      end
+    end
+  end
   
   desc 'Runs a rake task remotely'
   task :rake, :task do |t, args|
@@ -246,15 +308,27 @@ namespace :db do
 end
 
 def each_heroku_app
-  if @heroku_apps.blank? && @app_settings.keys.size == 1
-    app = @app_settings.keys.first
-    puts "Defaulting to #{app} app since only one app is defined"
-    @heroku_apps = [app]
+  if @heroku_apps.blank? 
+    if @app_settings.keys.size == 1
+      app = @app_settings.keys.first
+      puts "Defaulting to #{app} app since only one app is defined"
+      @heroku_apps = [app]
+    else
+      @app_settings.keys.each do |key|
+        active_branch = %x{git branch}.split("\n").select { |b| b =~ /^\*/ }.first.split(" ").last.strip
+        if key == active_branch
+          puts "Defaulting to #{key} as it matches the current branch"
+          @heroku_apps = [key]
+        end
+      end
+    end
   end
+
   if @heroku_apps.present?
     @heroku_apps.each do |name|
       app = @app_settings[name]['app']
-      config = @app_settings[name]['config'] || []
+      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)
     end
     puts

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: heroku_san
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Elijah Miller
@@ -20,6 +20,8 @@ date: 2011-03-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,11 +31,11 @@ dependencies:
         segments: 
         - 2
         version: "2"
-  version_requirements: *id001
-  name: rails
-  prerelease: false
   type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: heroku
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -43,12 +45,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  type: :runtime
   version_requirements: *id002
-  name: jeweler
+- !ruby/object:Gem::Dependency 
+  name: rails
   prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        version: "3"
   type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: aruba
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -57,24 +73,42 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id003
-  name: heroku
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: cucumber
   prerelease: false
-  type: :runtime
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 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: 
+- .gitignore
+- .gitmodules
+- .rvmrc
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
-- TODO
-- VERSION
+- features/command_line.feature
+- features/extended-config.feature
+- features/support/env.rb
+- heroku_san.gemspec
 - lib/heroku_san.rb
 - lib/heroku_san/railtie.rb
 - lib/heroku_san/tasks.rb
@@ -114,5 +148,7 @@ rubygems_version: 1.6.1
 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

data/TODO

@@ -1,2 +0,0 @@
-  - refactor config/helpers out of tasks.rb into own file(s)
-  - 

data/VERSION

@@ -1 +0,0 @@
-1.1.0