alpha_omega 1.3.3 → 1.3.4

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 (9) hide show
  1. data/VERSION +1 -1
  2. data/bin/ao +1 -0
  3. data/libexec/_ao +3 -8
  4. data/libexec/_jason +4 -0
  5. data/libexec/_sub +2 -2
  6. data/libexec/_treadstone +4 -0
  7. data/libexec/aoh-proxy +2 -2
  8. data/libexec/aoh-remote +1 -1
  9. metadata +3 -3
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.3.3
1
+ 1.3.4
data/bin/ao CHANGED
@@ -1,4 +1,5 @@
1
1
  #!/usr/bin/env ruby
2
2
 
3
+ ENV['_AO_HOME'] = File.dirname(ENV['BUNDLE_GEMFILE'])
3
4
  shome=File.expand_path('../..', __FILE__)
4
5
  system("#{shome}/sbin/aoh", *ARGV)
data/libexec/_ao CHANGED
@@ -19,8 +19,8 @@ function enforce_rvm {
19
19
  export _AO_RVM=1
20
20
 
21
21
  local pth_ruby_loader="${_AO_RUBY_LOADER:-}"
22
- : ${pth_ruby_loader:=$(ryaml $shome/config/deploy.yml ruby_loader)}
23
- local ruby_deploy="$(ryaml $shome/config/deploy.yml app_ruby)"
22
+ : ${pth_ruby_loader:=$(ryaml $_AO_HOME/config/deploy.yml ruby_loader)}
23
+ local ruby_deploy="$(ryaml $_AO_HOME/config/deploy.yml app_ruby)"
24
24
 
25
25
  if [[ -z $pth_ruby_loader || -z $ruby_deploy ]]; then
26
26
  return
@@ -38,7 +38,6 @@ enforce_rvm "$@"
38
38
  # define command line options:
39
39
  # var name, default, description, short option
40
40
  DEFINE_string "gateway" "" "deploy gateway host" "G"
41
- DEFINE_boolean "autoconf" "$FLAGS_TRUE" "use config/ssh to configure remote access" "z"
42
41
  DEFINE_boolean "proxy" "$FLAGS_FALSE" "use a gateway to proxy deploys" "p"
43
42
  DEFINE_boolean "direct" "$FLAGS_FALSE" "override proxy" "d"
44
43
  DEFINE_string "chef" "" "location to chef repo with opsdb" "c"
@@ -58,7 +57,7 @@ function main {
58
57
 
59
58
  local nm_component="$1" # will shift later since this could be an integration environment
60
59
  if [[ "$#" = 1 ]]; then
61
- local deploy_base="$(ryaml $shome/config/deploy.yml deploy_base)"
60
+ local deploy_base="$(ryaml $_AO_HOME/config/deploy.yml deploy_base)"
62
61
  if [[ -n "$deploy_base" ]]; then
63
62
  local pod_shortcut="$(ryaml $HOME/.getting-started/config/pods.yml pods ${deploy_base}${nm_component} pod)"
64
63
  if [[ -n "$pod_shortcut" ]]; then
@@ -107,10 +106,6 @@ function main {
107
106
  fi
108
107
  fi
109
108
 
110
- if [[ "$FLAGS_autoconf" = "$FLAGS_TRUE" ]]; then
111
- PATH="$shome/.deploy/ssh/bin:$PATH"
112
- fi
113
-
114
109
  if [[ -n "$FLAGS_user" ]]; then
115
110
  export _AO_USER="$FLAGS_user"
116
111
  else
data/libexec/_jason CHANGED
@@ -10,6 +10,10 @@ if [[ -z "${shome:-}" ]]; then
10
10
  shome="$(cd -P -- "$(dirname -- "${BASH_SOURCE}")/.." && pwd -P)"
11
11
  fi
12
12
 
13
+ if [[ -z "${_AO_HOME:-}" ]]; then
14
+ export _AO_HOME="$(dirname "$BUNDLE_GEMFILE")"
15
+ fi
16
+
13
17
  function get_started {
14
18
  # if getting-started bootstrap is detected, put this in the path
15
19
  # mainly useful for getopt on os x
data/libexec/_sub CHANGED
@@ -39,8 +39,8 @@ function sub {
39
39
  fi
40
40
  }
41
41
 
42
- if [[ "$shome/config/deploy.yml" ]]; then
43
- export _JASON_RUBY="$(ryaml "$shome/config/deploy.yml" "app_ruby")"
42
+ if [[ "$_AO_HOME/config/deploy.yml" ]]; then
43
+ export _JASON_RUBY="$(ryaml "$_AO_HOME/config/deploy.yml" "app_ruby")"
44
44
  fi
45
45
 
46
46
  if [[ ! -x "$(which rvm-exec 2>&1 || true)" ]]; then
data/libexec/_treadstone CHANGED
@@ -4,5 +4,9 @@ if [[ -z "${shome:-}" ]]; then
4
4
  shome="$(cd -P -- "$(dirname -- "${BASH_SOURCE}")/.." && pwd -P)"
5
5
  fi
6
6
 
7
+ if [[ -z "${_AO_HOME:-}" ]]; then
8
+ export _AO_HOME="$(dirname "$BUNDLE_GEMFILE")"
9
+ fi
10
+
7
11
  source "$shome/libexec/_jason"
8
12
  set -fue
data/libexec/aoh-proxy CHANGED
@@ -60,8 +60,8 @@ function main {
60
60
  case "$hst_gateway" in
61
61
  *)
62
62
  local pth_rvmrun="${_AO_RUBY_LOADER:-}"
63
- : ${pth_rvmrun:=$(ruby -ryaml -e 'puts YAML.load(File.read(ARGV[0]))[ARGV[1]]' $shome/config/deploy.yml ruby_loader)}
64
- local nm_ruby="$(ruby -ryaml -e 'puts YAML.load(File.read(ARGV[0]))[ARGV[1]]' $shome/config/deploy.yml app_ruby)"
63
+ : ${pth_rvmrun:=$(ruby -ryaml -e 'puts YAML.load(File.read(ARGV[0]))[ARGV[1]]' $_AO_HOME/config/deploy.yml ruby_loader)}
64
+ local nm_ruby="$(ruby -ryaml -e 'puts YAML.load(File.read(ARGV[0]))[ARGV[1]]' $_AO_HOME/config/deploy.yml app_ruby)"
65
65
 
66
66
  local tmp_remote="$(ssh $hst_gateway mktemp -t XXXXXXXXX)"
67
67
  scp -q $shome/sbin/remote-helper $hst_gateway:$tmp_remote
data/libexec/aoh-remote CHANGED
@@ -21,7 +21,7 @@ function main {
21
21
  fi
22
22
 
23
23
  local nm_component="$1"; shift
24
- local deploy_base="$(ryaml $shome/config/deploy.yml deploy_base)"
24
+ local deploy_base="$(ryaml $_AO_HOME/config/deploy.yml deploy_base)"
25
25
  if [[ -n "$deploy_base" ]]; then
26
26
  local pod_shortcut="$(ryaml $HOME/.getting-started/config/pods.yml pods ${deploy_base}${nm_component} pod)"
27
27
  if [[ -n "$pod_shortcut" ]]; then
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alpha_omega
3
3
  version: !ruby/object:Gem::Version
4
- hash: 29
4
+ hash: 19
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 3
9
- - 3
10
- version: 1.3.3
9
+ - 4
10
+ version: 1.3.4
11
11
  platform: ruby
12
12
  authors:
13
13
  - David Nghiem