heroku-rails 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    heroku-rails (0.2.0)
+    heroku-rails (0.2.1)
       heroku
 
 GEM

data/README.md

@@ -43,6 +43,46 @@ Then edit config/heroku.yml with your project's heroku configurations. To persis
 
 This will create the heroku apps you have defined, and create the settings for each.
 
+### Example Configuration File
+
+    apps:
+      production: awesomeapp
+      staging: awesomeapp-staging
+      legacy: awesomeapp-legacy
+
+    stacks:
+      all: bamboo-mri-1.9.2
+      legacy: bamboo-ree-1.8.7
+
+    config:
+      all:
+        BUNDLE_WITHOUT: "test development"
+      production:
+        MONGODB_URI: "mongodb://[username:password@]host1[:port1][/database]"
+      staging:
+        MONGODB_URI: "mongodb://[username:password@]host1[:port1][/database]"
+
+    collaborators:
+      all:
+        - "heroku1@somedomain.com"
+        - "heroku2@somedomain.com"
+
+    domains:
+      production:
+        - "awesomeapp.com"
+        - "www.awesomeapp.com"
+
+    addons:
+      all:
+        - newrelic:bronze
+        # add any other addons here
+
+      production:
+        - ssl:piggyback
+        - cron:hourly
+        # list production env specific addons here
+
+
 ## Usage
 
 After configuring your Heroku apps you can use rake tasks to control the
@@ -97,17 +137,11 @@ With this in place, you can be a bit more terse:
 
 ### Deploy Hooks
 
-You can easily hook into the deploy process by defining any of the following rake tasks:
-
-You can generate these automatically within lib/tasks/heroku.rake by running:
-
-    rails generate heroku:callbacks
-
+You can easily hook into the deploy process by defining any of the following rake tasks.
 
-Then edit the rake tasks to provide custom logic for each of these steps
+When you ran `rails generate heroku:config`, it created a list of empty rake tasks within lib/tasks/heroku.rake. Edit these rake tasks to provide custom logic for before/after deployment.
 
     namespace :heroku do
-
       # runs before all the deploys complete
       task :before_deploy do
 
@@ -127,12 +161,9 @@ Then edit the rake tasks to provide custom logic for each of these steps
       task :after_deploy do
 
       end
-
     end
 
 
-
-
 ## About Heroku Rails
 
 ### Links
@@ -147,7 +178,7 @@ License:: Copyright (c) 2010 Jacques Crocker <railsjedi@gmail.com> released unde
 
 ## Forked from Heroku Sans
 
-Heroku Rails is a fork and rewrite/reorganiziation of Heroku Sans, and a nice simple set of Rake tasks for managing Heroku environments. Check out that project here: <http://github.com/fastestforward/heroku_san>
+Heroku Rails is a fork and rewrite/reorganiziation of the heroku_sans gem. Heroku Sans is a simple and elegant set of Rake tasks for managing Heroku environments. Check out that project here: <http://github.com/fastestforward/heroku_san>
 
 ### Heroku Sans Contributors
 

data/heroku-rails.gemspec

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

data/lib/generators/heroku/config_generator.rb

@@ -10,6 +10,10 @@ module Heroku
       def create_config_file
         template 'heroku.yml', File.join('config', "heroku.yml")
       end
+
+      def create_rake_file
+        template 'heroku.rake', File.join('lib', 'tasks', "heroku.rake")
+      end
     end
   end
 end

data/lib/generators/templates/heroku.rake

@@ -1,3 +1,12 @@
+# ### Shortcuts: uncomment these for easier to type deployments
+# ### e.g. rake deploy (instead of rake heroku:deploy)
+# ###
+# task :deploy =>  ["heroku:deploy"]
+# task :console => ["heroku:console"]
+# task :setup =>   ["heroku:setup"]
+# task :logs =>    ["heroku:logs"]
+# task :restart => ["heroku:restart"]
+
 # Heroku Deploy Callbacks
 namespace :heroku do
 

data/lib/heroku/rails/heroku_runner.rb

@@ -222,7 +222,7 @@ module Heroku
             rake demo staging deploy"
 
           puts "\nYou can use also command all Heroku apps for this project:
-            rake all heroku:share"
+            rake all heroku:setup"
 
           exit(1)
         end

data/lib/heroku/rails/tasks.rb

@@ -103,6 +103,13 @@ namespace :heroku do
     end
   end
 
+  desc "Shows the Heroku logs"
+  task :logs do
+    HEROKU_RUNNER.each_heroku_app do |heroku_env, app_name, repo|
+      system_with_echo "heroku logs --app #{app_name}"
+    end
+  end
+
   desc "Restarts remote servers"
   task :restart do
     HEROKU_RUNNER.each_heroku_app do |heroku_env, app_name, repo|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: heroku-rails
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Elijah Miller
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-01 00:00:00 -07:00
+date: 2010-11-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,7 +61,6 @@ extra_rdoc_files:
 - TODO
 - CHANGELOG
 files: 
-- lib/generators/heroku/callbacks_generator.rb
 - lib/generators/heroku/config_generator.rb
 - lib/generators/templates/heroku.rake
 - lib/generators/templates/heroku.yml

data/lib/generators/heroku/callbacks_generator.rb

@@ -1,15 +0,0 @@
-module Heroku
-  module Generators
-    class CallbacksGenerator < ::Rails::Generators::Base
-      desc "Generates the rake tasks (lib/tasks/heroku.rake) that let you override heroku deploy callbacks"
-
-      def self.source_root
-        @_heroku_gen_source_root ||= File.expand_path("../../templates", __FILE__)
-      end
-
-      def create_callbacks_rake_file
-        template 'heroku.rake', File.join('lib', 'tasks', "heroku.rake")
-      end
-    end
-  end
-end