guideline 0.1.2 → 0.1.3

data/lib/guideline/checkers/abc_complexity_checker.rb

@@ -12,18 +12,22 @@ module Guideline
 
     def checker
       AbcParser.new do |complexity, method, module_name, class_method_flag|
-        if complexity > max
-          report(
-            :path    => @current_path,
-            :line    => method.line,
-            :message => "ABC Complexity of method<%s%s%s>%3d should be less than %d" % [
-              module_name,
-              class_method_flag ? "." : "#",
-              method.method_name,
-              complexity,
-              max,
-            ]
-          )
+        begin
+          if complexity > max
+            report(
+              :path    => @current_path,
+              :line    => method.line,
+              :message => "ABC Complexity of method<%s%s%s>%3d should be less than %d" % [
+                module_name,
+                class_method_flag ? "." : "#",
+                method.method_name,
+                complexity,
+                max,
+              ]
+            )
+          end
+        rescue Exception
+          require "pry"; binding.pry
         end
       end
     end
@@ -69,23 +73,21 @@ module Guideline
       end
 
       add_callback :start_def do |node|
-        @current_method = node
+        @current_method << node
         clear
       end
 
       add_callback :start_defs do |node|
-        @current_method = node
+        @current_method << node
         clear
       end
 
       add_callback :end_def do |node|
-        @callback.call(complexity, @current_method, current_module_name, false)
-        @current_method = nil
+        @callback.call(complexity, @current_method.pop, current_module_name, false)
       end
 
       add_callback :end_defs do |node|
-        @callback.call(complexity, @current_method, current_module_name, true)
-        @current_method = nil
+        @callback.call(complexity, @current_method.pop, current_module_name, true)
       end
 
       add_callback :start_binary do |node|
@@ -95,6 +97,7 @@ module Guideline
       def initialize(*, &callback)
         clear
         @callback = callback
+        @current_method = []
         super
       end
 

data/lib/guideline/checkers/hash_comma_checker.rb

@@ -32,6 +32,11 @@ module Guideline
         push_stacks
       end
 
+      def on_embexpr_end(token)
+        call(lineno) if has_error?
+        pop_stacks
+      end
+
       def on_rbrace(token)
         call(lineno) if has_error?
         pop_stacks

data/lib/guideline/version.rb

@@ -1,3 +1,3 @@
 module Guideline
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/guideline/visitor.rb

@@ -77,11 +77,17 @@ module Guideline
       end
 
       def only_pattern
-        options[:only] || "**/*.rb"
+        if options[:only]
+          File.expand_path(options[:only])
+        else
+          File.expand_path("**/*.rb")
+        end
       end
 
       def except_pattern
-        options[:except]
+        if options[:except]
+          File.expand_path(options[:except])
+        end
       end
     end
   end

data/spec/guideline/checkers/abc_complexity_checker_spec.rb

@@ -220,6 +220,19 @@ module Guideline
           subject
         end
       end
+
+      context "when there is nested method" do
+        let(:script) do
+          <<-'EOF'
+            def a
+              def b
+                c
+              end
+            end
+          EOF
+        end
+        it { should_not have_error }
+      end
     end
   end
 end

data/spec/guideline/visitor_spec.rb

@@ -19,17 +19,6 @@ module Guideline
         Pathname.new("spec/guideline/visitor_spec.rb")
       end
 
-      context "when :only option is not specified" do
-        it "visits all paths" do
-          called = false
-          checker.should_receive(:check).at_least(1) do |args|
-            called = true if args == path
-          end
-          visitor.visit
-          called.should be_true
-        end
-      end
-
       context "when :only option is specified" do
         before do
           options[:only] = "lib/**/*.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guideline
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70221529066600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70221529066600
 - !ruby/object:Gem::Dependency
   name: code_analyzer
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70221529082560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70221529082560
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70221529082140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70221529082140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70221529081640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: 2.12.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.12.0
+  version_requirements: *70221529081640
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70221529081220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70221529081220
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70221529080760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,12 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70221529080760
 description: Guideline.gem checks that your code is protectingthe rule of coding guideline
 email:
 - r7kamura@gmail.com
@@ -171,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: The guideline of your code
@@ -189,3 +159,4 @@ test_files:
 - spec/guideline/runner_spec.rb
 - spec/guideline/visitor_spec.rb
 - spec/spec_helper.rb
+has_rdoc: