svutil 0.1.6 → 0.1.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.
- data/lib/svutil.rb +1 -1
- data/lib/svutil/config.rb +4 -2
- metadata +8 -8
data/lib/svutil.rb
CHANGED
data/lib/svutil/config.rb
CHANGED
|
@@ -57,7 +57,7 @@ module SVUtil
|
|
|
57
57
|
|
|
58
58
|
def validate
|
|
59
59
|
# TODO: Check file perms
|
|
60
|
-
if (pid_file.nil? or pid_file.empty? or File.directory?(pid_file) && self.daemon)
|
|
60
|
+
if ((pid_file.nil? or pid_file.empty? or File.directory?(pid_file)) && self.daemon)
|
|
61
61
|
STDERR.puts "PID file must be a writable file"
|
|
62
62
|
exit 1
|
|
63
63
|
end
|
|
@@ -67,7 +67,8 @@ module SVUtil
|
|
|
67
67
|
def init
|
|
68
68
|
self.set do |c|
|
|
69
69
|
process_options
|
|
70
|
-
|
|
70
|
+
# If there is no config file and we haven't specified one then ignore
|
|
71
|
+
if File.exists?(self.config_file) || !self.config_provided_on_cli
|
|
71
72
|
load_config_file
|
|
72
73
|
end
|
|
73
74
|
end
|
|
@@ -83,6 +84,7 @@ module SVUtil
|
|
|
83
84
|
OptionParser.new do |opts|
|
|
84
85
|
opts.on("-f", "--config [filename]", "Config file to use (default 'settings')") do |filename|
|
|
85
86
|
self.config_file = filename.strip
|
|
87
|
+
self.config_provided_on_cli = true
|
|
86
88
|
end
|
|
87
89
|
opts.on("-d", "--daemon", "Run in the background as a daemon") do
|
|
88
90
|
self.daemon = true
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: svutil
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.7
|
|
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: 2011-12-
|
|
12
|
+
date: 2011-12-21 00:00:00.000000000Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: newgem
|
|
16
|
-
requirement: &
|
|
16
|
+
requirement: &70110179821260 !ruby/object:Gem::Requirement
|
|
17
17
|
none: false
|
|
18
18
|
requirements:
|
|
19
19
|
- - ! '>='
|
|
@@ -21,10 +21,10 @@ dependencies:
|
|
|
21
21
|
version: 1.5.3
|
|
22
22
|
type: :development
|
|
23
23
|
prerelease: false
|
|
24
|
-
version_requirements: *
|
|
24
|
+
version_requirements: *70110179821260
|
|
25
25
|
- !ruby/object:Gem::Dependency
|
|
26
26
|
name: hoe
|
|
27
|
-
requirement: &
|
|
27
|
+
requirement: &70110179800800 !ruby/object:Gem::Requirement
|
|
28
28
|
none: false
|
|
29
29
|
requirements:
|
|
30
30
|
- - ~>
|
|
@@ -32,10 +32,10 @@ dependencies:
|
|
|
32
32
|
version: '2.12'
|
|
33
33
|
type: :development
|
|
34
34
|
prerelease: false
|
|
35
|
-
version_requirements: *
|
|
35
|
+
version_requirements: *70110179800800
|
|
36
36
|
- !ruby/object:Gem::Dependency
|
|
37
37
|
name: rdoc
|
|
38
|
-
requirement: &
|
|
38
|
+
requirement: &70110178496000 !ruby/object:Gem::Requirement
|
|
39
39
|
none: false
|
|
40
40
|
requirements:
|
|
41
41
|
- - ~>
|
|
@@ -43,7 +43,7 @@ dependencies:
|
|
|
43
43
|
version: '3.10'
|
|
44
44
|
type: :development
|
|
45
45
|
prerelease: false
|
|
46
|
-
version_requirements: *
|
|
46
|
+
version_requirements: *70110178496000
|
|
47
47
|
description: A simple managed process builder for Ruby projects
|
|
48
48
|
email:
|
|
49
49
|
- daniel@netfox.com
|