flay 2.0.1 → 2.1.0

data.tar.gz.sig

@@ -1,2 +1,4 @@
-��  �v��{/ڃ*G��X��޺���kF��	m�&(�EA�
-����%~��su���L0Z\����}yZb��.�eS��Ҿ��
+;}����/��ѥ�X��~���b2����8.�Mz��6g[�Z��>�[KULb|«f�&֞�o&�r�#Ĥ
+Yh>5����Y��3�Q��y�fr
+��"����{F����qU�0�z�B�M�h��jF��EQ��|�ߤ1�6(��4Q9�?3z��\�J���\)`�i��aGUF����A��ۤ0�C�<�<
+���c�

data/History.txt

@@ -1,3 +1,13 @@
+=== 2.1.0 / 2013-02-13
+
+* 5 minor enhancements:
+
+  * Added --timeout option. Defaults to 10 seconds.
+  * Added ability for plugins to define options_<pluginname> method to extend options.
+  * Flay no longer defaults to '.' if no args given. Allows plugins to do more
+  * Moved #analyze down to #report. #process only processes, nothing more.
+  * Sort output for more stable reporting. Better for diffing against, my dear.
+
 === 2.0.1 / 2012-12-18
 
 * 2 bug fixes:

data/bin/flay

@@ -4,7 +4,6 @@ require 'flay'
 
 flay = Flay.new Flay.parse_options
 
-ARGV << '.' if ARGV.empty?
 files = Flay.expand_dirs_to_files(*ARGV)
 
 flay.process(*files)

data/lib/flay.rb

@@ -15,7 +15,7 @@ class File
 end
 
 class Flay
-  VERSION = '2.0.1'
+  VERSION = '2.1.0'
 
   def self.default_options
     {
@@ -23,10 +23,11 @@ class Flay
       :mass    => 16,
       :summary => false,
       :verbose => false,
+      :timeout => 10,
     }
   end
 
-  def self.parse_options
+  def self.parse_options args = ARGV
     options = self.default_options
 
     OptionParser.new do |opts|
@@ -46,7 +47,8 @@ class Flay
         abort "--fuzzy is no longer supported. Sorry. It sucked."
       end
 
-      opts.on('-m', '--mass MASS', Integer, "Sets mass threshold") do |m|
+      opts.on('-m', '--mass MASS', Integer,
+              "Sets mass threshold (default = #{options[:mass]})") do |m|
         options[:mass] = m.to_i
       end
 
@@ -62,13 +64,23 @@ class Flay
         options[:summary] = true
       end
 
+      opts.on('-t', '--timeout TIME', Integer,
+              "Set the timeout. (default = #{options[:timeout]})") do |t|
+        options[:timeout] = t.to_i
+      end
+
       extensions = ['rb'] + Flay.load_plugins
 
       opts.separator ""
       opts.separator "Known extensions: #{extensions.join(', ')}"
 
+      extensions.each do |meth|
+        msg = "options_#{meth}"
+        send msg, opts, options if self.respond_to?(msg)
+      end
+
       begin
-        opts.parse!
+        opts.parse! args
       rescue => e
         abort "#{e}\n\n#{opts}"
       end
@@ -155,8 +167,6 @@ class Flay
         warn "  skipping #{file}: #{e.message}"
       end
     end
-
-    analyze
   end
 
   def analyze
@@ -172,7 +182,7 @@ class Flay
 
   def process_rb file
     begin
-      RubyParser.new.process(File.binread(file), file)
+      RubyParser.new.process(File.binread(file), file, option[:timeout])
     rescue Timeout::Error
       warn "TIMEOUT parsing #{file}. Skipping."
     end
@@ -251,6 +261,8 @@ class Flay
   end
 
   def report prune = nil
+    analyze
+
     puts "Total score (lower is better) = #{self.total}"
     puts
 
@@ -282,7 +294,7 @@ class Flay
       puts "%d) %s code found in %p (mass%s = %d)" %
         [count, match, node.first, bonus, mass]
 
-      nodes.each_with_index do |x, i|
+      nodes.sort_by { |x| [x.file, x.line] }.each_with_index do |x, i|
         if option[:diff] then
           c = (?A.ord + i).chr
           puts "  #{c}: #{x.file}:#{x.line}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flay
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 2
-  - 0
   - 1
-  version: 2.0.1
+  - 0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-12-19 00:00:00 Z
+date: 2013-02-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
@@ -76,11 +76,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 23
         segments: 
         - 4
-        - 3
-        version: "4.3"
+        - 6
+        version: "4.6"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -106,11 +106,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 13
         segments: 
         - 3
-        - 4
-        version: "3.4"
+        - 5
+        version: "3.5"
   type: :development
   version_requirements: *id005
 description: |-
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Flay analyzes code for structural similarities