capistrano-fanfare 0.0.14 → 0.0.15

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/testtask'
 
 Rake::TestTask.new do |t|
   t.libs.push "lib"
-  t.test_files = FileList['spec/*_spec.rb']
+  t.test_files = FileList['spec/**/*_spec.rb']
   t.verbose = true
 end
 

data/lib/capistrano/fanfare/airbrake.rb

@@ -13,3 +13,7 @@ module Capistrano::Fanfare::Airbrake
     end
   end
 end
+
+if Capistrano::Configuration.instance
+  Capistrano::Fanfare::Airbrake.load_into(Capistrano::Configuration.instance)
+end

data/lib/capistrano/fanfare/foreman.rb

@@ -48,6 +48,7 @@ module Capistrano::Fanfare::Foreman
           raise "Please specify a command to execute via the COMMAND " +
             "environment variable" if command.empty?
 
+          logger.info "Running command `#{command}'"
           run "cd #{current_path} && #{foreman_cmd} run '#{command}'"
         end
 

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

@@ -13,7 +13,6 @@ module Capistrano
             svp = configuration[:runit_sv_path]
 
             run [
-              "set -x &&",
               "svp=#{svp} &&",
               "cd #{configuration[:current_release]} &&",
               "if [ -f Procfile ] ; then",
@@ -26,13 +25,12 @@ module Capistrano
                   "${svp}-pre",
                   "--app=#{configuration[:runit_app_name]}",
                   "--log=#{configuration[:shared_path]}/log",
-                  "--user=#{configuration[:user]} &&",
+                  "--user=#{configuration[:user]} >/dev/null &&",
 
                 # 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) &&",
+                  "sed -i \"s|${svp}-pre|${svp}|g\" 2>/dev/null || true) &&",
 
                 # calculate checksums of all service files in both
                 # service directories
@@ -42,23 +40,22 @@ module Capistrano
                 "(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' &&",
+                  "echo '-----> Foreman export atrifacts are identical' &&",
                   "rm -rf ${svp}-pre",
 
                 "; else", # diff -q
-                  "echo '\\n===> Updated Foreman export artifacts detected\\n' &&",
-                  "echo '---> Stoping processes' &&",
+                  "echo '-----> Updated Foreman export artifacts detected' &&",
+                  "echo '-----> Stoping processes' &&",
                   "rm -f #{all_services} &&",
-                  "echo '---> Installing updated Foreman export artifacts' &&",
+                  "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' &&",
+                "echo '-----> Cleaning up' &&",
                 "rm -f /tmp/sv-{dir,pre-dir}-$$",
 
               "; else", # -f Procfile

data/lib/capistrano/fanfare/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Fanfare
-    VERSION = "0.0.14"
+    VERSION = "0.0.15"
   end
 end

data/spec/foreman/strategy/runit_spec.rb

@@ -22,7 +22,6 @@ describe Capistrano::Fanfare::Foreman::Strategy::Runit do
     strategy.export
 
     @config.must_have_run [
-      "set -x &&",
       "svp=/srv/fooapp/shared/sv &&",
       "cd /srv/fooapp/releases/thisone &&",
       "if [ -f Procfile ] ; then",
@@ -30,25 +29,23 @@ describe Capistrano::Fanfare::Foreman::Strategy::Runit do
         "mkdir -p ${svp}-pre &&",
         "bin/foreman export runit ${svp}-pre",
           "--app=fooapp_production --log=/srv/fooapp/shared/log",
-          "--user=deploy &&",
-        "set +x &&",
+          "--user=deploy >/dev/null &&",
         "egrep -lr ${svp}-pre ${svp}-pre | (xargs",
-        "sed -i \"s|${svp}-pre|${svp}|g\" || true) &&",
+        "sed -i \"s|${svp}-pre|${svp}|g\" 2>/dev/null || 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' &&",
+          "echo '-----> Foreman export atrifacts are identical' &&",
           "rm -rf ${svp}-pre",
         "; else",
-            "echo '\\n===> Updated Foreman export artifacts detected\\n' &&",
-            "echo '---> Stoping processes' &&",
+            "echo '-----> Updated Foreman export artifacts detected' &&",
+            "echo '-----> Stoping processes' &&",
             "rm -f /home/foouser/service/fooapp_production-* &&",
-            "echo '---> Installing updated Foreman export artifacts' &&",
+            "echo '-----> Installing updated Foreman export artifacts' &&",
             "rm -rf ${svp} && mv ${svp}-pre ${svp} &&",
             "touch ${svp}/.symlink_boot",
         "; fi &&",
-        "echo '---> Cleaning up' &&",
+        "echo '-----> Cleaning up' &&",
         "rm -f /tmp/sv-{dir,pre-dir}-$$",
       "; else",
         "echo '>>>> A Procfile must exist in this project.' && exit 10",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-fanfare
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000 Z
+date: 2012-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70156228009440 !ruby/object:Gem::Requirement
+  requirement: &70199785856480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.10.0.pre
   type: :runtime
   prerelease: false
-  version_requirements: *70156228009440
+  version_requirements: *70199785856480
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
-  requirement: &70156228008060 !ruby/object:Gem::Requirement
+  requirement: &70199785855100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70156228008060
+  version_requirements: *70199785855100
 - !ruby/object:Gem::Dependency
   name: sushi
-  requirement: &70156228006920 !ruby/object:Gem::Requirement
+  requirement: &70199785853960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70156228006920
+  version_requirements: *70199785853960
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70156228005400 !ruby/object:Gem::Requirement
+  requirement: &70199785852440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70156228005400
+  version_requirements: *70199785852440
 - !ruby/object:Gem::Dependency
   name: minitest-capistrano
-  requirement: &70156228002800 !ruby/object:Gem::Requirement
+  requirement: &70199785849840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.0'
   type: :development
   prerelease: false
-  version_requirements: *70156228002800
+  version_requirements: *70199785849840
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70156228001000 !ruby/object:Gem::Requirement
+  requirement: &70199785848040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70156228001000
+  version_requirements: *70199785848040
 description: Capistrano recipes (with full test suite) for fanfare application deployment
   framework
 email: