flog 2.1.2 → 2.2.0

data/History.txt

@@ -1,3 +1,17 @@
+=== 2.2.0 / 2009-08-14
+
+* 1 minor enhancement:
+
+  * #mass pushed up to sexp_processor
+
+* 5 bug fixes:
+
+  * --group didn't use canonical class name.
+  * Fixed bin/flog to use flog, not flog_files (removed in last rev)
+  * Fixed crasher when processing a block with empty goalposts.
+  * Switching to ruby_parser broke ERB syntax error handling. (imccoy)
+  * skip empty files instead of crashing. yay?
+
 === 2.1.2 / 2009-06-24
 
 * 1 bug fix:

data/bin/flog

@@ -8,7 +8,7 @@ options = Flog.parse_options
 ARGV << "-" if ARGV.empty?
 
 flogger = Flog.new options
-flogger.flog_files ARGV
+flogger.flog ARGV
 flogger.report
 
 exit 0

data/lib/flog.rb

@@ -3,15 +3,8 @@ require 'sexp_processor'
 require 'ruby_parser'
 require 'optparse'
 
-# REFACTOR: push up to sexp_processor. also in flay
-class Sexp
-  def mass
-    @mass ||= self.structure.flatten.size
-  end
-end
-
 class Flog < SexpProcessor
-  VERSION = '2.1.2'
+  VERSION = '2.2.0'
 
   THRESHOLD = 0.60
   SCORES = Hash.new 1
@@ -181,10 +174,11 @@ class Flog < SexpProcessor
         warn "** flogging #{file}" if options[:verbose]
 
         ast = @parser.process(ruby, file)
+        next unless ast
         mass[file] = ast.mass
         process ast
       rescue SyntaxError, Racc::ParseError => e
-        if e.inspect =~ /<%|%>/ then
+        if e.inspect =~ /<%|%>/ or ruby =~ /<%|%>/ then
           warn "#{e.inspect} at #{e.backtrace.first(5).join(', ')}"
           warn "\n...stupid lemmings and their bad erb templates... skipping"
         else
@@ -267,7 +261,7 @@ class Flog < SexpProcessor
       methods = Hash.new { |h,k| h[k] = [] }
 
       calls.sort_by { |k,v| -my_totals[k] }.each do |class_method, call_list|
-        klass = class_method.split(/#|::/).first
+        klass = class_method.split(/#/).first
         score = totals[class_method]
         methods[klass] << [class_method, score]
         scores[klass] += score
@@ -546,7 +540,8 @@ class Flog < SexpProcessor
 
     add_to_score :branch
 
-    exp.pop if exp.last == 0
+    exp.delete 0
+
     process exp.shift # no penalty for LHS
 
     penalize_by 0.1 do

metadata

@@ -1,36 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: flog
 version: !ruby/object:Gem::Version 
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors: 
 - Ryan Davis
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBADANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
-  ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTA5MDMwNjE4NTMxNVoXDTEwMDMwNjE4NTMxNVowRTETMBEGA1UE
-  AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
-  JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
-  b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
-  taCPaLmfYIaFcHHCSY4hYDJijRQkLxPeB3xbOfzfLoBDbjvx5JxgJxUjmGa7xhcT
-  oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
-  GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
-  qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
-  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQAY59gYvDxqSqgC92nAP9P8dnGgfZgLxP237xS6XxFGJSghdz/nI6pusfCWKM8m
-  vzjjH2wUMSSf3tNudQ3rCGLf2epkcU13/rguI88wO6MrE0wi4ZqLQX+eZQFskJb/
-  w6x9W1ur8eR01s397LSMexySDBrJOh34cm2AlfKr/jokKCTwcM0OvVZnAutaovC0
-  l1SVZ0ecg88bsWHA0Yhh7NFxK1utWoIhtB6AFC/+trM0FQEB/jZkIS8SaNzn96Rl
-  n0sZEf77FLf5peR8TP/PtmIg7Cyqz23sLM4mCOoTGIy5OcZ8TdyiyINUHtb5ej/T
-  FBHgymkyj/AOSqKRIpXPhjC6
-  -----END CERTIFICATE-----
+cert_chain: []
 
-date: 2009-06-24 00:00:00 -07:00
+date: 2009-08-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.0
+        version: 2.3.3
     version: 
 description: |-
   Flog reports the most tortured code in an easy to read pain
@@ -128,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Flog reports the most tortured code in an easy to read pain report

data.tar.gz.sig

@@ -1,2 +0,0 @@
-�?�`�ɡ�b�kT�X8��v������Ί=\0K����kWnj���;���.��5�������b
���dAŦ1
-�
�Q�@�k�`	z���D��j�Vfe�^'�Xd��yl�$1"�����0,F�����o"\����˗�ӜU�5

metadata.gz.sig

@@ -1,3 +0,0 @@
-0|�Rn���9��3x���@��p�%R�
-��u�^��R�6c���Ml��#�M�tF�:L�X�(�1������ow.G�!i
-�J%
e3a8&�t