ruby-watchr 0.3.4 → 0.3.5

data/lib/watchr/analyse.rb

@@ -21,18 +21,18 @@ module Watchr
     # @param {String} Path to code folders.
     #
     def initialize(path)
-      files = Paths.files_by_dirs(path)
+      files = Paths.files_by_dirs(['rb'], path)
 
       # Flay essentially cant be done on file level because its first class
       # citizen is duplication of code between files. Its done once for all
       # the files in the analyse and results are injected to the proper file
       # later.
-      flay = Watchr::FlayMetric::Report.new(files)
+      # flay = Watchr::FlayMetric::Report.new(files)
 
       # Create report for each file.
       @files = files.map do |file|
         Watchr::FileAnalyse.new(file).tap { |file|
-          file.flay(flay.duplications_by_file(file))
+          # file.flay(flay.duplications_by_file(file))
         }
       end
 

data/lib/watchr/metrics/flog/class_report_factory.rb

@@ -11,12 +11,10 @@ module Watchr
         methods.each do |name, score|
           next if name =~ /#none/
 
-          clazz.add_method(
-            FlogReportMethod.new(
-              clazz, name, score,
-              Location.from_path(method_locations[name])
-            )
-          )
+          method_location = method_locations[name]
+          location = method_location ? Location.from_path(method_location) : nil
+
+          clazz.add_method(FlogReportMethod.new(clazz, name, score, location))
         end
 
         clazz

data/lib/watchr/paths.rb

@@ -1,13 +1,11 @@
 module Watchr
   module Paths
-    def self.files_by_dirs *dirs
-      extensions = ['rb']
-
-      dirs.flatten.map { |p|
-        if File.directory? p then
-          Dir[File.join(p, '**', "*.{#{extensions.join(',')}}")]
+    def self.files_by_dirs(extensions, *dirs)
+      dirs.flatten.map { |dir|
+        if File.directory?(dir) then
+          Dir[File.join(dir, '**', "*.{#{extensions.join(',')}}")]
         else
-          p
+          dir
         end
       }.flatten.sort
     end

data/lib/watchr/version.rb

@@ -1,3 +1,3 @@
 module Watchr
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/spec/watchr/paths_spec.rb

@@ -3,9 +3,17 @@ require 'watchr/paths'
 
 describe Watchr::Paths do
   describe '.files_by_dirs' do
+    context 'single folder' do
+      subject { Watchr::Paths.files_by_dirs(['rb'], 'spec/fixtures/') }
 
-    subject { Watchr::Paths.files_by_dirs('spec/fixtures/') }
+      it { should include('spec/fixtures/class.rb') }
+    end
 
-    it { should include('spec/fixtures/class.rb') }
+    context 'multiple folders' do
+      subject { Watchr::Paths.files_by_dirs(['rb'], 'spec/fixtures/', 'lib/') }
+
+      it { should include('lib/watchr.rb') }
+      it { should include('spec/fixtures/class.rb') }
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Petr Janda
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-13 00:00:00 +02:00
+date: 2012-08-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency