capistrano-fanfare 0.0.2 → 0.0.3

data/lib/capistrano/fanfare/database_yaml.rb

@@ -0,0 +1,26 @@
+require 'capistrano'
+
+module Capistrano::Fanfare::DatabaseYaml
+  def self.load_into(configuration)
+    configuration.load do
+      # =========================================================================
+      # These are the tasks that are available to help with deploying web apps.
+      # You can have cap give you a summary of them with `cap -T'.
+      # =========================================================================
+
+      namespace :db do
+        desc <<-DESC
+          [internal] Copies database.yml from shared_path into release_path.
+        DESC
+        task :cp_database_yml, :roles => :app, :except => { :no_release => true } do
+         run [
+           "mkdir -p #{release_path}/config &&",
+           "cp #{shared_path}/config/database.yml #{release_path}/config/database.yml"
+         ].join(' ')
+        end
+      end
+
+      after "deploy:update_code", "db:cp_database_yml"
+    end
+  end
+end

data/lib/capistrano/fanfare/foreman.rb

@@ -145,10 +145,13 @@ module Capistrano::Fanfare::Foreman
         foreman.run_cmd
       end
 
-      after "deploy:update_code", "foreman:cp_env"
-      after "deploy:start", "foreman:start"
-      after "deploy:stop", "foreman:stop"
-      after "deploy:restart", "foreman:restart"
+      after   "deploy:finalize_update", "foreman:cp_env"
+      after   "deploy:update_code",     "foreman:export"
+      before  "deploy:start",           "foreman:register"
+      after   "deploy:start",           "foreman:start"
+      before  "deploy:restart",         "foreman:register"
+      after   "deploy:restart",         "foreman:restart"
+      after   "deploy:stop",            "foreman:stop"
     end
   end
 end

data/lib/capistrano/fanfare/foreman/strategy/runit.rb

@@ -10,55 +10,122 @@ module Capistrano
 
         class Runit < Base
           def export
+            svp = configuration[:runit_sv_path]
+
             run [
+              "set -x &&",
+              "svp=#{svp} &&",
               "cd #{configuration[:current_release]} &&",
               "if [ -f Procfile ] ; then",
-              "mkdir -p #{configuration[:runit_sv_path]} &&",
-              "#{configuration[:foreman_cmd]} export runit",
-              "#{configuration[:runit_sv_path]}",
-              "--app=#{configuration[:runit_app_name]}",
-              "--log=#{configuration[:shared_path]}/log",
-              "--user=#{configuration[:user]} &&",
-              "find #{configuration[:runit_sv_path]} -type f -name run",
-              "-exec chmod 755 {} \\; ; else",
-              "echo '>>>> A Procfile must exist in this project.' && exit 10 ;",
-              "fi"
+                # create an empty staging directory for services
+                "rm -rf ${svp}-pre &&",
+                "mkdir -p ${svp}-pre &&",
+
+                # export services into a *-pre directory
+                "#{configuration[:foreman_cmd]} export runit",
+                  "${svp}-pre",
+                  "--app=#{configuration[:runit_app_name]}",
+                  "--log=#{configuration[:shared_path]}/log",
+                  "--user=#{configuration[:user]} &&",
+
+                # fix any path references in files back to :runit_sv_path
+                # and ensure that a non-zero sed exit doesn't propagate
+                "set +x &&",
+                "egrep -lr ${svp}-pre ${svp}-pre | (xargs",
+                  "sed -i \"s|${svp}-pre|${svp}|g\" || true) &&",
+
+                # calculate checksums of all service files in both
+                # service directories
+                "(cd ${svp} ; find . -path '*/supervise' -type d",
+                  "-prune -o -type f | grep -v 'supervise$' | sort |",
+                  "xargs openssl sha) > /tmp/sv-dir-$$ &&",
+                "(cd ${svp}-pre ; find . -path '*/supervise' -type d",
+                  "-prune -o -type f | grep -v 'supervise$' | sort |",
+                  "xargs openssl sha) > /tmp/sv-pre-dir-$$ &&",
+                "set -x &&",
+
+                "if diff -q /tmp/sv-dir-$$ /tmp/sv-pre-dir-$$ >/dev/null ; then",
+                  "echo '\\n===> Foreman export atrifacts are identical\\n' &&",
+                  "rm -rf ${svp}-pre",
+
+                "; else", # diff -q
+                  "echo '\\n===> Updated Foreman export artifacts detected\\n' &&",
+                  "echo '---> Stoping processes' &&",
+                  "rm -f #{all_services} &&",
+                  "echo '---> Installing updated Foreman export artifacts' &&",
+                  "rm -rf ${svp} && mv ${svp}-pre ${svp} &&",
+                  "touch ${svp}/.symlink_boot",
+                "; fi &&", # diff -q
+
+                # clean checksum calculations
+                "echo '---> Cleaning up' &&",
+                "rm -f /tmp/sv-{dir,pre-dir}-$$",
+
+              "; else", # -f Procfile
+                # die with a warning about including a Procfile
+                "echo '>>>> A Procfile must exist in this project.' && exit 10",
+              "; fi" # -f Procfile
             ].join(' ')
           end
 
           def register
+            symlink_boot = capture([
+              "if [ -f #{configuration[:runit_sv_path]}/.symlink_boot ] ; then",
+                "echo true",
+              "; else",
+                "echo false",
+              "; fi"
+            ].join(' ')).chomp
+
+            # if the service symlinks are fresh, this will start the
+            # service automatically so we won't try to pile on and
+            # call foreman:start or foreman:restart
+            if symlink_boot == "true" && callbacks[:after]
+              callbacks[:after].reject! { |c| c.source == "foreman:start" }
+              callbacks[:after].reject! { |c| c.source == "foreman:restart" }
+            end
+
             run [
               "ln -snf #{configuration[:runit_sv_path]}/*",
-              "#{configuration[:runit_service_path]}/"
+              "#{configuration[:runit_service_path]}/ &&",
+              "rm -f #{configuration[:runit_sv_path]}/.symlink_boot"
             ].join(' ')
           end
 
           def start(proc_group = nil)
             run [
-              "sv start #{configuration[:runit_service_path]}/",
-              "#{configuration[:runit_app_name]}-*"
-            ].join
+              "sv start #{all_services}",
+              "(s=$? && echo \"Start exited with $s\" && exit $s)"
+            ].join(' || ')
           end
 
           def stop(proc_group = nil)
             run [
-              "sv stop #{configuration[:runit_service_path]}/",
-              "#{configuration[:runit_app_name]}-*"
-            ].join
+              "sv stop #{all_services}",
+              "(s=$? && echo \"Stop exited with $s\" && exit $s)"
+            ].join(' || ')
           end
 
           def restart(proc_group = nil)
             run [
-              "sv restart #{configuration[:runit_service_path]}/",
-              "#{configuration[:runit_app_name]}-*"
-            ].join
+              "sv restart #{all_services}",
+              "(s=$? && echo \"Restart exited with $s\" && exit $s)"
+            ].join(' || ')
           end
 
           def ps
             run [
-              "sv status #{configuration[:runit_service_path]}/",
+              "sv status #{all_services}",
+              "(s=$? && echo \"Status exited with $s\" && exit $s)"
+            ].join(' || ')
+          end
+
+          private
+
+          def all_services
+            [ configuration[:runit_service_path],
               "#{configuration[:runit_app_name]}-*"
-            ].join
+            ].join('/')
           end
         end
       end

data/lib/capistrano/fanfare/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Fanfare
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/bundler_spec.rb

@@ -71,7 +71,7 @@ load Gem.bin_path('bundler', 'bundle')
 
     describe ":bundle_flags" do
       after do
-        ENV.delete('VERBOSE')
+        ENV.delete('QUIET')
       end
 
       it "contains --deployment" do

data/spec/database_yaml_spec.rb

@@ -0,0 +1,32 @@
+require 'minitest/autorun'
+require 'minitest/capistrano'
+require 'capistrano/fanfare'
+require 'capistrano/fanfare/database_yaml'
+
+describe Capistrano::Fanfare::DatabaseYaml do
+  before do
+    @config = Capistrano::Configuration.new
+    Capistrano::Fanfare::DatabaseYaml.load_into(@config)
+    @config.extend(MiniTest::Capistrano::ConfigurationExtension)
+  end
+
+  describe "for namespace :db" do
+    describe "task :cp_database_yml" do
+      it "copies config/database.yml into :release_path" do
+        @config.set :shared_path, "/a/appattack/shared"
+        @config.set :release_path, "/a/appattack/releases/thisone"
+        @config.find_and_execute_task("db:cp_database_yml")
+
+        @config.must_have_run [
+          "mkdir -p /a/appattack/releases/thisone/config &&",
+          "cp /a/appattack/shared/config/database.yml",
+            "/a/appattack/releases/thisone/config/database.yml"
+        ].join(' ')
+      end
+
+      it "gets called after deploy:update_code task" do
+        @config.must_have_callback_after "deploy:update_code", "db:cp_database_yml"
+      end
+    end
+  end
+end

data/spec/foreman/strategy/runit_spec.rb

@@ -17,28 +17,97 @@ describe Capistrano::Fanfare::Foreman::Strategy::Runit do
     @config.set :shared_path, "/srv/fooapp/shared"
     @config.set :runit_sv_path, "/srv/fooapp/shared/sv"
     @config.set :runit_app_name, "fooapp_production"
+    @config.set :runit_service_path, "/home/foouser/service"
     @config.set :user, "deploy"
     strategy.export
 
     @config.must_have_run [
+      "set -x &&",
+      "svp=/srv/fooapp/shared/sv &&",
       "cd /srv/fooapp/releases/thisone &&",
       "if [ -f Procfile ] ; then",
-      "mkdir -p /srv/fooapp/shared/sv &&",
-      "bin/foreman export runit /srv/fooapp/shared/sv",
-      "--app=fooapp_production --log=/srv/fooapp/shared/log",
-      "--user=deploy &&",
-      "find /srv/fooapp/shared/sv -type f -name run",
-      "-exec chmod 755 {} \\; ; else",
-      "echo '>>>> A Procfile must exist in this project.' && exit 10 ; fi"
+        "rm -rf ${svp}-pre &&",
+        "mkdir -p ${svp}-pre &&",
+        "bin/foreman export runit ${svp}-pre",
+          "--app=fooapp_production --log=/srv/fooapp/shared/log",
+          "--user=deploy &&",
+        "set +x &&",
+        "egrep -lr ${svp}-pre ${svp}-pre | (xargs",
+        "sed -i \"s|${svp}-pre|${svp}|g\" || true) &&",
+        "(cd ${svp} ; find . -path '*/supervise' -type d -prune -o -type f | grep -v 'supervise$' | sort | xargs openssl sha) > /tmp/sv-dir-$$ &&",
+        "(cd ${svp}-pre ; find . -path '*/supervise' -type d -prune -o -type f | grep -v 'supervise$' | sort | xargs openssl sha) > /tmp/sv-pre-dir-$$ &&",
+        "set -x &&",
+        "if diff -q /tmp/sv-dir-$$ /tmp/sv-pre-dir-$$ >/dev/null ; then",
+          "echo '\\n===> Foreman export atrifacts are identical\\n' &&",
+          "rm -rf ${svp}-pre",
+        "; else",
+            "echo '\\n===> Updated Foreman export artifacts detected\\n' &&",
+            "echo '---> Stoping processes' &&",
+            "rm -f /home/foouser/service/fooapp_production-* &&",
+            "echo '---> Installing updated Foreman export artifacts' &&",
+            "rm -rf ${svp} && mv ${svp}-pre ${svp} &&",
+            "touch ${svp}/.symlink_boot",
+        "; fi &&",
+        "echo '---> Cleaning up' &&",
+        "rm -f /tmp/sv-{dir,pre-dir}-$$",
+      "; else",
+        "echo '>>>> A Procfile must exist in this project.' && exit 10",
+      "; fi"
     ].join(' ')
   end
 
-  it "#register symlinks services in :runit_sv_path to :runit_service_path" do
-    @config.set :runit_sv_path, "/apps/foo/shared/sv"
-    @config.set :runit_service_path, "/home/foouser/service"
-    strategy.register
+  describe "#register" do
+    it "symlinks services in :runit_sv_path to :runit_service_path" do
+      @config.set :runit_sv_path, "/apps/foo/shared/sv"
+      @config.set :runit_service_path, "/home/foouser/service"
+      @config.captures_responses["if [ -f /apps/foo/shared/sv/.symlink_boot ] ; then echo true ; else echo false ; fi"] = "true\n"
+      strategy.register
+
+      @config.must_have_run [
+        "ln -snf /apps/foo/shared/sv/* /home/foouser/service/",
+        "rm -f /apps/foo/shared/sv/.symlink_boot"
+      ].join(' && ')
+    end
+
+    describe "with a symlink_boot" do
+      before do
+        @config.set :runit_sv_path, "/apps/foo/shared/sv"
+        @config.set :runit_service_path, "/home/foouser/service"
+        @config.after "deploy:start", "foreman:start"
+        @config.after "deploy:restart", "foreman:restart"
+        @config.captures_responses["if [ -f /apps/foo/shared/sv/.symlink_boot ] ; then echo true ; else echo false ; fi"] = "true\n"
+      end
 
-    @config.must_have_run "ln -snf /apps/foo/shared/sv/* /home/foouser/service/"
+      it "removes the start callback" do
+        strategy.register
+        @config.wont_have_callback_after "foreman:start", "deploy:start"
+      end
+
+     it "removes the restart callback" do
+        strategy.register
+        @config.wont_have_callback_after "foreman:restart", "deploy:restart"
+      end
+    end
+
+    describe "without a symlink_boot" do
+      before do
+        @config.set :runit_sv_path, "/apps/foo/shared/sv"
+        @config.set :runit_service_path, "/home/foouser/service"
+        @config.after "deploy:start", "foreman:start"
+        @config.after "deploy:restart", "foreman:restart"
+        @config.captures_responses["if [ -f /apps/foo/shared/sv/.symlink_boot ] ; then echo true ; else echo false ; fi"] = "false\n"
+      end
+
+      it "preserves the start callback" do
+        strategy.register
+        @config.must_have_callback_after "deploy:start", "foreman:start"
+      end
+
+     it "preserves the restart callback" do
+        strategy.register
+        @config.must_have_callback_after "deploy:restart", "foreman:restart"
+      end
+    end
   end
 
   describe "#start" do
@@ -47,7 +116,10 @@ describe Capistrano::Fanfare::Foreman::Strategy::Runit do
       @config.set :runit_app_name, "wuzzle_production"
       strategy.start
 
-      @config.must_have_run "sv start /home/foouser/service/wuzzle_production-*"
+      @config.must_have_run [
+        "sv start /home/foouser/service/wuzzle_production-*",
+        "(s=$? && echo \"Start exited with $s\" && exit $s)"
+      ].join(' || ')
     end
   end
 
@@ -57,7 +129,10 @@ describe Capistrano::Fanfare::Foreman::Strategy::Runit do
       @config.set :runit_app_name, "wuzzle_production"
       strategy.stop
 
-      @config.must_have_run "sv stop /home/foouser/service/wuzzle_production-*"
+      @config.must_have_run [
+        "sv stop /home/foouser/service/wuzzle_production-*",
+        "(s=$? && echo \"Stop exited with $s\" && exit $s)"
+      ].join(' || ')
     end
   end
 
@@ -67,7 +142,10 @@ describe Capistrano::Fanfare::Foreman::Strategy::Runit do
       @config.set :runit_app_name, "wuzzle_production"
       strategy.restart
 
-      @config.must_have_run "sv restart /home/foouser/service/wuzzle_production-*"
+      @config.must_have_run [
+        "sv restart /home/foouser/service/wuzzle_production-*",
+        "(s=$? && echo \"Restart exited with $s\" && exit $s)"
+      ].join(' || ')
     end
   end
 
@@ -77,7 +155,10 @@ describe Capistrano::Fanfare::Foreman::Strategy::Runit do
       @config.set :runit_app_name, "wuzzle_production"
       strategy.ps
 
-      @config.must_have_run "sv status /home/foouser/service/wuzzle_production-*"
+      @config.must_have_run [
+        "sv status /home/foouser/service/wuzzle_production-*",
+        "(s=$? && echo \"Status exited with $s\" && exit $s)"
+      ].join(' || ')
     end
   end
 end

data/spec/foreman_spec.rb

@@ -71,8 +71,8 @@ describe Capistrano::Fanfare::Foreman do
         @config.must_have_run "cp /tmp/app/shared/env /tmp/app/releases/blah/.env"
       end
 
-      it "gets called after deploy:updated_code task" do
-        @config.must_have_callback_after "deploy:update_code", "foreman:cp_env"
+      it "gets called after deploy:finalize_update task" do
+        @config.must_have_callback_after "deploy:finalize_update", "foreman:cp_env"
       end
     end
 
@@ -111,6 +111,10 @@ describe Capistrano::Fanfare::Foreman do
 
         strategy.verify
       end
+
+      it "gets called after deploy:update_code task" do
+        @config.must_have_callback_after "deploy:update_code", "foreman:export"
+      end
     end
 
     describe "task :register" do
@@ -120,6 +124,14 @@ describe Capistrano::Fanfare::Foreman do
 
         strategy.verify
       end
+
+      it "gets called before deploy:start task" do
+        @config.must_have_callback_before "deploy:start", "foreman:register"
+      end
+
+      it "gets called before deploy:restart task" do
+        @config.must_have_callback_before "deploy:restart", "foreman:register"
+      end
     end
 
     describe "task :start" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-fanfare
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000 Z
+date: 2012-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70360322152180 !ruby/object:Gem::Requirement
+  requirement: &70250305558200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.10.0.pre
   type: :runtime
   prerelease: false
-  version_requirements: *70360322152180
+  version_requirements: *70250305558200
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
-  requirement: &70360322151440 !ruby/object:Gem::Requirement
+  requirement: &70250305557440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70360322151440
+  version_requirements: *70250305557440
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70360322150660 !ruby/object:Gem::Requirement
+  requirement: &70250305556660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70360322150660
+  version_requirements: *70250305556660
 - !ruby/object:Gem::Dependency
   name: minitest-capistrano
-  requirement: &70360322149900 !ruby/object:Gem::Requirement
+  requirement: &70250305555900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.0'
   type: :development
   prerelease: false
-  version_requirements: *70360322149900
+  version_requirements: *70250305555900
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70360322149340 !ruby/object:Gem::Requirement
+  requirement: &70250305555360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70360322149340
+  version_requirements: *70250305555360
 description: Capistrano recipes (with full test suite) for fanfare application deployment
   framework
 email:
@@ -83,6 +83,7 @@ files:
 - capistrano-fanfare.gemspec
 - lib/capistrano/fanfare.rb
 - lib/capistrano/fanfare/bundler.rb
+- lib/capistrano/fanfare/database_yaml.rb
 - lib/capistrano/fanfare/defaults.rb
 - lib/capistrano/fanfare/foreman.rb
 - lib/capistrano/fanfare/foreman/strategy.rb
@@ -93,6 +94,7 @@ files:
 - lib/capistrano/fanfare/version.rb
 - lib/capistrano/recipes/deploy/strategy/git_style.rb
 - spec/bundler_spec.rb
+- spec/database_yaml_spec.rb
 - spec/defaults_spec.rb
 - spec/fixtures/Procfile
 - spec/fixtures/fanfare/bark.rb
@@ -117,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 805475541908766951
+      hash: -3823857243740536617
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 805475541908766951
+      hash: -3823857243740536617
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -136,6 +138,7 @@ summary: Capistrano recipes (with full test suite) for fanfare application deplo
   framework
 test_files:
 - spec/bundler_spec.rb
+- spec/database_yaml_spec.rb
 - spec/defaults_spec.rb
 - spec/fixtures/Procfile
 - spec/fixtures/fanfare/bark.rb