roku_builder 4.9.4 → 4.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e7e842ba95866a3844d32bfa0602aaab6889210
-  data.tar.gz: 3d9b1df45f0c8e4b70626008a1c56fe94ca5ac8f
+  metadata.gz: 8f7dcf7f887352dabf7d59d8fcf47e53beb2846a
+  data.tar.gz: 0e069f0cc4769374a011a909e17c436bff3dbce3
 SHA512:
-  metadata.gz: 8cfeb6f8646b95f9d3c03a819d912a45b05a52da4190bb0a77c850fed14f9ec5d1c79b577f4ac0804fd9e825a14ab118b6f85d25249c1fa1886f217a7f52124e
-  data.tar.gz: 248e630891b9134db3304936ae3b6d1a605e7c6ea084917d46dcbbd8b44d9c8d4acbc115fa4d5a68239ac5f764d259544d048c34a04d236be2a98454976a22fd
+  metadata.gz: 8826d8af980a33ce0d182861e6e8a1346bbd14169035ff1cda0bd8f426323365e42c99622d72dfce4ef50a0595156eab36639608352975c4c3c33630e78aeb9f
+  data.tar.gz: 384b2ac125f3535754a2cc43beb20b640ce08646b87933cb2e8757547795903e1407916f94b1917b0958585492ebf4b08c06e641e0f8baddb5dfceb765063c32

data/CHANGELOG

@@ -1,3 +1,11 @@
+ = 4.9.5 =
+
+ - Add --node-tracking command to monitor changes in node counts
+
+ = 4.9.4 =
+
+ - Move Analyzer config to main config
+
  = 4.9.3 =
 
  - Fix crash on invlaid config

data/lib/roku_builder/plugins/profiler.rb

@@ -10,7 +10,8 @@ module RokuBuilder
       {
         profile: {device: true},
         sgperf: {device: true},
-        devlog: {device: true}
+        devlog: {device: true},
+        node_tracking: {device: true}
       }
     end
 
@@ -26,15 +27,24 @@ module RokuBuilder
         options[:devlog] = t || "rendezvous"
         options[:devlog_function] = f
       end
+      parser.on("--node-tracking [INTERVAL]", "Take snapshots of the current nodes and print difference since last snapshot") do |interval|
+        options[:node_tracking] = true
+        options[:node_tracking_interval] = interval
+      end
+      parser.separator "Options:"
+      parser.on("--add-ids", "Add ids to stats command") do
+        options[:add_ids] = true
+      end
     end
 
     # Run the profiler commands
     # @param command [Symbol] The profiler command to run
     def profile(options:)
+      @options = options
       @connection = nil
       case options[:profile].to_sym
       when :stats
-        print_stats
+        print_all_node_stats
       when :all
         print_all_nodes
       when :roots
@@ -95,33 +105,99 @@ module RokuBuilder
       connection.puts("enhanced_dev_log #{options[:devlog]} #{options[:devlog_function]}\n")
     end
 
+    def node_tracking(options:)
+      @options = options
+      @connection = nil
+      begin
+        current_nodes = nil
+        previous_nodes = nil
+        while true
+          current_nodes = get_stats
+          diff = diff_node_stats(current_nodes, previous_nodes)
+          print_stats(stats: diff)
+          previous_nodes = current_nodes
+          current_nodes = nil
+          STDIN.read(1)
+        end
+      rescue SystemExit, Interrupt
+        @connection.close if @connection
+      end
+    end
+
     private
 
     # Print the node stats
-    def print_stats
+    def print_all_node_stats
+      print_stats(stats: get_stats)
+    end
+
+    # Print the node stats
+    def get_stats
       end_reg = /<\/All_Nodes>/
       start_reg = /<All_Nodes>/
       lines = get_command_response(command: "sgnodes all", start_reg: start_reg, end_reg: end_reg)
       xml_string = lines.join("\n")
-      stats = {"Total" => 0}
+      stats = {"Total" => {count: 0}}
       doc = Oga.parse_xml(xml_string)
       handle_node(stats: stats, node: doc.children.first)
+      stats
+    end
+
+    def print_stats(stats:)
       stats = stats.to_a
-      stats = stats.sort {|a, b| b[1] <=> a[1]}
-      printf "%30s | %5s\n", "Name", "Count"
+      stats = stats.sort do |a, b|
+        next -1 if a[0] == "Total"
+        next 1 if b[0] == "Total"
+        b[1][:count] <=> a[1][:count]
+      end
+      if @options[:add_ids]
+        printf "%30s | %5s | %s\n%s\n", "Name", "Count", "Ids", "-"*60
+      else
+        printf "%30s | %5s\n%s\n", "Name", "Count", "-"*60
+      end
       stats.each do |key_pair|
-        printf "%30s | %5d\n", key_pair[0], key_pair[1]
+        if key_pair[0] == "Total" and key_pair[1][:total]
+          printf "%30s | %5d %5d", key_pair[0], key_pair[1][:count], key_pair[1][:total]
+        else
+          printf "%30s | %5d", key_pair[0], key_pair[1][:count]
+        end
+        if @options[:add_ids] and key_pair[1][:ids] and key_pair[1][:ids].count > 0
+          id_string = key_pair[1][:ids].join(",")
+          printf "[#{id_string}]"
+        end
+        printf "\n"
       end
     end
 
     def handle_node(stats:,  node:)
-      node.children.each do |element|
-        next unless element.class == Oga::XML::Element
-        stats[element.name] ||= 0
-        stats[element.name] += 1
-        stats["Total"] += 1
-        handle_node(stats: stats, node: element)
+      if node
+        node.children.each do |element|
+          next unless element.class == Oga::XML::Element
+          attributes = element.attributes.map{|attr| {"#{attr.name}": attr.value}}.reduce({}, :merge)
+          stats[element.name] ||= {count: 0, ids: []}
+          stats[element.name][:count] += 1
+          stats[element.name][:ids].push(attributes[:name]) if attributes[:name]
+          stats["Total"][:count] += 1
+          handle_node(stats: stats, node: element)
+        end
+      end
+    end
+
+    def diff_node_stats(current, previous)
+      return current unless previous
+      diff = current.deep_dup
+      diff.each_pair do |node, stats|
+        if previous[node]
+          stats[:count] = stats[:count] - previous[node][:count]
+          if stats[:count] == 0 and node != "Total"
+            diff.delete(node)
+          elsif stats[:ids]
+            stats[:ids] = stats[:ids] - previous[node][:ids]
+          end
+        end
       end
+      diff["Total"][:total] = current["Total"][:count]
+      diff
     end
 
     def print_all_nodes

data/lib/roku_builder/version.rb

@@ -2,5 +2,5 @@
 
 module RokuBuilder
   # Version of the RokuBuilder Gem
-  VERSION = "4.9.4"
+  VERSION = "4.9.5"
 end

data/test/roku_builder/plugins/test_analyzer.rb

@@ -26,7 +26,6 @@ module RokuBuilder
     def teardown
       manifest = File.join(@root_dir, "manifest")
       FileUtils.rm(manifest) if File.exist?(manifest)
-      remove_config
       @request_stubs.each {|req| remove_request_stub(req)}
     end
     def test_analyzer_parse_commands
@@ -412,18 +411,9 @@ module RokuBuilder
     end
 
     def set_config(config_content)
-      config = File.join(@root_dir, ".roku_builder_analyze.json")
-      File.open(config, "w") do |file|
-        file.write(config_content.to_json)
-      end
-    end
-
-    def remove_config
-      config = File.join(@root_dir, ".roku_builder_analyze.json")
-      FileUtils.rm(config) if File.exist? config
+      @config.project.merge!(config_content)
     end
 
-
     def print_all(warnings)
       warnings.each do |warning|
         puts warning[:message]

data/test/roku_builder/plugins/test_profiler.rb

@@ -20,6 +20,38 @@ module RokuBuilder
       parser.parse! argv
       assert_equal "command", options[:profile]
     end
+    def test_profiler_node_tracking
+      options = {profile: "stats"}
+      config, options = build_config_options_objects(ProfilerTest, options, false)
+      waitfor = Proc.new do |telnet_config, &blk|
+        assert_equal(/.+/, telnet_config["Match"])
+        assert_equal(1, telnet_config["Timeout"])
+        txt = "<All_Nodes><NodeA /><NodeB /><NodeC><NodeD /></NodeC></All_Nodes>\n"
+        blk.call(txt)
+        true
+      end
+      count = 0
+      read_stub = Proc.new do |size|
+        raise SystemExit if count = 2
+        count += 1
+      end
+      connection = Minitest::Mock.new
+      profiler = Profiler.new(config: config)
+
+      connection.expect(:puts, nil, ["sgnodes all\n"])
+      connection.expect(:waitfor, nil, &waitfor)
+      connection.expect(:close, nil)
+
+      Net::Telnet.stub(:new, connection) do
+        profiler.stub(:printf, nil) do
+          STDIN.stub(:read, read_stub) do
+            profiler.node_tracking(options: options)
+          end
+        end
+      end
+
+      connection.verify
+    end
     def test_profiler_stats
       options = {profile: "stats"}
       config, options = build_config_options_objects(ProfilerTest, options, false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.9.4
+  version: 4.9.5
 platform: ruby
 authors:
 - greeneca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip