heroku_deploy 0.0.12 → 0.0.13

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/heroku_deploy.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{heroku_deploy}
-  s.version = "0.0.12"
+  s.version = "0.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ross Hale", "Chris Lemcke"]
@@ -23,13 +23,19 @@ Gem::Specification.new do |s|
      "heroku_deploy.gemspec",
      "lib/heroku_deploy.rb",
      "lib/heroku_deploy/tasks.rb",
-     "lib/tasks/heroku_deploy.rake"
+     "lib/tasks/heroku_deploy.rake",
+     "test/heroku_deploy_test.rb",
+     "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/lottay/heroku_deploy}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{initial import}
+  s.test_files = [
+    "test/heroku_deploy_test.rb",
+     "test/test_helper.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/heroku_deploy/tasks.rb

@@ -10,17 +10,22 @@ class Rake::Application
 end
 
 class HerokuDeploy
+  attr_accessor :staging_app, :production_app
+
+  def initialize( options = {} )
+    @staging_app = options.delete(:staging_app)
+    @production_app = options.delete(:production_app)
+  end
 
   class Tasks < ::Rake::TaskLib
-    attr_accessor :heroku_deploy, :staging_app, :production_app
+    attr_accessor :heroku_deploy
 
     def initialize( options = {} )
       Rake.application.heroku_deploy_tasks = self
 
-      @staging_app = options.delete(:staging_app)
-      @production_app = options.delete(:production_app)
-      @heroku_deploy = HerokuDeploy.new
-      
+      @heroku_deploy = HerokuDeploy.new( :staging_app => options.delete(:staging_app),
+                                         :production_app => options.delete(:production_app))
+
       define
     end
 
@@ -28,72 +33,23 @@ class HerokuDeploy
       namespace :heroku_deploy do
         desc 'Setup branches and apps on heroku'
         task :setup => :environment do
-
-          puts ""
-          puts "Creating staging branch"
-          puts ""
-          `git branch staging`
-          `git push origin origin/master:refs/heads/staging`
-
-          puts ""
-          puts "Creating production branch"
-          puts ""
-          `git branch production`
-          `git push origin origin/master:refs/heads/production`
-
-          `git checkout master`
-
-          puts ""
-          puts "Creating #{staging_app} Heroku app"
-          puts ""
-          `heroku app:create #{staging_app}`
-          `heroku addons:add bundles:single --app #{staging_app}`
-
-          puts ""
-          puts "Creating #{production_app} Heroku app"
-          puts ""
-          `heroku app:create #{production_app}`
-          `heroku addons:add bundles:single --app #{production_app}`
-
-          puts ""
-          puts "Setup Complete!"
-          puts ""
-
+          heroku_deploy.setup
         end
 
         desc 'Deploy changes to staging'
         task :staging => :environment do
-
-          heroku_deploy.backup( staging_app )
-
-          puts "Deploying to Staging"
-          heroku_deploy.merge( "master", "staging" )
-
-          heroku_deploy.push_to 'staging', staging_app
-          puts ""
-          puts "Staging Deployed!"
-          puts ""
+          heroku_deploy.staging
         end
 
         desc 'Deploy changes to production'
         task :production => :environment do
-
-          heroku_deploy.backup( production_app )
-
-          puts "Deploying to Production"
-          heroku_deploy.merge( "staging", "production" )
-
-          heroku_deploy.push_to 'production', production_app
-
-          puts ""
-          puts "Production Deployed!"
-          puts ""
+          heroku_deploy.production
         end
 
         namespace :backup do
           desc 'Backup and download the staging code and database in a heroku bundle'
           task :staging => :environment do
-            heroku_deploy.backup staging_app
+            heroku_deploy.backup_staging
           end
 
           desc 'Backup and download the production code and database in a heroku bundle'
@@ -101,11 +57,77 @@ class HerokuDeploy
             heroku_deploy.backup production_app
           end
         end
-
       end
     end
   end
 
+  def setup
+    puts ""
+    puts "Creating staging branch"
+    puts ""
+    `git branch staging`
+    `git push origin origin/master:refs/heads/staging`
+
+    puts ""
+    puts "Creating production branch"
+    puts ""
+    `git branch production`
+    `git push origin origin/master:refs/heads/production`
+
+    `git checkout master`
+
+    puts ""
+    puts "Creating #{staging_app} Heroku app"
+    puts ""
+    `heroku app:create #{staging_app}`
+    `heroku addons:add bundles:single --app #{staging_app}`
+
+    puts ""
+    puts "Creating #{production_app} Heroku app"
+    puts ""
+    `heroku app:create #{production_app}`
+    `heroku addons:add bundles:single --app #{production_app}`
+
+    puts ""
+    puts "Setup Complete!"
+    puts ""
+  end
+
+  def staging
+    backup staging_app
+
+    puts "Deploying to Staging"
+    merge "master", "staging"
+
+    push_to 'staging', staging_app
+    puts ""
+    puts "Staging Deployed!"
+    puts ""
+  end
+
+  def production
+    backup production_app
+
+    puts "Deploying to Production"
+    merge "staging", "production"
+
+    push_to 'production', production_app
+
+    puts ""
+    puts "Production Deployed!"
+    puts ""
+  end
+
+  def backup_staging
+    backup staging_app
+  end
+
+  def backup_production
+    backup production_app
+  end
+
+  private
+
   def merge(from_branch, to_branch)
     puts "Merging #{from_branch} with #{to_branch}"
 
@@ -145,7 +167,7 @@ class HerokuDeploy
   def backup( app )
     puts ""
     puts "Beginning Backup"
-    timestamp = Time.now.to_s(:number)
+    timestamp = Time.now.strftime("%Y%m%d%H%M%S")
     old_bundle = `heroku bundles --app #{app}`.split.first
 
     `heroku bundles:destroy #{old_bundle} --app #{app}`
@@ -166,14 +188,12 @@ class HerokuDeploy
 
       puts "New Bundle Downloaded: #{app}-#{timestamp}.tar.gz"
     end
-    
+
     puts "Backup Complete!"
     puts ""
 
   end
 
-  protected
-
   def bundle_not_yet_captured?( app )
     `heroku bundles --app #{app}`.include?(" capturing ")
   end
@@ -182,4 +202,6 @@ class HerokuDeploy
     `heroku bundles --app #{app}`.include?(" complete ")
   end
 
+  
+
 end

data/lib/heroku_deploy.rb

@@ -1,5 +1,6 @@
 class HerokuDeploy
   autoload :Tasks, 'heroku_deploy/tasks'
+  autoload :HerokuDeploy, 'heroku_deploy/tasks'
 end
 
 

data/test/heroku_deploy_test.rb

@@ -0,0 +1,61 @@
+require 'test_helper'
+
+require 'rake'
+class HerokuDeployTest < Test::Unit::TestCase
+  include Rake
+
+  context 'Initializing HerokuDeploy::Tasks' do
+    setup do
+      @tasks = HerokuDeploy::Tasks.new( :staging_app => "example-staging", :production_app => "example" )
+    end
+
+    teardown do
+      Task.clear
+    end
+
+    should 'set self as the application-wide jeweler tasks' do
+      assert_same @tasks, Rake.application.heroku_deploy_tasks
+    end
+
+    context "HerokuDeploy instance" do
+
+      setup do
+        @heroku_deploy = @tasks.heroku_deploy
+        stub(@heroku_deploy).__double_definition_create__.call(:`) { "" }
+        stub(@heroku_deploy).puts
+        stub(@heroku_deploy).bundle_not_yet_captured? { false }
+        stub(@heroku_deploy).bundle_captured? { true }
+      end
+
+      should "assign staging_app" do
+        assert_equal "example-staging", @heroku_deploy.staging_app
+      end
+
+      should "assign production_app" do
+        assert_equal "example", @heroku_deploy.production_app
+      end
+
+      should "invoke setup" do
+        @heroku_deploy.setup
+      end
+
+      should "invoke staging" do
+        @heroku_deploy.staging
+      end
+
+      should "invoke production" do
+        @heroku_deploy.production
+      end
+
+      should "invoke backup_staging" do
+        @heroku_deploy.backup_staging
+      end
+
+      should "invoke backup_production" do
+        @heroku_deploy.backup_production
+      end
+
+    end
+
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,13 @@
+require 'test/unit'
+require 'rubygems'
+
+require 'rake'
+require 'shoulda'
+require 'rr'
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+require 'heroku_deploy'
+
+
+class Test::Unit::TestCase
+  include RR::Adapters::TestUnit unless include?(RR::Adapters::TestUnit)
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: heroku_deploy
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Ross Hale
@@ -50,6 +50,8 @@ files:
 - lib/heroku_deploy.rb
 - lib/heroku_deploy/tasks.rb
 - lib/tasks/heroku_deploy.rake
+- test/heroku_deploy_test.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/lottay/heroku_deploy
 licenses: []
@@ -84,5 +86,6 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: initial import
-test_files: []
-
+test_files: 
+- test/heroku_deploy_test.rb
+- test/test_helper.rb