easy-deployment 0.1.2 → 0.1.3

data/lib/easy-deployment/version.rb

@@ -1,5 +1,5 @@
 module Easy
   module Deployment
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/lib/easy/deployment/capistrano.rb

@@ -3,6 +3,22 @@
 
 Capistrano::Configuration.instance(:must_exist).load do
 
+  # color the string
+  def red(str)
+    "\e[31m#{str}\e[0m"
+  end
+
+  # Get the name of the current local branch
+  def current_git_branch
+    current_branch = `git symbolic-ref HEAD 2> /dev/null`.strip.gsub(/^refs\/heads\//, '')
+    puts red("Warning: Redundant use of 'tag'. Your current branch is deployed by default") if ENV['tag'] == current_branch
+    branch_to_deploy = ENV['tag'] || current_branch
+    puts "Deploying branch #{red branch_to_deploy}"
+    branch_to_deploy
+  end
+
+  set :branch, current_git_branch
+
   # ssh options
   set :use_sudo, false
   ssh_options[:forward_agent] = true # run `ssh-add ;` to ensure your identity file is added
@@ -30,19 +46,6 @@ Capistrano::Configuration.instance(:must_exist).load do
       run "cd #{directory}; RAILS_ENV=#{stage} bundle exec rake db:create"
     end
 
-    desc "Load reference data"
-    task :reference_data, :roles => :db, :only => { :primary => true } do
-      migrate_target = fetch(:migrate_target, :latest)
-
-      directory = case migrate_target.to_sym
-                  when :current then current_path
-                  when :latest  then latest_release
-                  else raise ArgumentError, "unknown migration target #{migrate_target.inspect}"
-                  end
-
-      run "cd #{directory} && RAILS_ENV=#{stage} bundle exec rake reference:load"
-    end
-
     # By default, we deploy using passenger as an app server
     task :start do ; end
     task :stop do ; end
@@ -58,12 +61,5 @@ Capistrano::Configuration.instance(:must_exist).load do
         puts "Skipping copying of config/deploy/#{stage}/database.yml as the file is not present"
       end
     end
-
-    desc "Allow deployment of a branch, commit or tag"
-    task :set_branch do
-      set :branch, ENV['tag'] || 'master'
-    end
   end
-
-  before 'deploy:update_code',  'deploy:set_branch' # allow specification of branch, tag or commit on the command line
 end

data/lib/easy/deployment/dbreference.rb

@@ -0,0 +1,19 @@
+# To load this capistrano configuration, require 'easy/deployment/dbreference' from deploy.rb
+Capistrano::Configuration.instance(:must_exist).load do
+  namespace :deploy do
+    desc "Load reference data"
+    task :reference_data, :roles => :db, :only => { :primary => true } do
+      migrate_target = fetch(:migrate_target, :latest)
+
+      directory = case migrate_target.to_sym
+                  when :current then current_path
+                  when :latest  then latest_release
+                  else raise ArgumentError, "unknown migration target #{migrate_target.inspect}"
+                  end
+      
+      run "cd #{directory} && RAILS_ENV=#{stage} bundle exec rake reference:load"
+    end
+  end
+
+  after 'deploy:migrate', 'deploy:reference_data'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy-deployment
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-01 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -132,6 +132,7 @@ files:
 - lib/easy/deployment/apache.rb
 - lib/easy/deployment/backup.rb
 - lib/easy/deployment/capistrano.rb
+- lib/easy/deployment/dbreference.rb
 - lib/easy/deployment/logrotate.rb
 - lib/easy/deployment/niet.rb
 - lib/easy/deployment/whenever.rb
@@ -157,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4265744311530263395
+      hash: -1446539074970372509
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -166,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4265744311530263395
+      hash: -1446539074970372509
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24