ymlex 1.1.0 → 1.1.1

data/bin/ymlex

@@ -17,7 +17,7 @@ def find_last
         dir = pwd
       end
     end
-    pwd = pwd.sub(/\/(\w)*$/,"")
+    pwd = pwd.sub(/\/[^\/]*$/,"")
   end
   [last, dir]
 end

data/lib/ymlex/argusyml.rb

@@ -334,7 +334,6 @@ class ArgusYml
                   "mon_idc" => "local",
                   "req_type" => "port",
                 }
-      @instance["request"] << dft_raw.merge(raw_value)
       alert_name = "default_alert"
       if raw_value["alert"]
         alt = @alert.get_alert raw_value["alert"]
@@ -342,6 +341,8 @@ class ArgusYml
         @instance["alert"] << alt
         alert_name = raw_name
       end
+      raw_value.delete("alert").delete("contacts")
+      @instance["request"] << dft_raw.merge(raw_value)
       @instance["rule"] << { "name" => raw_name,
                              "formula" => "#{raw_name} != 'ok'",
                              "filter" => raw_value["filter"]||"3/3",

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: ymlex
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
+  prerelease: 
 platform: ruby
 authors:
 - Wen Li
@@ -24,25 +25,27 @@ files:
 homepage: https://github.com/cruelwen/ymlex
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.preview3.1
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: extend ymal!
 test_files: []
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: 08193ba23283d08722054a4aeb4e727b366c33e1
-  data.tar.gz: 36a6458002ac1726f5b8110a1c6f2565530c0ba2
-!binary "U0hBNTEy":
-  metadata.gz: 27558b9ac2e0139539676232418c3654103249c1d186c84d089472bef087115e655016e82f40e409b757d90429d1a6bf5cc855021925c9c408ee3b3bc36a365a
-  data.tar.gz: 6dc301b9d99f40b8ba104d3ffb2c854baf3684e095c2299ff6d12cf21431bdf3c5ab038167ebe3ab585460c799889f02cde8d96b322e353c50263e5ddea30bd5