alpha_omega 1.5.6 → 1.5.7

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 (6) hide show
  1. data/VERSION +1 -1
  2. data/libexec/_sub +2 -17
  3. data/libexec/aoh-init +1 -16
  4. data/libexec/aohelper +24 -8
  5. data/libexec/aohelper.template +30 -0
  6. metadata +86 -93
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.5.6
1
+ 1.5.7
data/libexec/_sub CHANGED
@@ -1,17 +1,10 @@
1
1
  #!/bin/bash
2
2
 
3
- : ${_JASON_RUBY:=}
4
-
5
3
  function sub {
6
4
  local bsource="$1"; shift
7
5
  local sub_base="$(basename "$bsource")"
8
6
  local bsource_cmd="$shome/libexec/${sub_base}"
9
7
 
10
- local ruby_loader=
11
- if [[ -n "$_JASON_RUBY" ]]; then
12
- ruby_loader="rvm-exec $_JASON_RUBY "
13
- fi
14
-
15
8
  if [[ "$bsource_cmd" = "$bsource" ]]; then
16
9
  FLAGS_SUB="$FLAGS_TRUE"
17
10
  export _SUB_ARGS="$@"
@@ -28,26 +21,18 @@ function sub {
28
21
 
29
22
  if [[ -x "$sub_cmd" ]]; then
30
23
  shift
31
- exec ${ruby_loader}"$sub_cmd" "$@"
24
+ exec "$sub_cmd" "$@"
32
25
  fi
33
26
  fi
34
27
  fi
35
28
 
36
29
  if [[ -x "$bsource_cmd" && "$bsource_cmd" != "$bsource" ]]; then
37
- exec ${ruby_loader}"$bsource_cmd" "$@"
30
+ exec "$bsource_cmd" "$@"
38
31
  else
39
32
  main "$@"
40
33
  fi
41
34
  }
42
35
 
43
- if [[ "$_AO_HOME/config/deploy.yml" ]]; then
44
- export _JASON_RUBY="$(ryaml "$_AO_HOME/config/deploy.yml" "app_ruby")"
45
- fi
46
-
47
- if [[ ! -x "$(which rvm-exec 2>&1 || true)" ]]; then
48
- PATH="$PATH:$HOME/.rvm/bin:/usr/local/rvm/bin"
49
- fi
50
-
51
36
  if [[ "$#" > 0 ]]; then
52
37
  sub "$@"
53
38
  fi
data/libexec/aoh-init CHANGED
@@ -20,22 +20,7 @@ function main {
20
20
 
21
21
  if [[ "$FLAGS_helpers" = "$FLAGS_TRUE" ]]; then
22
22
  mkdir -p "libexec"
23
- cat > "libexec/aohelper" <<EOF
24
- function ryaml {
25
- ruby -ryaml -e 'def ps x; unless x.nil?; puts (x.class == String || x.class == Fixnum) ? x : x.to_yaml; end; end; ps ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[acc.class == Array ? key.to_i : key] }' "${dollar}@" 2>&-
26
- }
27
-
28
- shome="${dollar}(cd -P -- "${dollar}(dirname -- "${dollar}BASH_SOURCE")/.." && pwd -P)"
29
-
30
- app_ruby="${dollar}(ryaml ${dollar}shome/config/deploy.yml app_ruby)"
31
- ruby_loader="${dollar}(ryaml ${dollar}shome/config/deploy.yml ruby_loader)"
32
- PATH="${dollar}PATH:/usr/local/rvm/bin:${dollar}HOME/.rvm/bin"
33
-
34
- if ! ${dollar}ruby_loader ${dollar}app_ruby bundle check 2>&- > /dev/null; then
35
- ${dollar}ruby_loader ${dollar}app_ruby bundle install --local --quiet --path vendor/bundle
36
- fi
37
- ${dollar}ruby_loader ${dollar}app_ruby bundle exec ao "${dollar}{BASH_SOURCE##*/}" "${dollar}@"
38
- EOF
23
+ cp -f "$shome/libexec/aohelper.template" "libexec/aohelper"
39
24
  chmod 755 "libexec/aohelper"
40
25
 
41
26
  for nm_cmd in activate check compare debug deploy dna hosts lock migrate proxy release restart rollback shell stage unlock signoff; do
data/libexec/aohelper CHANGED
@@ -1,14 +1,30 @@
1
+ #!/bin/bash
2
+
3
+ shome="$(cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
4
+
1
5
  function ryaml {
2
6
  ruby -ryaml -e 'def ps x; unless x.nil?; puts (x.class == String || x.class == Fixnum) ? x : x.to_yaml; end; end; ps ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[acc.class == Array ? key.to_i : key] }' "$@" 2>&-
3
7
  }
4
8
 
5
- shome="$(cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
9
+ function main {
10
+ local app_ruby="$(ryaml $shome/config/deploy.yml app_ruby)"
11
+ local ruby_loader="$(ryaml $shome/config/deploy.yml ruby_loader)"
12
+ local ruby_runner="$ruby_loader $app_ruby"
13
+ PATH="$PATH:/usr/local/rvm/bin:$HOME/.rvm/bin"
14
+
15
+ if [[ "$ruby_loader" = "rvm-exec" ]]; then
16
+ local pth_rvm="$(type -f $ruby_loader 2>&- | awk '{print $3}')"
17
+ if [[ -x "$pth_rvm" ]]; then
18
+ true
19
+ else
20
+ ruby_runner=""
21
+ fi
22
+ fi
6
23
 
7
- app_ruby="$(ryaml $shome/config/deploy.yml app_ruby)"
8
- ruby_loader="$(ryaml $shome/config/deploy.yml ruby_loader)"
9
- PATH="$PATH:/usr/local/rvm/bin:$HOME/.rvm/bin"
24
+ if ! $ruby_runner bundle check 2>&- > /dev/null; then
25
+ $ruby_runner bundle install --local --quiet --path vendor/bundle
26
+ fi
27
+ $ruby_runner bundle exec ao "${BASH_SOURCE##*/}" "$@"
28
+ }
10
29
 
11
- if ! $ruby_loader $app_ruby bundle check 2>&- > /dev/null; then
12
- $ruby_loader $app_ruby bundle install --local --quiet --path vendor/bundle
13
- fi
14
- $ruby_loader $app_ruby bundle exec ao "${BASH_SOURCE##*/}" "$@"
30
+ main "$@"
data/libexec/aohelper.template ADDED
@@ -0,0 +1,30 @@
1
+ #!/bin/bash
2
+
3
+ shome="$(cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
4
+
5
+ function ryaml {
6
+ ruby -ryaml -e 'def ps x; unless x.nil?; puts (x.class == String || x.class == Fixnum) ? x : x.to_yaml; end; end; ps ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[acc.class == Array ? key.to_i : key] }' "$@" 2>&-
7
+ }
8
+
9
+ function main {
10
+ local app_ruby="$(ryaml $shome/config/deploy.yml app_ruby)"
11
+ local ruby_loader="$(ryaml $shome/config/deploy.yml ruby_loader)"
12
+ local ruby_runner="$ruby_loader $app_ruby"
13
+ PATH="$PATH:/usr/local/rvm/bin:$HOME/.rvm/bin"
14
+
15
+ if [[ "$ruby_loader" = "rvm-exec" ]]; then
16
+ local pth_rvm="$(type -f $ruby_loader 2>&- | awk '{print $3}')"
17
+ if [[ -x "$pth_rvm" ]]; then
18
+ true
19
+ else
20
+ ruby_runner=""
21
+ fi
22
+ fi
23
+
24
+ if ! $ruby_runner bundle check 2>&- > /dev/null; then
25
+ $ruby_runner bundle install --local --quiet --path vendor/bundle
26
+ fi
27
+ $ruby_runner bundle exec ao "${BASH_SOURCE##*/}" "$@"
28
+ }
29
+
30
+ main "$@"
metadata CHANGED
@@ -1,104 +1,106 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: alpha_omega
3
- version: !ruby/object:Gem::Version
4
- hash: 15
3
+ version: !ruby/object:Gem::Version
4
+ version: 1.5.7
5
5
  prerelease:
6
- segments:
7
- - 1
8
- - 5
9
- - 6
10
- version: 1.5.6
11
6
  platform: ruby
12
- authors:
7
+ authors:
13
8
  - David Nghiem
14
9
  - Tom Bombadil
15
10
  autorequire:
16
11
  bindir: bin
17
12
  cert_chain: []
18
-
19
- date: 2011-08-31 00:00:00 Z
20
- dependencies:
21
- - !ruby/object:Gem::Dependency
13
+ date: 2011-08-31 00:00:00.000000000 Z
14
+ dependencies:
15
+ - !ruby/object:Gem::Dependency
22
16
  name: json
23
- prerelease: false
24
- requirement: &id001 !ruby/object:Gem::Requirement
17
+ requirement: !ruby/object:Gem::Requirement
25
18
  none: false
26
- requirements:
27
- - - ">="
28
- - !ruby/object:Gem::Version
29
- hash: 3
30
- segments:
31
- - 0
32
- version: "0"
19
+ requirements:
20
+ - - ! '>='
21
+ - !ruby/object:Gem::Version
22
+ version: '0'
33
23
  type: :runtime
34
- version_requirements: *id001
35
- - !ruby/object:Gem::Dependency
36
- name: deep_merge
37
24
  prerelease: false
38
- requirement: &id002 !ruby/object:Gem::Requirement
25
+ version_requirements: !ruby/object:Gem::Requirement
26
+ none: false
27
+ requirements:
28
+ - - ! '>='
29
+ - !ruby/object:Gem::Version
30
+ version: '0'
31
+ - !ruby/object:Gem::Dependency
32
+ name: deep_merge
33
+ requirement: !ruby/object:Gem::Requirement
39
34
  none: false
40
- requirements:
41
- - - ">="
42
- - !ruby/object:Gem::Version
43
- hash: 3
44
- segments:
45
- - 0
46
- version: "0"
35
+ requirements:
36
+ - - ! '>='
37
+ - !ruby/object:Gem::Version
38
+ version: '0'
47
39
  type: :runtime
48
- version_requirements: *id002
49
- - !ruby/object:Gem::Dependency
50
- name: capistrano
51
40
  prerelease: false
52
- requirement: &id003 !ruby/object:Gem::Requirement
41
+ version_requirements: !ruby/object:Gem::Requirement
42
+ none: false
43
+ requirements:
44
+ - - ! '>='
45
+ - !ruby/object:Gem::Version
46
+ version: '0'
47
+ - !ruby/object:Gem::Dependency
48
+ name: capistrano
49
+ requirement: !ruby/object:Gem::Requirement
53
50
  none: false
54
- requirements:
55
- - - ">="
56
- - !ruby/object:Gem::Version
57
- hash: 3
58
- segments:
59
- - 0
60
- version: "0"
51
+ requirements:
52
+ - - ! '>='
53
+ - !ruby/object:Gem::Version
54
+ version: '0'
61
55
  type: :runtime
62
- version_requirements: *id003
63
- - !ruby/object:Gem::Dependency
64
- name: capistrano_colors
65
56
  prerelease: false
66
- requirement: &id004 !ruby/object:Gem::Requirement
57
+ version_requirements: !ruby/object:Gem::Requirement
67
58
  none: false
68
- requirements:
69
- - - ">="
70
- - !ruby/object:Gem::Version
71
- hash: 3
72
- segments:
73
- - 0
74
- version: "0"
59
+ requirements:
60
+ - - ! '>='
61
+ - !ruby/object:Gem::Version
62
+ version: '0'
63
+ - !ruby/object:Gem::Dependency
64
+ name: capistrano_colors
65
+ requirement: !ruby/object:Gem::Requirement
66
+ none: false
67
+ requirements:
68
+ - - ! '>='
69
+ - !ruby/object:Gem::Version
70
+ version: '0'
75
71
  type: :runtime
76
- version_requirements: *id004
77
- - !ruby/object:Gem::Dependency
78
- name: capistrano-log_with_awesome
79
72
  prerelease: false
80
- requirement: &id005 !ruby/object:Gem::Requirement
73
+ version_requirements: !ruby/object:Gem::Requirement
81
74
  none: false
82
- requirements:
83
- - - ">="
84
- - !ruby/object:Gem::Version
85
- hash: 3
86
- segments:
87
- - 0
88
- version: "0"
75
+ requirements:
76
+ - - ! '>='
77
+ - !ruby/object:Gem::Version
78
+ version: '0'
79
+ - !ruby/object:Gem::Dependency
80
+ name: capistrano-log_with_awesome
81
+ requirement: !ruby/object:Gem::Requirement
82
+ none: false
83
+ requirements:
84
+ - - ! '>='
85
+ - !ruby/object:Gem::Version
86
+ version: '0'
89
87
  type: :runtime
90
- version_requirements: *id005
88
+ prerelease: false
89
+ version_requirements: !ruby/object:Gem::Requirement
90
+ none: false
91
+ requirements:
92
+ - - ! '>='
93
+ - !ruby/object:Gem::Version
94
+ version: '0'
91
95
  description: Common reciples for persistent capistrano releases
92
- email:
96
+ email:
93
97
  - nghidav@gmail.com
94
98
  - amanibhavam@destructuring.org
95
- executables:
99
+ executables:
96
100
  - ao
97
101
  extensions: []
98
-
99
102
  extra_rdoc_files: []
100
-
101
- files:
103
+ files:
102
104
  - LICENSE
103
105
  - VERSION
104
106
  - README.mkd
@@ -137,6 +139,7 @@ files:
137
139
  - libexec/aoh-task
138
140
  - libexec/aoh-unlock
139
141
  - libexec/aohelper
142
+ - libexec/aohelper.template
140
143
  - libexec/build
141
144
  - libexec/build-gem
142
145
  - libexec/bump
@@ -194,36 +197,26 @@ files:
194
197
  - bin/ao
195
198
  homepage: https://github.com/destructuring/alpha_omega
196
199
  licenses: []
197
-
198
200
  post_install_message:
199
201
  rdoc_options: []
200
-
201
- require_paths:
202
+ require_paths:
202
203
  - lib
203
- required_ruby_version: !ruby/object:Gem::Requirement
204
+ required_ruby_version: !ruby/object:Gem::Requirement
204
205
  none: false
205
- requirements:
206
- - - ">="
207
- - !ruby/object:Gem::Version
208
- hash: 3
209
- segments:
210
- - 0
211
- version: "0"
212
- required_rubygems_version: !ruby/object:Gem::Requirement
206
+ requirements:
207
+ - - ! '>='
208
+ - !ruby/object:Gem::Version
209
+ version: '0'
210
+ required_rubygems_version: !ruby/object:Gem::Requirement
213
211
  none: false
214
- requirements:
215
- - - ">="
216
- - !ruby/object:Gem::Version
217
- hash: 3
218
- segments:
219
- - 0
220
- version: "0"
212
+ requirements:
213
+ - - ! '>='
214
+ - !ruby/object:Gem::Version
215
+ version: '0'
221
216
  requirements: []
222
-
223
217
  rubyforge_project:
224
218
  rubygems_version: 1.8.24
225
219
  signing_key:
226
220
  specification_version: 3
227
221
  summary: alpha_omega capistrano recipes
228
222
  test_files: []
229
-