heroku-rails 0.3.2 → 0.4.0

data/Gemfile

@@ -6,3 +6,5 @@ gem "ruby-debug19", :platforms => :mri_19
 
 gem "autotest", ">= 0"
 gem "growl-glue", ">= 0"
+
+gem "rake", "0.8.7"

data/Gemfile.lock

@@ -1,47 +1,50 @@
 PATH
   remote: .
   specs:
-    heroku-rails (0.3.2)
+    heroku-rails (0.4.0)
       heroku (>= 1.11.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    ZenTest (4.6.2)
+    addressable (2.2.6)
     archive-tar-minitar (0.5.2)
-    autotest (4.4.1)
-    columnize (0.3.1)
-    configuration (1.2.0)
-    diff-lcs (1.1.2)
+    autotest (4.4.6)
+      ZenTest (>= 4.4.1)
+    columnize (0.3.5)
+    diff-lcs (1.1.3)
     growl-glue (1.0.7)
-    heroku (1.20.1)
-      launchy (~> 0.3.2)
-      rest-client (< 1.7.0, >= 1.4.0)
-    launchy (0.3.7)
-      configuration (>= 0.0.5)
-      rake (>= 0.8.1)
-    linecache (0.43)
-    linecache19 (0.5.11)
+    heroku (2.15.1)
+      launchy (>= 0.3.2)
+      rest-client (~> 1.6.1)
+      rubyzip
+      term-ansicolor (~> 1.0.5)
+    launchy (2.0.5)
+      addressable (~> 2.2.6)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    mime-types (1.16)
+    mime-types (1.17.2)
     rake (0.8.7)
-    rest-client (1.6.1)
+    rbx-require-relative (0.0.5)
+    rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-    ruby-debug (0.10.3)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
+    ruby-debug (0.10.4)
       columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    ruby-debug-base19 (0.11.24)
+    ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby_core_source (>= 0.1.4)
@@ -49,8 +52,10 @@ GEM
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.4)
+    ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
+    rubyzip (0.9.5)
+    term-ansicolor (1.0.7)
 
 PLATFORMS
   ruby
@@ -59,6 +64,7 @@ DEPENDENCIES
   autotest
   growl-glue
   heroku-rails!
+  rake (= 0.8.7)
   rspec (~> 2.0)
   ruby-debug
   ruby-debug19

data/heroku-rails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "heroku-rails"
-  s.version = "0.3.2"
+  s.version = "0.4.0"
 
   s.authors = ["Elijah Miller", "Glenn Roberts", "Jacques Crocker"]
   s.summary = "Deployment and configuration tools for Heroku/Rails"

data/lib/generators/templates/heroku.rake

@@ -16,12 +16,12 @@ namespace :heroku do
   end
 
   # runs before each push to a particular heroku deploy environment
-  task :before_each_deploy do
+  task :before_each_deploy, [:app_name] do |t,args|
 
   end
 
   # runs after each push to a particular heroku deploy environment
-  task :after_each_deploy do
+  task :after_each_deploy, [:app_name] do |t,args|
 
   end
 

data/lib/heroku-rails/config.rb

@@ -1,3 +1,5 @@
+require 'erb'
+
 module HerokuRails
   class Config
 
@@ -14,7 +16,7 @@ module HerokuRails
 
     def initialize(config_filepath)
       if File.exists?(config_filepath)
-        self.settings = YAML.load_file(config_filepath) || {}
+        self.settings = YAML.load(ERB.new(File.read(config_filepath)).result) || {}
       else
         self.settings = {}
       end

data/lib/heroku-rails/runner.rb

@@ -46,7 +46,7 @@ module HerokuRails
 
         stack = @config.stack(heroku_env)
         stack_option = " --stack #{stack}" if stack.to_s.size > 0
-        system_with_echo "heroku create #{app_name}#{stack_option} --remote #{app_name}"
+        creation_command "heroku create #{app_name}#{stack_option} --remote #{app_name}"
       end
     end
 
@@ -63,7 +63,7 @@ module HerokuRails
         # if the stacks don't match, then perform a migration
         if stack != heroku_app_info[:stack]
           puts "Migrating the app: #{app_name} to the stack: #{stack}"
-          system_with_echo "heroku stack:migrate #{stack} --app #{app_name}"
+          creation_command "heroku stack:migrate #{stack} --app #{app_name}"
         end
       end
     end
@@ -90,7 +90,7 @@ module HerokuRails
           # check to see if we need to delete this person
           unless collaborator_emails.include?(existing_email)
             # delete that collaborator if they arent on the approved list
-            system_with_echo "heroku sharing:remove #{existing_email} --app #{app_name}"
+            destroy_command "heroku sharing:remove #{existing_email} --app #{app_name}"
           end
         end
 
@@ -99,9 +99,12 @@ module HerokuRails
           # check to see if we need to add this person
           unless existing_emails.include?(collaborator_email)
             # add the collaborator if they are not already on the server
-            system_with_echo "heroku sharing:add #{collaborator_email} --app #{app_name}"
+            creation_command "heroku sharing:add #{collaborator_email} --app #{app_name}"
           end
         end
+
+        # display the destructive commands
+        output_destroy_commands
       end
     end
 
@@ -134,7 +137,7 @@ module HerokuRails
             set_config << "#{key}='#{val}' "
           end
 
-          system_with_echo "heroku config:add #{set_config} --app #{app_name}"
+          creation_command "heroku config:add #{set_config} --app #{app_name}"
         end
       end
     end
@@ -150,7 +153,7 @@ module HerokuRails
         existing_addons = (@heroku.installed_addons(app_name) || []).map{|a| a["name"]}
 
         # all apps need the shared database
-        addons << "shared-database:5mb" unless addons.index("shared-database:5mb")
+        addons << "shared-database:5mb" unless addons.index("shared-database:5mb") || addons.index("shared-database:20gb")
 
         # add "custom_domains" if that addon doesnt already exist
         # and we have domains configured for this app
@@ -163,7 +166,7 @@ module HerokuRails
           # check to see if we need to delete this addon
           unless addons.include?(existing_addon)
             # delete this addon if they arent on the approved list
-            system_with_echo "heroku addons:remove #{existing_addon} --app #{app_name}"
+            destroy_command "heroku addons:remove #{existing_addon} --app #{app_name}"
           end
         end
 
@@ -172,9 +175,12 @@ module HerokuRails
           # check to see if we need to add this addon
           unless existing_addons.include?(addon)
             # add this addon if they are not already added
-            system_with_echo "heroku addons:add #{addon} --app #{app_name}"
+            creation_command "heroku addons:add #{addon} --app #{app_name}"
           end
         end
+
+        # display the destructive commands
+        output_destroy_commands
       end
     end
 
@@ -193,7 +199,7 @@ module HerokuRails
           # check to see if we need to delete this domain
           unless domains.include?(existing_domain)
             # delete this domain if they arent on the approved list
-            system_with_echo "heroku domains:remove #{existing_domain} --app #{app_name}"
+            destroy_command "heroku domains:remove #{existing_domain} --app #{app_name}"
           end
         end
 
@@ -202,9 +208,12 @@ module HerokuRails
           # check to see if we need to add this domain
           unless existing_domains.include?(domain)
             # add this domain if they are not already added
-            system_with_echo "heroku domains:add #{domain} --app #{app_name}"
+            creation_command "heroku domains:add #{domain} --app #{app_name}"
           end
         end
+
+        # display the destructive commands
+        output_destroy_commands
       end
     end
 
@@ -248,6 +257,27 @@ module HerokuRails
       command(*args)
     end
 
+    def creation_command(*args)
+      system_with_echo(*args)
+    end
+
+    def destroy_command(*args)
+      puts args.join(' ')
+      @destroy_commands ||= []
+      @destroy_commands << @destroy_commands
+    end
+
+    def output_destroy_commands(app)
+      puts "The #{app} had a few things removed from the heroku.yml."
+      puts "If they are no longer neccessary, then run the following commands:"
+      (@destroy_commands || []).each do |destroy_command|
+        puts destroy_command
+      end
+      puts "these commands may cause data loss so make sure you know that these are necessary"
+      # clear destroy commands
+      @destroy_commands = []
+    end
+
     def command(*args)
       system(*args)
     end

data/lib/heroku/rails/tasks.rb

@@ -60,7 +60,7 @@ namespace :heroku do
       # set the current heroku_app so that callbacks can read the data
       @heroku_app = {:env => heroku_env, :app_name => app_name, :repo => repo}
       Rake::Task["heroku:before_each_deploy"].reenable
-      Rake::Task["heroku:before_each_deploy"].invoke
+      Rake::Task["heroku:before_each_deploy"].invoke(app_name)
 
       branch = `git branch`.scan(/^\* (.*)\n/).flatten.first.to_s
       if branch.present?
@@ -71,7 +71,7 @@ namespace :heroku do
         exit(1)
       end
       Rake::Task["heroku:after_each_deploy"].reenable
-      Rake::Task["heroku:after_each_deploy"].invoke
+      Rake::Task["heroku:after_each_deploy"].invoke(app_name)
       puts "\n"
     end
     Rake::Task["heroku:after_deploy"].invoke
@@ -86,11 +86,11 @@ namespace :heroku do
   end
 
   # Callback before each deploy
-  task :before_each_deploy do
+  task :before_each_deploy, [:app_name] do |t,args|
   end
 
   # Callback after each deploy
-  task :after_each_deploy do
+  task :after_each_deploy, [:app_name] do |t,args|
   end
 
   # Callback for when we switch environment

metadata

@@ -1,54 +1,51 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: heroku-rails
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease: 
-  version: 0.3.2
 platform: ruby
-authors: 
+authors:
 - Elijah Miller
 - Glenn Roberts
 - Jacques Crocker
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-26 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-07 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153321540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2153321540
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2153320680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-description: Manage multiple Heroku instances/apps for a single Rails app using Rake. It's the Capistrano for Heroku, without the suck.
+  version_requirements: *2153320680
+description: Manage multiple Heroku instances/apps for a single Rails app using Rake.
+  It's the Capistrano for Heroku, without the suck.
 email: railsjedi@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
 - TODO
 - CHANGELOG
-files: 
+files:
 - lib/generators/heroku/config_generator.rb
 - lib/generators/templates/heroku.rake
 - lib/generators/templates/heroku.yml
@@ -69,41 +66,38 @@ files:
 - Rakefile
 - README.md
 - TODO
-has_rdoc: true
 homepage: http://github.com/railsjedi/heroku-rails
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-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: 3832137273780756345
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3500876346162424707
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3832137273780756345
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3500876346162424707
 requirements: []
-
 rubyforge_project: none
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Deployment and configuration tools for Heroku/Rails
-test_files: 
+test_files:
 - spec/fixtures/heroku-config.yml
 - spec/heroku/rails/heroku_config_spec.rb
 - spec/heroku/rails/heroku_runner_spec.rb