foreman 0.53.0-java → 0.57.0-java
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/bin/foreman-runner +7 -10
- data/data/export/upstart/master.conf.erb +7 -2
- data/lib/foreman/cli.rb +10 -6
- data/lib/foreman/version.rb +1 -1
- data/spec/resources/export/upstart/app.conf +7 -2
- metadata +6 -6
data/bin/foreman-runner
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
#!/bin/bash
|
1
|
+
#!/usr/bin/env bash
|
2
2
|
#
|
3
3
|
#/ Usage: foreman-runner [-d <dir>] [-p] <command> [<args>...]
|
4
4
|
#/
|
@@ -16,12 +16,12 @@ usage() {
|
|
16
16
|
exit
|
17
17
|
}
|
18
18
|
|
19
|
-
|
19
|
+
read_profile=""
|
20
20
|
|
21
21
|
while getopts ":hd:p" OPT; do
|
22
22
|
case $OPT in
|
23
23
|
d) cd "$OPTARG" ;;
|
24
|
-
p)
|
24
|
+
p) read_profile="1" ;;
|
25
25
|
h) usage ;;
|
26
26
|
\?) error "invalid option: -$OPTARG" ;;
|
27
27
|
:) error "option -$OPTARG requires an argument" ;;
|
@@ -32,13 +32,10 @@ shift $((OPTIND-1))
|
|
32
32
|
|
33
33
|
[ -z "$1" ] && usage
|
34
34
|
|
35
|
-
if [ "$
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
source $script
|
40
|
-
done
|
41
|
-
shopt -u nullglob
|
35
|
+
if [ "$read_profile" == "1" ]; then
|
36
|
+
if [ -f .profile ]; then
|
37
|
+
source .profile
|
38
|
+
fi
|
42
39
|
fi
|
43
40
|
|
44
41
|
exec "$@"
|
@@ -7,5 +7,10 @@ EOF
|
|
7
7
|
|
8
8
|
end script
|
9
9
|
|
10
|
-
start on started network
|
11
|
-
|
10
|
+
start on (started network-interface
|
11
|
+
or started network-manager
|
12
|
+
or started networking)
|
13
|
+
|
14
|
+
stop on (stopping network-interface
|
15
|
+
or stopping network-manager
|
16
|
+
or stopping networking)
|
data/lib/foreman/cli.rb
CHANGED
@@ -75,13 +75,17 @@ class Foreman::CLI < Thor
|
|
75
75
|
|
76
76
|
def run(*args)
|
77
77
|
load_environment!
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
78
|
+
pid = fork do
|
79
|
+
begin
|
80
|
+
engine.env.each { |k,v| ENV[k] = v }
|
81
|
+
exec args.shelljoin
|
82
|
+
rescue Errno::EACCES
|
83
|
+
error "not executable: #{args.first}"
|
84
|
+
rescue Errno::ENOENT
|
85
|
+
error "command not found: #{args.first}"
|
86
|
+
end
|
84
87
|
end
|
88
|
+
Process.wait(pid)
|
85
89
|
end
|
86
90
|
|
87
91
|
desc "version", "Display Foreman gem version"
|
data/lib/foreman/version.rb
CHANGED
@@ -7,5 +7,10 @@ EOF
|
|
7
7
|
|
8
8
|
end script
|
9
9
|
|
10
|
-
start on started network
|
11
|
-
|
10
|
+
start on (started network-interface
|
11
|
+
or started network-manager
|
12
|
+
or started networking)
|
13
|
+
|
14
|
+
stop on (stopping network-interface
|
15
|
+
or stopping network-manager
|
16
|
+
or stopping networking)
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: foreman
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.57.0
|
5
5
|
prerelease:
|
6
6
|
platform: java
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-
|
12
|
+
date: 2012-08-21 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: thor
|
16
|
-
requirement: &
|
16
|
+
requirement: &70340052711020 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: 0.13.6
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *70340052711020
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: posix-spawn
|
27
|
-
requirement: &
|
27
|
+
requirement: &70340052709680 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ~>
|
@@ -32,7 +32,7 @@ dependencies:
|
|
32
32
|
version: 0.3.6
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *70340052709680
|
36
36
|
description: Process manager for applications with multiple components
|
37
37
|
email: ddollar@gmail.com
|
38
38
|
executables:
|