capistrano-fanfare 0.0.14 → 0.0.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. data/Rakefile +1 -1
  2. data/lib/capistrano/fanfare/airbrake.rb +4 -0
  3. data/lib/capistrano/fanfare/foreman.rb +1 -0
  4. data/lib/capistrano/fanfare/foreman/strategy/runit.rb +7 -10
  5. data/lib/capistrano/fanfare/version.rb +1 -1
  6. data/spec/foreman/strategy/runit_spec.rb +7 -10
  7. metadata +14 -14
data/Rakefile CHANGED
@@ -5,7 +5,7 @@ require 'rake/testtask'
5
5
 
6
6
  Rake::TestTask.new do |t|
7
7
  t.libs.push "lib"
8
- t.test_files = FileList['spec/*_spec.rb']
8
+ t.test_files = FileList['spec/**/*_spec.rb']
9
9
  t.verbose = true
10
10
  end
11
11
 
data/lib/capistrano/fanfare/airbrake.rb CHANGED
@@ -13,3 +13,7 @@ module Capistrano::Fanfare::Airbrake
13
13
  end
14
14
  end
15
15
  end
16
+
17
+ if Capistrano::Configuration.instance
18
+ Capistrano::Fanfare::Airbrake.load_into(Capistrano::Configuration.instance)
19
+ end
data/lib/capistrano/fanfare/foreman.rb CHANGED
@@ -48,6 +48,7 @@ module Capistrano::Fanfare::Foreman
48
48
  raise "Please specify a command to execute via the COMMAND " +
49
49
  "environment variable" if command.empty?
50
50
 
51
+ logger.info "Running command `#{command}'"
51
52
  run "cd #{current_path} && #{foreman_cmd} run '#{command}'"
52
53
  end
53
54
 
data/lib/capistrano/fanfare/foreman/strategy/runit.rb CHANGED
@@ -13,7 +13,6 @@ module Capistrano
13
13
  svp = configuration[:runit_sv_path]
14
14
 
15
15
  run [
16
- "set -x &&",
17
16
  "svp=#{svp} &&",
18
17
  "cd #{configuration[:current_release]} &&",
19
18
  "if [ -f Procfile ] ; then",
@@ -26,13 +25,12 @@ module Capistrano
26
25
  "${svp}-pre",
27
26
  "--app=#{configuration[:runit_app_name]}",
28
27
  "--log=#{configuration[:shared_path]}/log",
29
- "--user=#{configuration[:user]} &&",
28
+ "--user=#{configuration[:user]} >/dev/null &&",
30
29
 
31
30
  # fix any path references in files back to :runit_sv_path
32
31
  # and ensure that a non-zero sed exit doesn't propagate
33
- "set +x &&",
34
32
  "egrep -lr ${svp}-pre ${svp}-pre | (xargs",
35
- "sed -i \"s|${svp}-pre|${svp}|g\" || true) &&",
33
+ "sed -i \"s|${svp}-pre|${svp}|g\" 2>/dev/null || true) &&",
36
34
 
37
35
  # calculate checksums of all service files in both
38
36
  # service directories
@@ -42,23 +40,22 @@ module Capistrano
42
40
  "(cd ${svp}-pre ; find . -path '*/supervise' -type d",
43
41
  "-prune -o -type f | grep -v 'supervise$' | sort |",
44
42
  "xargs openssl sha) > /tmp/sv-pre-dir-$$ &&",
45
- "set -x &&",
46
43
 
47
44
  "if diff -q /tmp/sv-dir-$$ /tmp/sv-pre-dir-$$ >/dev/null ; then",
48
- "echo '\\n===> Foreman export atrifacts are identical\\n' &&",
45
+ "echo '-----> Foreman export atrifacts are identical' &&",
49
46
  "rm -rf ${svp}-pre",
50
47
 
51
48
  "; else", # diff -q
52
- "echo '\\n===> Updated Foreman export artifacts detected\\n' &&",
53
- "echo '---> Stoping processes' &&",
49
+ "echo '-----> Updated Foreman export artifacts detected' &&",
50
+ "echo '-----> Stoping processes' &&",
54
51
  "rm -f #{all_services} &&",
55
- "echo '---> Installing updated Foreman export artifacts' &&",
52
+ "echo '-----> Installing updated Foreman export artifacts' &&",
56
53
  "rm -rf ${svp} && mv ${svp}-pre ${svp} &&",
57
54
  "touch ${svp}/.symlink_boot",
58
55
  "; fi &&", # diff -q
59
56
 
60
57
  # clean checksum calculations
61
- "echo '---> Cleaning up' &&",
58
+ "echo '-----> Cleaning up' &&",
62
59
  "rm -f /tmp/sv-{dir,pre-dir}-$$",
63
60
 
64
61
  "; else", # -f Procfile
data/lib/capistrano/fanfare/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Capistrano
2
2
  module Fanfare
3
- VERSION = "0.0.14"
3
+ VERSION = "0.0.15"
4
4
  end
5
5
  end
data/spec/foreman/strategy/runit_spec.rb CHANGED
@@ -22,7 +22,6 @@ describe Capistrano::Fanfare::Foreman::Strategy::Runit do
22
22
  strategy.export
23
23
 
24
24
  @config.must_have_run [
25
- "set -x &&",
26
25
  "svp=/srv/fooapp/shared/sv &&",
27
26
  "cd /srv/fooapp/releases/thisone &&",
28
27
  "if [ -f Procfile ] ; then",
@@ -30,25 +29,23 @@ describe Capistrano::Fanfare::Foreman::Strategy::Runit do
30
29
  "mkdir -p ${svp}-pre &&",
31
30
  "bin/foreman export runit ${svp}-pre",
32
31
  "--app=fooapp_production --log=/srv/fooapp/shared/log",
33
- "--user=deploy &&",
34
- "set +x &&",
32
+ "--user=deploy >/dev/null &&",
35
33
  "egrep -lr ${svp}-pre ${svp}-pre | (xargs",
36
- "sed -i \"s|${svp}-pre|${svp}|g\" || true) &&",
34
+ "sed -i \"s|${svp}-pre|${svp}|g\" 2>/dev/null || true) &&",
37
35
  "(cd ${svp} ; find . -path '*/supervise' -type d -prune -o -type f | grep -v 'supervise$' | sort | xargs openssl sha) > /tmp/sv-dir-$$ &&",
38
36
  "(cd ${svp}-pre ; find . -path '*/supervise' -type d -prune -o -type f | grep -v 'supervise$' | sort | xargs openssl sha) > /tmp/sv-pre-dir-$$ &&",
39
- "set -x &&",
40
37
  "if diff -q /tmp/sv-dir-$$ /tmp/sv-pre-dir-$$ >/dev/null ; then",
41
- "echo '\\n===> Foreman export atrifacts are identical\\n' &&",
38
+ "echo '-----> Foreman export atrifacts are identical' &&",
42
39
  "rm -rf ${svp}-pre",
43
40
  "; else",
44
- "echo '\\n===> Updated Foreman export artifacts detected\\n' &&",
45
- "echo '---> Stoping processes' &&",
41
+ "echo '-----> Updated Foreman export artifacts detected' &&",
42
+ "echo '-----> Stoping processes' &&",
46
43
  "rm -f /home/foouser/service/fooapp_production-* &&",
47
- "echo '---> Installing updated Foreman export artifacts' &&",
44
+ "echo '-----> Installing updated Foreman export artifacts' &&",
48
45
  "rm -rf ${svp} && mv ${svp}-pre ${svp} &&",
49
46
  "touch ${svp}/.symlink_boot",
50
47
  "; fi &&",
51
- "echo '---> Cleaning up' &&",
48
+ "echo '-----> Cleaning up' &&",
52
49
  "rm -f /tmp/sv-{dir,pre-dir}-$$",
53
50
  "; else",
54
51
  "echo '>>>> A Procfile must exist in this project.' && exit 10",
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: capistrano-fanfare
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.14
4
+ version: 0.0.15
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-02-14 00:00:00.000000000 Z
12
+ date: 2012-02-15 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: capistrano
16
- requirement: &70156228009440 !ruby/object:Gem::Requirement
16
+ requirement: &70199785856480 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - =
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 2.10.0.pre
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70156228009440
24
+ version_requirements: *70199785856480
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: capistrano_colors
27
- requirement: &70156228008060 !ruby/object:Gem::Requirement
27
+ requirement: &70199785855100 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0.5'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70156228008060
35
+ version_requirements: *70199785855100
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: sushi
38
- requirement: &70156228006920 !ruby/object:Gem::Requirement
38
+ requirement: &70199785853960 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 0.0.2
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70156228006920
46
+ version_requirements: *70199785853960
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: minitest
49
- requirement: &70156228005400 !ruby/object:Gem::Requirement
49
+ requirement: &70199785852440 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 2.10.0
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70156228005400
57
+ version_requirements: *70199785852440
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: minitest-capistrano
60
- requirement: &70156228002800 !ruby/object:Gem::Requirement
60
+ requirement: &70199785849840 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0.0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70156228002800
68
+ version_requirements: *70199785849840
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: timecop
71
- requirement: &70156228001000 !ruby/object:Gem::Requirement
71
+ requirement: &70199785848040 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,7 +76,7 @@ dependencies:
76
76
  version: '0.3'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70156228001000
79
+ version_requirements: *70199785848040
80
80
  description: Capistrano recipes (with full test suite) for fanfare application deployment
81
81
  framework
82
82
  email: