heroku_san 2.2.2 → 3.0.0

data/lib/{tasks.rb → heroku_san/tasks.rb}

@@ -1,12 +1,18 @@
+require 'heroku_san'
 require 'git'
 include Git
 
-@heroku_san = HerokuSan::Project.new(Rails.root.join('config', 'heroku.yml'))
+if defined?(Rails)
+  HerokuSan.project ||= HerokuSan::Project.new(
+                          Rails.root.join("config", "heroku.yml"),
+                          :deploy => HerokuSan::Deploy::Rails
+                          )
+end
 
-@heroku_san.all.each do |stage|
+HerokuSan.project.all.each do |stage|
   desc "Select #{stage} Heroku app for later commands"
   task "heroku:stage:#{stage}" do
-    @heroku_san << stage
+    HerokuSan.project << stage
   end
   task stage => "heroku:stage:#{stage}"
 end
@@ -14,7 +20,7 @@ end
 namespace :heroku do
   desc 'Select all Heroku apps for later command'
   task 'stage:all' do
-    @heroku_san << @heroku_san.all
+    HerokuSan.project << HerokuSan.project.all
   end
   
   desc "Creates the Heroku app"
@@ -108,8 +114,9 @@ namespace :heroku do
 
   desc 'Creates an example configuration file'
   task :create_config do
-    filename = %Q{#{@heroku_san.config_file.to_s}}
-    if @heroku_san.create_config
+    # FIXME: sh "rails generate heroku_san"
+    filename = %Q{#{HerokuSan.project.config_file.to_s}}
+    if HerokuSan.project.create_config
       puts "Copied example config to #{filename.inspect}"
       if ENV['EDITOR'] && ENV['EDITOR'] != ''
         sh "#{ENV['EDITOR']} #{filename}"
@@ -163,7 +170,7 @@ namespace :heroku do
   desc "Pushes the given commit (default: HEAD)"
   task :push, :commit do |t, args|
     each_heroku_app do |stage|
-      stage.deploy(args[:commit])
+      stage.push(args[:commit])
     end
   end
 
@@ -171,7 +178,7 @@ namespace :heroku do
     desc "Force-pushes the given commit (default: HEAD)"
     task :force, :commit do |t, args|
       each_heroku_app do |stage|
-        stage.deploy(args[:commit], :force)
+        stage.push(args[:commit], :force)
       end
     end
   end
@@ -203,8 +210,7 @@ namespace :heroku do
   desc "Pushes the given commit, migrates and restarts (default: HEAD)"
   task :deploy, [:commit] => [:before_deploy] do |t, args|
     each_heroku_app do |stage|
-      stage.deploy(args[:commit])
-      stage.migrate
+      stage.deploy(args)
     end
     Rake::Task[:after_deploy].execute
   end
@@ -213,8 +219,7 @@ namespace :heroku do
     desc "Force-pushes the given commit, migrates and restarts (default: HEAD)"
     task :force, [:commit] => [:before_deploy] do |t, args|
       each_heroku_app do |stage|
-        stage.deploy(args[:commit], :force)
-        stage.migrate
+        stage.deploy(args.merge(:force => true))
       end
       Rake::Task[:after_deploy].execute
     end
@@ -325,7 +330,7 @@ alias_task 'heroku:rack_env' => 'heroku:config:rack_env'
 alias_task :shell => 'heroku:shell'
 
 def each_heroku_app(&block)
-  @heroku_san.each_app(&block)
+  HerokuSan.project.each_app(&block)
   puts
 rescue HerokuSan::NoApps => e
   puts "You must first specify at least one Heroku app:

data/lib/heroku_san/version.rb

@@ -1,3 +1,3 @@
 module HerokuSan
-  VERSION = "2.2.2"
+  VERSION = "3.0.0"
 end

data/lib/heroku_san.rb

@@ -1,10 +1,13 @@
-require 'railtie' if defined?(Rails) && Rails::VERSION::MAJOR == 3
+require 'railtie' if defined?(Rails) && Rails::VERSION::MAJOR >= 3
 require 'git'
 require 'heroku_san/stage'
 require 'heroku_san/project'
+require 'heroku_san/deploy/rails'
+require 'heroku_san/deploy/sinatra'
 
 module HerokuSan
+  mattr_accessor :project
   class NoApps < StandardError; end
   class MissingApp < StandardError; end
   class Deprecated < StandardError; end
-end
+end

data/lib/railtie.rb

@@ -1,10 +1,9 @@
-require 'heroku_san'
 require 'rails'
 
 module HerokuSan
   class Railtie < Rails::Railtie
     rake_tasks do
-      load 'tasks.rb'
+      load 'heroku_san/tasks.rb'
     end
   end
 end

data/lib/tasks/heroku.rake

@@ -1 +1 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'tasks'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../heroku_san', 'tasks'))

data/spec/heroku_san/deploy/base_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+module HerokuSan
+  module Deploy
+    describe Base do
+      let(:stage) { HerokuSan::Stage.new('test', {"app" => "awesomeapp", "deploy" => 'HerokuSan::Deploy::Base'}) }
+      
+      it "calls push" do
+        subject = described_class.new(stage, {})
+        stage.should_receive(:push).with(nil, nil)
+        subject.deploy
+      end
+      
+      it "calls push(sha)" do
+        subject = described_class.new(stage, {:commit => 'sha'})
+        stage.should_receive(:push).with('sha', nil)
+        subject.deploy
+      end
+      
+      it "calls push(nil, :force)" do
+        subject = described_class.new(stage, {:force => true})
+        stage.should_receive(:push).with(nil, true)
+        subject.deploy
+      end
+
+      it "calls push(sha, :force)" do
+        subject = described_class.new(stage, {:commit => 'sha', :force => true})
+        stage.should_receive(:push).with('sha', true)
+        subject.deploy
+      end
+    end
+  end
+end

data/spec/heroku_san/deploy/rails_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+module HerokuSan
+  module Deploy
+    describe Rails do
+      let(:stage) { HerokuSan::Stage.new('test', {"app" => "awesomeapp", "deploy" => 'HerokuSan::Deploy::Rails'}) }
+
+      it "calls migrate" do
+        subject = described_class.new(stage, {})
+        stage.should_receive(:push) # "mock" super
+        stage.should_receive(:rake).with('db:migrate')
+        stage.should_receive(:restart)
+        subject.deploy
+      end
+    end
+  end
+end

data/spec/heroku_san/project_spec.rb

@@ -2,96 +2,106 @@ require 'spec_helper'
 require 'tmpdir'
 
 describe HerokuSan::Project do
-  specify ".new with a missing config file has no stages" do
-    heroku_san = HerokuSan::Project.new("/u/should/never/get/here")
-    heroku_san.all.should == []
-  end
-    
-  context "using the example config file" do
-    let(:heroku_config_file) { File.join(SPEC_ROOT, "fixtures", "example.yml") }
-    let(:template_config_file) { 
-      path = File.join(SPEC_ROOT, "..", "lib/templates", "heroku.example.yml")
-      (File.respond_to? :realpath) ? File.realpath(path) : path
-    }
-    let(:heroku_san) { HerokuSan::Project.new(heroku_config_file) }
-    subject { heroku_san }
-        
-    its(:all) { should =~ %w[production staging demo] }
-    
-    context "using the heroku_san format" do
-      let(:heroku_san) { HerokuSan::Project.new(File.join(SPEC_ROOT, "fixtures", "old_format.yml")) }
+  let(:heroku_config_file) { File.join(SPEC_ROOT, "fixtures", "example.yml") }
+  let(:heroku_san) { HerokuSan::Project.new(heroku_config_file) }
+  subject { heroku_san }
 
-      it "returns a list of apps" do
-        heroku_san.all.should =~ %w[production staging demo]
+  describe ".new" do
+    its(:all) { should =~ %w[production staging demo] }
+    specify "with a missing config file has no stages" do
+      heroku_san = HerokuSan::Project.new("/u/should/never/get/here")
+      heroku_san.all.should == []
+    end
+  
+    specify "with a deploy option configures each stage with the strategy" do
+      heroku_san = HerokuSan::Project.new(heroku_config_file, :deploy => HerokuSan::Deploy::Base)
+      heroku_san << heroku_san.all
+      heroku_san.each_app do |stage|
+        stage.instance_variable_get('@options')['deploy'].should == HerokuSan::Deploy::Base
       end
     end
-        
-    describe "#apps adds an app to the deploy list" do
-      it "appends known shorthands to apps" do
-        heroku_san.apps.should == []
-        heroku_san << 'production'
-        heroku_san.apps.should == %w[production]
-        heroku_san << 'staging'
-        heroku_san.apps.should == %w[production staging]
-        heroku_san << 'unknown'
-        heroku_san.apps.should == %w[production staging]
+  end
+  
+  describe "#apps constructs the deploy list" do
+    it "appends known shorthands to apps" do
+      heroku_san.apps.should == []
+      heroku_san << 'production'
+      heroku_san.apps.should == %w[production]
+      heroku_san << 'staging'
+      heroku_san.apps.should == %w[production staging]
+      heroku_san << 'unknown'
+      heroku_san.apps.should == %w[production staging]
+    end
+  
+    it "appends .all (or any array)" do
+      heroku_san << heroku_san.all
+      heroku_san.apps.should == heroku_san.all
+    end
+  
+    describe "extra (default) behaviors" do
+      specify "on a git branch that matches an app name" do
+        heroku_san.should_receive(:git_active_branch) { "staging" }
+        $stdout.should_receive(:puts).with("Defaulting to 'staging' as it matches the current branch")
+        expect {
+          heroku_san.apps.should == %w[staging]
+        }.to change{heroku_san.instance_variable_get('@apps')}.from([]).to(%w[staging])
       end
     
-      it "appends .all (or any array)" do
-        heroku_san << heroku_san.all
-        heroku_san.apps.should == heroku_san.all
+      specify "on a git branch that doesn't matches an app name" do
+        heroku_san.should_receive(:git_active_branch) { "master" }
+        heroku_san.apps.should == %w[]
       end
     
-      describe "extra (default) behaviors" do
-        specify "on a git branch that matches an app name" do
-          heroku_san.should_receive(:git_active_branch) { "staging" }
-          $stdout.should_receive(:puts).with("Defaulting to 'staging' as it matches the current branch")
+      context "with only a single configured app" do        
+        let(:heroku_san) { HerokuSan::Project.new(File.join(SPEC_ROOT, "fixtures", "single_app.yml")) }
+        it "returns the app" do
+          $stdout.should_receive(:puts).with('Defaulting to "production" since only one app is defined')
           expect {
-            heroku_san.apps.should == %w[staging]
-          }.to change{heroku_san.instance_variable_get('@apps')}.from([]).to(%w[staging])
-        end
-      
-        specify "on a git branch that doesn't matches an app name" do
-          heroku_san.should_receive(:git_active_branch) { "master" }
-          heroku_san.apps.should == %w[]
-        end
-      
-        context "with only a single configured app" do        
-          let(:heroku_san) { HerokuSan::Project.new(File.join(SPEC_ROOT, "fixtures", "single_app.yml")) }
-          it "returns the app" do
-            $stdout.should_receive(:puts).with('Defaulting to "production" since only one app is defined')
-            expect {
-              heroku_san.apps.should == %w[production]
-            }.to change{heroku_san.instance_variable_get('@apps')}.from([]).to(%w[production])
-          end
+            heroku_san.apps.should == %w[production]
+          }.to change{heroku_san.instance_variable_get('@apps')}.from([]).to(%w[production])
         end
       end
     end
+  end
+  
+  describe "#each_app" do    
+    it "raises an error is no apps were specified" do
+      expect { heroku_san.each_app do true; end }.to raise_error HerokuSan::NoApps
+    end
     
-    describe "#each_app" do    
-      it "raises an error is no apps were specified" do
-        expect { heroku_san.each_app do true; end }.to raise_error HerokuSan::NoApps
-      end
-      
-      it "yields to a block with args" do
-        heroku_san << 'production'
-        block = double('block')
-        block.should_receive(:action).with(heroku_san['production'])
-        heroku_san.each_app do |stage|
-          block.action(stage)
-        end
+    it "yields to a block with args" do
+      heroku_san << 'production'
+      block = double('block')
+      block.should_receive(:action).with(heroku_san['production'])
+      heroku_san.each_app do |stage|
+        block.action(stage)
       end
     end
-    
-    describe "#[]" do
-      it "returns a config section" do
-        heroku_san.all.each do |app|
-          heroku_san[app].should be_a HerokuSan::Stage
-        end
+  end
+  
+  describe "#[]" do
+    it "returns a config section" do
+      heroku_san.all.each do |app|
+        heroku_san[app].should be_a HerokuSan::Stage
       end
     end
+  end
+
+  context "using the heroku_san format" do
+    let(:heroku_san) { HerokuSan::Project.new(File.join(SPEC_ROOT, "fixtures", "old_format.yml")) }
+
+    it "returns a list of apps" do
+      heroku_san.all.should =~ %w[production staging demo]
+    end
+  end
+        
+  describe "#create_config" do
+    context "unknown project" do
+      let(:template_config_file) do
+        path = File.join(SPEC_ROOT, "..", "lib/templates", "heroku.example.yml")
+        (File.respond_to? :realpath) ? File.realpath(path) : path
+      end
 
-    describe "#create_config" do
       it "creates a new file using the example file" do
         Dir.mktmpdir do |dir|
           tmp_config_file = File.join dir, 'config.yml'
@@ -100,11 +110,12 @@ describe HerokuSan::Project do
           heroku_san.create_config.should be_true
         end
       end
-      
+    
       it "does not overwrite an existing file" do
         FileUtils.should_not_receive(:cp)
         heroku_san.create_config.should be_false
       end
     end    
-  end
+  end    
+
 end

data/spec/heroku_san/stage_spec.rb

@@ -83,25 +83,25 @@ describe HerokuSan::Stage do
     end
   end
 
-  describe "#deploy" do
+  describe "#push" do
     it "deploys to heroku" do
       subject.should_receive(:git_push).with(git_parsed_tag(subject.tag), subject.repo, [])
-      subject.deploy
+      subject.push
     end
     
     it "deploys with a custom sha" do
       subject.should_receive(:git_push).with('deadbeef', subject.repo, [])
-      subject.deploy('deadbeef')
+      subject.push('deadbeef')
     end
     
     it "deploys with --force" do
       subject.should_receive(:git_push).with(git_parsed_tag(subject.tag), subject.repo, %w[--force])
-      subject.deploy(nil, :force)
+      subject.push(nil, :force)
     end
     
     it "deploys with a custom sha & --force" do
       subject.should_receive(:git_push).with('deadbeef', subject.repo, %w[--force])
-      subject.deploy('deadbeef', :force)
+      subject.push('deadbeef', :force)
     end
   end
 
@@ -114,6 +114,25 @@ describe HerokuSan::Stage do
     end
   end
   
+  describe "#deploy" do
+    context "using the default strategy" do
+      it "(rails) pushes & migrates" do
+        HerokuSan::Deploy::Rails.any_instance.should_receive(:deploy)
+        subject.deploy
+      end
+    end
+    context "using a custom strategy" do
+      class TestDeployStrategy < HerokuSan::Deploy::Base
+        def deploy; end
+      end
+      subject = HerokuSan::Stage.new('test', {"app" => "awesomeapp", "deploy" => TestDeployStrategy})
+      it "(custom) calls deploy" do
+        TestDeployStrategy.any_instance.should_receive(:deploy)
+        subject.deploy
+      end
+    end
+  end
+  
   describe "#maintenance" do
     it ":on" do
       with_app(subject, 'name' => subject.app )do |app_data|