ymlex 1.1.3 → 1.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: 73163cac01f7dc4bc74cb24fed3dfa698f2cda4b
+  data.tar.gz: bad5fe1ea61688707a906b56deab0e8d601c372f
+!binary "U0hBNTEy":
+  metadata.gz: 42981f480ed643b3270683cd3d904aaadd441e2dcbeab3413a4365ac33401ae727f3b69b60febb9bae8e14d26d1560e5b3c6126ae35674f3481101db5460fd21
+  data.tar.gz: 1e13aacd99fed81284df37540d25b3e0b8d4e3fccb9d5629c96bcad0bd1f75317400029d9fd3f33946f467804145331c8f136074992e2869799b3ece88a0a893

data/lib/ymlex/argusyml.rb

@@ -128,41 +128,14 @@ class ArgusYml
     input
   end
 
-  def dump_json dir_path, append_mode = true
+  def dump_json dir_path
     
     dir = "#{dir_path}/cluster/cluster.#{@name}.#{@product}.all"
     `mkdir -p #{dir}`
 
     # instance
     filename = "#{dir}/instance"
-    if append_mode 
-      old_instance = nil
-      begin
-        File.open(filename,"r") do |f|
-          old_instance = JSON.parse f.read
-        end
-        old_instance = empty if !old_instance
-      rescue
-        old_instance = empty
-      end
-      new_instance = {}
-      ["raw","request","rule","alert"].each do |type| 
-        new_instance[type] = old_instance[type]
-        next unless @instance[type]
-        @instance[type].each do |new_item|
-          idx = old_instance[type].find_index do |old_item| 
-            old_item["name"] == new_item["name"]
-          end
-          if idx
-            new_instance[type][idx] = new_item
-          else
-            new_instance[type] << new_item
-          end
-        end
-      end 
-    else
-      new_instance = @instance
-    end
+    new_instance = @instance
     File.open(filename,"w") do |f|
       f.puts JSON.pretty_generate new_instance
     end
@@ -203,10 +176,16 @@ class ArgusYml
         trans_log value
       when "aggr"
         trans_aggr value
+      when "derived"
+        trans_derived value
       end
     end
   end
 
+  def trans_derived list
+    @instance["derived"] = list
+  end
+
   def trans_aggr list
     list.each do | rule_name, value | 
       @service_aggr << { "items" => value["items"],

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ymlex
 version: !ruby/object:Gem::Version
-  version: 1.1.3
-  prerelease: 
+  version: 1.1.4
 platform: ruby
 authors:
 - Wen Li
@@ -25,27 +24,25 @@ 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: 1.8.23
+rubygems_version: 2.0.0.preview3.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: extend ymal!
 test_files: []
-has_rdoc: