ruby-lint 0.0.4 → 0.0.5

data/spec/ruby-lint/virtual_machine/methods/{exporting.rb → exporting_spec.rb}

@@ -1,8 +1,8 @@
-require File.expand_path('../../../../helper', __FILE__)
+require 'spec_helper'
 
 describe RubyLint::VirtualMachine do
   describe 'exporting variables out of method scopes' do
-    should 'export variables to the outer scope' do
+    example 'export variables to the outer scope' do
       code = <<-CODE
 def example
   @number = 10
@@ -16,4 +16,4 @@ end
         .should == true
     end
   end
-end
+end

data/spec/ruby-lint/virtual_machine/methods/{parameters.rb → parameters_spec.rb}

@@ -1,8 +1,8 @@
-require File.expand_path('../../../../helper', __FILE__)
+require 'spec_helper'
 
 describe RubyLint::VirtualMachine do
   describe 'creating variables for method parameters' do
-    should 'create local variables' do
+    example 'create local variables' do
       code = <<-CODE
 def example(number)
   return number
@@ -17,7 +17,7 @@ end
         .should == true
     end
 
-    should 'allow the assignment using parameters' do
+    example 'allow the assignment using parameters' do
       code = <<-CODE
 def example(number)
   other_number = number
@@ -32,7 +32,7 @@ end
         .should == true
     end
 
-    should 'take all argument types into account' do
+    example 'take all argument types into account' do
       code = <<-CODE
 def example(required, optional = 10, *splat, more, &block)
   _required = required
@@ -53,7 +53,7 @@ end
       method.lookup(:lvar, '_optional').value.value.should == 10
     end
 
-    should 'store arguments under special types' do
+    example 'store arguments under special types' do
       code = <<-CODE
 def example(required, optional = 10, *splat, more, &block)
 end
@@ -73,5 +73,17 @@ end
         method.lookup(type, name).is_a?(ruby_object).should == true
       end
     end
+
+    # Keyword arguments were introduced in Ruby 2.0.
+    specific_ruby_version '2.0' do
+      example 'support keyword arguments' do
+        code   = 'def example(number: 10); end'
+        defs   = build_definitions(code)
+        method = defs.lookup(:instance_method, 'example')
+
+        method.lookup(:kwoptarg, 'number').value.value.should == 10
+        method.lookup(:lvar, 'number').value.value.should     == 10
+      end
+    end
   end
 end

data/spec/ruby-lint/virtual_machine/methods/{patching.rb → patching_spec.rb}

@@ -1,14 +1,14 @@
-require File.expand_path('../../../../helper', __FILE__)
+require 'spec_helper'
 
 describe RubyLint::VirtualMachine do
-  should 'be able to patch global definitions' do
+  describe 'patching methods' do
     after do
-      RubyLint::VirtualMachine.global_scope.lookup(:const, 'String') \
+      RubyLint::GlobalScope.definitions.lookup(:const, 'String') \
         .definitions[:method] \
         .delete('foobar')
     end
 
-    should 'add a class method to the String class' do
+    example 'add a class method to the String class' do
       code = <<-CODE
 class String
   def self.foobar

data/spec/ruby-lint/virtual_machine/methods/{scoping.rb → scoping_spec.rb}

@@ -1,8 +1,8 @@
-require File.expand_path('../../../../helper', __FILE__)
+require 'spec_helper'
 
 describe RubyLint::VirtualMachine do
   describe 'scoping method definitions' do
-    should 'process a global method' do
+    example 'process a global method' do
       defs    = build_definitions('def example; end')
       example = defs.lookup(:instance_method, 'example')
 
@@ -12,7 +12,7 @@ describe RubyLint::VirtualMachine do
       example.name.should == 'example'
     end
 
-    should 'process a nested method' do
+    example 'process a nested method' do
       code = <<-CODE
 def first
   def second
@@ -32,7 +32,7 @@ end
       defs.lookup(:instance_method, 'second').nil?.should == true
     end
 
-    should 'process a global and nested method' do
+    example 'process a global and nested method' do
       code = <<-CODE
 def first
   def second
@@ -60,4 +60,4 @@ end
         .should == true
     end
   end
-end
+end

data/spec/ruby-lint/virtual_machine/methods/{visibility.rb → visibility_spec.rb}

@@ -1,8 +1,8 @@
-require File.expand_path('../../../../helper', __FILE__)
+require 'spec_helper'
 
 describe RubyLint::VirtualMachine do
   describe 'method visibility' do
-    should 'define a method as public' do
+    example 'define a method as public' do
       code = <<-CODE
 def example
 end
@@ -13,7 +13,7 @@ end
       defs.lookup(:instance_method, 'example').visibility.should == :public
     end
 
-    should 'define a method as private' do
+    example 'define a method as private' do
       code = <<-CODE
 private
 
@@ -26,7 +26,7 @@ end
       defs.lookup(:instance_method, 'example').visibility.should == :private
     end
 
-    should 'define a method as protected' do
+    example 'define a method as protected' do
       code = <<-CODE
 protected
 
@@ -39,7 +39,7 @@ end
       defs.lookup(:instance_method, 'example').visibility.should == :protected
     end
 
-    should 'define a method as private and then reset it' do
+    example 'define a method as private and then reset it' do
       code = <<-CODE
 private
 
@@ -61,4 +61,4 @@ end
         .should == :public
     end
   end
-end
+end

data/spec/ruby-lint/virtual_machine/{modules.rb → modules_spec.rb}

@@ -1,8 +1,8 @@
-require File.expand_path('../../../helper', __FILE__)
+require 'spec_helper'
 
 describe 'Building module definitions' do
   describe 'scoping definitions' do
-    should 'process a global module' do
+    example 'process a global module' do
       defs    = build_definitions('module Example; end')
       example = defs.lookup(:const, 'Example')
 
@@ -12,7 +12,7 @@ describe 'Building module definitions' do
       example.name.should == 'Example'
     end
 
-    should 'process a nested module' do
+    example 'process a nested module' do
       code = <<-CODE
 module First
   module Second
@@ -32,7 +32,7 @@ end
         .should == true
     end
 
-    should 'process a global and nested module' do
+    example 'process a global and nested module' do
       code = <<-CODE
 module First
   module Second
@@ -68,7 +68,7 @@ end
   end
 
   describe 'redefining modules' do
-    should 'update a module when it is redefined' do
+    example 'update a module when it is redefined' do
       code = <<-CODE
 module First
 end
@@ -86,10 +86,40 @@ end
         .is_a?(ruby_method) \
         .should == true
     end
+
+    example 'should not pollute modules in a different namespace' do
+      code = <<-CODE
+module Foo
+  module Parser
+  end
+
+  module Bar
+    module Parser
+      def foo
+      end
+    end
+  end
+end
+      CODE
+
+      defs = build_definitions(code)
+
+      first = defs.lookup(:const, 'Foo')
+        .lookup(:const, 'Parser')
+
+      second = defs.lookup(:const, 'Foo')
+        .lookup(:const, 'Bar')
+        .lookup(:const, 'Parser')
+
+      first.should_not == second
+
+      first.lookup(:instance_method, 'foo').is_a?(ruby_object).should  == false
+      second.lookup(:instance_method, 'foo').is_a?(ruby_object).should == true
+    end
   end
 
   describe 'including modules' do
-    should 'include a module' do
+    example 'include a module' do
       code = <<-CODE
 module First
   def example
@@ -109,7 +139,7 @@ end
         .should == true
     end
 
-    should 'extend a module' do
+    example 'extend a module' do
       code = <<-CODE
 module First
   def example
@@ -129,7 +159,7 @@ end
         .should == true
     end
 
-    should 'include a module using a constant path' do
+    example 'include a module using a constant path' do
       code = <<-CODE
 module First
   module Second
@@ -151,7 +181,7 @@ end
         .should == true
     end
 
-    should 'include a module using a variable' do
+    example 'include a module using a variable' do
       code = <<-CODE
 module First
   def example

data/spec/ruby-lint/virtual_machine/reference_amount_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe RubyLint::VirtualMachine do
+  describe 'reference counting' do
+    example 'count the amount of references for a variable' do
+      code = <<-CODE
+  number = 10
+  number
+  number
+      CODE
+
+      defs = build_definitions(code)
+
+      defs.lookup(:lvar, 'number').reference_amount.should == 2
+    end
+
+    example 'count the amount of references for a constant path' do
+      code = <<-CODE
+  module A; end
+  A::B = 10
+  A::B
+  A::B
+      CODE
+
+      defs = build_definitions(code)
+
+      defs.lookup(:const, 'A') \
+        .lookup(:const, 'B') \
+        .reference_amount \
+        .should == 2
+    end
+
+    example 'mark variables created using OR/AND assignments as used' do
+      code = <<-CODE
+number1 = 5
+
+number  ||= 10
+number1 &&= 10
+      CODE
+
+      defs = build_definitions(code)
+
+      number  = defs.lookup(:lvar, 'number')
+      number1 = defs.lookup(:lvar, 'number1')
+
+      number.used?.should  == true
+      number1.used?.should == true
+    end
+
+    example 'overwriting a variable should increase the reference amount' do
+      code = <<-CODE
+number = 10
+number = 20
+      CODE
+
+      defs = build_definitions(code)
+
+      defs.lookup(:lvar, 'number').reference_amount.should == 1
+    end
+  end
+end

data/spec/ruby-lint/virtual_machine/{unused.rb → unused_spec.rb}

@@ -1,17 +1,17 @@
-require File.expand_path('../../../helper', __FILE__)
+require 'spec_helper'
 
 describe RubyLint::VirtualMachine do
   describe 'marking variables as used/unused' do
-    should 'mark variables as unused by default' do
+    example 'mark variables as unused by default' do
       defs = build_definitions('number = 10')
 
       defs.lookup(:lvar, 'number').used?.should == false
     end
 
-    should 'mark variables as used' do
+    example 'mark variables as used' do
       defs = build_definitions('number = 10; number')
 
       defs.lookup(:lvar, 'number').used?.should == true
     end
   end
-end
+end

data/spec/{helper.rb → spec_helper.rb}

@@ -1,7 +1,6 @@
-require 'bacon'
-require 'bacon/colored_output'
+require 'rspec'
 require 'stringio'
-require_relative 'support/bacon'
+require 'redcard'
 
 if ENV['COVERAGE']
   require_relative 'support/simplecov'
@@ -16,5 +15,8 @@ require_relative 'support/building'
 require_relative 'support/parsing'
 require_relative 'support/definitions'
 require_relative 'support/fixtures'
+require_relative 'support/versions'
 
-Bacon.summary_on_exit
+RSpec.configure do |config|
+  config.color = true
+end

data/spec/support/building.rb

@@ -5,9 +5,11 @@
 # @return [RubyLint::Definition::RubyObject]
 #
 def build_definitions(code)
-  ast = parse(code, false)
-  vm  = RubyLint::VirtualMachine.new
+  loader        = RubyLint::ConstantLoader.new
+  ast, comments = parse_with_comments(code)
+  vm            = RubyLint::VirtualMachine.new(:comments => comments)
 
+  loader.iterate(ast)
   vm.run(ast)
 
   return vm.definitions
@@ -21,9 +23,11 @@ end
 # @return [RubyLint::Report]
 #
 def build_report(code, iterator)
-  ast = parse(code, false)
-  vm  = RubyLint::VirtualMachine.new
+  loader        = RubyLint::ConstantLoader.new
+  ast, comments = parse_with_comments(code)
+  vm            = RubyLint::VirtualMachine.new(:comments => comments)
 
+  loader.iterate(ast)
   vm.run(ast)
 
   report   = RubyLint::Report.new
@@ -41,8 +45,8 @@ end
 # @return [Hash]
 #
 def build_associations(code)
-  ast = parse(code, false)
-  vm  = RubyLint::VirtualMachine.new
+  ast, comments = parse_with_comments(code)
+  vm            = RubyLint::VirtualMachine.new(:comments => comments)
 
   vm.run(ast)
 

data/spec/support/coveralls.rb

@@ -2,4 +2,4 @@ require 'coveralls'
 
 SimpleCov.formatter = Coveralls::SimpleCov::Formatter
 
-Coveralls.wear!
+Coveralls.wear_merged!

data/spec/support/parsing.rb

@@ -8,11 +8,20 @@
 # @return [RubyLint::Node]
 #
 def parse(code, first = true)
-  ast = RubyLint::Parser.new.parse(code)
+  ast, _ = RubyLint::Parser.new.parse(code)
 
   return first ? ast.children[0] : ast
 end
 
+##
+# Parses the block of code and returns both the AST and comments.
+#
+# @see #parse
+#
+def parse_with_comments(code)
+  return RubyLint::Parser.new.parse(code)
+end
+
 ##
 # Shorthand for creating instances of a AST node.
 #