heroku_san 2.1.2 → 2.1.3

data/features/step_definitions/remote_steps.rb

@@ -1,7 +1,7 @@
 World(Aruba::Api)
 
 Given /^I have a new Rails project$/ do
-  cmd = "rails new heroku_san_test --quiet --force --database=postgresql --skip-bundle --skip-javascript --skip-test-unit --skip-sprockets" #" --template #{template}"
+  cmd = "rails new heroku_san_test --quiet --force --database=postgresql --skip-bundle --skip-javascript --skip-test-unit --skip-sprockets"
   run_simple unescape(cmd)
 end
 

data/lib/heroku_san/project.rb

@@ -43,7 +43,7 @@ module HerokuSan
       if !@apps.empty?
         @apps
       else
-        case all.size
+        @apps = case all.size
         when 1
           $stdout.puts "Defaulting to #{all.first.inspect} since only one app is defined"
           all

data/lib/heroku_san/version.rb

@@ -1,3 +1,3 @@
 module HerokuSan
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 end

data/lib/tasks.rb

@@ -283,18 +283,26 @@ namespace :heroku do
   end
 end
 
-task :all => 'heroku:stage:all'
-task :deploy => 'heroku:deploy'
-task 'deploy:force' => 'heroku:deploy:force'
-task :before_deploy => 'heroku:deploy:before'
-task :after_deploy => 'heroku:deploy:after'
-task :console => 'heroku:console'
-task :restart => 'heroku:restart'
-task :migrate => 'heroku:db:migrate'
-task :logs => 'heroku:logs:default'
-task 'logs:tail' => 'heroku:logs:tail'
-task 'heroku:rack_env' => 'heroku:config:rack_env'
-task :shell => 'heroku:shell'
+
+def alias_task(hash)
+  hash.each_pair do |(new_task, original_task)|
+    the_task = Rake.application[original_task]
+    task new_task, {the_task.arg_names => [original_task]}
+  end
+end
+
+alias_task :all => 'heroku:stage:all'
+alias_task :deploy => 'heroku:deploy'
+alias_task 'deploy:force' => 'heroku:deploy:force'
+alias_task :before_deploy => 'heroku:deploy:before'
+alias_task :after_deploy => 'heroku:deploy:after'
+alias_task :console => 'heroku:console'
+alias_task :restart => 'heroku:restart'
+alias_task :migrate => 'heroku:db:migrate'
+alias_task :logs => 'heroku:logs:default'
+alias_task 'logs:tail' => 'heroku:logs:tail'
+alias_task 'heroku:rack_env' => 'heroku:config:rack_env'
+alias_task :shell => 'heroku:shell'
 
 def each_heroku_app(&block)
   @heroku_san.each_app(&block)

data/spec/heroku_san/project_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'tmpdir'
 
 describe HerokuSan::Project do
-  specify ".new with a missing config file" 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
@@ -26,7 +26,7 @@ describe HerokuSan::Project do
       end
     end
         
-    describe "Adding an app to the deploy list" do
+    describe "#apps adds an app to the deploy list" do
       it "appends known shorthands to apps" do
         heroku_san.apps.should == []
         heroku_san << 'production'
@@ -41,25 +41,29 @@ describe HerokuSan::Project do
         heroku_san << heroku_san.all
         heroku_san.apps.should == heroku_san.all
       end
-    end
     
-    describe "#apps 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")
-        heroku_san.apps.should == %w[staging]
-      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
       
-      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
+        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 "but 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')
-          heroku_san.apps.should == %w[production]
+        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
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_san
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-29 00:00:00.000000000Z
+date: 2012-03-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152396440 !ruby/object:Gem::Requirement
+  requirement: &2152371380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2152396440
+  version_requirements: *2152371380
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &2152385600 !ruby/object:Gem::Requirement
+  requirement: &2152370780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *2152385600
+  version_requirements: *2152370780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152384980 !ruby/object:Gem::Requirement
+  requirement: &2152370200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152384980
+  version_requirements: *2152370200
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2152384220 !ruby/object:Gem::Requirement
+  requirement: &2152369560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152384220
+  version_requirements: *2152369560
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2152383620 !ruby/object:Gem::Requirement
+  requirement: &2152369120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152383620
+  version_requirements: *2152369120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152382980 !ruby/object:Gem::Requirement
+  requirement: &2152368700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152382980
+  version_requirements: *2152368700
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152382280 !ruby/object:Gem::Requirement
+  requirement: &2152368160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,7 +90,7 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *2152382280
+  version_requirements: *2152368160
 description: Manage multiple Heroku instances/apps for a single Rails app using Rake
 email: elijah.miller@gmail.com
 executables: []