ruby-watchr 0.4.0 → 0.4.1

data/Gemfile

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

data/Gemfile.lock

@@ -1,3 +1,14 @@
+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:
@@ -5,34 +16,33 @@ PATH
       flay
       flog
       reek
-      ruby2ruby
 
 GEM
   remote: http://rubygems.org/
   specs:
-    ParseTree (3.0.8)
-      RubyInline (>= 3.7.0)
-      sexp_processor (>= 3.0.0)
-    RubyInline (3.11.3)
+    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)
     diff-lcs (1.1.3)
-    flay (2.0.0)
-      ruby_parser (~> 3.0.0)
-      sexp_processor (~> 4.0)
-    flog (3.0.0)
-      ruby_parser (~> 3.0.0)
-      sexp_processor (~> 4.0)
+    flay (1.4.3)
+      ruby_parser (~> 2.0)
+      sexp_processor (~> 3.0)
+    flog (2.5.3)
+      ruby_parser (~> 2.0)
+      sexp_processor (~> 3.0)
     i18n (0.6.1)
     metaclass (0.0.1)
     mocha (0.13.0)
       metaclass (~> 0.0.1)
     multi_json (1.3.7)
-    reek (0.2.3)
-      ParseTree (>= 2.2.0)
+    ripper_ruby_parser (0.0.8)
+      sexp_processor (~> 3.0)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -41,12 +51,13 @@ GEM
     rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.0)
-    ruby2ruby (2.0.1)
-      ruby_parser (~> 3.0.0)
-      sexp_processor (~> 4.0)
-    ruby_parser (3.0.1)
-      sexp_processor (~> 4.1)
-    sexp_processor (4.1.2)
+    ruby2ruby (1.2.5)
+      ruby_parser (~> 2.0)
+      sexp_processor (~> 3.0)
+    ruby_parser (2.0.0)
+      ParseTree
+      sexp_processor (>= 3.0.0)
+    sexp_processor (3.2.0)
     shoulda-matchers (1.4.1)
       activesupport (>= 3.0.0)
 
@@ -54,11 +65,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  flay
   flog
   mocha
-  reek
+  reek!
   rspec
   ruby-watchr!
-  ruby2ruby
+  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.upcase}_#{type.upcase}_THRESHOLD")
+        score >= Flog.const_get("#{level.to_s.upcase}_#{type.to_s.upcase}_THRESHOLD")
       end
     end
   end

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

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

data/lib/watchr/version.rb

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

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/watchr.gemspec

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

metadata

@@ -1,87 +1,74 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ruby-watchr
-version: !ruby/object:Gem::Version
-  version: 0.4.0
+version: !ruby/object:Gem::Version 
+  hash: 596984887313028563
   prerelease: 
+  segments: 
+  - 0
+  - 4
+  - 1
+  version: 0.4.1
 platform: ruby
-authors:
+authors: 
 - Petr Janda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-11-17 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: flog
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  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
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2002549777813010636
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: flay
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !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'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2002549777813010636
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: reek
   prerelease: false
-  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
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2002549777813010636
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *id003
 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
@@ -123,31 +110,40 @@ files:
 - 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 2002549777813010636
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 2002549777813010636
+      segments: 
+      - 0
+      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