Merge pull request #23 from metricfu/remove_rubygems_require

Remove rubygems require & fixing a bunch of Ruby warnings

lib/roodi/checks/abc_metric_method_check.rb

@@ -35,23 +35,20 @@ def evaluate_start(node)
       private
 
       def count_assignments(node)
-        count = 0
-        count = count + 1 if assignment?(node)
-        node.children.each {|node| count += count_assignments(node)}
+        count = assignment?(node) ? 1 : 0
+        node.children.each {|child_node| count += count_assignments(child_node)}
         count
       end
 
       def count_branches(node)
-        count = 0
-        count = count + 1 if branch?(node)
-        node.children.each {|node| count += count_branches(node)}
+        count = branch?(node) ? 1 : 0
+        node.children.each {|child_node| count += count_branches(child_node)}
         count
       end
 
       def count_conditionals(node)
-        count = 0
-        count = count + 1 if conditional?(node)
-        node.children.each {|node| count += count_conditionals(node)}
+        count = conditional?(node) ? 1 : 0
+        node.children.each {|child_node| count += count_conditionals(child_node)}
         count
       end
 

lib/roodi/checks/check.rb

@@ -28,8 +28,8 @@ def initialize
       NODE_TYPES.each do |node|
         start_node_method = "evaluate_start_#{node}"
         end_node_method = "evaluate_end_#{node}"
-        define_method(start_node_method) { |node| return } unless self.respond_to?(start_node_method)
-        define_method(end_node_method) { |node| return } unless self.respond_to?(end_node_method)
+        define_method(start_node_method) { |start_node| return } unless self.respond_to?(start_node_method)
+        define_method(end_node_method) { |end_node| return } unless self.respond_to?(end_node_method)
       end
 
       def position(offset = 0)

lib/roodi/checks/method_name_check.rb

@@ -3,17 +3,17 @@
 module Roodi
   module Checks
     # Checks a method name to make sure it matches the specified pattern.
-    # 
+    #
     # Keeping to a consistent nameing convention makes your code easier to read.
     class MethodNameCheck < NameCheck
 
       DEFAULT_PATTERN = /^[_a-z<>=\[|+-\/\*`]+[_a-z0-9_<>=~@\[\]]*[=!\?]?$/
-      
+
       def initialize
         super()
         self.pattern = DEFAULT_PATTERN
       end
-      
+
       def interesting_nodes
         [:defn]
       end

lib/roodi/core/parser.rb

@@ -1,18 +1,17 @@
-require 'rubygems'
 require 'ruby_parser'
 require 'rbconfig'
 
 module Roodi
   module Core
     class Parser
       def parse(content, filename)
-        silence_stream(STDERR) do 
+        silence_stream(STDERR) do
           return silent_parse(content, filename)
         end
       end
-      
+
       private
-      
+
       def silence_stream(stream)
         old_stream = stream.dup
         stream.reopen(null_stream_output)
@@ -21,16 +20,16 @@ def silence_stream(stream)
       ensure
         stream.reopen(old_stream)
       end
-      
+
       def silent_parse(content, filename)
         @parser ||= RubyParser.new
         @parser.parse(content, filename)
       end
-      
+
       def null_stream_output
         null_output_for_platform(RbConfig::CONFIG['host_os'])
       end
-      
+
       def null_output_for_platform(host_os)
         case host_os
         when windows_host_os_matcher
@@ -39,7 +38,7 @@ def null_output_for_platform(host_os)
           '/dev/null'
         end
       end
-      
+
       def windows_host_os_matcher
         /mingw|mswin32|cygwin/o
       end

lib/roodi/core/runner.rb

@@ -60,7 +60,7 @@ def errors
       def parse(filename, content)
         begin
           Parser.new.parse(content, filename)
-        rescue Exception => e
+        rescue Exception
           parsing_errors << "#{filename} looks like it's not a valid Ruby file."
           nil
         end

lib/roodi/core/visitable_sexp.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'sexp'
 
 class Sexp
@@ -13,11 +12,11 @@ def node_type
   def children
     find_all { | sexp | Sexp === sexp }
   end
-  
+
   def is_language_node?
     first.class == Symbol
   end
-  
+
   def visitable_children
     parent = is_language_node? ? sexp_body : self
     parent.children