alpha_omega 1.5.8 → 1.5.9
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.
- data/VERSION +1 -1
- data/libexec/aohelper +12 -18
- data/libexec/aohelper.template +12 -18
- metadata +1 -1
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
1.5.
|
|
1
|
+
1.5.9
|
data/libexec/aohelper
CHANGED
|
@@ -84,29 +84,23 @@ function main {
|
|
|
84
84
|
fi
|
|
85
85
|
fi
|
|
86
86
|
|
|
87
|
-
if [[
|
|
87
|
+
if [[ -d "$chef_path" ]]; then
|
|
88
|
+
# in operations environments, must use ruby loader
|
|
89
|
+
if !verify_ruby "$ruby_runner"; then
|
|
90
|
+
# ruby loader is not loading the right ruby
|
|
91
|
+
fatal_ruby $ruby_runner
|
|
92
|
+
fi
|
|
93
|
+
else
|
|
88
94
|
# proxied deploy, so relax rvm rquirements, just check current ruby
|
|
89
95
|
if verify_ruby; then
|
|
90
96
|
# current ruby is OK
|
|
91
97
|
ruby_runner=""
|
|
92
98
|
true
|
|
99
|
+
elif [[ -n "$ruby_runner" ]] && verify_ruby "$ruby_runner"; then
|
|
100
|
+
# trying again with ruby_runner works
|
|
101
|
+
true
|
|
93
102
|
else
|
|
94
|
-
|
|
95
|
-
# check with configured ruby loader
|
|
96
|
-
if ! verify_ruby "$ruby_runner"; then
|
|
97
|
-
# ruby loader is not loading the right ruby
|
|
98
|
-
fatal_ruby $ruby_runner
|
|
99
|
-
fi
|
|
100
|
-
else
|
|
101
|
-
# no configured ruby loader, current ruby is not loading the right ruby
|
|
102
|
-
fatal_ruby
|
|
103
|
-
fi
|
|
104
|
-
fi
|
|
105
|
-
else
|
|
106
|
-
# in operations environments, must use ruby loader
|
|
107
|
-
if !verify_ruby "$ruby_runner"; then
|
|
108
|
-
# ruby loader is not loading the right ruby
|
|
109
|
-
fatal_ruby $ruby_runner
|
|
103
|
+
fatal_ruby # since rvm requirements are relaxed, report on current ruby errors
|
|
110
104
|
fi
|
|
111
105
|
fi
|
|
112
106
|
|
|
@@ -115,7 +109,7 @@ function main {
|
|
|
115
109
|
fi
|
|
116
110
|
|
|
117
111
|
# pass deploy command and arguments to ao script in alpha_omega gem
|
|
118
|
-
|
|
112
|
+
$ruby_runner bundle exec ao "${BASH_SOURCE##*/}" "$@"
|
|
119
113
|
}
|
|
120
114
|
|
|
121
115
|
main "$@"
|
data/libexec/aohelper.template
CHANGED
|
@@ -84,29 +84,23 @@ function main {
|
|
|
84
84
|
fi
|
|
85
85
|
fi
|
|
86
86
|
|
|
87
|
-
if [[
|
|
87
|
+
if [[ -d "$chef_path" ]]; then
|
|
88
|
+
# in operations environments, must use ruby loader
|
|
89
|
+
if !verify_ruby "$ruby_runner"; then
|
|
90
|
+
# ruby loader is not loading the right ruby
|
|
91
|
+
fatal_ruby $ruby_runner
|
|
92
|
+
fi
|
|
93
|
+
else
|
|
88
94
|
# proxied deploy, so relax rvm rquirements, just check current ruby
|
|
89
95
|
if verify_ruby; then
|
|
90
96
|
# current ruby is OK
|
|
91
97
|
ruby_runner=""
|
|
92
98
|
true
|
|
99
|
+
elif [[ -n "$ruby_runner" ]] && verify_ruby "$ruby_runner"; then
|
|
100
|
+
# trying again with ruby_runner works
|
|
101
|
+
true
|
|
93
102
|
else
|
|
94
|
-
|
|
95
|
-
# check with configured ruby loader
|
|
96
|
-
if ! verify_ruby "$ruby_runner"; then
|
|
97
|
-
# ruby loader is not loading the right ruby
|
|
98
|
-
fatal_ruby $ruby_runner
|
|
99
|
-
fi
|
|
100
|
-
else
|
|
101
|
-
# no configured ruby loader, current ruby is not loading the right ruby
|
|
102
|
-
fatal_ruby
|
|
103
|
-
fi
|
|
104
|
-
fi
|
|
105
|
-
else
|
|
106
|
-
# in operations environments, must use ruby loader
|
|
107
|
-
if !verify_ruby "$ruby_runner"; then
|
|
108
|
-
# ruby loader is not loading the right ruby
|
|
109
|
-
fatal_ruby $ruby_runner
|
|
103
|
+
fatal_ruby # since rvm requirements are relaxed, report on current ruby errors
|
|
110
104
|
fi
|
|
111
105
|
fi
|
|
112
106
|
|
|
@@ -115,7 +109,7 @@ function main {
|
|
|
115
109
|
fi
|
|
116
110
|
|
|
117
111
|
# pass deploy command and arguments to ao script in alpha_omega gem
|
|
118
|
-
|
|
112
|
+
$ruby_runner bundle exec ao "${BASH_SOURCE##*/}" "$@"
|
|
119
113
|
}
|
|
120
114
|
|
|
121
115
|
main "$@"
|