reek 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71abe096497ff72ac2b0ff61c0264cde02d49ff3
-  data.tar.gz: 03e5768e1b53aef97a23e47d985daceb3f7316dd
+  metadata.gz: d10cc19d7d47e9a5094aaf117aac55072abe9064
+  data.tar.gz: db2544839858ea0cad619f8bef26c77e0ebb9745
 SHA512:
-  metadata.gz: 9e8b1c75ccd4d2982825ee6f066a834dc602b8d370179740d2a79645bd5ae1c3974ffb466560dc0e4962393f203efb7e8cb603afb22ebd37913d11eb91348c44
-  data.tar.gz: c12a018c2777291fdcaaf93d3220b8d3abf193542cbe13763017c982473afa1e22767c3595cca3efe8e64c170954165b4a616412daff0822e1a053e0e8ed6fd5
+  metadata.gz: 0b29e3d3b6fcdcd5399b3d6faa881c88a226626589f5fff426c62e550c836b53b74280117a0dd9e362a9921b5fac4b2b86762714388d5a48ed425b0425c703e5
+  data.tar.gz: 7bc7a0108f69942487dc213fa76a5f43c09780d8c162151c0a66351aaa5520cafc2c4de5946050034827b3c6dcea5ad7abe728e709c6481efd62c0031df1b732

data/.rubocop.yml

@@ -18,6 +18,10 @@ Metrics/MethodLength:
 Metrics/LineLength:
   Max: 100
 
+# Indent one level for follow-up lines
+Style/MultilineOperationIndentation:
+  EnforcedStyle: indented
+
 # Allow small arrays of words with quotes
 Style/WordArray:
   MinSize: 3

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 3.0.3
+
+* (troessner) Fix finding sources when using just the current directory.
+
 == 3.0.2
 
 * (troessner) Only use ruby source files.

data/lib/reek/configuration/app_configuration.rb

@@ -56,8 +56,8 @@ module Reek
 
         def exclude_paths
           @exclude_paths ||= @configuration.
-                             fetch(EXCLUDE_PATHS_KEY, []).
-                             map { |path| path.chomp('/') }
+            fetch(EXCLUDE_PATHS_KEY, []).
+            map { |path| path.chomp('/') }
         end
 
         private

data/lib/reek/report/formatter.rb

@@ -18,7 +18,7 @@ module Reek
       def self.header(examiner)
         count = examiner.smells_count
         result = Rainbow("#{examiner.description} -- ").cyan +
-                 Rainbow("#{count} warning").yellow
+          Rainbow("#{count} warning").yellow
         result += Rainbow('s').yellow unless count == 1
         result
       end

data/lib/reek/smells/nested_iterators.rb

@@ -66,7 +66,7 @@ module Reek
       def find_iters_for_iter_node(exp, depth)
         ignored = ignored_iterator? exp
         result = find_iters(exp.call, depth) +
-                 find_iters(exp.block, depth + (ignored ? 0 : 1))
+          find_iters(exp.block, depth + (ignored ? 0 : 1))
         result << [exp, depth] unless ignored
         result
       end

data/lib/reek/source/source_locator.rb

@@ -11,7 +11,9 @@ module Reek
       #
       # paths - a list of paths as Strings
       def initialize(paths)
-        @paths = paths.map { |path| path.chomp('/') }
+        @pathnames = paths.
+          map { |path| Pathname.new(path.chomp('/')) }.
+          flat_map { |pathname| current_directory?(pathname) ? pathname.entries : pathname }
       end
 
       # Traverses all paths we initialized the SourceLocator with, finds
@@ -25,11 +27,9 @@ module Reek
       private
 
       def source_paths
-        relevant_paths = []
-        @paths.map do |given_path|
-          print_no_such_file_error(given_path) && next unless path_exists?(given_path)
-          Find.find(given_path) do |path|
-            pathname = Pathname.new(path)
+        @pathnames.each_with_object([]) do |given_pathname, relevant_paths|
+          print_no_such_file_error(given_pathname) && next unless path_exists?(given_pathname)
+          given_pathname.find do |pathname|
             if pathname.directory?
               ignore_path?(pathname) ? Find.prune : next
             else
@@ -37,7 +37,6 @@ module Reek
             end
           end
         end
-        relevant_paths.flatten.sort
       end
 
       def path_excluded?(pathname)
@@ -61,7 +60,11 @@ module Reek
       end
 
       def ruby_file?(pathname)
-        pathname.to_s.end_with?('.rb')
+        pathname.extname == '.rb'
+      end
+
+      def current_directory?(pathname)
+        ['.', './'].include? pathname.to_s
       end
     end
   end

data/lib/reek/version.rb

@@ -3,6 +3,6 @@ module Reek
   # This module holds the Reek version informations
   #
   module Version
-    STRING = '3.0.2'
+    STRING = '3.0.3'
   end
 end

data/spec/reek/source/source_locator_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Reek::Source::SourceLocator do
         sources = described_class.new([path]).sources
 
         expect(sources.map(&:path)).
-          not_to include(files_that_are_expected_to_be_ignored)
+          not_to include(*files_that_are_expected_to_be_ignored)
 
         expect(sources.map(&:path)).to eq expected_files
       end
@@ -37,7 +37,7 @@ RSpec.describe Reek::Source::SourceLocator do
           sources = described_class.new([path]).sources
 
           expect(sources.map(&:path).sort).
-            not_to include(files_that_are_expected_to_be_ignored)
+            not_to include(*files_that_are_expected_to_be_ignored)
 
           expect(sources.map(&:path).sort).to eq [
             'spec/samples/source_with_exclude_paths/nested/uncommunicative_parameter_name.rb'
@@ -62,10 +62,27 @@ RSpec.describe Reek::Source::SourceLocator do
         sources = described_class.new([path]).sources
 
         expect(sources.map(&:path)).
-          not_to include(files_that_are_expected_to_be_ignored)
+          not_to include(*files_that_are_expected_to_be_ignored)
 
         expect(sources.map(&:path)).to eq expected_files
       end
     end
+
+    context 'passing "." or "./" as argument' do
+      let(:expected_files) do
+        [
+          'spec/spec_helper.rb',
+          'lib/reek.rb'
+        ]
+      end
+
+      it 'expands it correctly' do
+        sources_for_dot       = described_class.new(['.']).sources
+        sources_for_dot_slash = described_class.new(['./']).sources
+
+        expect(sources_for_dot.map(&:path)).to include(*expected_files)
+        expect(sources_for_dot.map(&:path)).to eq(sources_for_dot_slash.map(&:path))
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reek
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Kevin Rutherford
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-03 00:00:00.000000000 Z
+date: 2015-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser