flay 2.12.1 → 2.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82b6642b1277bcd3a44da4c3ce4b5e72fa4432f7660a3d497d933ca4c2950556
-  data.tar.gz: c865cbbdf68e0183bbf3fb6a1ff6188651034634398364aac77c4eed451384c3
+  metadata.gz: f398ea8e7f796a1871faedb32dbee7d7377d30abcc91edd075f2015a6be95c74
+  data.tar.gz: cdb49c908285be2c5c40118a33e7d0227e4a32a4b31736b374aaf31a43e58ac6
 SHA512:
-  metadata.gz: 5ed7081512167da74c114acbd37098f1b6ff01a0521c2f400408da1243441030e6d342d7e34b400702eb74cf97a66879bd5b276339564c83582f1105c624fe15
-  data.tar.gz: c57fdc2be2bb6c85523fa4e895fc6cbe04ffd158a17a0d946768950dec545653a132ccdfa9ab51c25502a66076f7a7e8f45ba78dafc921995b175aabe22f1531
+  metadata.gz: 9c7f5b54202e563702d21ee8006d24124dd7810bb3518ae307a1eba17966a042864af2c0b772df9deab11517a8a6268159e5503d6fe70845722ef3544b7b84a9
+  data.tar.gz: 301d1e56ecfd1c12e8d41e826e56c44899598712aec55daac4ba55f74df547e5421250c3ea8dace955edaeacacd0a513c4a3e888f83aa47fddcfe340fb49c9b2

data/History.rdoc

@@ -1,3 +1,32 @@
+=== 2.13.3 / 2024-05-21
+
+* 2 bug fixes:
+
+  * Add secondary sort of score & files on output. (njhammond)
+  * Sort input files to make tracking progress easier.
+
+=== 2.13.2 / 2024-02-05
+
+* 1 bug fix:
+
+  * Pass dirs to Flay.run in FlayTask. (adam12)
+
+=== 2.13.1 / 2023-07-20
+
+* 1 minor enhancement:
+
+  * Brought in action_view erubi hacks to enable block calls w/ <%= forms.
+
+=== 2.13.0 / 2022-04-09
+
+* 1 minor enhancement:
+
+  * Switched from erubis to erubi for erb processing. (clive-devops)
+
+* 1 bug fix:
+
+  * Minor cleanup and top-level error handling changes.
+
 === 2.12.1 / 2019-10-08
 
 * 1 bug fix:

data/Rakefile

@@ -21,7 +21,7 @@ Hoe.spec "flay" do
 
   dependency "sexp_processor", "~> 4.0"
   dependency "ruby_parser",    "~> 3.0"
-  dependency "erubis",         "~> 2.7.0"
+  dependency "erubi",          "~> 1.10"
   dependency "path_expander",  "~> 1.0"
 
   dependency "minitest",       "~> 5.8.0", :dev

data/lib/flay.rb

@@ -1,23 +1,14 @@
 #!/usr/bin/env ruby -w
 
 require "optparse"
-require "rubygems"
 require "sexp_processor"
 require "ruby_parser"
 require "path_expander"
 require "timeout"
 require "zlib"
 
-class File
-  RUBY19 = "<3".respond_to? :encoding unless defined? RUBY19 # :nodoc:
-
-  class << self
-    alias :binread :read unless RUBY19
-  end
-end
-
 class Flay
-  VERSION = "2.12.1" # :nodoc:
+  VERSION = "2.13.3" # :nodoc:
 
   class Item < Struct.new(:structural_hash, :name, :bonus, :mass, :locations)
     alias identical? bonus
@@ -35,7 +26,7 @@ class Flay
     files = expander.filter_files expander.process, DEFAULT_IGNORE
 
     flay = Flay.new Flay.parse_options args
-    flay.process(*files)
+    flay.process(*files.sort)
     flay
   end
 
@@ -159,8 +150,8 @@ class Flay
       end
     end
     @@plugins
-  rescue
-    # ignore
+  rescue => e
+    warn "Error loading plugins: #{e}" if option[:verbose]
   end
 
   # :stopdoc:
@@ -493,7 +484,7 @@ class Flay
     if option[:summary] then
       io.puts
 
-      self.summary.sort_by { |_,v| -v }.each do |file, score|
+      self.summary.sort_by { |f,v| [-v, f] }.each do |file, score|
         io.puts "%8.2f: %s" % [score, file]
       end
 

data/lib/flay_erb.rb

@@ -1,8 +1,5 @@
-#!/usr/bin/ruby
-
-require "rubygems"
 require "flay"
-require "erubis"
+require "erubi"
 
 class Flay
 
@@ -13,7 +10,8 @@ class Flay
   def process_erb file
     erb = File.read file
 
-    ruby = Erubis.new(erb).src
+    ruby = Erubi.new(erb).src
+
     begin
       RubyParser.new.process(ruby, file)
     rescue => e
@@ -22,22 +20,67 @@ class Flay
     end
   end
 
-  class Erubis < ::Erubis::Eruby # :nodoc:
-    BLOCK_EXPR = /\s+(do|\{)(\s*\|[^|]*\|)?\s*\Z/
+  # stolen (and munged) from lib/action_view/template/handlers/erb/erubi.rb
+  # this is also in the debride-erb gem, update both!
+  class Erubi < ::Erubi::Engine
+    # :nodoc: all
+    def initialize(input, properties = {})
+      @newline_pending = 0
+
+      properties[:postamble]  = "_buf.to_s"
+      properties[:bufvar]     = "_buf"
+      properties[:freeze_template_literals] = false
+
+      super
+    end
+
+    def add_text(text)
+      return if text.empty?
 
-    def add_expr_literal(src, code)
-      if code =~ BLOCK_EXPR
-        src << '@output_buffer.append= ' << code
+      if text == "\n"
+        @newline_pending += 1
       else
-        src << '@output_buffer.append=(' << code << ');'
+        src << "_buf.safe_append='"
+        src << "\n" * @newline_pending if @newline_pending > 0
+        src << text.gsub(/['\\]/, '\\\\\&')
+        src << "';"
+
+        @newline_pending = 0
       end
     end
 
-    def add_expr_escaped(src, code)
-      if code =~ BLOCK_EXPR
-        src << "@output_buffer.safe_append= " << code
+    BLOCK_EXPR = /\s*((\s+|\))do|\{)(\s*\|[^|]*\|)?\s*\Z/
+
+    def add_expression(indicator, code)
+      flush_newline_if_pending(src)
+
+      if (indicator == "==") || @escape
+        src << "_buf.safe_expr_append="
       else
-        src << "@output_buffer.safe_append=(" << code << ");"
+        src << "_buf.append="
+      end
+
+      if BLOCK_EXPR.match?(code)
+        src << " " << code
+      else
+        src << "(" << code << ");"
+      end
+    end
+
+    def add_code(code)
+      flush_newline_if_pending(src)
+      super
+    end
+
+    def add_postamble(_)
+      flush_newline_if_pending(src)
+      super
+    end
+
+    def flush_newline_if_pending(src)
+      if @newline_pending > 0
+        src << "_buf.safe_append='#{"\n" * @newline_pending}';"
+        @newline_pending = 0
       end
     end
   end

data/lib/flay_task.rb

@@ -45,7 +45,7 @@ class FlayTask < Rake::TaskLib
     desc "Analyze for code duplication in: #{dirs.join(", ")}"
     task name do
       require "flay"
-      flay = Flay.run
+      flay = Flay.run(dirs)
       flay.report if verbose
 
       raise "Flay total too high! #{flay.total} > #{threshold}" if

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: flay
 version: !ruby/object:Gem::Version
-  version: 2.12.1
+  version: 2.13.3
 platform: ruby
 authors:
 - Ryan Davis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAzANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBCDANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE4MTIwNDIxMzAxNFoXDTE5MTIwNDIxMzAxNFowRTETMBEGA1UE
+  GRYDY29tMB4XDTI0MDEwMjIxMjEyM1oXDTI1MDEwMTIxMjEyM1owRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +22,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQCbJwLmpJR2PomLU+Zzw3KRzH/hbyUWc/ftru71AopZ1fy4iY9J/BW5QYKVYwbP
-  V0FSBWtvfI/RdwfKGtuGhPKECZgmLieGuZ3XCc09qPu1bdg7i/tu1p0t0c6163ku
-  nDMDIC/t/DAFK0TY9I3HswuyZGbLW7rgF0DmiuZdN/RPhHq2pOLMLXJmFclCb/im
-  9yToml/06TJdUJ5p64mkBs0TzaK66DIB1Smd3PdtfZqoRV+EwaXMdx0Hb3zdR1JR
-  Em82dBUFsipwMLCYj39kcyHWAxyl6Ae1Cn9r/ItVBCxoeFdrHjfavnrIEoXUt4bU
-  UfBugfLD19bu3nvL+zTAGx/U
+  AQCygvpmncmkiSs9r/Kceo4bBPDszhTv6iBi4LwMReqnFrpNLMOWJw7xi8x+3eL2
+  XS09ZPNOt2zm70KmFouBMgOysnDY4k2dE8uF6B8JbZOO8QfalW+CoNBliefOTcn2
+  bg5IOP7UoGM5lC174/cbDJrJnRG9bzig5FAP0mvsgA8zgTRXQzIUAZEo92D5K7p4
+  B4/O998ho6BSOgYBI9Yk1ttdCtti6Y+8N9+fZESsjtWMykA+WXWeGUScHqiU+gH8
+  S7043fq9EbQdBr2AXdj92+CDwuTfHI6/Hj5FVBDULufrJaan4xUgL70Hvc6pTTeW
+  deKfBjgVAq7EYHu1AczzlUly
   -----END CERTIFICATE-----
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2024-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -60,19 +60,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: erubi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: path_expander
   requirement: !ruby/object:Gem::Requirement
@@ -141,14 +141,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.18'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.18'
+        version: '4.2'
 description: |-
   Flay analyzes code for structural similarities. Differences in literal
   values, variable, class, method names, whitespace, programming style,
@@ -176,8 +176,10 @@ files:
 homepage: http://ruby.sadi.st/
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: http://ruby.sadi.st/
+  source_code_uri: https://github.com/seattlerb/flay
+post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -194,8 +196,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Flay analyzes code for structural similarities
 test_files: []