ruby-watchr 0.1.5.2 → 0.1.6

data/lib/watchr/analyse.rb

@@ -1,5 +1,5 @@
 require 'watchr/paths'
-require 'watchr/flay_metric/report'
+require 'watchr/metrics/flay/report'
 require 'watchr/file_analyse'
 
 module Watchr

data/lib/watchr/analysers/reek.rb

@@ -0,0 +1,23 @@
+require 'watchr/smell'
+
+module Watchr
+  module Analysers
+    module Reek
+      include SmellTypes
+
+      def analyse_reek(report)
+        report.smells.each do |smell|
+          location = Location.new(
+            smell.location['source'], 
+            smell.location['lines'].first
+          )
+
+          add_smell(Watchr::Smell.new(
+            smell.smell['subclass'],
+            smell.location['context'], smell.smell['message'], location, {}
+          ))
+        end
+      end
+    end
+  end
+end

data/lib/watchr/file_analyse.rb

@@ -1,7 +1,9 @@
-require 'watchr/flog_metric/report'
+require 'watchr/metrics/flog/report'
+require 'watchr/metrics/reek/report'
 require 'watchr/smell'
 require 'watchr/smells_collector'
 require 'watchr/analysers/flog'
+require 'watchr/analysers/reek'
 require 'watchr/rating'
 
 module Watchr
@@ -12,6 +14,7 @@ module Watchr
   #
   class FileAnalyse
     include Analysers::Flog
+    include Analysers::Reek
     include Rating
 
     attr_reader :path
@@ -24,8 +27,9 @@ module Watchr
     def initialize(path)
       @path = path
       @smells = SmellsCollector.new
-
+      
       analyse_flog(FlogMetric::Report.new([path]))
+      analyse_reek(ReekMetric::Report.new([path]))
     end
 
     def smelly?

data/lib/watchr/{flay_metric → metrics/flay}/report.rb

@@ -1,5 +1,5 @@
 require 'flay'
-require 'watchr/flay_metric/diff'
+require 'watchr/metrics/flay/diff'
 require 'watchr/location'
 
 module Watchr

data/lib/watchr/{flog_metric → metrics/flog}/report.rb

@@ -1,6 +1,6 @@
 require 'flog'
-require 'watchr/flog_metric/class'
-require 'watchr/flog_metric/method'
+require 'watchr/metrics/flog/class'
+require 'watchr/metrics/flog/method'
 require 'watchr/location'
 
 module Watchr

data/lib/watchr/metrics/reek/report.rb

@@ -0,0 +1,15 @@
+require 'reek'
+
+module Watchr
+  module ReekMetric
+    class Report
+      def initialize(path)
+        @warnings = Reek::Examiner.new(path).all_active_smells
+      end
+
+      def smells
+        @warnings
+      end
+    end
+  end
+end

data/lib/watchr/version.rb

@@ -1,3 +1,3 @@
 module Watchr
-  VERSION = "0.1.5.2"
+  VERSION = "0.1.6"
 end

data/spec/watchr/file_analyse_spec.rb

@@ -19,6 +19,8 @@ describe Watchr::FileAnalyse do
     subject { file_analyse.smelly? }
 
     context 'with no smells' do
+      before { file_analyse.stubs(:smells).returns([]) }
+
       it { should be_false }
     end
 

data/spec/watchr/flay/report_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'watchr/flay_metric/report'
+require 'watchr/metrics/flay/report'
 
 describe Watchr::FlayMetric::Report do
   let(:report) { 

data/spec/watchr/flog_metric/flog_matric/flog_report_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'watchr/flog_metric/report'
+require 'watchr/metrics/flog/report'
 
 describe Watchr::FlogMetric::Report do
   let(:flog_report) { 

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  - 2
-  version: 0.1.5.2
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Petr Janda
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-09 00:00:00 +02:00
+date: 2012-07-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,13 +74,15 @@ files:
 - lib/watchr.rb
 - lib/watchr/analyse.rb
 - lib/watchr/analysers/flog.rb
+- lib/watchr/analysers/reek.rb
 - lib/watchr/file_analyse.rb
-- lib/watchr/flay_metric/diff.rb
-- lib/watchr/flay_metric/report.rb
-- lib/watchr/flog_metric/class.rb
-- lib/watchr/flog_metric/method.rb
-- lib/watchr/flog_metric/report.rb
 - lib/watchr/location.rb
+- lib/watchr/metrics/flay/diff.rb
+- lib/watchr/metrics/flay/report.rb
+- lib/watchr/metrics/flog/class.rb
+- lib/watchr/metrics/flog/method.rb
+- lib/watchr/metrics/flog/report.rb
+- lib/watchr/metrics/reek/report.rb
 - lib/watchr/paths.rb
 - lib/watchr/rating.rb
 - lib/watchr/smell.rb