checkstyle_filter-git 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: eefefc30a709cd108ff7af5fc8665bdb3e233697
-  data.tar.gz: 86fd8708b347ac2331d691ec9974fcbbaf589984
+SHA256:
+  metadata.gz: 398394838f77852b714bb97c721e3390d8d075b79fd7777a025c74300489d38f
+  data.tar.gz: 686e3c314f636b1b42f5ef4555b8c5d577527d78f9a115c4b77e3714d300ae14
 SHA512:
-  metadata.gz: 3b44da9604d392b41a91dd785e934ff6cc930a463309ec6ce86d4a30cd0bc51ce4709ddfd355f523ad46b7d9373d51c0f5da03656b1d4ea79df3485776cbf4f0
-  data.tar.gz: a73d4e34ff10f4e955cce90609c9dc1af28853ae135c5e262483c0d41eebc2688d4c90e9279542e316e15b13144155dc821dea36d656ba0f2c25cdb9e2fd4be7
+  metadata.gz: 405300899cf8146e57da9bb8f5ab98e25b55479b205a7d822f0807de20fbc1551230b9eca444d6baaae248a3eb5972608c98d8f0d6da57c8d882a2ad8eb911bd
+  data.tar.gz: 741b2a3c9b5831ffdedc60dc1ac726b4e07a454757ba16b4962f499c7978d0f843485559c7ae8cc5e03827e46f480a7feb00ff4447812e48f1f1382ac8bb8137

data/.circleci/config.yml

@@ -0,0 +1,35 @@
+version: 2.1
+orbs:
+  ruby: circleci/ruby@1.1.2
+
+executors:
+  linux:
+    docker:
+      - image: cimg/base:stable
+
+jobs:
+  test:
+    parameters:
+      os:
+        type: executor
+      ruby-version:
+        type: string
+    executor: << parameters.os >>
+    steps:
+      - checkout
+      - ruby/install:
+          version: << parameters.ruby-version >>
+      - run:
+          name: bundle install
+          command: bundle install
+      - run:
+          name: test
+          command: bundle exec rake
+workflows:
+  all-tests:
+    jobs:
+      - test:
+          matrix:
+            parameters:
+              os: [linux]
+              ruby-version: ["2.5", "2.6", "2.7", "3.0"]

data/.conventional-changelog.context.js

@@ -0,0 +1,17 @@
+'use strict';
+var execSync = require('child_process').execSync;
+var URI = require('urijs');
+
+var gemspec = JSON.parse(execSync('bundle exec parse-gemspec-cli checkstyle_filter-git.gemspec'));
+var homepageUrl = gemspec.homepage;
+var url = new URI(homepageUrl);
+var host = url.protocol() + '://' + url.authority();
+var owner = url.pathname().split('/')[1];
+var repository = url.pathname().split('/')[2];
+
+module.exports = {
+  version: gemspec.version,
+  host: host,
+  owner: owner,
+  repository: repository
+};

data/.gitignore

@@ -7,6 +7,8 @@
 /pkg/
 /spec/reports/
 /tmp/
+/node_modules/
+/package-lock.json
 
 # Ignore bundler binstubs
 /bundle_bin

data/Gemfile

@@ -3,5 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in checkstyle_filter-git.gemspec
 gemspec
 
-gem 'byebug' if RUBY_VERSION >= '2.0.0'
+gem 'byebug'
 gem 'pry'
+gem 'parse_gemspec-cli'

data/README.md

@@ -1,7 +1,7 @@
 # CheckstyleFilter::Git
 
 [![Gem Version](http://img.shields.io/gem/v/checkstyle_filter-git.svg?style=flat)](http://badge.fury.io/rb/checkstyle_filter-git)
-[![Build Status](http://img.shields.io/travis/packsaddle/ruby-checkstyle_filter-git/master.svg?style=flat)](https://travis-ci.org/packsaddle/ruby-checkstyle_filter-git)
+[![Build Status](https://img.shields.io/circleci/build/github/packsaddle/ruby-checkstyle_filter-git?style=flat)](https://circleci.com/gh/packsaddle/ruby-checkstyle_filter-git)
 
 ## What is this?
 
@@ -20,7 +20,8 @@
   <file name='/Users/sane/work/ruby-study/checkstyle_filter-git/lib/checkstyle_filter/git/cli.rb'>
     <error line='14' column='6' severity='info' message='Assignment Branch Condition size for diff is too high. [54.73/15]' source='com.puppycrawl.tools.checkstyle.Metrics/AbcSize'/>
   </file>
-<checkstyle>
+</checkstyle>
+
 ```
 
 2. git diff
@@ -125,6 +126,7 @@ Or install it yourself as:
 $ checkstyle_filter-git
 Commands:
   checkstyle_filter-git diff            # Filter using `git diff`
+  checkstyle_filter-git exec            # Exec command `"git diff --no-color origin/master | iconv -f EUCJP -t UTF8"`
   checkstyle_filter-git help [COMMAND]  # Describe available commands or one specific command
   checkstyle_filter-git version         # Show the CheckstyleFilter/Git version
 
@@ -137,6 +139,12 @@ Options:
   [--file=FILE]
 
 Filter using `git diff`
+
+$ checkstyle_filter-git help exec
+Usage:
+  checkstyle_filter-git exec
+
+Exec command `"git diff --no-color origin/master | iconv -f EUCJP -t UTF8"`
 ```
 
 ## Development

data/changelog.md

@@ -0,0 +1,24 @@
+<a name="1.2.0"></a>
+# [1.2.0](https://github.com/packsaddle/ruby-checkstyle_filter-git/compare/v1.1.0...v1.2.0) (2021-04-13)
+
+
+### Features
+
+* **deps:** add rexml for ruby 3.0 compatibility ([0ec9d95](https://github.com/packsaddle/ruby-checkstyle_filter-git/commit/0ec9d95))
+
+
+
+# ChangeLog
+
+<a name="1.1.0"></a>
+# [1.1.0](https://github.com/packsaddle/ruby-checkstyle_filter-git/compare/v1.0.3...v1.1.0) (2016-06-25)
+
+
+### Features
+
+* **command:** inmpement exec command([a11c3c7](https://github.com/packsaddle/ruby-checkstyle_filter-git/commit/a11c3c7f4daf1ddf26c0ab4f4ae9d8b1b78bda4b)), closes [#11](https://github.com/packsaddle/ruby-checkstyle_filter-git/pull/11)
+
+
+## 1.0.3
+
+* Relax dependencies

data/checkstyle_filter-git.gemspec

@@ -23,10 +23,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'thor'
-  spec.add_runtime_dependency 'git-diff-parser'
+  spec.add_runtime_dependency 'git_diff_parser'
+  spec.add_runtime_dependency 'rexml'
 
-  spec.add_development_dependency 'bundler', '~> 1.8'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'test-unit'
   spec.add_development_dependency 'nori'
 end

data/example/example1.xml

@@ -1,9 +1,9 @@
 <?xml version='1.0'?>
 <checkstyle>
-  <file name='/Users/sane/work/ruby-study/checkstyle_filter-git/checkstyle_filter-git.gemspec'/>
-  <file name='/Users/sane/work/ruby-study/checkstyle_filter-git/example/invalid.rb'>
+  <file name='checkstyle_filter-git.gemspec'/>
+  <file name='example/invalid.rb'>
     <error line='3' column='100' severity='info' message='Line is too long. [188/100]' source='com.puppycrawl.tools.checkstyle.Metrics/LineLength'/>
   </file>
-  <file name='/Users/sane/work/ruby-study/checkstyle_filter-git/exe/checkstyle_filter-git'/>
-  <file name='/Users/sane/work/ruby-study/checkstyle_filter-git/lib/checkstyle_filter/git/cli.rb'/>
-</checkstyle>
+  <file name='exe/checkstyle_filter-git'/>
+  <file name='lib/checkstyle_filter/git/cli.rb'/>
+</checkstyle>

data/lib/checkstyle_filter/git.rb

@@ -1,4 +1,4 @@
-require 'git/diff/parser'
+require 'git_diff_parser'
 require 'checkstyle_filter/git/version'
 require 'checkstyle_filter/git/filter'
 

data/lib/checkstyle_filter/git/cli.rb

@@ -29,6 +29,19 @@ module CheckstyleFilter
         puts ::CheckstyleFilter::Git::Filter.filter(data, git_diff)
       end
 
+      desc 'exec', 'Exec command `"git diff --no-color origin/master | iconv -f EUCJP -t UTF8"`'
+      def exec(command)
+        data = if !$stdin.tty?
+                 ARGV.clear
+                 ARGF.read
+               end
+
+        abort if !data || data.empty?
+
+        git_diff, _, _ = Open3.capture3(command)
+        puts ::CheckstyleFilter::Git::Filter.filter(data, git_diff)
+      end
+
       desc 'version', 'Show the CheckstyleFilter/Git version'
       map %w(-v --version) => :version
 

data/lib/checkstyle_filter/git/filter.rb

@@ -5,15 +5,17 @@ module CheckstyleFilter
   module Git
     class Filter
       def self.filter(data, git_diff)
-        patches = ::Git::Diff::Parser.parse(git_diff)
+        patches = ::GitDiffParser.parse(git_diff)
 
         document = REXML::Document.new data
         document.elements.each('/checkstyle/file') do |file_element|
           file_name = file_element.attribute('name') && file_element.attribute('name').value
-          if file_in_patches?(file_name, patches)
+          file = file_relative_path_string(file_name)
+          patch = patches.find_patch_by_file(file)
+          if patch
             file_element.elements.each('error') do |error_element|
               line = error_element.attribute('line') && error_element.attribute('line').value.to_i
-              unless file_element_error_line_no_in_patches?(file_name, patches, line)
+              unless patch.changed_line_numbers.include?(line)
                 error_element.remove
               end
             end
@@ -27,30 +29,12 @@ module CheckstyleFilter
         document.to_s
       end
 
-      def self.file_in_patches?(file_name, patches)
-        patches
-          .map(&:file)
-          .map { |file| Pathname.new(file).expand_path }
-          .include?(Pathname.new(file_name).expand_path)
-      end
-
-      def self.file_element_error_line_no_in_patches?(file_name, patches, line_no)
-        diff_patches = patches
-                       .select { |patch| same_file?(patch.file, file_name) }
-        return false if diff_patches.empty?
-
-        modified_lines = Set.new
-        diff_patches.map do |patch|
-          patch.changed_lines.map do |line|
-            modified_lines << line.number
-          end
+      def self.file_relative_path_string(file_name)
+        if Pathname.new(file_name).absolute?
+          Pathname.new(file_name).relative_path_from(Pathname.new(Dir.pwd)).to_s
+        else
+          Pathname.new(file_name).relative_path_from(Pathname.new('.')).to_s
         end
-
-        modified_lines.include?(line_no)
-      end
-
-      def self.same_file?(one, other)
-        Pathname.new(one).expand_path == Pathname.new(other).expand_path
       end
     end
   end

data/lib/checkstyle_filter/git/version.rb

@@ -1,5 +1,5 @@
 module CheckstyleFilter
   module Git
-    VERSION = '1.0.0'
+    VERSION = '1.2.0'
   end
 end

data/package.json

@@ -0,0 +1,11 @@
+{
+  "devDependencies": {
+    "conventional-changelog-cli": "^1.1.1",
+    "npm-check-updates": "^2.2.3",
+    "urijs": "^1.16.1"
+  },
+  "scripts": {
+    "changelog": "conventional-changelog -i changelog.md --same-file --preset angular --context .conventional-changelog.context.js",
+    "ncu": "ncu -u"
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: checkstyle_filter-git
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - sanemat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-02-21 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -25,7 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: git-diff-parser
+  name: git_diff_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -42,30 +56,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -102,9 +116,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".conventional-changelog.context.js"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -112,6 +127,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- changelog.md
 - checkstyle_filter-git.gemspec
 - example/example1.xml
 - example/invalid.rb
@@ -121,6 +137,7 @@ files:
 - lib/checkstyle_filter/git/cli.rb
 - lib/checkstyle_filter/git/filter.rb
 - lib/checkstyle_filter/git/version.rb
+- package.json
 homepage: https://github.com/packsaddle/ruby-checkstyle_filter-git
 licenses:
 - MIT
@@ -140,8 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Filter checkstyle format errors on ONLY modified lines.

data/.travis.yml

@@ -1,15 +0,0 @@
-language: ruby
-sudo: false
-rvm:
-  - 1.9
-  - 2.0
-  - 2.1
-  - 2.2
-before_install:
-  - gem update bundler
-notifications:
-  email:
-    - ogataken@gmail.com
-branches:
-  only:
-    - master