heroku_deploy 0.0.5 → 0.0.6

data/README.markdown

@@ -1,4 +1,20 @@
 # heroku_deploy
 This gem is an easy way to quickly setup and
 deploy staging and production environments for
-your project on heroku.
+your project on heroku.
+
+###Installation Instructions
+Install the gem:
+    sudo gem install heroku_deploy
+
+In environment.rb
+    config.gem "heroku_deploy"
+
+In your Rakefile:
+    begin
+      require 'heroku_deploy'
+      HerokuDeploy::Tasks.new( :staging_app => "example-app-staging", :production_app => "example-app")
+    rescue LoadError
+      puts "heroku_deploy (or a dependency) not available. Install it with: gem install heroku_deploy"
+    end
+

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/heroku_deploy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{heroku_deploy}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ross Hale", "Chris Lemcke"]
-  s.date = %q{2010-06-29}
+  s.date = %q{2010-07-12}
   s.description = %q{Deploy strategy and scripts for Heroku.}
   s.email = %q{rosshale@gmail.com}
   s.extra_rdoc_files = [
@@ -17,11 +17,9 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
-     ".idea/dictionaries/rosshale.xml",
      "README.markdown",
      "Rakefile",
      "VERSION",
-     "config/heroku_deploy.yml",
      "heroku_deploy.gemspec",
      "lib/heroku_deploy.rb",
      "lib/heroku_deploy/tasks.rb",

data/lib/heroku_deploy/tasks.rb

@@ -9,15 +9,17 @@ class Rake::Application
   end
 end
 
-
 class HerokuDeploy
 
   class Tasks < ::Rake::TaskLib
-    attr_accessor :heroku_deploy
+    attr_accessor :heroku_deploy, :staging_app, :production_app
 
-    def initialize
+    def initialize( options = {} )
       Rake.application.heroku_deploy_tasks = self
 
+      @staging_app = options.delete(:staging_app)
+      @production_app = options.delete(:production_app)
+      
       define
     end
 
@@ -25,25 +27,48 @@ class HerokuDeploy
       namespace :heroku_deploy do
         desc 'Setup branches and apps on heroku'
         task :setup => :environment do
-          puts "I AM THE SETUP TASK!!"
+
+          puts ""
+          puts "Creating staging branch"
+          puts ""
+          `git branch staging`
+          `git checkout staging`
+          `git push origin origin:refs/heads/staging`
+
+          puts ""
+          puts "Creating production branch"
+          puts ""
+          `git branch production`
+          `git checkout production`
+          `git push origin origin:refs/heads/production`
+
+          `git checkout master`
+
+          puts ""
+          puts "Creating #{staging_app} Heroku app"
+          puts ""
+          `heroku app:create #{staging_app}`
+
+          puts ""
+          puts "Creating #{production_app} Heroku app"
+          puts ""
+          `heroku app:create #{production_app}`
+
+          puts ""
+          puts "Setup Complete!"
+          puts ""
+
         end
 
         desc 'Deploy changes to staging'
         task :staging => :environment do
 
-          Rake::Task['deploy:backup:staging'].invoke
+          backup( staging_app )
 
           puts "Deploying to Staging"
-          puts "Merging staging with master"
-
-          `git checkout master`
-          `git pull origin master`
-          `git checkout staging`
-          `git pull origin staging`
-          `git merge master`
-          `git push origin staging`
+          merge( "master", "staging" )
 
-          heroku_deploy.push_to 'staging'
+          heroku_deploy.push_to 'staging', staging_app
           puts ""
           puts "Staging Deployed!"
           puts ""
@@ -52,19 +77,12 @@ class HerokuDeploy
         desc 'Deploy changes to production'
         task :production => :environment do
 
-          Rake::Task['deploy:backup:production'].invoke
+          backup( production_app )
 
           puts "Deploying to Production"
-          puts "Merging production with staging"
+          merge( "staging", "production" )
 
-          `git checkout staging`
-          `git pull origin staging`
-          `git checkout production`
-          `git pull origin production`
-          `git merge staging`
-          `git push origin production`
-
-          heroku_deploy.push_to 'production'
+          heroku_deploy.push_to 'production', production_app
 
           puts ""
           puts "Production Deployed!"
@@ -86,10 +104,18 @@ class HerokuDeploy
     end
   end
 
-  def push_to( branch )
+  def merge(from_branch, to_branch)
+    puts "Merging #{from_branch} with #{to_branch}"
+
+    `git checkout #{from_branch}`
+    `git pull origin #{from_branch}`
+    `git checkout #{to_branch}`
+    `git pull origin #{to_branch}`
+    `git merge #{from_branch}`
+    `git push origin #{to_branch}`
+  end
 
-    app = "grouppay" if branch == "production"
-    app = "grouppay-staging" if branch == "staging"
+  def push_to( branch, app )
 
     puts "Going into maintenance mode"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: heroku_deploy
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Ross Hale
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 -07:00
+date: 2010-07-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,11 +43,9 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - .gitignore
-- .idea/dictionaries/rosshale.xml
 - README.markdown
 - Rakefile
 - VERSION
-- config/heroku_deploy.yml
 - heroku_deploy.gemspec
 - lib/heroku_deploy.rb
 - lib/heroku_deploy/tasks.rb

data/.idea/dictionaries/rosshale.xml

@@ -1,3 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="rosshale" />
-</component>

data/config/heroku_deploy.yml

@@ -1,6 +0,0 @@
-# An example of a heroku_deploy.yml
-staging:
-  app: an-app-on-heroku-staging
-
-production:
-  app: an-app-on-heroku