ruby-lint 0.9.1 → 1.0.0.pre.preview1

data/lib/ruby-lint/file_loader.rb

@@ -27,8 +27,6 @@ module RubyLint
   #  @return [Set]
   #
   class FileLoader < Iterator
-    include Helper::ConstantPaths
-
     attr_reader :file_scanner, :parser, :nodes, :comments, :debug, :paths
 
     ##
@@ -45,9 +43,10 @@ module RubyLint
     # @param [RubyLint::AST::Node] node
     #
     def on_const(node)
-      segments      = constant_segments(node)
-      constant_path = segments.join('::')
-      files         = file_scanner.scan(constant_path)
+      const_path = ConstantPath.new(node)
+
+      files      = file_scanner.scan(const_path.to_s)
+      last_name  = const_path.constant_segments.last.last
 
       paths << node.file
 
@@ -58,7 +57,7 @@ module RubyLint
 
         debug_message("Processing extra file: #{path}")
 
-        process_file(segments[-1], path)
+        process_file(last_name, path)
       end
     end
 

data/lib/ruby-lint/file_scanner.rb

@@ -23,6 +23,13 @@ module RubyLint
 
       @directories = directories
       @ignore      = ignore || []
+
+      # Hash that will contain the matching file paths for a given constant.
+      @constant_paths_cache = {}
+
+      # Globbing all files at once and then comparing those results is faster
+      # than running a Dir.glob for every call to #scan.
+      @glob_cache = Dir.glob("#{directories.join(',')}/**/*.rb")
     end
 
     ##
@@ -34,17 +41,31 @@ module RubyLint
     # @return [Array]
     #
     def scan(constant)
-      segment = constant_to_path(constant)
-      paths   = Dir.glob(glob_pattern(segment))
+      unless constant_paths_cached?(constant)
+        build_constant_paths_cache(constant)
+      end
+
+      return @constant_paths_cache[constant]
+    end
+
+    private
+
+    ##
+    # Searches all the files that could potentially define the given constant
+    # and caches them.
+    #
+    # @param [String] constant
+    #
+    def build_constant_paths_cache(constant)
+      paths = match_globbed_files(constant_to_path(constant))
 
       # Lets see if we can find anything when using dashes for the directory
       # names instead of underscores.
       if paths.empty?
-        segment = constant_to_dashed_path(constant)
-        paths   = Dir.glob(glob_pattern(segment))
+        paths = match_globbed_files(constant_to_dashed_path(constant))
       end
 
-      paths.map! { |path| File.expand_path(path) }
+      paths.map! { |p| File.expand_path(p) }
 
       ignore.each do |pattern|
         paths.reject! do |path|
@@ -52,23 +73,35 @@ module RubyLint
         end
       end
 
-      # Ensure that the order is from top-level -> deeply nested files instead
-      # of a random order.
+      # Ensure that the order is from top-level -> deeply nested files
+      # instead of a random order.
       paths.sort! do |left, right|
         left.length <=> right.length
       end
 
-      return paths
+      @constant_paths_cache[constant] = paths
     end
 
-    private
+    ##
+    # @return [Array]
+    #
+    def match_globbed_files(segment)
+      return @glob_cache.select { |p| p.include?(segment) }
+    end
+
+    ##
+    # @return [TrueClass|FalseClass]
+    #
+    def constant_paths_cached?(constant)
+      return @constant_paths_cache.key?(constant)
+    end
 
     ##
     # @param [String] constant
     # @return [String]
     #
     def constant_to_path(constant)
-      return constant.gsub('::', '/').snake_case
+      return constant.gsub('::', '/').snake_case + '.rb'
     end
 
     ##
@@ -79,7 +112,7 @@ module RubyLint
       last     = segments[-1]
       path     = segments[0..-2].join('/').snake_case.gsub('_', '-')
 
-      return "#{path}/#{last.snake_case}"
+      return "#{path}/#{last.snake_case}.rb"
     end
 
     ##

data/lib/ruby-lint/inspector.rb

@@ -132,9 +132,19 @@ module RubyLint
     # @return [Array]
     #
     def get_methods(getter = :methods)
-      diff = constant.send(getter) - Object.send(getter)
+      diff    = constant.send(getter) - Object.send(getter)
+      methods = diff | constant.send(getter, false)
+
+      # If the constant manually defines the initialize method (= private)
+      # we'll also want to include it.
+      if getter == :instance_methods \
+      and constant.is_a?(Class) \
+      and constant.private_method_defined?(:initialize) \
+      and constant.instance_method(:initialize).source_location
+        methods = methods | [:initialize]
+      end
 
-      return diff | constant.send(getter, false)
+      return methods
     end
 
     ##

data/lib/ruby-lint/runner.rb

@@ -144,7 +144,7 @@ module RubyLint
         :level   => :error,
         :message => diagnostic.message,
         :line    => diagnostic.location.line,
-        :column  => diagnostic.location.column,
+        :column  => diagnostic.location.column + 1,
         :file    => diagnostic.location.source_buffer.name
       )
     end
@@ -170,7 +170,11 @@ module RubyLint
     # @param [RubyLint::Report] report
     #
     def run_analysis(ast, vm, report)
-      configuration.analysis_classes.each do |const|
+      classes = configuration.analysis_classes.select do |const|
+        const.analyze?(ast, vm)
+      end
+
+      classes.each do |const|
         instance = const.new(:vm => vm, :report => report)
         instance.iterate(ast)
       end

data/lib/ruby-lint/version.rb

@@ -1,3 +1,3 @@
 module RubyLint
-  VERSION = '0.9.1'
+  VERSION = '1.0.0-preview1'
 end # RubyLint

data/lib/ruby-lint/virtual_machine.rb

@@ -70,8 +70,6 @@ module RubyLint
   #  @return [RubyLint::Docstring::Mapping]
   #
   class VirtualMachine < Iterator
-    include Helper::ConstantPaths
-
     attr_reader :associations,
       :comments,
       :definitions,
@@ -99,7 +97,17 @@ module RubyLint
     #
     # @return [Array]
     #
-    PRIMITIVES = [:int, :float, :str, :sym, :true, :false, :nil]
+    PRIMITIVES = [
+      :int,
+      :float,
+      :str,
+      :sym,
+      :true,
+      :false,
+      :nil,
+      :erange,
+      :irange
+    ]
 
     ##
     # Returns a Hash containing the method call evaluators to use for `(send)`
@@ -241,7 +249,7 @@ module RubyLint
       scope  = current_scope
 
       if node.children[0]
-        scope = resolve_constant_path(node.children[0])
+        scope = ConstantPath.new(node.children[0]).resolve(current_scope)
 
         return unless scope
       end
@@ -881,6 +889,12 @@ Received: #{arguments.length}
 
       buffer_assignment_value(variable.value)
 
+      # Primarily used by #after_send to support variable assignments as method
+      # call arguments.
+      if value and !value_stack.empty?
+        value_stack.push(value)
+      end
+
       add_variable(variable)
     end
 
@@ -969,7 +983,7 @@ Received: #{arguments.length}
     #
     def definition_for_node(node)
       if node.const? and node.children[0]
-        definition = resolve_constant_path(node)
+        definition = ConstantPath.new(node).resolve(current_scope)
       else
         definition = current_scope.lookup(node.type, node.name)
       end

data/ruby-lint.gemspec

@@ -30,15 +30,13 @@ using the handle "yorickpeterse".
   s.required_ruby_version = '>= 1.9.3'
 
   s.add_dependency 'parser', ['>= 2.0.0']
-  s.add_dependency 'racc', ['>= 1.4.10']
-  s.add_dependency 'slop'
+  s.add_dependency 'slop', ['~> 3.4', '>= 3.4.7']
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', ['>= 2.14']
   s.add_development_dependency 'yard'
   s.add_development_dependency 'pry-rescue'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'rubygems-openpgp'
   s.add_development_dependency 'coveralls'
   s.add_development_dependency 'json'
   s.add_development_dependency 'kramdown'

data/spec/ruby-lint/analysis/argument_amount_spec.rb

@@ -15,7 +15,7 @@ example
     entry.is_a?(RubyLint::Report::Entry).should == true
 
     entry.line.should    == 4
-    entry.column.should  == 0
+    entry.column.should  == 1
     entry.message.should == 'wrong number of arguments (expected 2 but got 0)'
   end
 
@@ -33,7 +33,7 @@ example
     entry.is_a?(RubyLint::Report::Entry).should == true
 
     entry.line.should    == 4
-    entry.column.should  == 0
+    entry.column.should  == 1
     entry.message.should == 'wrong number of arguments ' \
       '(expected 2..3 but got 0)'
   end
@@ -52,7 +52,7 @@ example
     entry.is_a?(RubyLint::Report::Entry).should == true
 
     entry.line.should    == 4
-    entry.column.should  == 0
+    entry.column.should  == 1
     entry.message.should == 'wrong number of arguments ' \
       '(expected 2 but got 0)'
   end
@@ -107,11 +107,11 @@ Person.new(10, 20)
     first, second = report.entries
 
     first.line.should    == 6
-    first.column.should  == 0
+    first.column.should  == 1
     first.message.should == 'wrong number of arguments (expected 1 but got 0)'
 
     second.line.should    == 7
-    second.column.should  == 0
+    second.column.should  == 1
     second.message.should == 'wrong number of arguments (expected 1 but got 2)'
   end
 end

data/spec/ruby-lint/analysis/base_spec.rb

@@ -9,4 +9,8 @@ describe RubyLint::Analysis::Base do
 
     blk.should_not raise_error
   end
+
+  example 'enable analysis by default' do
+    RubyLint::Analysis::Base.analyze?(double(:ast), double(:vm)).should == true
+  end
 end

data/spec/ruby-lint/analysis/shadowing_variables_spec.rb

@@ -16,7 +16,7 @@ end
     entry.is_a?(RubyLint::Report::Entry).should == true
 
     entry.line.should    == 3
-    entry.column.should  == 18
+    entry.column.should  == 19
     entry.message.should == 'shadowing outer local variable number'
   end
 
@@ -53,7 +53,7 @@ end
     entry.is_a?(RubyLint::Report::Entry).should == true
 
     entry.line.should    == 5
-    entry.column.should  == 18
+    entry.column.should  == 19
     entry.message.should == 'shadowing outer local variable number'
   end
 
@@ -77,9 +77,9 @@ end
     first, second = report.entries
 
     first.line.should    == 3
-    first.column.should  == 17
+    first.column.should  == 18
 
     second.line.should    == 7
-    second.column.should  == 17
+    second.column.should  == 18
   end
 end

data/spec/ruby-lint/analysis/undefined_methods_spec.rb

@@ -8,7 +8,7 @@ describe RubyLint::Analysis::UndefinedMethods do
     entry.is_a?(RubyLint::Report::Entry).should == true
 
     entry.line.should    == 1
-    entry.column.should  == 0
+    entry.column.should  == 1
     entry.message.should == 'undefined method example_method'
   end
 
@@ -28,7 +28,7 @@ String.example_method
     entry.is_a?(RubyLint::Report::Entry).should == true
 
     entry.line.should    == 6
-    entry.column.should  == 0
+    entry.column.should  == 1
     entry.message.should == 'undefined method example_method on String'
   end
 
@@ -40,7 +40,7 @@ String.example_method
     entry.is_a?(RubyLint::Report::Entry).should == true
 
     entry.line.should    == 1
-    entry.column.should  == 0
+    entry.column.should  == 1
     entry.message.should == 'undefined method example_method ' \
       'on an instance of String'
   end
@@ -69,7 +69,7 @@ name
     entry.is_a?(RubyLint::Report::Entry).should == true
 
     entry.line.should    == 11
-    entry.column.should  == 0
+    entry.column.should  == 1
     entry.message.should == 'undefined method name'
   end
 
@@ -132,7 +132,7 @@ name.downcasex
     entry = report.entries[0]
 
     entry.line.should    == 4
-    entry.column.should  == 0
+    entry.column.should  == 1
     entry.message.should == 'undefined method downcasex on an instance of String'
   end
 
@@ -156,7 +156,7 @@ user.invalid
     entry = report.entries[0]
 
     entry.line.should    == 9
-    entry.column.should  == 0
+    entry.column.should  == 1
     entry.message.should == 'undefined method invalid on an instance of User'
   end
 

data/spec/ruby-lint/analysis/undefined_variables_spec.rb

@@ -8,7 +8,7 @@ describe RubyLint::Analysis::UndefinedVariables do
     entry.is_a?(RubyLint::Report::Entry).should == true
 
     entry.line.should    == 1
-    entry.column.should  == 0
+    entry.column.should  == 1
     entry.message.should == 'undefined instance variable @number'
   end
 
@@ -19,7 +19,7 @@ describe RubyLint::Analysis::UndefinedVariables do
     entry.is_a?(RubyLint::Report::Entry).should == true
 
     entry.line.should    == 1
-    entry.column.should  == 0
+    entry.column.should  == 1
     entry.message.should == 'undefined class variable @@number'
   end
 
@@ -30,7 +30,7 @@ describe RubyLint::Analysis::UndefinedVariables do
     entry.is_a?(RubyLint::Report::Entry).should == true
 
     entry.line.should    == 1
-    entry.column.should  == 0
+    entry.column.should  == 1
     entry.message.should == 'undefined global variable $number'
   end
 
@@ -41,7 +41,7 @@ describe RubyLint::Analysis::UndefinedVariables do
     entry.is_a?(RubyLint::Report::Entry).should == true
 
     entry.line.should    == 1
-    entry.column.should  == 0
+    entry.column.should  == 1
     entry.message.should == 'undefined constant NUMBER'
   end
 
@@ -63,7 +63,7 @@ A::B
     entry.is_a?(RubyLint::Report::Entry).should == true
 
     entry.line.should    == 8
-    entry.column.should  == 0
+    entry.column.should  == 1
     entry.message.should == 'undefined constant A::B'
   end
 

data/spec/ruby-lint/analysis/unused_variables_spec.rb

@@ -8,7 +8,7 @@ describe RubyLint::Analysis::UnusedVariables do
     entry.is_a?(RubyLint::Report::Entry).should == true
 
     entry.line.should    == 1
-    entry.column.should  == 0
+    entry.column.should  == 1
     entry.message.should == 'unused local variable number'
   end
 
@@ -17,7 +17,7 @@ describe RubyLint::Analysis::UnusedVariables do
     entry = report.entries[0]
 
     entry.line.should    == 1
-    entry.column.should  == 0
+    entry.column.should  == 1
     entry.message.should == 'unused instance variable @number'
   end
 
@@ -40,7 +40,7 @@ number
     entry.is_a?(RubyLint::Report::Entry).should == true
 
     entry.line.should    == 1
-    entry.column.should  == 0
+    entry.column.should  == 1
     entry.message.should == 'unused constant NUMBER'
   end
 
@@ -73,7 +73,7 @@ A::B = 10
     entry.is_a?(RubyLint::Report::Entry).should == true
 
     entry.line.should    == 4
-    entry.column.should  == 0
+    entry.column.should  == 1
     entry.message.should == 'unused constant A::B'
   end
 
@@ -90,7 +90,7 @@ end
     entry.is_a?(RubyLint::Report::Entry).should == true
 
     entry.line.should    == 2
-    entry.column.should  == 2
+    entry.column.should  == 3
     entry.message.should == 'unused local variable number'
   end
 
@@ -107,7 +107,7 @@ second = first
     entry = report.entries[0]
 
     entry.line.should    == 2
-    entry.column.should  == 0
+    entry.column.should  == 1
     entry.message.should == 'unused local variable second'
   end
 
@@ -155,7 +155,7 @@ end
 
       entry.message.should == 'unused argument number'
       entry.line.should    == 1
-      entry.column.should  == 13
+      entry.column.should  == 14
     end
 
     example 'warn for a unused optional argument' do
@@ -169,7 +169,7 @@ end
 
       entry.message.should == 'unused argument amount'
       entry.line.should    == 1
-      entry.column.should  == 13
+      entry.column.should  == 14
     end
 
     example 'warn for a unused rest argument' do
@@ -183,7 +183,7 @@ end
 
       entry.message.should == 'unused argument args'
       entry.line.should    == 1
-      entry.column.should  == 13
+      entry.column.should  == 14
     end
 
     example 'warn for a unused block argument' do
@@ -197,7 +197,7 @@ end
 
       entry.message.should == 'unused argument block'
       entry.line.should    == 1
-      entry.column.should  == 13
+      entry.column.should  == 14
     end
 
     specific_ruby_version '2.0' do
@@ -212,7 +212,7 @@ end
 
         entry.message.should == 'unused argument amount'
         entry.line.should    == 1
-        entry.column.should  == 13
+        entry.column.should  == 14
       end
     end
 
@@ -241,7 +241,7 @@ end
 
       entry.message.should == 'unused argument number'
       entry.line.should    == 1
-      entry.column.should  == 18
+      entry.column.should  == 19
     end
 
     example 'do not warn for a used argument' do