roodi 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fe93f143f769ff54f5113a656f2069c9e608070
-  data.tar.gz: e816fefa85c0c9294d8e2370eb7cd5f9715f8c02
+  metadata.gz: 791b4df2f1296693e2b3bb3eff9ca6f20e5f42f3
+  data.tar.gz: 3c6cc32ae0aae19f77615c293f59f331d209a076
 SHA512:
-  metadata.gz: 7c7142c98fcb6fffb1c48038118c46da45168d12f95eb9517b4b77e69b38e29c5aadeffdb01fb3679a837704323a312507542e2ec7806e2105f9927b987a5862
-  data.tar.gz: 9e8e8147ccc6d25e5a3866a2eb536122c6bfdec6c8b1a166047937e99618416c327f523c887e93a56390ce30ed7fb672e02f9bb75924a21df13119fd0ebba3dc
+  metadata.gz: cc7d87be26ee71b755ca594122c0fcb95321dd223d16c7c3ea3b0d88756b7d667a6d99b82338f6a36e21df30cc1ecf61c2b9d01496774abcd18c05a15f041090
+  data.tar.gz: e400fb3c7e4a3b66d8992ef43e18b881ddff25d4a51e49da8c000a491ebe15fc365432db646761d7ddcdcf7b9713189fdd374877385903a1262eed8ee95e61a3

data/History.txt

@@ -1,3 +1,8 @@
+= 3.1.1
+* Merge pull request #23 from metricfu/remove_rubygems_require
+  * Fix ruby warnings
+  * Remove unnecessary require of rubygems
+
 = 3.1.0
 * Loosen ruby_parser version dependency (PR from Benjamin Fleischer)
 * Files that can't be parsed are no longer silently skipped

data/lib/roodi/checks/abc_metric_method_check.rb

@@ -35,23 +35,20 @@ module Roodi
       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
 

data/lib/roodi/checks/check.rb

@@ -28,8 +28,8 @@ module Roodi
       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)

data/lib/roodi/checks/method_name_check.rb

@@ -3,17 +3,17 @@ require 'roodi/checks/name_check'
 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

data/lib/roodi/core/parser.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'ruby_parser'
 require 'rbconfig'
 
@@ -6,13 +5,13 @@ 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 @@ module Roodi
       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 @@ module Roodi
           '/dev/null'
         end
       end
-      
+
       def windows_host_os_matcher
         /mingw|mswin32|cygwin/o
       end

data/lib/roodi/core/runner.rb

@@ -60,7 +60,7 @@ module Roodi
       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

data/lib/roodi/core/visitable_sexp.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'sexp'
 
 class Sexp
@@ -13,11 +12,11 @@ class Sexp
   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

data/lib/roodi/version.rb

@@ -1,3 +1,3 @@
 module Roodi
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roodi
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Marty Andrews
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_parser