Skip to content

Commit

Permalink
%s/dust/nitpick/g
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinclark committed Mar 19, 2009
1 parent 7760d38 commit a0acb7b
Show file tree
Hide file tree
Showing 37 changed files with 220 additions and 220 deletions.
4 changes: 2 additions & 2 deletions README
@@ -1,9 +1,9 @@
Ruby lint. Sorta.

http://github.com/kevinclark/dust/wikis
http://github.com/kevinclark/nitpick/wikis


Clio:dust kev$ ./bin/dust spec/fixtures/block_badness.rb \
Clio:nitpick kev$ ./bin/nitpick spec/fixtures/block_badness.rb \
> spec/fixtures/branch_badness.rb \
> spec/fixtures/method_badness.rb \
> spec/fixtures/rescue_badness.rb \
Expand Down
6 changes: 3 additions & 3 deletions Rakefile
Expand Up @@ -6,10 +6,10 @@ task :default => :spec
begin
require 'jeweler'
Jeweler::Tasks.new do |gem|
gem.name = "dust"
gem.name = "nitpick"
gem.summary = %Q{TODO}
gem.email = "kevin.clark@gmail.com"
gem.homepage = "http://github.com/kevinclark/dust"
gem.homepage = "http://github.com/kevinclark/nitpick"
gem.authors = ["Kevin Clark"]
gem.add_dependency('trollop')
# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
Expand All @@ -21,7 +21,7 @@ end
require 'rake/rdoctask'
Rake::RDocTask.new do |rdoc|
rdoc.rdoc_dir = 'rdoc'
rdoc.title = 'dust'
rdoc.title = 'nitpick'
rdoc.options << '--line-numbers' << '--inline-source'
rdoc.rdoc_files.include('README*')
rdoc.rdoc_files.include('lib/**/*.rb')
Expand Down
28 changes: 14 additions & 14 deletions bin/nitpick
Expand Up @@ -3,21 +3,21 @@ require 'pp'

require 'rubygems'
$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
require 'dust'
require 'nitpick'

# {Constant => {Method => [Warnings]}}
$warnings = Hash.new {|h,k| h[k] = Hash.new {|_h,_k| _h[_k] = [] }}

require 'trollop'
opts = Trollop::options do
opt :only, "Dust only classes/modules that match this string.", :type => :string, :multi => true
opt :except, "Don't dust classes/modules that match this string.", :type => :string, :multi => true
opt :only, "Nitpick only classes/modules that match this string.", :type => :string, :multi => true
opt :except, "Don't nitpick classes/modules that match this string.", :type => :string, :multi => true
end

DustOptions = { :only => opts[:only] || [], :except => opts[:except] || []}
Dusters = [
Dust::ArgumentDuster, Dust::BlockDuster, Dust::BranchDuster,
Dust::LocalVariableDuster, Dust::MethodDuster, Dust::RescueDuster
NitpickOptions = { :only => opts[:only] || [], :except => opts[:except] || []}
Nitpickers = [
Nitpick::ArgumentNitpicker, Nitpick::BlockNitpicker, Nitpick::BranchNitpicker,
Nitpick::LocalVariableNitpicker, Nitpick::MethodNitpicker, Nitpick::RescueNitpicker
]

class Module
Expand All @@ -27,13 +27,13 @@ class Module
def method_added(name)
original_method_added(name)

return if DustOptions[:except].any? {|namespace| /#{namespace}/ =~ self.to_s }
return unless DustOptions[:only].empty? or DustOptions[:only].any? {|namespace| /#{namespace}/ =~ self.to_s }
return if NitpickOptions[:except].any? {|namespace| /#{namespace}/ =~ self.to_s }
return unless NitpickOptions[:only].empty? or NitpickOptions[:only].any? {|namespace| /#{namespace}/ =~ self.to_s }

warnings = Dusters.map do |duster_class|
duster = duster_class.new(self, name)
duster.dust!
duster.warnings
warnings = Nitpickers.map do |nitpicker_class|
nitpicker = nitpicker_class.new(self, name)
nitpicker.nitpick!
nitpicker.warnings
end.flatten

$warnings[self.name][name.to_s] = warnings
Expand Down Expand Up @@ -73,6 +73,6 @@ ARGV.each do |file|
begin
load file
rescue Exception => e # grab *everything*
$stderr.puts "*** Dust had trouble loading #{file.inspect}:\n\t#{e.class} #{e.message}"
$stderr.puts "*** Nitpick had trouble loading #{file.inspect}:\n\t#{e.class} #{e.message}"
end
end
42 changes: 21 additions & 21 deletions lib/nitpick.rb
Expand Up @@ -4,29 +4,29 @@
require 'parse_tree'
require 'ruby2ruby'

require 'dust/warnings/simple_warning'
require 'dust/warnings/unused_variable'
require 'dust/warnings/unprotected_block'
require 'dust/warnings/useless_branch'
require 'dust/warnings/identical_branch'
require 'dust/warnings/rescue_value'
require 'dust/warnings/rescue_everything'
require 'dust/warnings/unused_argument'
require 'dust/warnings/assignment_as_condition'
require 'dust/warnings/shadowed_variable'
require 'dust/warnings/empty_method'
require 'nitpick/warnings/simple_warning'
require 'nitpick/warnings/unused_variable'
require 'nitpick/warnings/unprotected_block'
require 'nitpick/warnings/useless_branch'
require 'nitpick/warnings/identical_branch'
require 'nitpick/warnings/rescue_value'
require 'nitpick/warnings/rescue_everything'
require 'nitpick/warnings/unused_argument'
require 'nitpick/warnings/assignment_as_condition'
require 'nitpick/warnings/shadowed_variable'
require 'nitpick/warnings/empty_method'

require 'dust/duster'
require 'dust/local_variable_counter'
require 'dust/local_variable_duster'
require 'dust/argument_duster'
require 'dust/block_duster'
require 'dust/branch_duster'
require 'dust/rescue_duster'
require 'dust/method_duster'
require 'nitpick/nitpicker'
require 'nitpick/local_variable_counter'
require 'nitpick/local_variable_nitpicker'
require 'nitpick/argument_nitpicker'
require 'nitpick/block_nitpicker'
require 'nitpick/branch_nitpicker'
require 'nitpick/rescue_nitpicker'
require 'nitpick/method_nitpicker'


require 'dust/sexp_extension'
require 'nitpick/sexp_extension'
class Sexp
include Dust::SexpExtension
include Nitpick::SexpExtension
end
6 changes: 3 additions & 3 deletions lib/nitpick/argument_nitpicker.rb
@@ -1,6 +1,6 @@
module Dust
class ArgumentDuster < LocalVariableCounter
def dust!
module Nitpick
class ArgumentNitpicker < LocalVariableCounter
def nitpick!
@silence_warnings = false
super
return if @silence_warnings
Expand Down
4 changes: 2 additions & 2 deletions lib/nitpick/block_nitpicker.rb
@@ -1,5 +1,5 @@
module Dust
class BlockDuster < Duster
module Nitpick
class BlockNitpicker < Nitpicker
def process_if(exp)
cond = Sexp.from_array(exp.shift)
yes_branch = Sexp.from_array(exp.shift)
Expand Down
4 changes: 2 additions & 2 deletions lib/nitpick/branch_nitpicker.rb
@@ -1,5 +1,5 @@
module Dust
class BranchDuster < Duster
module Nitpick
class BranchNitpicker < Nitpicker
def process_if(exp)
cond = process(exp.shift)
yes_branch = process(exp.shift)
Expand Down
4 changes: 2 additions & 2 deletions lib/nitpick/local_variable_counter.rb
@@ -1,5 +1,5 @@
module Dust
class LocalVariableCounter < Duster
module Nitpick
class LocalVariableCounter < Nitpicker
def initialize(klass, meth)
super
# uses.succ each time a local variable is referenced or assigned to
Expand Down
6 changes: 3 additions & 3 deletions lib/nitpick/local_variable_nitpicker.rb
@@ -1,6 +1,6 @@
module Dust
class LocalVariableDuster < LocalVariableCounter
def dust!
module Nitpick
class LocalVariableNitpicker < LocalVariableCounter
def nitpick!
super

@lvars.each do |name, details|
Expand Down
4 changes: 2 additions & 2 deletions lib/nitpick/method_nitpicker.rb
@@ -1,5 +1,5 @@
module Dust
class MethodDuster < Duster
module Nitpick
class MethodNitpicker < Nitpicker
def process_defn(exp)
# def foo(x); 1 end =>
# [:defn, :foo, [:scope, [:block, [:args, :x], [:lit, 1]]]]
Expand Down
6 changes: 3 additions & 3 deletions lib/nitpick/nitpicker.rb
@@ -1,5 +1,5 @@
module Dust
class Duster < SexpProcessor
module Nitpick
class Nitpicker < SexpProcessor
attr_accessor :warnings

def initialize(klass, meth)
Expand All @@ -14,7 +14,7 @@ def initialize(klass, meth)
@warnings = []
end

def dust!
def nitpick!
process(ParseTree.translate(@class, @method))
end

Expand Down
4 changes: 2 additions & 2 deletions lib/nitpick/rescue_nitpicker.rb
@@ -1,5 +1,5 @@
module Dust
class RescueDuster < Duster
module Nitpick
class RescueNitpicker < Nitpicker
def process_resbody(exp)
exceptions = exp.shift
rescue_value = exp.shift
Expand Down
2 changes: 1 addition & 1 deletion lib/nitpick/sexp_extension.rb
@@ -1,4 +1,4 @@
module Dust
module Nitpick
module SexpExtension
define_method :"!~" do |pattern|
!(self =~ pattern)
Expand Down
2 changes: 1 addition & 1 deletion lib/nitpick/warnings/assignment_as_condition.rb
@@ -1,4 +1,4 @@
module Dust
module Nitpick
module Warnings
class AssignmentAsCondition < SimpleWarning
ASSIGNMENT_NODES = [:lasgn, :op_asgn_or, :op_asgn_and, :iasgn,
Expand Down
2 changes: 1 addition & 1 deletion lib/nitpick/warnings/empty_method.rb
@@ -1,4 +1,4 @@
module Dust
module Nitpick
module Warnings
class EmptyMethod < SimpleWarning
attr_reader :body
Expand Down
2 changes: 1 addition & 1 deletion lib/nitpick/warnings/identical_branch.rb
@@ -1,4 +1,4 @@
module Dust
module Nitpick
module Warnings
class IdenticalBranch < SimpleWarning
attr_reader :yes_branch, :no_branch
Expand Down
2 changes: 1 addition & 1 deletion lib/nitpick/warnings/rescue_everything.rb
@@ -1,4 +1,4 @@
module Dust
module Nitpick
module Warnings
class RescueEverything < SimpleWarning
def initialize(*args)
Expand Down
2 changes: 1 addition & 1 deletion lib/nitpick/warnings/rescue_value.rb
@@ -1,4 +1,4 @@
module Dust
module Nitpick
module Warnings
class RescueValue < SimpleWarning
def initialize(*args)
Expand Down
2 changes: 1 addition & 1 deletion lib/nitpick/warnings/shadowed_variable.rb
@@ -1,6 +1,6 @@
require 'set'

module Dust
module Nitpick
module Warnings
class ShadowedVariable < SimpleWarning
attr_reader :vars
Expand Down
2 changes: 1 addition & 1 deletion lib/nitpick/warnings/simple_warning.rb
@@ -1,4 +1,4 @@
module Dust
module Nitpick
module Warnings
class SimpleWarning
def self.discover(args = [])
Expand Down
2 changes: 1 addition & 1 deletion lib/nitpick/warnings/unprotected_block.rb
@@ -1,4 +1,4 @@
module Dust
module Nitpick
module Warnings
class UnprotectedBlock < SimpleWarning
attr_reader :condition, :yes_branch, :no_branch
Expand Down
2 changes: 1 addition & 1 deletion lib/nitpick/warnings/unused_argument.rb
@@ -1,4 +1,4 @@
module Dust
module Nitpick
module Warnings
class UnusedArgument < SimpleWarning
attr_reader :argument
Expand Down
2 changes: 1 addition & 1 deletion lib/nitpick/warnings/unused_variable.rb
@@ -1,4 +1,4 @@
module Dust
module Nitpick
module Warnings
class UnusedVariable < SimpleWarning
attr_reader :variable
Expand Down
2 changes: 1 addition & 1 deletion lib/nitpick/warnings/useless_branch.rb
@@ -1,4 +1,4 @@
module Dust
module Nitpick
module Warnings
class UselessBranch < SimpleWarning
attr_reader :yes_branch, :no_branch
Expand Down

0 comments on commit a0acb7b

Please sign in to comment.