debride 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 940626014070c225b026dfb66c2447942dc3b3e1
-  data.tar.gz: bae7f08f057b29e7045d1641b6ee69466127e0c5
+  metadata.gz: 82b0f1e06d3647db71770771357949a6b602f2eb
+  data.tar.gz: b8dd7fb4af36fd5742baef9a041763aed58e5ccb
 SHA512:
-  metadata.gz: 78711d1f9bb7e3076fd4c8d0513fa15636039b76efbe8a92616fd50ff2b4f224e1c38ad5a75d15704e8151866fa1807a83cf6af8dd50c9a802a61af9b6b4b521
-  data.tar.gz: 6fabb380cc55ff7b23d1cb8e1da189ac1ff2187bffb7f23fc1e3a19f6f0f1f6016b68de6f4cbdc4138c8c79791b8049238412fa17b08c18fcfa9e2817f639809
+  metadata.gz: 24628c05032af7f7f86dcd53ee0f67d73061b80d94c291d794edb3731e9cc2c9e697918d7ee5818358d26b5e13b0082e15e44cf2174bd3fc3c5def8b71aa42d3
+  data.tar.gz: 38725e26ec1f5b696c9f02299e7625e40d009c813cde75a3c634ead60f85d0343310589d0478c618ea4aa038d9ce165605abb9551d0c397bc63965641b0b26a0

data/History.rdoc

@@ -1,3 +1,13 @@
+=== 1.6.0 / 2016-05-15
+
+* 1 minor enhancement:
+
+  * Switched to path_expander to deal with cmdline args. See path_expander for details.
+
+* 1 bug fix:
+
+  * Fixed confusing crasher when a plugin raises an exception. (phiggins)
+
 === 1.5.1 / 2015-08-10
 
 * 1 bug fix:

data/README.rdoc

@@ -14,6 +14,10 @@ Analyze code for potentially uncalled / dead methods.
 * Whitelisting known good methods by name or regexp.
 * Use --rails for Rails-specific domain knowledge.
 * Use `debride_rails_whitelist` to generate an emperical whitelist from logs.
+* 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
 
 == SYNOPSIS:
 
@@ -44,10 +48,13 @@ You can also use regexps in your whitelist by delimiting them with //'s.
 
 debride-erb  :: Extends debride to analyze erb files (via erubis ala rails).
 debride-haml :: Plugin to allow debride to parse Haml files.
+debride-curly :: A plugin for the Curly templating language
 
 == REQUIREMENTS:
 
-* ruby 1.8+
+* sexp_processor
+* ruby_parser
+* path_expander
 
 == INSTALL:
 

data/Rakefile

@@ -3,6 +3,13 @@
 require "rubygems"
 require "hoe"
 
+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 :isolate
 Hoe.plugin :seattlerb
 Hoe.plugin :rdoc
@@ -13,26 +20,36 @@ Hoe.spec "debride" do
 
   dependency "sexp_processor", "~> 4.5"
   dependency "ruby_parser", "~> 3.6"
+  dependency "path_expander",  "~> 1.0"
 end
 
-def run dir, wl
+def run dir, whitelist
+  abort "Specify dir to scan with D=<path>" unless dir
+
   ENV["GEM_HOME"] = "tmp/isolate/ruby-2.0.0"
   ENV["GEM_PATH"] = "../../debride-erb/dev/tmp/isolate/ruby-2.0.0"
-  verbose = ENV["V"] ? "-v" : ""
 
-  abort "Specify dir to scan with D=<path>" unless dir
-  wl = "--whitelist #{wl}" if wl
+  whitelist = whitelist && ["--whitelist", whitelist]
+  verbose   = ENV["V"]  && "-v"
+
+  require "debride"
 
-  ruby "-Ilib:../../debride-erb/dev/lib bin/debride --rails #{verbose} #{dir} #{wl}"
+  args = ["--rails", verbose, whitelist, dir].flatten.compact
+
+  Debride.run(args).report
 end
 
-task :run do
+task :run => :isolate do
   run ENV["D"], ENV["W"]
 end
 
-task :rails do
-  d = "~/Work/git/seattlerb.org"
-  run "#{d}/{app,lib,config}", "#{d}/whitelist.txt"
+task :rails => :isolate do
+  ENV["GEM_HOME"] = "tmp/isolate/ruby-2.0.0"
+  ENV["GEM_PATH"] = "../../debride-erb/dev/tmp/isolate/ruby-2.0.0"
+
+  d = File.expand_path "~/Work/git/seattlerb.org"
+
+  run d, "#{d}/whitelist.txt"
 end
 
 task :debug do

data/lib/debride.rb

@@ -1,9 +1,12 @@
 #!/usr/bin/ruby -w
 
-require "ruby_parser"
-require "sexp_processor"
 require "optparse"
 require "set"
+require "stringio"
+
+require "ruby_parser"
+require "sexp_processor"
+require "path_expander"
 
 # :stopdoc:
 class File
@@ -19,21 +22,9 @@ end
 # A static code analyzer that points out possible dead methods.
 
 class Debride < MethodBasedSexpProcessor
-  VERSION = "1.5.1" # :nodoc:
+  VERSION = "1.6.0" # :nodoc:
   PROJECT = "debride"
 
-  def self.expand_dirs_to_files *dirs # TODO: push back up to sexp_processor
-    extensions = self.file_extensions
-
-    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
-
   def self.load_plugins proj = PROJECT
     unless defined? @@plugins then
       @@plugins = []
@@ -47,7 +38,7 @@ class Debride < MethodBasedSexpProcessor
         begin
           load plugin
           @@plugins << plugin_name
-        rescue LoadError => e
+        rescue RuntimeError, LoadError => e
           warn "error loading #{plugin.inspect}: #{e.message}. skipping..."
         end
       end
@@ -55,7 +46,7 @@ class Debride < MethodBasedSexpProcessor
 
     @@plugins
   rescue
-    # ignore
+    []
   end
 
   def self.file_extensions
@@ -70,8 +61,12 @@ class Debride < MethodBasedSexpProcessor
 
     debride = Debride.new opt
 
-    files = expand_dirs_to_files(args)
-    files -= expand_dirs_to_files(debride.option[:exclude]) if debride.option[:exclude]
+    extensions = self.file_extensions
+    glob = "**/*.{#{extensions.join(",")}}"
+    expander = PathExpander.new(args, glob)
+    files = expander.process
+    excl  = debride.option[:exclude]
+    files = expander.filter_files files, StringIO.new(excl.join "\n") if excl
 
     debride.run(files)
     debride

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: debride
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAjANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBAzANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE0MDkxNzIzMDcwN1oXDTE1MDkxNzIzMDcwN1owRTETMBEGA1UE
+  GRYDY29tMB4XDTE1MDkxOTIwNTEyMloXDTE2MDkxODIwNTEyMlowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +22,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQAFoDJRokCQdxFfOrmsKX41KOFlU/zjrbDVM9hgB/Ur999M6OXGSi8FitXNtMwY
-  FVjsiAPeU7HaWVVcZkj6IhINelTkXsxgGz/qCzjHy3iUMuZWw36cS0fiWJ5rvH+e
-  hD7uXxJSFuyf1riDGI1aeWbQ74WMwvNstOxLUMiV5a1fzBhlxPqb537ubDjq/M/h
-  zPUFPVYeL5KjDHLCqI2FwIk2sEMOQgjpXHzl+3NlD2LUgUhHDMevmgVua0e2GT1B
-  xJcC6UN6NHMOVMyAXsr2HR0gRRx4ofN1LoP2KhXzSr8UMvQYlwPmE0N5GQv1b5AO
-  VpzF30vNaJK6ZT7xlIsIlwmH
+  AQB+Hx8xUgrpZa4P8H8gR8zme5kISwQrG80MbpqJV6/G3/ZicRFhN5sjwu0uHGue
+  bd9Cymf6oIRwHVarJux2M32T6bL07Hmi07w2QaPc3MnMKB/D46SRZ2JSSGPFRBTc
+  SilobMRoGs/7B15uGFUEnNrCB/ltMqhwwSx1r++UQPfeySHEV9uqu03E5Vb7J37O
+  2Er6PLXHRiYsIycD1LkMi6YnixdITRHmrqJYE2rsjaIfpIehiusVAPHkNf7qbpHq
+  qx3h45R1CAsObX0SQDIT+rRbQrtKz1GHIZTOFYvEJjUY1XmRTZupD3CJ8Q7sDqSy
+  NLq5jm1fq6Y9Uolu3RJbmycf
   -----END CERTIFICATE-----
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2016-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -60,19 +60,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.6'
 - !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
@@ -93,14 +93,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.15'
 description: Analyze code for potentially uncalled / dead methods.
 email:
 - ryand-ruby@zenspider.com
@@ -114,7 +114,6 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .autotest
-- .gemtest
 - History.rdoc
 - Manifest.txt
 - README.rdoc