reek 1.2.7.2 → 1.2.7.3

data/spec/reek/spec/should_reek_only_of_spec.rb

@@ -42,7 +42,7 @@ describe ShouldReekOnlyOf do
 
   context 'with 1 non-matching smell' do
     def smells
-      [SmellWarning.new('ControlCouple', 'context', [1], 'any old message', false)]
+      [SmellWarning.new('ControlCouple', 'context', [1], 'any old message')]
     end
 
     it_should_behave_like 'no match'
@@ -51,8 +51,8 @@ describe ShouldReekOnlyOf do
   context 'with 2 non-matching smells' do
     def smells
       [
-        SmellWarning.new('ControlCouple', 'context', [1], 'any old message', false),
-        SmellWarning.new('FeatureEnvy', 'context', [1], 'any old message', false)
+        SmellWarning.new('ControlCouple', 'context', [1], 'any old message'),
+        SmellWarning.new('FeatureEnvy', 'context', [1], 'any old message')
         ]
     end
 
@@ -62,8 +62,8 @@ describe ShouldReekOnlyOf do
   context 'with 1 non-matching and 1 matching smell' do
     def smells
       [
-        SmellWarning.new('ControlCouple', 'context', [1], 'any old message', false),
-        SmellWarning.new(@expected_smell_class.to_s, 'context', [1], "message mentioning #{@expected_context_name}", false)
+        SmellWarning.new('ControlCouple', 'context', [1], 'any old message'),
+        SmellWarning.new(@expected_smell_class.to_s, 'context', [1], "message mentioning #{@expected_context_name}")
         ]
     end
 
@@ -72,7 +72,7 @@ describe ShouldReekOnlyOf do
 
   context 'with 1 matching smell' do
     def smells
-      [SmellWarning.new(@expected_smell_class.to_s, nil, [1], "message mentioning #{@expected_context_name}", false)]
+      [SmellWarning.new(@expected_smell_class.to_s, nil, [1], "message mentioning #{@expected_context_name}")]
     end
     it 'matches' do
       @match.should be_true

data/spec/reek/spec/should_reek_spec.rb

@@ -21,7 +21,7 @@ describe ShouldReek, 'checking code in a string' do
 
   it 'reports the smells when should_not fails' do
     @matcher.matches?(@smelly_code)
-    @matcher.failure_message_for_should_not.should match('Uncommunicative Name')
+    @matcher.failure_message_for_should_not.should match('UncommunicativeName')
   end
 end
 
@@ -42,7 +42,7 @@ describe ShouldReek, 'checking code in a Dir' do
 
   it 'reports the smells when should_not fails' do
     @matcher.matches?(@smelly_dir)
-    @matcher.failure_message_for_should_not.should match('Uncommunicative Name')
+    @matcher.failure_message_for_should_not.should match('UncommunicativeName')
   end
 end
 
@@ -63,6 +63,6 @@ describe ShouldReek, 'checking code in a File' do
 
   it 'reports the smells when should_not fails' do
     @matcher.matches?(@smelly_file)
-    @matcher.failure_message_for_should_not.should match('Uncommunicative Name')
+    @matcher.failure_message_for_should_not.should match('UncommunicativeName')
   end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: reek
 version: !ruby/object:Gem::Version 
-  version: 1.2.7.2
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 7
+  - 3
+  version: 1.2.7.3
 platform: ruby
 authors: 
 - Kevin Rutherford
@@ -9,39 +15,48 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-05 00:00:00 +00:00
+date: 2010-03-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby_parser
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
         version: "2.0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: ruby2ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
         version: "1.2"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
         version: "3.0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: |
   Reek is a tool that examines Ruby classes, modules and methods
   and reports any code smells it finds.
@@ -80,11 +95,8 @@ files:
 - lib/reek/cli/report.rb
 - lib/reek/cli/version_command.rb
 - lib/reek/cli/yaml_command.rb
-- lib/reek/core/class_context.rb
 - lib/reek/core/code_context.rb
 - lib/reek/core/code_parser.rb
-- lib/reek/core/detector_stack.rb
-- lib/reek/core/masking_collection.rb
 - lib/reek/core/method_context.rb
 - lib/reek/core/module_context.rb
 - lib/reek/core/object_refs.rb
@@ -92,6 +104,7 @@ files:
 - lib/reek/core/smell_configuration.rb
 - lib/reek/core/sniffer.rb
 - lib/reek/core/stop_context.rb
+- lib/reek/core/warning_collector.rb
 - lib/reek/examiner.rb
 - lib/reek/rake/task.rb
 - lib/reek/smell_warning.rb
@@ -136,17 +149,16 @@ files:
 - spec/reek/cli/report_spec.rb
 - spec/reek/cli/version_command_spec.rb
 - spec/reek/cli/yaml_command_spec.rb
-- spec/reek/core/class_context_spec.rb
 - spec/reek/core/code_context_spec.rb
 - spec/reek/core/code_parser_spec.rb
 - spec/reek/core/config_spec.rb
-- spec/reek/core/masking_collection_spec.rb
 - spec/reek/core/method_context_spec.rb
 - spec/reek/core/module_context_spec.rb
 - spec/reek/core/object_refs_spec.rb
 - spec/reek/core/singleton_method_context_spec.rb
 - spec/reek/core/smell_configuration_spec.rb
 - spec/reek/core/stop_context_spec.rb
+- spec/reek/core/warning_collector_spec.rb
 - spec/reek/examiner_spec.rb
 - spec/reek/smell_warning_spec.rb
 - spec/reek/smells/attribute_spec.rb
@@ -233,18 +245,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: reek
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Code smell detector for Ruby

data/lib/reek/core/class_context.rb

@@ -1,22 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'module_context')
-
-module Reek
-  module Core
-
-    #
-    # A context wrapper for any class found in a syntax tree.
-    #
-    class ClassContext < ModuleContext
-
-      attr_reader :parsed_methods
-
-      def initialize(outer, name, exp)
-        super
-      end
-
-      def is_struct?
-        exp.superclass == [:const, :Struct]
-      end
-    end
-  end
-end

data/lib/reek/core/detector_stack.rb

@@ -1,33 +0,0 @@
-
-module Reek
-  module Core
-
-    #
-    # A list of smell detectors of the same class, but with differing
-    # configurations.
-    #
-    class DetectorStack
-
-      def initialize(default_detector)
-        @detectors = [default_detector]
-      end
-
-      def push(config)
-        clone = @detectors[-1].supersede_with(config)
-        @detectors << clone
-      end
-
-      def adopt(config)
-        @detectors[-1].configure_with(config)
-      end
-
-      def listen_to(hooks)
-        @detectors.each { |det| det.listen_to(hooks) }
-      end
-
-      def report_on(report)
-        @detectors.each { |det| det.report_on(report) }
-      end
-    end
-  end
-end

data/lib/reek/core/masking_collection.rb

@@ -1,52 +0,0 @@
-require 'set'
-
-module Reek
-  module Core
-
-    #
-    # A set of items that can be "masked" or "visible". If an item is added
-    # more than once, only the "visible" copy is retained.
-    #
-    class MaskingCollection
-      def initialize
-        @visible_items = SortedSet.new
-        @masked_items = SortedSet.new
-      end
-
-      def collect_from(sources, config)
-        sources.each { |src| Core::Sniffer.new(src, config).report_on(self) }
-        self
-      end
-
-      def all_items
-        all = SortedSet.new(@visible_items)
-        all.merge(@masked_items)
-        all.to_a
-      end
-      def all_active_items
-        @visible_items
-      end
-      def found_smell(item)
-        @visible_items.add(item)
-        @masked_items.delete(item) if @masked_items.include?(item)
-      end
-      def found_masked_smell(item)
-        @masked_items.add(item) unless @visible_items.include?(item)
-      end
-      def num_visible_items
-        @visible_items.length
-      end
-      def num_masked_items
-        @masked_items.length
-      end
-      def each_item(&blk)
-        all = SortedSet.new(@visible_items)
-        all.merge(@masked_items)
-        all.each(&blk)
-      end
-      def each_visible_item(&blk)
-        @visible_items.each(&blk)
-      end
-    end
-  end
-end

data/spec/reek/core/class_context_spec.rb

@@ -1,53 +0,0 @@
-require File.join(File.dirname(File.dirname(File.dirname(File.expand_path(__FILE__)))), 'spec_helper')
-require File.join(File.dirname(File.dirname(File.dirname(File.dirname(File.expand_path(__FILE__))))), 'lib', 'reek', 'core', 'class_context')
-require File.join(File.dirname(File.dirname(File.dirname(File.dirname(File.expand_path(__FILE__))))), 'lib', 'reek', 'core', 'stop_context')
-
-include Reek::Core
-
-describe ClassContext do
-  it 'should report Long Parameter List' do
-    ruby = 'class Inner; def simple(arga, argb, argc, argd) f(3);true end end'
-    ruby.should reek_of(:LongParameterList, /Inner/, /simple/, /4 parameters/)
-  end
-
-  it 'should report two different methods' do
-    src = <<EOEX
-# module for test
-class Fred
-  def simple(arga, argb, argc, argd) f(3);true end
-  def simply(arga, argb, argc, argd) f(3);false end
-end
-EOEX
-
-    src.should reek_of(:LongParameterList, /Fred/, /simple/)
-    src.should reek_of(:LongParameterList, /Fred/, /simply/)
-  end
-
-  it 'should report many different methods' do
-    src = <<EOEX
-# module for test
-class Fred
-    def textile_bq(tag, atts, cite, content) f(3);end
-    def textile_p(tag, atts, cite, content) f(3);end
-    def textile_fn_(tag, num, atts, cite, content) f(3);end
-    def textile_popup_help(name, windowW, windowH) f(3);end
-end
-EOEX
-    
-    src.should reek_of(:LongParameterList, /Fred/, /textile_bq/)
-    src.should reek_of(:LongParameterList, /Fred/, /textile_fn_/)
-    src.should reek_of(:LongParameterList, /Fred/, /textile_p/)
-  end
-end
-
-describe ClassContext do
-  it 'does not report empty class in another module' do
-    '# module for test
-class Treetop::Runtime::SyntaxNode; end'.should_not reek
-  end
-
-  it 'deals with :: scoped names' do
-    element = ClassContext.create(StopContext.new, [:colon2, [:colon2, [:const, :Treetop], :Runtime], :SyntaxNode])
-    element.num_methods.should == 0
-  end
-end

data/spec/reek/core/masking_collection_spec.rb

@@ -1,235 +0,0 @@
-require File.join(File.dirname(File.dirname(File.dirname(File.expand_path(__FILE__)))), 'spec_helper')
-require File.join(File.dirname(File.dirname(File.dirname(File.dirname(File.expand_path(__FILE__))))), 'lib', 'reek', 'core', 'masking_collection')
-
-include Reek::Core
-
-describe MaskingCollection do
-  before(:each) do
-    @collection = MaskingCollection.new
-  end
-
-  context 'when empty' do
-    it 'has no visible items' do
-      @collection.num_visible_items.should == 0
-    end
-    it 'has no masked items' do
-      @collection.num_masked_items.should == 0
-    end
-    it 'yields no items' do
-      count = 0
-      @collection.each_item {|item| count+= 1}
-      count.should == 0
-    end
-    it 'yields no visible items' do
-      count = 0
-      @collection.each_visible_item {|item| count+= 1}
-      count.should == 0
-    end
-  end
-
-  shared_examples_for 'one visible item' do
-    it 'has one visible item' do
-      @collection.num_visible_items.should == 1
-    end
-    it 'has no masked items' do
-      @collection.num_masked_items.should == 0
-    end
-    it 'yields one item' do
-      count = 0
-      @collection.each_item do |item|
-        item.should == @item
-        count+= 1
-      end
-      count.should == 1
-    end
-    it 'yields one visible item' do
-      count = 0
-      @collection.each_visible_item do |item|
-        item.should == @item
-        count+= 1
-      end
-      count.should == 1
-    end
-  end
-
-  shared_examples_for 'one masked item' do
-    it 'has no visible items' do
-      @collection.num_visible_items.should == 0
-    end
-    it 'has one masked item' do
-      @collection.num_masked_items.should == 1
-    end
-    it 'yields one item' do
-      count = 0
-      @collection.each_item do |item|
-        item.should == @item
-        count+= 1
-      end
-      count.should == 1
-    end
-    it 'yields no visible items' do
-      count = 0
-      @collection.each_visible_item { |item| count+= 1 }
-      count.should == 0
-    end
-  end
-
-  context 'with one visible item' do
-    before :each do
-      @item = "hello"
-      @collection.found_smell(@item)
-    end
-    it_should_behave_like 'one visible item'
-  end
-
-  context 'with one masked item' do
-    before :each do
-      @item = "hiding!"
-      @collection.found_masked_smell(@item)
-    end
-    it_should_behave_like 'one masked item'
-  end
-
-  context 'with one masked and one visible' do
-    before :each do
-      @visible = "visible"
-      @masked = "masked"
-      @collection.found_masked_smell(@masked)
-      @collection.found_smell(@visible)
-    end
-    it 'has one visible item' do
-      @collection.num_visible_items.should == 1
-    end
-    it 'has one masked item' do
-      @collection.num_masked_items.should == 1
-    end
-    it 'yields both items' do
-      yielded_items = []
-      @collection.each_item { |item| yielded_items << item }
-      yielded_items.length.should == 2
-      yielded_items.should include(@visible)
-      yielded_items.should include(@masked)
-    end
-    it 'yields one visible item' do
-      count = 0
-      @collection.each_visible_item do |item|
-        item.should == @visible
-        count+= 1
-      end
-      count.should == 1
-    end
-    it 'yields the items in sort order' do
-      yielded_items = []
-      @collection.each_item { |item| yielded_items << item }
-      yielded_items.length.should == 2
-      yielded_items[0].should == @masked
-      yielded_items[1].should == @visible
-    end
-  end
-
-  context 'with one visible item added twice' do
-    before :each do
-      @item = "hello"
-      @collection.found_smell(@item)
-      @collection.found_smell(@item)
-    end
-    it_should_behave_like 'one visible item'
-  end
-
-  context 'with one masked item added twice' do
-    before :each do
-      @item = "hello"
-      @collection.found_masked_smell(@item)
-      @collection.found_masked_smell(@item)
-    end
-    it_should_behave_like 'one masked item'
-  end
-
-  context 'with two different visible items' do
-    before :each do
-      @first_item = "hello"
-      @second_item = "goodbye"
-      @collection.found_smell(@first_item)
-      @collection.found_smell(@second_item)
-    end
-    it 'has 2 visible items' do
-      @collection.num_visible_items.should == 2
-    end
-    it 'has no masked items' do
-      @collection.num_masked_items.should == 0
-    end
-    it 'yields both items' do
-      yielded_items = []
-      @collection.each_item { |item| yielded_items << item }
-      yielded_items.length.should == 2
-      yielded_items.should include(@first_item)
-      yielded_items.should include(@second_item)
-    end
-    it 'yields both visible items' do
-      yielded_items = []
-      @collection.each_visible_item { |item| yielded_items << item }
-      yielded_items.length.should == 2
-      yielded_items.should include(@first_item)
-      yielded_items.should include(@second_item)
-    end
-    it 'yields the items in sort order' do
-      yielded_items = []
-      @collection.each_visible_item { |item| yielded_items << item }
-      yielded_items.length.should == 2
-      yielded_items[0].should == @second_item
-      yielded_items[1].should == @first_item
-    end
-  end
-
-  context 'with two different masked items' do
-    before :each do
-      @first_item = "hello"
-      @second_item = "goodbye"
-      @collection.found_masked_smell(@first_item)
-      @collection.found_masked_smell(@second_item)
-    end
-    it 'has 0 visible items' do
-      @collection.num_visible_items.should == 0
-    end
-    it 'has 2 masked items' do
-      @collection.num_masked_items.should == 2
-    end
-    it 'yields both items' do
-      yielded_items = []
-      @collection.each_item { |item| yielded_items << item }
-      yielded_items.length.should == 2
-      yielded_items.should include(@first_item)
-      yielded_items.should include(@second_item)
-    end
-    it 'yields no visible items' do
-      count = 0
-      @collection.each_visible_item { |item| count+= 1 }
-      count.should == 0
-    end
-    it 'yields the items in sort order' do
-      yielded_items = []
-      @collection.each_item { |item| yielded_items << item }
-      yielded_items.length.should == 2
-      yielded_items[0].should == @second_item
-      yielded_items[1].should == @first_item
-    end
-  end
-
-  context 'with one masked item later made visible' do
-    before :each do
-      @item = "hello"
-      @collection.found_masked_smell(@item)
-      @collection.found_smell(@item)
-    end
-    it_should_behave_like 'one visible item'
-  end
-
-  context 'with one visible item later masked' do
-    before :each do
-      @item = "hello"
-      @collection.found_smell(@item)
-      @collection.found_masked_smell(@item)
-    end
-    it_should_behave_like 'one visible item'
-  end
-end