gry 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c1bd8a42dbd705ae82a96c17fd3a91333ee52c5
-  data.tar.gz: 6b6b7bfbb3be43b5861a4e3dc99856e394c7348e
+  metadata.gz: 9605fe8fdf8e5f72df91b6e979f06dc8d136eee4
+  data.tar.gz: 153bbc340c13752a2f6678798b00c852db24b228
 SHA512:
-  metadata.gz: cf28029f72d0bf2706218ea7acd46f9a57626823513b57c25b58caf5485bbb6985a0cda2be5708c44be22068e2a2483336a7f14819ea36461f911ad1eed51a94
-  data.tar.gz: b7e0925469a617efcc20ed4c455d9f8edbee75256aed64eb3b99c012de555dbe8f20789606d5a7f9a7b8284889bc8413bdfabb3bc4354919b2adddefd8d5aebd
+  metadata.gz: be5344b6d408fc07cd560895720dbcafd2b1db31892273d653edd858c8f7a5a158fc3be167d96ab71e62f18f934a35864fdd6b9b60c0b1140d888b289fef8944
+  data.tar.gz: '068c51e65070aa65d512f8b6c38df7c62add4409b2617bb2d96a4f1f1c41331187267e4c7d294f16bdd45f19afc7c9cf4fba2535198ebf326c2e6c9df67cedec'

data/lib/gry/cli.rb

@@ -19,10 +19,10 @@ module Gry
       pilot_study = Gry::PilotStudy.new(cops, process: opt.process)
 
       bills = pilot_study.analyze
-      # TODO: Specify the value from option
       congress = Congress.new(
         max_count: opt.max_count,
         min_difference: opt.min_difference,
+        metrics_percentile: opt.metrics_percentile,
       )
       laws = bills.map do |cop_name, bill|
         congress.discuss(cop_name, bill)

data/lib/gry/congress.rb

@@ -1,33 +1,78 @@
 module Gry
   class Congress
-    def initialize(max_count:, min_difference:)
+    def initialize(max_count:, min_difference:, metrics_percentile:)
       @max_count = max_count
       @min_difference = min_difference
+      @metrics_percentile = metrics_percentile
     end
 
     # @param name [String] cop name
-    # @param bill [Hash{Hash => Integer}] rubocop results
+    # @param bill [Hash{Hash => Array}] rubocop results
     #   {
-    #     {config1} => 20,
-    #     {config2} =>  0,
-    #     {config3} => 10,
+    #     {config1} => [offenses],
+    #     {config2} => [offenses],
+    #     {config3} => [offenses],
     #   }
     # @return [Law]
     def discuss(name, bill)
-      letter = letter(bill)
+      letter = letter(name, bill)
       Law.new(name, bill, letter)
     end
 
-    def letter(bill)
-      # [[conf, count], ...]
-      sorted = bill.sort_by{|_conf, count| count}
-      min_count = sorted.first.last
+
+    private
+
+    def letter(name, bill)
+      if RubocopAdapter.metrics_cop?(name)
+        letter_for_metrics(name, bill)
+      else
+        letter_for_enforced_style(bill)
+      end
+    end
+
+    def letter_for_metrics(name, bill)
+      raise "bill.size is not 1, got #{bill.size}" unless bill.size == 1
+      values = bill
+        .values[0]
+        .map{|offense| offense['message']}
+        .map{|message| message[%r!\[([0-9.]+)/[0-9.]+\]$!, 1]}
+        .map(&:to_i)
+        .sort
+
+      max = percentile(values)
+      if name == 'Metrics/AbcSize'
+        max = max.round(2)
+      else
+        max = max.round
+      end
+
+      {
+        'Enabled' => true,
+        'Max' => max,
+      }
+    end
+
+    def letter_for_enforced_style(bill)
+      # [[conf, offenses], ...]
+      sorted = bill.sort_by{|_conf, offenses| offenses.size}
+      min_count = sorted[0].last.size
       return nil if min_count > @max_count
 
-      second_count = sorted[1].last
+      second_count = sorted[1].last.size
       return nil if second_count - min_count < @min_difference
 
       sorted.first.first
     end
+
+    # @param values [Array<Numeric>]
+    # @return [Numeric]
+    def percentile(values)
+      size = values.size
+      index = size.to_f / 100 * @metrics_percentile - 1
+      v1 = values[index.floor]
+      v2 = values[index.ceil]
+
+      v1 + (index - index.ceil) * (v2 - v1)
+    end
   end
 end

data/lib/gry/formatter.rb

@@ -17,7 +17,9 @@ module Gry
             next
           end
         end
-        comment = to_comment(law.bill)
+        comment = RubocopAdapter.metrics_cop?(law.name) ?
+          '' :
+          to_comment(law.bill)
         yaml = to_yaml(letter)
         comment + yaml
       end.compact
@@ -35,7 +37,9 @@ module Gry
     end
 
     def to_comment(set_count)
-      set_count.map do |setting, count|
+      set_count.map do |setting, offenses|
+        count = offenses.size
+
         x = setting
           .reject{|key, _| key == 'Enabled'}
           .map{|key, value| "#{key}: #{value}"}

data/lib/gry/option.rb

@@ -1,6 +1,6 @@
 module Gry
   class Option
-    attr_reader :args, :process, :version, :fast, :max_count, :min_difference, :display_disabled_cops
+    attr_reader :args, :process, :version, :fast, :max_count, :min_difference, :display_disabled_cops, :metrics_percentile
 
     def initialize(argv)
       opt = OptionParser.new
@@ -10,6 +10,7 @@ module Gry
       @max_count = 10
       @min_difference = 10
       @display_disabled_cops = false
+      @metrics_percentile = 95
 
       opt.banner = 'Usage: gry [options] [Cop1, Cop2, ...]'
 
@@ -19,6 +20,7 @@ module Gry
       opt.on('--[no-]fast', 'Run only fast cops. Default: true') {|v| @fast = v}
       opt.on('--max-count=10', 'Upper limit of issues.') {|v| @max_count = v.to_i}
       opt.on('--min-difference=10', 'Lower limit of issues number difference') {|v| @min_difference = v.to_i}
+      opt.on('--metrics_percentile=95', 'Percentile for allowed complex code') {|v| @metrics_percentile = v.to_i}
       opt.on('--display-disabled-cops', 'Display disabled cops') {|v| @display_disabled_cops = v}
 
       @args = opt.parse(argv)

data/lib/gry/pilot_study.rb

@@ -40,7 +40,7 @@ module Gry
         cops, setting = *arg
         setting.each do |cop_name, s|
           res[cop_name] ||= {}
-          res[cop_name][s] ||= 0
+          res[cop_name][s] ||= []
         end
 
         RubocopRunner.new(cops, setting)
@@ -58,7 +58,7 @@ module Gry
           f['offenses'].each do |offense|
             cop_name = offense['cop_name']
             next if cop_name == 'Syntax' # Syntax cop is not configurable.
-            res[cop_name][setting[cop_name]] += 1
+            res[cop_name][setting[cop_name]].push(offense)
           end
         end
       end
@@ -73,10 +73,33 @@ module Gry
     # @param cop_name [String]
     # @return [Array<Hash>]
     def cop_configs(cop_name)
+      if RubocopAdapter.metrics_cop?(cop_name)
+        cop_configs_for_metrics(cop_name)
+      else
+        cop_configs_for_enforced_style(cop_name)
+      end
+    end
+
+    # @param cop_name [String]
+    # @return [Array<Hash>]
+    def cop_configs_for_metrics(cop_name)
+      [
+        {
+          cop_name => {
+            'Enabled' => true,
+            'Max' => 0,
+          }
+        }
+      ]
+    end
+
+    # @param cop_name [String]
+    # @return [Array<Hash>]
+    def cop_configs_for_enforced_style(cop_name)
       cop_config = RubocopAdapter.default_config[cop_name]
 
       # e.g. %w[EnforcedHashRocketStyle EnforcedColonStyle EnforcedLastArgumentHashStyle]
-      enforced_style_names = RubocopAdapter.configurable_styles(cop_config)
+      enforced_style_names = RubocopAdapter.enforced_styles(cop_config)
 
       # e.g. [
       #   %w[key separator table],

data/lib/gry/rubocop_adapter.rb

@@ -9,19 +9,26 @@ module Gry
     def configurable_cops
       conf = RuboCop::ConfigLoader.default_configuration.to_h
       conf
-        .reject{|_key, cop_conf| configurable_styles(cop_conf).empty?}
+        .select{|key, cop_conf| !enforced_styles(cop_conf).empty? || metrics_cop?(key) }
         .reject{|key, _cop_conf| !rails? && key.start_with?('Rails/')}
         .select{|key, _cop_conf| conf = config_specified_by_user.for_cop(key); conf.empty? || !conf['Enabled']}
         .keys
     end
 
     # @param cop_conf [Hash]
-    def configurable_styles(cop_conf)
+    def enforced_styles(cop_conf)
       cop_conf.keys.select do |key|
         key.start_with?('Enforced')
       end
     end
 
+    # @param cop_name [String]
+    # @return [Boolean]
+    def metrics_cop?(cop_name)
+      cop_name.start_with?('Metrics') &&
+        !%w[Metrics/ParameterLists Metrics/BlockNesting].include?(cop_name)
+    end
+
     def to_supported_styles(enforced_style)
       RuboCop::Cop::Util.to_supported_styles(enforced_style)
     end

data/lib/gry/rubocop_runner.rb

@@ -1,5 +1,5 @@
 module Gry
-  # Run RuboCop with spwcify cops and config
+  # Run RuboCop with specific cops and config
   class RubocopRunner
     # @param cops [Array<String>] cop names. e.g.) ['Style/EmptyElse']
     # @param setting [Hash] e.g.) {'Style/EmptyElse' => {'EnforcedStyle' => 'both'}}

data/lib/gry/version.rb

@@ -1,3 +1,3 @@
 module Gry
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gry
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Masataka Kuwabara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler