what 0.3.3 → 0.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 (4) hide show
  1. checksums.yaml +4 -12
  2. data/lib/what/config.rb +5 -0
  3. data/lib/what/version.rb +1 -1
  4. metadata +12 -12
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- MGIxNDQ2Y2I1Njg2YTllNzYwZDg5ZDVlNGIyNzQ2NzcxNTlmY2M4Zg==
5
- data.tar.gz: !binary |-
6
- NTRkMzcxY2Y0Yjg5Zjc0NDllZGQ3ZjZjNGZjNzFhZmVkODk2MTE1MQ==
3
+ metadata.gz: 96f3b91d61bb7a68a690acf38401504339a12c88
4
+ data.tar.gz: d131acd36708a8d4065dd385c18b7ba44025dfd5
7
5
  !binary "U0hBNTEy":
8
- metadata.gz: !binary |-
9
- NTJlZmY5NTNlZTE4MTc3YmM1MTc3YWJkYzNmM2JjMjY0MTA1MWM4ODY3MmIx
10
- NmRjZDE4YzUwZWQ3ODUxZGMxMjU5ZGU3NmU1NGY0ZTljOTVhNjcxMWY3Yzk4
11
- NjMzZjVjMmFlZmU5Y2MyZjY2MzU3ZjgwYmQxNjZkZTVmZDFmYWY=
12
- data.tar.gz: !binary |-
13
- M2Y2OTA2ZWI3Mjk0ZDRmMzY3MDQ1NDNjNmVlODQ4YTM4YmUxZDJkYzVkOGYw
14
- NzUyNzA3Mzk4MzJmNWUwZWJmNjJkNjljMDFiZDY2ZDJkODIyZTE0ZmQ5NzNm
15
- MDk2NDcwOWU0N2ExMjllOTg2Nzg3OTI1OTgzMGRhYzM5MzdiOTU=
6
+ metadata.gz: ac945b2c71cc2ae3941597756921169cb7389fa871b556d3716075ad73762bfa4f47a0dbfc2e54ea5af783af861d3af101fd79e708fc14ebe2aef830c6601c40
7
+ data.tar.gz: 42087da9046c443e15e05ccbe7549139637123f82a4a7394704846e07d4aca4bb42ed52cf5e3374ed1910ddaa2e502116aa4b288fce544d30b4b1413a9229aff
data/lib/what/config.rb CHANGED
@@ -37,6 +37,11 @@ module What
37
37
  end
38
38
  begin
39
39
  opts = YAML.load_file(path)
40
+
41
+ # Special-case modules--we want to append, not overwrite
42
+ @config['modules'] ||= []
43
+ @config['modules'] += Array(opts.delete('modules'))
44
+
40
45
  @config.merge!(opts)
41
46
  rescue Exception => e
42
47
  puts "Error loading config file #{path}: #{e}"
data/lib/what/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module What
2
- VERSION = "0.3.3"
2
+ VERSION = "0.3.4"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: what
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.3
4
+ version: 0.3.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ryan Fitzgerald
@@ -10,46 +10,46 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-08-12 00:00:00.000000000 Z
13
+ date: 2014-01-21 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
- version_requirements: !ruby/object:Gem::Requirement
16
+ name: rack
17
+ requirement: !ruby/object:Gem::Requirement
17
18
  requirements:
18
19
  - - ! '>='
19
20
  - !ruby/object:Gem::Version
20
21
  version: 1.1.2
21
22
  type: :runtime
22
23
  prerelease: false
23
- name: rack
24
- requirement: !ruby/object:Gem::Requirement
24
+ version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
26
  - - ! '>='
27
27
  - !ruby/object:Gem::Version
28
28
  version: 1.1.2
29
29
  - !ruby/object:Gem::Dependency
30
- version_requirements: !ruby/object:Gem::Requirement
30
+ name: json
31
+ requirement: !ruby/object:Gem::Requirement
31
32
  requirements:
32
33
  - - ! '>='
33
34
  - !ruby/object:Gem::Version
34
35
  version: '0'
35
36
  type: :runtime
36
37
  prerelease: false
37
- name: json
38
- requirement: !ruby/object:Gem::Requirement
38
+ version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
40
  - - ! '>='
41
41
  - !ruby/object:Gem::Version
42
42
  version: '0'
43
43
  - !ruby/object:Gem::Dependency
44
- version_requirements: !ruby/object:Gem::Requirement
44
+ name: celluloid
45
+ requirement: !ruby/object:Gem::Requirement
45
46
  requirements:
46
47
  - - ! '>='
47
48
  - !ruby/object:Gem::Version
48
49
  version: '0'
49
50
  type: :runtime
50
51
  prerelease: false
51
- name: celluloid
52
- requirement: !ruby/object:Gem::Requirement
52
+ version_requirements: !ruby/object:Gem::Requirement
53
53
  requirements:
54
54
  - - ! '>='
55
55
  - !ruby/object:Gem::Version
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
123
123
  version: '0'
124
124
  requirements: []
125
125
  rubyforge_project: what
126
- rubygems_version: 2.0.4
126
+ rubygems_version: 2.0.0
127
127
  signing_key:
128
128
  specification_version: 4
129
129
  summary: Simple server monitoring tool