mccabe 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fedee59e685c053624c54bbd801a2bdc85b9438
-  data.tar.gz: fb8618f85ca60eb054de2b28935a5cdd5f5ad92a
+  metadata.gz: 4b4261f514ab469d8844d7bbee617a65e14073c5
+  data.tar.gz: 4d7d947c352831abfcb7973b22dd2e22804ed2c9
 SHA512:
-  metadata.gz: 0210e6c28d5c8343443a0b0adf3bfd846ef7e2e1558c3e18eacafa0e9d47ee50714a77ec1430346a388a3349c459c3de7d8bb3333bdb870d37e5000dd5780025
-  data.tar.gz: 5e8da4b81d6668b98e0655a81ac81a95a7094ec63b55efb32c18bfae5b314eb78cb0d6760c5b19157a2412d11e6cc302aa66f9a403e4f235decbd892028504b3
+  metadata.gz: 1d78cafa498665ed5b4278f14cbf1da9b9df48726a4ab08e063ad199b06c17778b76568879d4489f52d34c8ac1f140481d289eb59197e2b22a995853e70151b3
+  data.tar.gz: 157508b3503e9025421226c8de04dbdd5fff0ae57cd9eedbd584aea636807123c901a8a309157916d0484230554b28b1ba466c448bed045bb1b2511aacd1d82c

data/bin/mccabe

@@ -2,7 +2,6 @@
 
 require 'mccabe/analyzer'
 require 'mccabe/cli'
-require 'mccabe/parser'
 
 options = McCabe::CLI.new.parse!(ARGV)
 
@@ -12,12 +11,11 @@ if ARGV.empty?
 end
 
 results = McCabe::CLI.get_all_files(ARGV).map do |file|
-  file_results = McCabe::Analyzer.analyze(McCabe::Parser.parse(File.read(file)))
-  file_results.keep_if { |method, info| info[:complexity] > options[:threshold] }
-  unless options[:quiet]
-    McCabe::CLI.display_results(file_results) unless file_results.empty?
-  end
-  file_results
-end
+  methods = McCabe::Analyzer.analyze(file)
+  methods.keep_if { |m| m.complexity > options[:threshold] }
+end.flatten
+
+options[:sort] && results.sort_by! { |m| -m.complexity }
+options[:quiet] || McCabe::CLI.display_results(results)
 
 exit 1 unless results.flatten.empty?

data/lib/mccabe/analyzer.rb

@@ -1,3 +1,4 @@
+require 'mccabe/analyzer/method_info'
 require 'mccabe/parser'
 
 module McCabe
@@ -5,12 +6,17 @@ module McCabe
     BRANCH_TYPES = [:if, :while, :until, :for, :when, :and, :or]
     ENUMERABLE_METHODS = Enumerable.instance_methods + [:each]
 
-    def self.analyze(ast)
+    def self.analyze(file)
+      ast = McCabe::Parser.parse(File.read(file))
       results = {}
-      McCabe::Parser.collect_methods(ast).each do |name, method|
-        results[name] = {line: method[:line], complexity: complexity(method[:body])}
+      McCabe::Parser.collect_methods(ast).map do |name, method_ast|
+        MethodInfo.new(
+          name,
+          complexity(method_ast[:body]),
+          file,
+          method_ast[:line]
+        )
       end
-      results
     end
 
     def self.complexity(ast)

data/lib/mccabe/analyzer/method_info.rb

@@ -0,0 +1,18 @@
+module McCabe
+  class Analyzer
+    class MethodInfo
+      attr_reader :complexity
+
+      def initialize(name, complexity, file, line)
+        @name = name
+        @complexity = complexity
+        @file = file
+        @line = line
+      end
+
+      def to_s
+        "#{@name} (#{@file}:#{@line}) #{@complexity}"
+      end
+    end
+  end
+end

data/lib/mccabe/cli.rb

@@ -6,14 +6,13 @@ module McCabe
   class CLI
     DEFAULT_OPTIONS = {
       threshold: 4,
-      quiet: false
+      quiet: false,
+      sort: false,
     }
 
     # Print out the results of a file to the console.
     def self.display_results(file_results)
-      file_results.each do |method, info|
-        puts "\t#{method} (line #{info[:line]}) had a complexity of #{info[:complexity]}"
-      end
+      file_results.each { |method_info| puts method_info.to_s }
     end
 
     # Get all files recursively.
@@ -53,6 +52,10 @@ module McCabe
           options[:threshold] = t.to_i
         end
 
+        option_parser.on '--sort' do |s|
+          options[:sort] = s
+        end
+
         option_parser.on '--quiet', "No output to stdout. Exit code only (1 for failure)." do |q|
           options[:quiet] = q
         end

data/lib/mccabe/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mccabe
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrew Mason
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -71,6 +71,7 @@ files:
 - bin/setup
 - lib/mccabe.rb
 - lib/mccabe/analyzer.rb
+- lib/mccabe/analyzer/method_info.rb
 - lib/mccabe/cli.rb
 - lib/mccabe/parser.rb
 - lib/mccabe/version.rb