kitchen_blame 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ee2517180cf5fb3b914f258d1da3d3041c0bf78
-  data.tar.gz: 8301215b313cda783e4912b0856e79771eb3a8b5
+  metadata.gz: 186f2029646cb8aa537f69f02a085cd6b68cda5d
+  data.tar.gz: 2a6d6dde0a425c33c5806a05b4790a9d7a457df6
 SHA512:
-  metadata.gz: ebbbe94a81f202c0a21d68ea7a3631351747db4044cc9b11384ca763bbf365723af5058ef7aa26f14a47a51a821494e9ddbc5d021eef68388f0b604571f370e9
-  data.tar.gz: 87dd1f321364cfebf470ceda1efb0b58ebcfd37a78ea7055f570004d0c77b398101f2fb1fdd2a915e4a9bc4c37215a302fcd9dd3ad04204fab4c6ab936256d00
+  metadata.gz: 42c193a5f13a2850cdde11b241a70469f0d9b265a3c14d6443635fd378714daeda813ca45acbb937ae1adca846dd28ed399dc8c5908340b1fd324d7bf730e6ed
+  data.tar.gz: 12a47ab2e5c96823be027a8749d84687b997e64e0786d27adbbf40c7a33240f10a06811c05f126931e85c026c8e36818d9a8599ba171d02cd3411025416cfe94

data/CHANGELOG.md

@@ -0,0 +1,19 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.2.0] - 2017-07-05
+### Added
+- version subcommand
+### Changed
+- Code cleanup
+### Fixed
+- Fixed defect in parsing kitchen logs with errors
+
+## [0.1.0] - 2017-06-16
+### Added
+- Initial Release

data/lib/kitchen_blame/cli.rb

@@ -17,6 +17,7 @@ require 'thor'
 require 'kitchen_blame'
 
 module KitchenBlame
+  # Processes command line invocation
   class CLI < Thor
     desc 'create KEY LOG', 'Use ssh KEY to analyze create time in a test kitchen LOG'
     def create(key, log)
@@ -32,5 +33,10 @@ module KitchenBlame
     def duration(log)
       KitchenBlame::Blame.analyze_duration(log)
     end
+
+    desc 'version', 'Output kitchen blame version'
+    def version
+      puts "kitchen blame version: #{KitchenBlame::VERSION}"
+    end
   end
 end

data/lib/kitchen_blame/version.rb

@@ -14,5 +14,5 @@
 # limitations under the License.
 
 module KitchenBlame
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/kitchen_blame.rb

@@ -18,6 +18,7 @@ require 'date'
 require 'json'
 
 module KitchenBlame
+  # Main class
   class Blame
     # Return the DateTime object from a regex match with a named capture of 'time'
     def self.extract_time(match)
@@ -44,47 +45,63 @@ module KitchenBlame
     end
 
     def self.analyze_create(key_path, log)
-      create_line = File.foreach(log).grep(/Creating/).first
-      match_data = /.,\s\[(?<time>.*)\]\s+[^:]+:(?<log>.*)$/.match(create_line)
-      create_time = extract_time(match_data)
-      ip = File.foreach(log).grep(/Attaching floating IP </).first[/\<(?<ip>.*)\>/, 'ip']
-      server_log_entries = `ssh -i #{key_path} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no vagrant@#{ip} 'sudo journalctl -o json --no-pager' 2>/dev/null`.split("\n")
-      server_log_entries = server_log_entries.map { |entry| JSON.parse(entry) }
-      boot_start = extract_syslog_time(server_log_entries.first)
-      create_duration = measure_duration(create_time, boot_start)
-
+      server_log_entries = server_log_entries(key_path, log)
+      create_duration = image_create(log, server_log_entries)
       startup_finished_entry = server_log_entries.find { |entry| entry['MESSAGE'].include?('Startup finished') }
+      boot_start = extract_syslog_time(server_log_entries.first)
       boot_finish = extract_syslog_time(startup_finished_entry)
       boot_duration = measure_duration(boot_start, boot_finish)
-      puts "Create took #{create_duration} seconds"
+      puts "Image create took #{create_duration} seconds"
       puts "Boot took #{boot_duration} seconds"
       puts "Systemd timing: #{startup_finished_entry['MESSAGE']}"
     end
 
+    def self.server_log_entries(key_path, log)
+      ip = File.foreach(log).grep(/Attaching floating IP </).first[/\<(?<ip>.*)\>/, 'ip']
+      server_log_entries = `ssh -i #{key_path} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no vagrant@#{ip} 'sudo journalctl -o json --no-pager' 2>/dev/null`.split("\n")
+      server_log_entries.map { |entry| JSON.parse(entry) }
+    end
+
+    def self.image_create(log, server_log_entries)
+      boot_start = extract_syslog_time(server_log_entries.first)
+      create_line = File.foreach(log).grep(/Creating/).first
+      match_data = /.,\s\[(?<time>.*)\]\s+[^:]+:(?<log>.*)$/.match(create_line)
+      create_time = extract_time(match_data)
+      measure_duration(create_time, boot_start)
+    end
+
+    # rubocop:disable MethodLength
     def self.analyze_recipe(log)
-      IO.readlines(log).grep(/Recipe:/).map do |line|
+      recipe_lines = IO.readlines(log).grep(/Recipe:/).map do |line|
         match_data = /\[(?<time>.*)\].*Recipe:\s(?<recipe>.*)$/.match(line)
+        next unless match_data
         time = extract_time(match_data)
         recipe = match_data[:recipe]
         { recipe: recipe, time: time }
-      end.each_cons(2) do |pair|
+      end
+      recipe_lines.compact.each_cons(2) do |pair|
         recipe = pair.first[:recipe]
         duration = measure_pair(pair)
         puts "#{duration} seconds for recipe #{recipe}"
       end
     end
+    # rubocop:enable MethodLength
 
+    # rubocop:disable MethodLength
     def self.analyze_duration(log)
-      IO.readlines(log).map do |line|
+      log_lines = IO.readlines(log).map do |line|
         match_data = /.,\s\[(?<time>.*)\]\s+[^:]+:(?<log>.*)$/.match(line)
+        next unless match_data
         time = extract_time(match_data)
         log = match_data[:log]
         { log: log, time: time }
-      end.each_cons(2) do |pair|
+      end
+      log_lines.compact.each_cons(2) do |pair|
         log = pair.first[:log]
         duration = measure_pair(pair)
         puts "#{duration} seconds for entry #{log}"
       end
     end
+    # rubocop:enable MethodLength
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen_blame
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-16 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,6 +62,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -92,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Analyzes Test Kitchen logs to assist in optimizations.