metric_fu 4.11.0 → 4.11.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTlhNTUwYTY3MzMxNmZiZGM4YzM4YjI0YjM2ZmUwMTU4MzA2YTM5NQ==
+    NjRkYzc2YTUyMTE0NzdkNTIxNmVhMTlkMGUzNzQ5NTIzYjY5N2JhNw==
   data.tar.gz: !binary |-
-    ZTNjOGQwNjIxOWRhYWYzYzE3ZWE4MTAzYjhlZmI0ZDAzNGU3Mjc3NQ==
+    YjYyYWU0YTk5NjE5ZDM4M2I1ZmVlNWY2ODM4NzM3Y2M4MTUwM2IxZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTkwMWM3ZjBkMjUwZDQzYzJiMmQ1YzZlZmNmMzMxNDVlNWM4NWRkZTE4MTEy
-    MGM4YjI3YjBkYWQxNGJhZGE5NTFiNDgxMmUwMTU4YzY2OTY5NjYzYjdlYTg4
-    YzFhYTVkZWRiYzU2ZDNiNzk3NWM3ZGNkMDBjYjI1NGZkMDI5OWI=
+    MjJmZjc0N2U3NmI1YTU3YTQwYmE3NjM2NTBhNDY0MmYzMmM2MTQyZjYxNmJj
+    OTM3ZmE1ODlmZjg1Yjg0MDZlYTNiZWNiZjAyMTM5MmQ0MThjNzJmMzkzODcy
+    YjcyZjA3YTYwNGE3ODQ0NzE5NjEwN2FiMWJlNTMyNjIyNjBkZWE=
   data.tar.gz: !binary |-
-    ZjkyNGU5YmE2MGRjYmEwODJkMTdlY2JlNjc0OWM5Y2JmZTc5ZGI4YmQ3NzEw
-    MDI0YWE1ZGYxMDVkYWM5MzNhY2VkZDlhYjc1NjkxYjE3ZTRjMGI2NjUyZDZj
-    ZWY1NWI4NmJlNzE5ZGE4NTY5MTdiOTE4NWRmODI4OTVmNGFjNGQ=
+    YjA1NmJmMDZiYzc2ZDBkODVmNDliNWFkMDllZmQyMTk2NGNhN2YwNTFlNzcx
+    NzI3OGNkMDNmMGFhYjZjYWU5YTFjYmNkYTFlZDM0M2VkNGNlNmRmMmFmN2Iy
+    ZWVmNGRmNWQ2MmIxNDQ0MDg3MzFlZWM5MzM0MGVlZTYxNzM5MWQ=

data/CONTRIBUTORS

@@ -32,6 +32,7 @@ Andy Gregorowicz
 Tarsoly András
 Benjamin Fleischer / Paul Swagerty
 unknown
+Nick Veys
 Extrovert
 Ben Turner
 KAKUTANI Shintaro
@@ -56,18 +57,19 @@ saltracer
 benlovell
 ff-cviradiya
 khall
-Todd A. Jacobs
 Stefan Huber
-Hans Hasselberg
-Bitdeli Chef
+Todd A. Jacobs
 jayzes
+Bitdeli Chef
+Hans Hasselberg
 Scyllinice
 Matthew Gordon
+Guilherme Simões
 factorylabs
-Paul Elliott
-Joel Nimety
+Greg Allen
 Chris Ian Fiel
+Mike Szyndel
+Joel Nimety
 René Föhring
+Paul Elliott
 Mike Ball
-Greg Allen
-Guilherme Simões

data/DEV.md

@@ -72,4 +72,5 @@ template.render_partial 'graph', {:graph_name => 'reek'}
 0. Run `rake usage_test` to make sure the examples are still valid
 1. Update lib/metric_fu/version.rb
 2. Update HISTORY.md
+3. Update CONTRIBUTORS and erd per README in etc
 3. `rake release`

data/HISTORY.md

@@ -4,13 +4,18 @@ Each change should fall into categories that would affect whether the release is
 
 As such, a _Feature_ would map to either major (breaking change) or minor. A _bug fix_ to a patch.  And _misc_ is either minor or patch, the difference being kind of fuzzy for the purposes of history.  Adding tests would be patch level.
 
-### Master [changes](https://github.com/metricfu/metric_fu/compare/v4.11.0...master)
+### Master [changes](https://github.com/metricfu/metric_fu/compare/v4.11.1...master)
 
 * Breaking Changes
 * Features
 * Fixes
 * Misc
 
+### [4.11.1](https://github.com/metricfu/metric_fu/compare/v4.11.0...v4.11.1)
+
+* Fixes
+  * Captured shell-output now only includes STDOUT.  Appending STDERR was breaking expectations. (Benjamin Fleischer, #230, fixes #229)
+
 ### [4.11.0](https://github.com/metricfu/metric_fu/compare/v4.10.0...v4.11.0)
 
 * Features

data/Rakefile

@@ -2,9 +2,6 @@
 using_git = File.exist?(File.expand_path('../.git/', __FILE__))
 if using_git
   require 'bundler/setup'
-  require 'bundler/gem_helper'
-  Bundler::GemHelper.install_tasks
-  # require 'appraisal'
 end
 require 'rake'
 

data/checksum/metric_fu-4.11.0.gem.sha512

@@ -0,0 +1 @@
+5402db0fe4fb45627ce37d071b0d0d0ec4d173320cfffb251e3e0406556e828ac97fc416a4ddd9387b39aa9e374687ebf900f94cb0a578d771b12ae4af8506c6

data/gem_tasks/build.rake

@@ -1,6 +1,8 @@
 # encoding: utf-8
 require 'rubygems'
 require 'digest/sha2'
+# require 'bundler/gem_helper'
+# Bundler::GemHelper.install_tasks
 
 # Based on https://github.com/bundler/bundler/blob/ec0621d/lib/bundler/gem_helpers.rb
 GEM_TASKS = Class.new(Rake::TaskLib) do

data/lib/metric_fu/gem_run.rb

@@ -30,18 +30,19 @@ module MetricFu
       mf_debug "Running #{summary}"
       captured_output = ''
       captured_errors = ''
+      thread = ''
       Open3.popen3("#{library_name}", *arguments) do |stdin, stdout, stderr, wait_thr|
         captured_output << stdout.read.chomp
         captured_errors << stderr.read.chomp
+        thread = wait_thr
       end
-      captured_output << "\nERRORS:\n#{captured_errors}"
     rescue StandardError => run_error
       handle_run_error(run_error)
     rescue SystemExit => system_exit
       handle_system_exit(system_exit)
     ensure
       print_errors
-      return captured_output
+      return captured_output, captured_errors, thread.value
     end
 
     def handle_run_error(run_error)

data/lib/metric_fu/metric.rb

@@ -55,7 +55,17 @@ module MetricFu
         # version: ,
         args: args,
       })
-      runner.run
+      stdout, stderr, status = runner.run
+      # TODO: do something with the stderr
+      # for now, just acknowledge we got it
+      unless stderr.empty?
+        STDERR.puts "STDERR from #{gem_name}:\n#{stderr}"
+      end
+      # TODO: status.success? is not reliable for distinguishing
+      # between a successful run of the metric and problems
+      # found by the metric. Talk to other metrics about this.
+      MetricFu.logger.debug "#{gem_name} ran with #{status.success? ? 'success' : 'failure'} code #{status.exitstatus}"
+      stdout
     end
 
     def configured_run_options

data/lib/metric_fu/metrics/flay/generator.rb

@@ -16,17 +16,25 @@ module MetricFu
     end
 
     def to_h
+      {:flay => calculate_result(@matches)}
+    end
+
+    # TODO: move into analyze method
+    def calculate_result(matches)
+      total_score = matches.shift.first.split('=').last.strip
       target = []
-      total_score = @matches.shift.first.split('=').last.strip
-      @matches.each do |problem|
+      matches.each do |problem|
         reason = problem.shift.strip
         lines_info = problem.map do |full_line|
-          name, line = full_line.split(":")
-          {:name => name.strip, :line => line.strip}
+          name, line = full_line.split(":").map(&:strip)
+          {:name => name, :line => line}
         end
         target << [:reason => reason, :matches => lines_info]
       end
-      {:flay => {:total_score => total_score, :matches => target.flatten}}
+      {
+        :total_score => total_score,
+        :matches => target.flatten
+      }
     end
 
     private

data/lib/metric_fu/version.rb

@@ -1,3 +1,3 @@
 module MetricFu
-  VERSION = '4.11.0'
+  VERSION = '4.11.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metric_fu
 version: !ruby/object:Gem::Version
-  version: 4.11.0
+  version: 4.11.1
 platform: ruby
 authors:
 - Jake Scruggs
@@ -49,7 +49,7 @@ cert_chain:
   dWphdUtxcjhoS0RMdTRLK3F1Q0dqWC82TEw2CldPTno5dlQ2aDA1M2tIWllN
   cmQ0R3MvTmRhQTR0SlN4cmhabFhkYWpBbS8wdkFPekxJcVVISFFrM1IwdGY3
   YVkKZC93PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flay
@@ -356,6 +356,7 @@ files:
 - certs/bf4.pem
 - checksum/.gitkeep
 - checksum/metric_fu-4.10.0.gem.sha512
+- checksum/metric_fu-4.11.0.gem.sha512
 - checksum/metric_fu-4.2.0.gem.sha512
 - checksum/metric_fu-4.2.1.gem.sha512
 - checksum/metric_fu-4.3.0.gem.sha512