ruby-watchr 0.4.1 → 0.4.2

data/Gemfile

@@ -3,9 +3,9 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in watchr.gemspec
 gemspec
 
-gem "reek", :git => 'git@github.com:petrjanda/reek.git', :branch => :rubinius_support
-gem 'flog'
-gem 'ruby_parser', '2.0'
+gem 'reek', '1.2.12'
+gem 'flog', '2.5.3'
+gem 'flay', '1.4.3'
 
 gem 'rspec'
 gem 'shoulda-matchers'

data/Gemfile.lock

@@ -1,14 +1,3 @@
-GIT
-  remote: git@github.com:petrjanda/reek.git
-  revision: a52c448ea2d88ec931c3402f540d33a42ec92abe
-  branch: rubinius_support
-  specs:
-    reek (1.2.12)
-      ripper_ruby_parser (~> 0.0.7)
-      ruby2ruby (~> 1.2.5)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-
 PATH
   remote: .
   specs:
@@ -16,16 +5,11 @@ PATH
       flay
       flog
       reek
+      ruby2ruby
 
 GEM
   remote: http://rubygems.org/
   specs:
-    ParseTree (3.0.9)
-      RubyInline (~> 3.9.0)
-      sexp_processor (~> 3.2.0)
-    RubyInline (3.9.0)
-      ZenTest (~> 4.3)
-    ZenTest (4.8.2)
     activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
@@ -41,6 +25,11 @@ GEM
     mocha (0.13.0)
       metaclass (~> 0.0.1)
     multi_json (1.3.7)
+    reek (1.2.12)
+      ripper_ruby_parser (~> 0.0.7)
+      ruby2ruby (~> 1.2.5)
+      ruby_parser (~> 2.0)
+      sexp_processor (~> 3.0)
     ripper_ruby_parser (0.0.8)
       sexp_processor (~> 3.0)
     rspec (2.12.0)
@@ -54,9 +43,8 @@ GEM
     ruby2ruby (1.2.5)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
-    ruby_parser (2.0.0)
-      ParseTree
-      sexp_processor (>= 3.0.0)
+    ruby_parser (2.3.1)
+      sexp_processor (~> 3.0)
     sexp_processor (3.2.0)
     shoulda-matchers (1.4.1)
       activesupport (>= 3.0.0)
@@ -65,10 +53,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  flog
+  flay (= 1.4.3)
+  flog (= 2.5.3)
   mocha
-  reek!
+  reek (= 1.2.12)
   rspec
   ruby-watchr!
-  ruby_parser (= 2.0)
   shoulda-matchers

data/lib/watchr/analysers/flog.rb

@@ -64,7 +64,7 @@ module Watchr
       end
 
       def is_complex_by_level?(score, type, level)
-        score >= Flog.const_get("#{level.to_s.upcase}_#{type.to_s.upcase}_THRESHOLD")
+        score >= Flog.const_get("#{level.upcase}_#{type.upcase}_THRESHOLD")
       end
     end
   end

data/lib/watchr/file_analyse.rb

@@ -38,6 +38,14 @@ module Watchr
       smells.any?
     end
 
+    def loc
+      stats_report.loc
+    end
+
+    def code_loc
+      stats_report.code_loc
+    end
+
     #
     # Store the flay report, which was evaluated on global basis
     # to check for duplications across multiple files.
@@ -56,5 +64,11 @@ module Watchr
     def add_smell(smell)
       @smells.add(smell)
     end
+
+    private
+
+    def stats_report
+      @stats ||= Stats::Report.new(path)
+    end
   end
 end

data/lib/watchr/metrics/flay/diff_factory.rb

@@ -5,9 +5,12 @@ module Watchr
         diff = Diff.new(same, nodes, bonus, mass)
 
         nodes.each do |x|
-          diff.add_location(Location.new(x.file, x.line - 1))
+          diff.add_location(Location.new(x.file, x.line))
         end
 
+        #r2r = Ruby2Ruby.new
+        #diff.code = n_way_diff(*nodes.map { |s| r2r.process(s.deep_clone) })
+
         diff
       end
     end

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

@@ -0,0 +1,48 @@
+module Watchr
+  module Stats
+    class Report
+      attr_reader :loc, :code_loc
+
+      def initialize(file_name)
+        @file_name = file_name
+
+        @loc = 0
+        @code_loc = 0
+        @inside_comment = false
+
+        calculate
+      end
+
+      private
+
+      def calculate
+        File.open(@file_name) do |file|
+          while line = file.gets
+            calculate_line(line)
+          end
+        end
+      end
+
+      def calculate_line(line)
+        @loc += 1
+
+        comment_end if inside_comment? && line =~ /^=end/
+        comment_start if line =~ /^=begin/
+        
+        @code_loc += 1 unless line =~ /^\s*$/ || line =~ /^\s*#/
+      end
+
+      def inside_comment?
+        @inside_comment
+      end
+
+      def comment_start
+        @inside_comment = true
+      end
+
+      def comment_end
+        @inside_comment = false
+      end
+    end
+  end
+end

data/lib/watchr/version.rb

@@ -1,3 +1,3 @@
 module Watchr
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/fixtures/class.rb

@@ -10,6 +10,9 @@ module Baz
       end
     end
 
+    #
+    # Bar
+    #
     def self.bar
       if true == false
         return false

data/spec/watchr/analysers/flog_spec.rb

@@ -60,7 +60,7 @@ describe Watchr::Analysers::Flog do
       Watchr::SmellBuilder.expects(:new).with(
         :complex_method,
         complex_method.name,
-        "complexity = #{complex_method.total_score}"
+        "complexity = #{complex_method.total_score}",
       ).returns(builder)
 
       analyse.expects(:add_smell).returns(smell)
@@ -84,7 +84,7 @@ describe Watchr::Analysers::Flog do
       Watchr::SmellBuilder.expects(:new).with(
         :very_complex_object,
         clazz.name,
-        "complexity = #{clazz.total_score}"
+        "complexity = #{clazz.total_score}",
       ).returns(builder)
 
       analyse.expects(:add_smell).returns(smell)

data/spec/watchr/file_analyse_spec.rb

@@ -32,4 +32,52 @@ describe Watchr::FileAnalyse do
       it { should be_true }
     end
   end
+
+  describe '#loc' do
+    let(:stats_report) do
+      stub('stats_report', :loc => 10)
+    end
+
+    subject { file_analyse.loc }
+
+    before do
+      Watchr::Stats::Report.expects(:new).with(path).returns(stats_report)
+    end
+
+    it 'should return loc from stats report' do
+      should == stats_report.loc
+    end
+
+    it 'should cache report' do
+      file_analyse.loc
+
+      Watchr::Stats::Report.expects(:new).never
+
+      file_analyse.loc
+    end
+  end
+
+  describe '#code_loc' do
+    let(:stats_report) do
+      stub('stats_report', :loc => 10, :code_loc => 20)
+    end
+
+    subject { file_analyse.code_loc }
+
+    before do
+      Watchr::Stats::Report.expects(:new).with(path).returns(stats_report)
+    end
+
+    it 'should return code_loc from stats report' do
+      should == stats_report.code_loc
+    end
+
+    it 'should cache report' do
+      file_analyse.loc.should == 10
+
+      Watchr::Stats::Report.expects(:new).never
+
+      file_analyse.code_loc.should == 20
+    end
+  end
 end

data/spec/watchr/metrics/flog/flog_report_spec.rb

@@ -59,7 +59,7 @@ describe Watchr::FlogMetric::Report do
             subject { flog_report.classes.first.methods.first.location }
 
             its(:file) { should == 'spec/fixtures/class.rb' }
-            its(:line) { should == 13 }
+            its(:line) { should == 16 }
           end
 
         end

data/spec/watchr/metrics/stats/stats_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'watchr/metrics/stats/report'
+
+describe Watchr::Stats::Report do
+  let(:stats) do
+    Watchr::Stats::Report.new(
+      'spec/fixtures/class.rb'
+    )
+  end
+
+  describe '#loc' do  
+    subject { stats.loc }
+
+    it { should == 24 }
+  end
+
+  describe '#code_loc' do
+    subject { stats.code_loc }
+
+    it { should == 19 }
+  end
+end

data/watchr.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'flog'
   s.add_dependency 'flay'
   s.add_dependency 'reek'
+  s.add_dependency 'ruby2ruby'
 end

metadata

@@ -1,74 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-watchr
-version: !ruby/object:Gem::Version 
-  hash: 596984887313028563
+version: !ruby/object:Gem::Version
+  version: 0.4.2
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 1
-  version: 0.4.1
 platform: ruby
-authors: 
+authors:
 - Petr Janda
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: flog
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2002549777813010636
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: flay
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: flay
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2002549777813010636
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: reek
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby2ruby
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2002549777813010636
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Utility to gather summary of code smells according to multiple analysers.
-email: 
+email:
 - petrjanda@me.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .rvmrc
@@ -89,6 +102,7 @@ files:
 - lib/watchr/metrics/flog/method.rb
 - lib/watchr/metrics/flog/report.rb
 - lib/watchr/metrics/reek/report.rb
+- lib/watchr/metrics/stats/report.rb
 - lib/watchr/paths.rb
 - lib/watchr/smell.rb
 - lib/watchr/smell_builder.rb
@@ -105,45 +119,37 @@ files:
 - spec/watchr/location_spec.rb
 - spec/watchr/metrics/flay/report_spec.rb
 - spec/watchr/metrics/flog/flog_report_spec.rb
+- spec/watchr/metrics/stats/stats_spec.rb
 - spec/watchr/paths_spec.rb
 - spec/watchr/smell_builder_spec.rb
 - spec/watchr/smell_spec.rb
 - spec/watchr/smells_collector_spec.rb
 - watchr.gemspec
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 2002549777813010636
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 2002549777813010636
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: watchr
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby static code analysis
-test_files: 
+test_files:
 - spec/fixtures/class.rb
 - spec/fixtures/module.rb
 - spec/spec_helper.rb
@@ -154,6 +160,7 @@ test_files:
 - spec/watchr/location_spec.rb
 - spec/watchr/metrics/flay/report_spec.rb
 - spec/watchr/metrics/flog/flog_report_spec.rb
+- spec/watchr/metrics/stats/stats_spec.rb
 - spec/watchr/paths_spec.rb
 - spec/watchr/smell_builder_spec.rb
 - spec/watchr/smell_spec.rb