rubocop-checkstyle_formatter 0.3.0 → 0.4.0

data/gemfiles/{rubocop_0.33.0.gemfile → rubocop_0.46.0.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rubocop", "0.33.0"
+gem "rubocop", "0.46.0"
 
 gemspec :path => "../"

data/gemfiles/{rubocop_0.37.2.gemfile.lock → rubocop_0.46.0.gemfile.lock}

@@ -1,8 +1,8 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
-    rubocop-checkstyle_formatter (0.2.0)
-      rubocop (>= 0.20.1)
+    rubocop-checkstyle_formatter (0.3.0)
+      rubocop (>= 0.30.1)
 
 GEM
   remote: https://rubygems.org/
@@ -12,17 +12,18 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.3.0)
-    diff-lcs (1.2.5)
-    parser (2.3.1.2)
+    diff-lcs (1.3)
+    parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
-    rainbow (2.1.0)
+    rainbow (2.2.2)
+      rake
     rake (10.5.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.2)
+    rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -31,15 +32,15 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.37.2)
-      parser (>= 2.3.0.4, < 3.0)
+    rubocop (0.46.0)
+      parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 0.3)
+      unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
-    thor (0.19.1)
-    unicode-display_width (0.3.1)
+    thor (0.19.4)
+    unicode-display_width (1.2.1)
 
 PLATFORMS
   ruby
@@ -49,8 +50,8 @@ DEPENDENCIES
   bundler (~> 1.3)
   rake (~> 10.1)
   rspec (~> 3.5.0)
-  rubocop (= 0.37.2)
+  rubocop (= 0.46.0)
   rubocop-checkstyle_formatter!
 
 BUNDLED WITH
-   1.12.5
+   1.14.6

data/gemfiles/rubocop_0.47.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rubocop", "0.47.1"
+
+gemspec :path => "../"

data/gemfiles/rubocop_0.47.1.gemfile.lock

@@ -0,0 +1,57 @@
+PATH
+  remote: ..
+  specs:
+    rubocop-checkstyle_formatter (0.3.0)
+      rubocop (>= 0.30.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (1.0.3)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.3.0)
+    diff-lcs (1.3)
+    parser (2.4.0.0)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    rainbow (2.2.2)
+      rake
+    rake (10.5.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubocop (0.47.1)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
+    thor (0.19.4)
+    unicode-display_width (1.2.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 1.0.0)
+  bundler (~> 1.3)
+  rake (~> 10.1)
+  rspec (~> 3.5.0)
+  rubocop (= 0.47.1)
+  rubocop-checkstyle_formatter!
+
+BUNDLED WITH
+   1.14.6

data/gemfiles/rubocop_0.48.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rubocop", "0.48.1"
+
+gemspec :path => "../"

data/gemfiles/rubocop_0.48.1.gemfile.lock

@@ -0,0 +1,57 @@
+PATH
+  remote: ..
+  specs:
+    rubocop-checkstyle_formatter (0.3.0)
+      rubocop (>= 0.30.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (1.0.3)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.3.0)
+    diff-lcs (1.3)
+    parser (2.4.0.0)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    rainbow (2.2.2)
+      rake
+    rake (10.5.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubocop (0.48.1)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
+    thor (0.19.4)
+    unicode-display_width (1.2.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 1.0.0)
+  bundler (~> 1.3)
+  rake (~> 10.1)
+  rspec (~> 3.5.0)
+  rubocop (= 0.48.1)
+  rubocop-checkstyle_formatter!
+
+BUNDLED WITH
+   1.14.6

data/lib/rubocop/formatter/checkstyle_formatter.rb

@@ -3,14 +3,14 @@ require 'rexml/document'
 require 'rubocop/formatter/base_formatter'
 
 # XXX: Renamed to RuboCop since 0.23.0
-RuboCop = Rubocop if defined?(Rubocop) && ! defined?(RuboCop)
+RuboCop = Rubocop if defined?(Rubocop) && !defined?(RuboCop)
 
 module RuboCop
   module Formatter
     # = This formatter reports in Checkstyle format.
     class CheckstyleFormatter < BaseFormatter
       include PathUtil if defined?(PathUtil)
-      def started(target_file)
+      def started(_target_file)
         @document = REXML::Document.new.tap do |d|
           d << REXML::XMLDecl.new
         end
@@ -20,15 +20,13 @@ module RuboCop
       def file_finished(file, offences)
         REXML::Element.new('file', @checkstyle).tap do |f|
           path_name = file
-          path_name = relative_path(file) if defined?(relative_path)
+          path_name = relative_path(path_name) if !ENV.has_key?('RUBOCOP_CHECKSTYLE_FORMATTER_ABSOLUTE_PATH') && defined?(relative_path)
           f.attributes['name'] = path_name
-          # f.attributes['name'] =
-            # defined?(PathUtil) ? PathUtil.relative_path(file) : file
           add_offences(f, offences)
         end
       end
 
-      def finished(inspected_files)
+      def finished(_inspected_files)
         @document.write(output, 2)
       end
 
@@ -37,15 +35,21 @@ module RuboCop
       def add_offences(parent, offences)
         offences.each do |offence|
           REXML::Element.new('error', parent).tap do |e|
-            e.attributes['line'] = offence.line
-            e.attributes['column'] = offence.column
-            e.attributes['severity'] = to_checkstyle_severity(offence.severity.to_s)
-            e.attributes['message'] = offence.message
-            e.attributes['source'] = 'com.puppycrawl.tools.checkstyle.' + offence.cop_name
+            e.add_attributes(offence_attributes(offence))
           end
         end
       end
 
+      def offence_attributes(offence)
+        {
+          'line' => offence.line,
+          'column' => offence.column,
+          'severity' => to_checkstyle_severity(offence.severity.to_s),
+          'message' => offence.message,
+          'source' => 'com.puppycrawl.tools.checkstyle.' + offence.cop_name
+        }
+      end
+
       # TODO be able to configure severity mapping
       def to_checkstyle_severity(rubocop_severity)
         case rubocop_severity.to_s

data/rubocop-checkstyle_formatter.gemspec

@@ -1,23 +1,25 @@
 # -*- encoding: utf-8 -*-
+
+require 'English'
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'rubocop-checkstyle_formatter'
-  gem.version       = '0.3.0'
+  gem.version       = '0.4.0'
   gem.authors       = ['Eito Katagiri']
   gem.email         = ['eitoball@gmail.com']
-  gem.description   = %q{A formatter for rubocop that outputs in checkstyle format}
-  gem.summary       = %q{A formatter for rubocop that outputs in checkstyle format}
+  gem.description   = 'A formatter for rubocop that outputs in checkstyle format'
+  gem.summary       = 'A formatter for rubocop that outputs in checkstyle format'
   gem.homepage      = 'https://github.com/eitoball/rubocop-checkstyle_formatter'
   gem.license       = 'MIT'
 
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'rubocop', '>= 0.30.1'
+  gem.add_dependency 'rubocop', '>= 0.35.1'
   gem.add_development_dependency 'appraisal', '~> 1.0.0'
   gem.add_development_dependency 'bundler', '~> 1.3'
   gem.add_development_dependency 'rake', '~> 10.1'

data/spec/rubocop/formatter/checkstyle_formatter_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require 'spec_helper'
 require 'stringio'
 require 'rexml/document'
@@ -6,7 +7,7 @@ require 'rexml/document'
 module RuboCop
   module Formatter
     describe CheckstyleFormatter do
-      let(:severities) { [:refactor, :convention, :warning, :error, :fatal] }
+      let(:severities) { %i[refactor convention warning error fatal] }
       let(:cop) do
         Cop::Cop.new.tap do |c|
           source_buffer = Parser::Source::Buffer.new('sample.rb', 1).tap { |b| b.source = '' }
@@ -43,13 +44,32 @@ module RuboCop
             message = error.attribute('message').value
             severity = error.attribute('severity').value
             case message
-            when 'refactor', 'convention'; expect(severity).to eq('info')
-            when 'warning'; expect(severity).to eq('warning')
-            when 'error', 'fatal'; expect(severity).to eq('error')
+            when 'refactor', 'convention' then expect(severity).to eq('info')
+            when 'warning' then expect(severity).to eq('warning')
+            when 'error', 'fatal' then expect(severity).to eq('error')
             end
           end
         end
       end
+
+      context 'RUBOCOP_CHECKSTYLE_FORMATTER_ABSOLUTE_PATH is defined' do
+        around do |example|
+          ENV['RUBOCOP_CHECKSTYLE_FORMATTER_ABSOLUTE_PATH'] = 'true'
+          example.run
+          ENV.delete('RUBOCOP_CHECKSTYLE_FORMATTER_ABSOLUTE_PATH')
+        end
+
+        it 'should use absolute path in name attribute of file tag' do
+          output = StringIO.new
+          formatter = described_class.new(output)
+          formatter.started(file)
+          formatter.file_finished(file, cop.respond_to?(:offenses) ? cop.offenses : cop.offences)
+          formatter.finished([file])
+          doc = REXML::Document.new(output.string)
+          file = REXML::XPath.first(doc, '/checkstyle/file')
+          expect(Pathname.new(file['name'])).to be_absolute
+        end
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w{ .. lib }))
+$LOAD_PATH.unshift(File.absolute_path('../../lib', __FILE__))
 require 'rspec'
 require 'rubocop'
 require 'rubocop/formatter/checkstyle_formatter'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-checkstyle_formatter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Eito Katagiri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2017-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: 0.35.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: 0.35.1
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -88,38 +88,32 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rubocop_0.30.1.gemfile
-- gemfiles/rubocop_0.30.1.gemfile.lock
-- gemfiles/rubocop_0.31.0.gemfile
-- gemfiles/rubocop_0.31.0.gemfile.lock
-- gemfiles/rubocop_0.32.1.gemfile
-- gemfiles/rubocop_0.32.1.gemfile.lock
-- gemfiles/rubocop_0.33.0.gemfile
-- gemfiles/rubocop_0.33.0.gemfile.lock
-- gemfiles/rubocop_0.34.2.gemfile
-- gemfiles/rubocop_0.34.2.gemfile.lock
-- gemfiles/rubocop_0.35.1.gemfile
-- gemfiles/rubocop_0.35.1.gemfile.lock
-- gemfiles/rubocop_0.36.0.gemfile
-- gemfiles/rubocop_0.36.0.gemfile.lock
-- gemfiles/rubocop_0.37.2.gemfile
-- gemfiles/rubocop_0.37.2.gemfile.lock
-- gemfiles/rubocop_0.38.0.gemfile
-- gemfiles/rubocop_0.38.0.gemfile.lock
-- gemfiles/rubocop_0.39.0.gemfile
-- gemfiles/rubocop_0.39.0.gemfile.lock
 - gemfiles/rubocop_0.40.0.gemfile
 - gemfiles/rubocop_0.40.0.gemfile.lock
 - gemfiles/rubocop_0.41.2.gemfile
 - gemfiles/rubocop_0.41.2.gemfile.lock
 - gemfiles/rubocop_0.42.0.gemfile
 - gemfiles/rubocop_0.42.0.gemfile.lock
+- gemfiles/rubocop_0.43.0.gemfile
+- gemfiles/rubocop_0.43.0.gemfile.lock
+- gemfiles/rubocop_0.44.1.gemfile
+- gemfiles/rubocop_0.44.1.gemfile.lock
+- gemfiles/rubocop_0.45.0.gemfile
+- gemfiles/rubocop_0.45.0.gemfile.lock
+- gemfiles/rubocop_0.46.0.gemfile
+- gemfiles/rubocop_0.46.0.gemfile.lock
+- gemfiles/rubocop_0.47.1.gemfile
+- gemfiles/rubocop_0.47.1.gemfile.lock
+- gemfiles/rubocop_0.48.1.gemfile
+- gemfiles/rubocop_0.48.1.gemfile.lock
 - lib/rubocop/formatter/checkstyle_formatter.rb
 - rubocop-checkstyle_formatter.gemspec
 - spec/rubocop/formatter/checkstyle_formatter_spec.rb
@@ -144,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A formatter for rubocop that outputs in checkstyle format