flay 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1c0f1551528a45340225c5bd74349a396bba865
-  data.tar.gz: 8f2fcda92e948267073c31a4aa3cbddc044cd83e
+  metadata.gz: 83938e425e7da6168fc862af2d5ecaa7f8c3cfc4
+  data.tar.gz: 0cecc5f44a897b0695ac0f638aee67535dedcff7
 SHA512:
-  metadata.gz: a81499c489c9d49cf066a4feef7bf5bb834850b74623de8539ee4dea339b543d3afe52097546f35888038a0637be4da32704b000b45b91dbadfd541ba9bf46fb
-  data.tar.gz: 4c96b08538b1b54866df0ca31a17e5963233fd2965f1f6c8a4ad9cf0792eceadf3ec428b4a8a8783a4a133194fab23dd82c2d7ad9284a6dbc25c395a667c0b6f
+  metadata.gz: 233071084997a9e3a585704098514fb245590987aa0ec9f8317e4defe0555c1196b83e6646e73eb9607f2b5923c94d608f88c8635494285a7a50f92b4fca4c05
+  data.tar.gz: ede337e5a5968d0d8097d2a14f1eb42d58ef63f9cbeccdeaee57ae23a4a54e50753dc445ba1fbd7c751ffae426b8ab2b771f21565ce4521b0ab648f04c3b26a5

data/History.txt

@@ -1,3 +1,14 @@
+=== 2.8.0 / 2016-05-16
+
+* 1 minor enhancement:
+
+  * Switched to path_expander to deal with cmdline args. See path_expander for details.
+
+* 2 bug fixes:
+
+  * Added dev deps and bundler plugin to make flavorjones happy. (flavorjones)
+  * Explictly require rake/tasklib in flay_task.rb. (jasonkarns)
+
 === 2.7.0 / 2016-01-21
 
 * 1 minor enhancement:

data/README.txt

@@ -25,6 +25,10 @@ braces vs do/end, etc are all ignored. Making this totally rad.
   * Ships with .rb and .erb.
   * javascript and others will be available separately.
 * Includes FlayTask for Rakefiles.
+* Uses path_expander, so you can use:
+  * dir_arg -- expand a directory automatically
+  * @file_of_args -- persist arguments in a file
+  * -path_to_subtract -- ignore intersecting subsets of files/directories
 * Skips files matched via patterns in .flayignore (subset format of .gitignore).
 * Totally rad.
 
@@ -86,6 +90,7 @@ braces vs do/end, etc are all ignored. Making this totally rad.
 
 * ruby_parser
 * sexp_processor
+* path_expander
 * ruby2ruby -- soft dependency: only if you want to use --diff
 
 == INSTALL:

data/Rakefile

@@ -7,10 +7,12 @@ Hoe::add_include_dirs("../../sexp_processor/dev/lib",
                       "../../ruby_parser/dev/lib",
                       "../../ruby2ruby/dev/lib",
                       "../../ZenTest/dev/lib",
+                      "../../path_expander/dev/lib",
                       "lib")
 
 Hoe.plugin :seattlerb
 Hoe.plugin :isolate
+Hoe.plugin :bundler
 
 Hoe.spec "flay" do
   developer "Ryan Davis", "ryand-ruby@zenspider.com"
@@ -19,6 +21,10 @@ Hoe.spec "flay" do
   dependency "sexp_processor", "~> 4.0"
   dependency "ruby_parser",    "~> 3.0"
   dependency "erubis",         "~> 2.7.0"
+  dependency "path_expander",  "~> 1.0"
+
+  dependency "minitest",       "~> 5.8.0", :dev
+  dependency "ruby2ruby",      "~> 2.2.0", :dev
 
   self.flay_threshold = 250
 end
@@ -27,30 +33,14 @@ task :debug => :isolate do
   require "flay"
 
   file = ENV["F"]
-  mass = ENV["M"]
-  diff = ENV["D"]
-  libr = ENV["L"]
-  ver  = ENV["V"]
-
-  opts = Flay.parse_options
-  opts[:mass] = mass.to_i if mass
-  opts[:diff] = diff.to_i if diff
-  opts[:liberal] = true if libr
-  opts[:verbose] = true if ver
-
-  flay = Flay.new opts
-  flay.process(*Flay.expand_dirs_to_files(file))
-  flay.report
-end
-
-task :run do
-  file = ENV["F"]
-  fuzz = ENV["Z"] && "-f #{ENV["Z"]}"
-  mass = ENV["M"] && "-m #{ENV["M"]}"
-  diff = ENV["D"] && "-d"
-  libr = ENV["L"] && "-l"
+  fuzz = ENV["Z"] && ["-f", ENV["Z"]]
+  mass = ENV["M"] && ["-m", ENV["M"]]
+  diff = ENV["D"] && ["-d"]
+  libr = ENV["L"] && ["-l"]
+  ver  = ENV["V"] && ["-v"]
 
-  ruby "#{Hoe::RUBY_FLAGS} bin/flay #{mass} #{fuzz} #{diff} #{libr} #{file}"
+  flay = Flay.run [mass, fuzz, diff, libr, file, ver].flatten.compact
+  flay.report
 end
 
 # vim: syntax=ruby

data/bin/flay

@@ -2,9 +2,4 @@
 
 require 'flay'
 
-flay = Flay.new Flay.parse_options
-
-files = Flay.filter_files Flay.expand_dirs_to_files(*ARGV)
-
-flay.process(*files)
-flay.report
+Flay.run.report

data/lib/flay.rb

@@ -4,6 +4,7 @@ require "optparse"
 require "rubygems"
 require "sexp_processor"
 require "ruby_parser"
+require "path_expander"
 require "timeout"
 
 class File
@@ -15,7 +16,7 @@ class File
 end
 
 class Flay
-  VERSION = "2.7.0" # :nodoc:
+  VERSION = "2.8.0" # :nodoc:
 
   class Item < Struct.new(:structural_hash, :name, :bonus, :mass, :locations)
     alias identical? bonus
@@ -25,6 +26,18 @@ class Flay
     alias fuzzy? fuzzy
   end
 
+  def self.run args = ARGV
+    extensions = ["rb"] + Flay.load_plugins
+    glob = "**/*.{#{extensions.join ","}}"
+
+    expander = PathExpander.new args, glob
+    files = expander.filter_files expander.process, DEFAULT_IGNORE
+
+    flay = Flay.new Flay.parse_options args
+    flay.process(*files)
+    flay
+  end
+
   ##
   # Returns the default options.
 
@@ -120,59 +133,9 @@ class Flay
     options
   end
 
-  ##
-  # Expands +*dirs+ to all files within that match ruby and rake extensions.
-  # --
-  # REFACTOR: from flog
-
-  def self.expand_dirs_to_files *dirs
-    extensions = ["rb"] + Flay.load_plugins
-
-    dirs.flatten.map { |p|
-      if File.directory? p then
-        Dir[File.join(p, "**", "*.{#{extensions.join(",")}}")]
-      else
-        p
-      end
-    }.flatten.map { |s| s.sub(/^\.\//, "") } # strip "./" from paths
-  end
-
   # so I can move this to flog wholesale
   DEFAULT_IGNORE = ".flayignore" # :nodoc:
 
-  ##
-  # A file filter mechanism similar to, but not as extensive as,
-  # .gitignore files:
-  #
-  # + If a pattern does not contain a slash, it is treated as a shell glob.
-  # + If a pattern ends in a slash, it matches on directories (and contents).
-  # + Otherwise, it matches on relative paths.
-  #
-  # File.fnmatch is used throughout, so glob patterns work for all 3 types.
-
-  def self.filter_files files, ignore = DEFAULT_IGNORE
-    ignore_paths = if ignore.respond_to? :read then
-                     ignore.read
-                   elsif File.exists? ignore then
-                     File.read ignore
-                   end
-
-    if ignore_paths then
-      nonglobs, globs = ignore_paths.split("\n").partition { |p| p.include? "/" }
-      dirs, ifiles    = nonglobs.partition { |p| p.end_with? "/" }
-      dirs            = dirs.map { |s| s.chomp "/" }
-
-      only_paths = File::FNM_PATHNAME
-      files = files.reject { |f|
-        dirs.any?     { |i| File.fnmatch?(i, File.dirname(f), only_paths) } ||
-          globs.any?  { |i| File.fnmatch?(i, f) } ||
-          ifiles.any? { |i| File.fnmatch?(i, f, only_paths) }
-      }
-    end
-
-    files
-  end
-
   ##
   # Loads all flay plugins. Files must be named "flay_*.rb".
 

data/lib/flay_task.rb

@@ -1,3 +1,5 @@
+require 'rake/tasklib'
+
 class FlayTask < Rake::TaskLib
   ##
   # The name of the task. Defaults to :flay
@@ -42,10 +44,7 @@ class FlayTask < Rake::TaskLib
   def define
     desc "Analyze for code duplication in: #{dirs.join(", ")}"
     task name do
-      require "flay"
-      flay = Flay.new
-      files = Flay.filter_files Flay.expand_dirs_to_files dirs
-      flay.process(*files)
+      flay = Flay.run
       flay.report if verbose
 
       raise "Flay total too high! #{flay.total} > #{threshold}" if

data/lib/gauntlet_flay.rb

@@ -78,13 +78,9 @@ class FlayGauntlet < Gauntlet
   ############################################################
 
   def score_for dir
-    # files = `find #{dir} -name \\*.rb | grep -v gen.*templ`.split(/\n/)
-    flayer = Flay.new
-
     dirs = %w(app lib test spec).reject { |f| ! File.directory? f }
 
-    flay = Flay.new
-    flay.process(*Flay.expand_dirs_to_files(dirs))
+    flay = Flay.run dirs
     flay.total
   rescue Interrupt
     # let us break out

data/test/test_flay.rb

@@ -436,52 +436,4 @@ class TestSexp < Minitest::Test
 
     assert_equal exp, flay.n_way_diff(*dog_and_cat).gsub(/^ {3}$/, "")
   end
-
-  def test_cls_expand_dirs_to_files
-    Dir.mktmpdir do |dir|
-      Dir.chdir dir do
-        FileUtils.touch "dog_and_cat.rb"
-
-        files = Flay.expand_dirs_to_files "."
-        assert_equal %w[dog_and_cat.rb], files
-      end
-    end
-  end
-
-  def assert_filter_files exp, filter, files = %w[test/dog_and_cat.rb]
-    ignore = StringIO.new filter
-    act = Flay.filter_files files, ignore
-    assert_equal exp, act
-  end
-
-  def test_cls_filter_files_dir
-    assert_filter_files [], "test/"
-  end
-
-  def test_cls_filter_files_files
-    assert_filter_files [], "test/*.rb"
-
-    example = %w[test/file.rb test/sub/file.rb top/test/perf.rb]
-
-    assert_filter_files example[1..-1], "test/*.rb", example
-  end
-
-  def test_cls_filter_files_glob
-    assert_filter_files [], "test*"
-    assert_filter_files [], "test*", ["test/lib/woot.rb"]
-    assert_filter_files [], "*.rb"
-    assert_filter_files [], "*dog*.rb"
-  end
-
-  def test_cls_filter_files_glob_miss
-    miss = %w[test/dog_and_cat.rb]
-    assert_filter_files miss, "test"
-    assert_filter_files miss, "nope"
-  end
-
-  def test_expand_dirs_on_frozen_string
-    s = "./foo"
-    s.freeze
-    assert_equal Flay.expand_dirs_to_files([s]), ["foo"]
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flay
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   qx3h45R1CAsObX0SQDIT+rRbQrtKz1GHIZTOFYvEJjUY1XmRTZupD3CJ8Q7sDqSy
   NLq5jm1fq6Y9Uolu3RJbmycf
   -----END CERTIFICATE-----
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -74,19 +74,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.7.0
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: path_expander
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.8'
-  type: :development
+        version: '1.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -101,20 +101,48 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.8.0
+- !ruby/object:Gem::Dependency
+  name: ruby2ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.15'
 description: |-
   Flay analyzes code for structural similarities. Differences in literal
   values, variable, class, method names, whitespace, programming style,