ymlex 1.1.0 → 1.1.1

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. data/bin/ymlex +1 -1
  2. data/lib/ymlex/argusyml.rb +2 -1
  3. metadata +9 -6
  4. checksums.yaml +0 -7
data/bin/ymlex CHANGED
@@ -17,7 +17,7 @@ def find_last
17
17
  dir = pwd
18
18
  end
19
19
  end
20
- pwd = pwd.sub(/\/(\w)*$/,"")
20
+ pwd = pwd.sub(/\/[^\/]*$/,"")
21
21
  end
22
22
  [last, dir]
23
23
  end
@@ -334,7 +334,6 @@ class ArgusYml
334
334
  "mon_idc" => "local",
335
335
  "req_type" => "port",
336
336
  }
337
- @instance["request"] << dft_raw.merge(raw_value)
338
337
  alert_name = "default_alert"
339
338
  if raw_value["alert"]
340
339
  alt = @alert.get_alert raw_value["alert"]
@@ -342,6 +341,8 @@ class ArgusYml
342
341
  @instance["alert"] << alt
343
342
  alert_name = raw_name
344
343
  end
344
+ raw_value.delete("alert").delete("contacts")
345
+ @instance["request"] << dft_raw.merge(raw_value)
345
346
  @instance["rule"] << { "name" => raw_name,
346
347
  "formula" => "#{raw_name} != 'ok'",
347
348
  "filter" => raw_value["filter"]||"3/3",
metadata CHANGED
@@ -1,7 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ymlex
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.1.1
5
+ prerelease:
5
6
  platform: ruby
6
7
  authors:
7
8
  - Wen Li
@@ -24,25 +25,27 @@ files:
24
25
  homepage: https://github.com/cruelwen/ymlex
25
26
  licenses:
26
27
  - MIT
27
- metadata: {}
28
28
  post_install_message:
29
29
  rdoc_options: []
30
30
  require_paths:
31
31
  - lib
32
32
  required_ruby_version: !ruby/object:Gem::Requirement
33
+ none: false
33
34
  requirements:
34
- - - ">="
35
+ - - ! '>='
35
36
  - !ruby/object:Gem::Version
36
37
  version: '0'
37
38
  required_rubygems_version: !ruby/object:Gem::Requirement
39
+ none: false
38
40
  requirements:
39
- - - ">="
41
+ - - ! '>='
40
42
  - !ruby/object:Gem::Version
41
43
  version: '0'
42
44
  requirements: []
43
45
  rubyforge_project:
44
- rubygems_version: 2.0.0.preview3.1
46
+ rubygems_version: 1.8.23
45
47
  signing_key:
46
- specification_version: 4
48
+ specification_version: 3
47
49
  summary: extend ymal!
48
50
  test_files: []
51
+ has_rdoc:
checksums.yaml DELETED
@@ -1,7 +0,0 @@
1
- ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: 08193ba23283d08722054a4aeb4e727b366c33e1
4
- data.tar.gz: 36a6458002ac1726f5b8110a1c6f2565530c0ba2
5
- !binary "U0hBNTEy":
6
- metadata.gz: 27558b9ac2e0139539676232418c3654103249c1d186c84d089472bef087115e655016e82f40e409b757d90429d1a6bf5cc855021925c9c408ee3b3bc36a365a
7
- data.tar.gz: 6dc301b9d99f40b8ba104d3ffb2c854baf3684e095c2299ff6d12cf21431bdf3c5ab038167ebe3ab585460c799889f02cde8d96b322e353c50263e5ddea30bd5