metric_fu 4.11.1 → 4.11.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjRkYzc2YTUyMTE0NzdkNTIxNmVhMTlkMGUzNzQ5NTIzYjY5N2JhNw==
-  data.tar.gz: !binary |-
-    YjYyYWU0YTk5NjE5ZDM4M2I1ZmVlNWY2ODM4NzM3Y2M4MTUwM2IxZQ==
+SHA1:
+  metadata.gz: e5a9b2b2a4948535584eff46f652281508cc5de5
+  data.tar.gz: 033ea94132c02ae98f68a8338f860bd0d065e0a8
 SHA512:
-  metadata.gz: !binary |-
-    MjJmZjc0N2U3NmI1YTU3YTQwYmE3NjM2NTBhNDY0MmYzMmM2MTQyZjYxNmJj
-    OTM3ZmE1ODlmZjg1Yjg0MDZlYTNiZWNiZjAyMTM5MmQ0MThjNzJmMzkzODcy
-    YjcyZjA3YTYwNGE3ODQ0NzE5NjEwN2FiMWJlNTMyNjIyNjBkZWE=
-  data.tar.gz: !binary |-
-    YjA1NmJmMDZiYzc2ZDBkODVmNDliNWFkMDllZmQyMTk2NGNhN2YwNTFlNzcx
-    NzI3OGNkMDNmMGFhYjZjYWU5YTFjYmNkYTFlZDM0M2VkNGNlNmRmMmFmN2Iy
-    ZWVmNGRmNWQ2MmIxNDQ0MDg3MzFlZWM5MzM0MGVlZTYxNzM5MWQ=
+  metadata.gz: 2ab4c65b33b1238dbd9d0d49aa1c88da8f2e46d77c27afd39109cb17d5404a4e741589b0ed11ef9860209f641257fc5a47d88decc5c1ab7f92004cb07b64e989
+  data.tar.gz: 8082172a72b8001f5c6b0b5aacf8572922db6eda66ebe00ba554d7a7084e1a7ebd8d1c86c7f5f8a0543fe8ec7967f4f9cf89531a31afa2a64952b095f26fa9c7

data/.travis.yml

@@ -2,8 +2,6 @@ language: ruby
 bundler_args: --path vendor/bundle
 script: bundle exec rspec
 cache: bundler
-gemfile:
-  - gemfiles/Gemfile.travis
 before_install:
   - gem install bundler
   - bundle config --local without local_development yard guard

data/CONTRIBUTORS

@@ -9,8 +9,8 @@ Robin Curry
 Sean Soper
 Delwyn de Villiers
 Carl Youngblood
-Andre Arko
 Martin Gotink
+Andre Arko
 Chris Griego
 Sathish
 Michael Stark
@@ -31,8 +31,9 @@ Josef Šimánek
 Andy Gregorowicz
 Tarsoly András
 Benjamin Fleischer / Paul Swagerty
-unknown
 Nick Veys
+unknown
+Micah Geisel
 Extrovert
 Ben Turner
 KAKUTANI Shintaro
@@ -44,8 +45,8 @@ David Barri
 Beau Fabry
 Chris Mason
 Andrew Selder
-Mark Wilden
 iain
+Mark Wilden
 Alessandro Dias
 Lars E. Hoeg
 Eric Wollesen
@@ -59,17 +60,17 @@ ff-cviradiya
 khall
 Stefan Huber
 Todd A. Jacobs
-jayzes
+René Föhring
+Scyllinice
 Bitdeli Chef
 Hans Hasselberg
-Scyllinice
+jayzes
 Matthew Gordon
-Guilherme Simões
 factorylabs
-Greg Allen
-Chris Ian Fiel
+Mike Ball
 Mike Szyndel
-Joel Nimety
-René Föhring
+Chris Ian Fiel
+Greg Allen
 Paul Elliott
-Mike Ball
+Guilherme Simões
+Joel Nimety

data/Gemfile

@@ -1,13 +1,28 @@
 # encoding: utf-8
 source 'https://rubygems.org'
 
+if RUBY_VERSION == '1.9.2'
+  # because of https://github.com/railsbp/rails_best_practices/blob/master/rails_best_practices.gemspec
+  gem 'activesupport', '~> 3.2'
+  # because of https://github.com/troessner/reek/issues/334
+  gem 'reek', '~> 1.4.0'
+  # rbp -> as -> i18n
+  gem 'i18n', '0.6.11'
+end
+
+gemspec :path => File.expand_path('..', __FILE__)
+
+platform :jruby do
+  group :jruby do
+    gem 'jruby-openssl', '~> 0.8.5'
+  end
+end
+
 group :test, :local_development  do
   gem 'pry'
   gem 'pry-nav'
 end
 
-gemspec :path => File.expand_path('..', __FILE__)
-
 # Added by devtools
 group :development do
   gem 'rake',  '~> 10.1.0'
@@ -31,9 +46,3 @@ group :guard do
   gem 'rb-notifu',               '~> 0.0.4', require: false
   gem 'terminal-notifier-guard', '~> 1.5.3', require: false
 end
-
-platform :jruby do
-  group :jruby do
-    gem 'jruby-openssl', '~> 0.8.5'
-  end
-end

data/HISTORY.md

@@ -4,13 +4,20 @@ 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.1...master)
+### Master [changes](https://github.com/metricfu/metric_fu/compare/v4.11.2...master)
 
 * Breaking Changes
 * Features
 * Fixes
 * Misc
 
+### [4.11.2](https://github.com/metricfu/metric_fu/compare/v4.11.1...v4.11.2)
+
+* Fixes
+  * Use reek as library, otherwise reek >= 1.6.2 hangs while reading input from stdin. (Martin Gotink, #240, fixes #239)
+* Misc
+  * Refactor MetricFu::Templates::MetricsTemplate#write into a composed method. (#237)
+
 ### [4.11.1](https://github.com/metricfu/metric_fu/compare/v4.11.0...v4.11.1)
 
 * Fixes

data/README.md

@@ -1,6 +1,6 @@
 # MetricFu [![Gem Version](https://badge.fury.io/rb/metric_fu.png)](http://badge.fury.io/rb/metric_fu) [![Build Status](https://travis-ci.org/metricfu/metric_fu.png?branch=master)](http://travis-ci.org/metricfu/metric_fu)
 
-[![Code Climate](https://codeclimate.com/github/metricfu/metric_fu.png)](https://codeclimate.com/github/metricfu/metric_fu) [![Inline docs](http://inch-pages.github.io/github/metricfu/metric_fu.png)](http://inch-pages.github.io/github/metricfu/metric_fu) [![Dependency Status](https://gemnasium.com/metricfu/metric_fu.png)](https://gemnasium.com/metricfu/metric_fu)
+[![Code Climate](https://codeclimate.com/github/metricfu/metric_fu.png)](https://codeclimate.com/github/metricfu/metric_fu) [![Inline docs](http://inch-ci.org/github/metricfu/metric_fu.png)](http://inch-ci.org/github/metricfu/metric_fu) [![Dependency Status](https://gemnasium.com/metricfu/metric_fu.png)](https://gemnasium.com/metricfu/metric_fu)
 
 [Rdoc](http://rdoc.info/github/metricfu/metric_fu/)
 

data/certs/bf4.pem

@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDjjCCAnagAwIBAgIBATANBgkqhkiG9w0BAQUFADBGMQwwCgYDVQQDDANkZXYx
-ITAfBgoJkiaJk/IsZAEZFhFiZW5qYW1pbmZsZWlzY2hlcjETMBEGCgmSJomT8ixk
-ARkWA2NvbTAeFw0xMzExMDcyMTQ0MDBaFw0xNDExMDcyMTQ0MDBaMEYxDDAKBgNV
-BAMMA2RldjEhMB8GCgmSJomT8ixkARkWEWJlbmphbWluZmxlaXNjaGVyMRMwEQYK
-CZImiZPyLGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-ncZFu7VMbliIBhiGj6J5aKXSuHF6gXZuA8gkpgM7dgVzkLhuud6hSYXoC8UZIr+M
-N9hvV/F2F3gLlj2J7aLHr8C0for4KVjc5N/b249vGoH9nIl0qZVE3qI+R7MIdYlO
-ONoeHgiymSKyssCzGFRzv8ZVrpWuUmcB3qixb6d2aiv1kcsZZnLjY4EO5jVW9X92
-d9VMuNdYYtZ0l88prmUM+1fVfaDdY+KGrigeffHUGD0j7pHOZnRCYKwGHG/7Nkg8
-0vEtYVBKSpHIQThBMWXIQu69gIpr6AmQd/kVnhejAdQgvsDz43n9h5iZvrwcedWY
-x2wz+FrUdJzZZhitUFGrnwIDAQABo4GGMIGDMAkGA1UdEwQCMAAwCwYDVR0PBAQD
-AgSwMB0GA1UdDgQWBBTGwGJtyo8nUoRuxbYfcI5bzuHL3zAkBgNVHREEHTAbgRlk
-ZXZAYmVuamFtaW5mbGVpc2NoZXIuY29tMCQGA1UdEgQdMBuBGWRldkBiZW5qYW1p
-bmZsZWlzY2hlci5jb20wDQYJKoZIhvcNAQEFBQADggEBAI/gyzcFn4XvrzXhqKWc
-zLUbOp0349rVIF6f0PlQvf3ZJZS76HKZ2EqSQJwzpcAboypvsRWk0kVmOwvzae4Y
-bB0ac2WuRf7AntS84VkZQmI/1AIxkaQUIQvHJacaw8yJKNggbDBKugHjcrIWWg2V
-vDvyjvJx4sQFpJ84LSDbAVkB92YaP6CUwoeXwrcsvvfrvo9x5AkBECz9KZGD532g
-o78P4WmzIWLgan5GIyNFtGxCsYAug+h0jnC4yujauKqr8hKDLu4K+quCGjX/6LL6
-WONz9vT6h053kHZYMrd4Gs/NdaA4tJSxrhZlXdajAm/0vAOzLIqUHHQk3R0tf7aY
-d/w=
+MIIDmjCCAoKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBJMQ8wDQYDVQQDDAZnaXRo
+dWIxITAfBgoJkiaJk/IsZAEZFhFiZW5qYW1pbmZsZWlzY2hlcjETMBEGCgmSJomT
+8ixkARkWA2NvbTAeFw0xNTAxMjIxMzAyNTNaFw0xNjAxMjIxMzAyNTNaMEkxDzAN
+BgNVBAMMBmdpdGh1YjEhMB8GCgmSJomT8ixkARkWEWJlbmphbWluZmxlaXNjaGVy
+MRMwEQYKCZImiZPyLGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA7V1VZBU7Aft01XAoK8I8tdClfv3H/NIauiV0jfyNtXtZEWwaZ6ooZNLk
+8kmIUsO2xI7I/B3es6w7le9q9xdEowlYjiR/X/yazNvufu5kpM4f6Ri1AKN8xvPk
+LFlR8aOAd9LptcusYDfE+BjhmAvnLTgMGODcDLJIaJzLJaRywTLUuFv4digpFwCm
+Zps9VheJnL4hkgI5BDn6DVjxHSCMRnccQM/kX9L34lbP9KkHXXEtQgkQYpElHbnd
+MtR753aPeLfOBxSGzsso+6Lhe+fz8huD05mzgWaEZN40e6M7dA9FRSsEzL32ZOad
+0z13MZWj3Yg5srV/cZvzCDCdVvRphwIDAQABo4GMMIGJMAkGA1UdEwQCMAAwCwYD
+VR0PBAQDAgSwMB0GA1UdDgQWBBQvUrPExdvmdz0Vau0dH3hRh1YQfDAnBgNVHREE
+IDAegRxnaXRodWJAYmVuamFtaW5mbGVpc2NoZXIuY29tMCcGA1UdEgQgMB6BHGdp
+dGh1YkBiZW5qYW1pbmZsZWlzY2hlci5jb20wDQYJKoZIhvcNAQEFBQADggEBAEWo
+g1soMaRTT/OfFklTuP+odV0w+2qJSfJhOY5bIebDjqxb9BN7hZJ9L6WXhcXCvl6r
+kuXjpcC05TIv1DoWWaSjGK2ADmEBDNVhaFepYidAYuUQN4+ZjVH/gS9V9OkBcE8h
+3ZwRv+9RkXM0uY1FwuGI6jgbgPeR1AkkfJnhOPohkG+VN5bFo9aK/Stw8Nwhuuiz
+axCPD3cmaJBguufRXSMC852SDiBT7AtI4Gl2Fyr+0M5TzXHKbQ9xRBxwfE1bWDd6
+lEs7ndJ1/vd/Hy0zQ1tIRWyql+ITLhqMi161Pw5flsYpQvPlRLR5pGJ4eD0/JdKE
+ZG9WSFH7QcGLY65mEYc=
 -----END CERTIFICATE-----

data/checksum/metric_fu-4.11.1.gem.sha512

@@ -0,0 +1 @@
+2d38eac5067748ee4417ab7088302a9e6c465e5163712cef9a1998bcb7048bf74c1b5c1facaccd8af042d2362693e4774de5b8c2bc6dbae5613eb91920ec58aa

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

@@ -13,12 +13,19 @@ module MetricFu
         mf_log "Skipping Reek, no files found to analyze"
         @output = ""
       else
-        args =  cli_options(files)
+        args = cli_options(files)
         @output = run!(args)
         @output = massage_for_reek_12 if reek_12?
       end
     end
 
+    def run!(args)
+      require 'reek/cli/application'
+
+      MetricFu::Utility.capture_output do
+        Reek::Cli::Application.new(args).execute
+      end
+    end
 
     def analyze
       @matches = @output.chomp.split("\n\n").map{|m| m.split("\n") }
@@ -99,8 +106,8 @@ module MetricFu
         disable_line_number_option,
         turn_off_color,
         config_option,
-        files.join(' ')
-      ].join(' ')
+        *files
+      ].reject(&:empty?)
     end
 
     # TODO: Check that specified line config file exists

data/lib/metric_fu/templates/metrics_template.rb

@@ -11,28 +11,42 @@ module MetricFu
 
     def write
       self.name = MetricFu.report_name
+      self.metrics = {}
+
+      copy_javascripts
+
+      result.each_pair do |section, contents|
+        write_section(section, contents)
+      end
+
+      write_index
+      write_file_data
+    end
+
+    private
 
-      # Copy javascripts to output directory
+    def copy_javascripts
       Dir[File.join(template_directory, 'javascripts', '*')].each do |f|
         FileUtils.cp(f, File.join(self.output_directory, File.basename(f)))
       end
+    end
 
-      self.metrics = {}
-      result.each_pair do |section, contents|
-        if template_exists?(section)
-          create_instance_var(section, contents)
-          self.metrics[section] = contents
-          create_instance_var(:per_file_data, per_file_data)
-          mf_debug  "Generating html for section #{section} with #{template(section)} for result #{result.class}"
-          self.html = erbify(section)
-          layout = erbify('layout')
-          fn = output_filename(section)
-          formatter.write_template(layout, fn)
-        else
-          mf_debug  "no template for section #{section} with #{template(section)} for result #{result.class}"
-        end
+    def write_section(section, contents)
+      if template_exists?(section)
+        create_instance_var(section, contents)
+        self.metrics[section] = contents
+        create_instance_var(:per_file_data, per_file_data)
+        mf_debug  "Generating html for section #{section} with #{template(section)} for result #{result.class}"
+        self.html = erbify(section)
+        layout = erbify('layout')
+        fn = output_filename(section)
+        formatter.write_template(layout, fn)
+      else
+        mf_debug  "no template for section #{section} with #{template(section)} for result #{result.class}"
       end
+    end
 
+    def write_index
       # Instance variables we need should already be created from above
       if template_exists?('index')
         self.html = erbify('index')
@@ -42,8 +56,6 @@ module MetricFu
       else
         mf_debug  "no template for section index for result #{result.class}"
       end
-
-      write_file_data
     end
 
     def write_file_data

data/lib/metric_fu/version.rb

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

data/spec/cli/helper_spec.rb

@@ -155,13 +155,13 @@ describe MetricFu::Cli::Helper do
       expect(helper.process_options(["--roodi"])[:roodi]).to be_truthy
     end
 
-    context 'given a single format' do
+    context "given a single format" do
       it "sets the format" do
         expect(helper.process_options(["--format", "json"])[:format]).to eq([['json']])
       end
     end
 
-    context 'given multiple formats' do
+    context "given multiple formats" do
       it "sets multiple formats" do
         expect(helper.process_options(["--format", "json", "--format", "yaml"])[:format]).to eq([['json'], ['yaml']])
       end

data/spec/metric_fu/configuration_spec.rb

@@ -5,7 +5,7 @@ describe MetricFu::Configuration do
 
 it_behaves_like 'configured' do
 
-  describe '#is_cruise_control_rb? ' do
+  describe "#is_cruise_control_rb? " do
 
     before(:each) { get_new_config }
     describe "when the CC_BUILD_ARTIFACTS env var is not nil" do
@@ -28,7 +28,7 @@ it_behaves_like 'configured' do
     describe "when the CC_BUILD_ARTIFACTS env var is nil" do
       before(:each) { ENV['CC_BUILD_ARTIFACTS'] = nil }
 
-      it 'should return false' do
+      it "should return false" do
         expect(@config.is_cruise_control_rb?).to be_falsey
       end
     end
@@ -36,7 +36,7 @@ it_behaves_like 'configured' do
 
   describe "#reset" do
 
-    describe 'when there is a CC_BUILD_ARTIFACTS environment variable' do
+    describe "when there is a CC_BUILD_ARTIFACTS environment variable" do
 
       before do
         ENV['CC_BUILD_ARTIFACTS'] = 'foo'
@@ -44,7 +44,7 @@ it_behaves_like 'configured' do
         @config.reset
         MetricFu.configure
       end
-      it 'should return the CC_BUILD_ARTIFACTS environment variable' do
+      it "should return the CC_BUILD_ARTIFACTS environment variable" do
         compare_paths(base_directory, ENV['CC_BUILD_ARTIFACTS'])
       end
       after do
@@ -53,13 +53,13 @@ it_behaves_like 'configured' do
       end
     end
 
-    describe 'when there is no CC_BUILD_ARTIFACTS environment variable' do
+    describe "when there is no CC_BUILD_ARTIFACTS environment variable" do
 
       before(:each) do
         ENV['CC_BUILD_ARTIFACTS'] = nil
         get_new_config
       end
-      it 'should return "tmp/metric_fu"' do
+      it "should return 'tmp/metric_fu'" do
         expect(base_directory).to eq(MetricFu.artifact_dir)
       end
 
@@ -88,11 +88,11 @@ it_behaves_like 'configured' do
 
   end
 
-  describe '#platform' do
+  describe "#platform" do
 
     before(:each) { get_new_config }
 
-    it 'should return the value of the PLATFORM constant' do
+    it "should return the value of the PLATFORM constant" do
       this_platform = RUBY_PLATFORM
       expect(@config.platform).to eq(this_platform)
     end

data/spec/metric_fu/formatter/configuration_spec.rb

@@ -4,31 +4,31 @@ require 'shared/configured'
 describe MetricFu::Configuration, 'for formatters' do
   it_behaves_like 'configured' do
 
-    describe '#configure_formatter' do
+    describe "#configure_formatter" do
       before(:each) { get_new_config }
 
-      context 'given a built-in formatter' do
+      context "given a built-in formatter" do
         before do
           @config.configure_formatter('html')
         end
 
-        it 'adds to the list of formatters' do
+        it "adds to the list of formatters" do
           expect(@config.formatters.first).to be_an_instance_of(MetricFu::Formatter::HTML)
         end
       end
 
-      context 'given a custom formatter by class name' do
+      context "given a custom formatter by class name" do
         before do
           stub_const('MyCustomFormatter', Class.new() { def initialize(*); end })
           @config.configure_formatter('MyCustomFormatter')
         end
 
-        it 'adds to the list of formatters' do
+        it "adds to the list of formatters" do
           expect(@config.formatters.first).to be_an_instance_of(MyCustomFormatter)
         end
       end
 
-      context 'given multiple formatters' do
+      context "given multiple formatters" do
         before do
           stub_const('MyCustomFormatter', Class.new() { def initialize(*); end })
           @config.configure_formatter('html')
@@ -36,7 +36,7 @@ describe MetricFu::Configuration, 'for formatters' do
           @config.configure_formatter('MyCustomFormatter')
         end
 
-        it 'adds each to the list of formatters' do
+        it "adds each to the list of formatters" do
           expect(@config.formatters.count).to eq(3)
         end
       end

data/spec/metric_fu/formatter_spec.rb

@@ -2,46 +2,46 @@ require "spec_helper"
 
 describe MetricFu::Formatter do
   describe "formatter class loading" do
-    context 'given a built-in formatter (string)' do
+    context "given a built-in formatter (string)" do
       subject { MetricFu::Formatter.class_for('html') }
 
-      it 'returns the formatter class' do
+      it "returns the formatter class" do
         expect(subject).to eq(MetricFu::Formatter::HTML)
       end
     end
 
-    context 'given a built-in formatter (symbol)' do
+    context "given a built-in formatter (symbol)" do
       subject { MetricFu::Formatter.class_for(:yaml) }
 
-      it 'returns the formatter class' do
+      it "returns the formatter class" do
         expect(subject).to eq(MetricFu::Formatter::YAML)
       end
     end
 
-    context 'given an unknown built-in formatter' do
+    context "given an unknown built-in formatter" do
       subject { MetricFu::Formatter.class_for(:unknown) }
 
-      it 'raises an error' do
+      it "raises an error" do
         expect{ subject }.to raise_error(NameError)
       end
     end
 
-    context 'given a custom formatter that exists' do
+    context "given a custom formatter that exists" do
       subject { MetricFu::Formatter.class_for('MyCustomFormatter') }
 
       before do
         stub_const('MyCustomFormatter', Class.new() { def initialize(*);end })
       end
 
-      it 'returns the formatter class' do
+      it "returns the formatter class" do
         expect(subject).to eq(MyCustomFormatter)
       end
     end
 
-    context 'given a custom formatter that doesnt exist' do
+    context "given a custom formatter that doesnt exist" do
       subject { MetricFu::Formatter.class_for('MyNonExistentCustomFormatter') }
 
-      it 'raises an error' do
+      it "raises an error" do
         expect{ subject }.to raise_error(NameError)
       end
     end