checkstyle_filter-git 0.1.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca6d69dfc71484d7250c9784f38db85977aee9c8
-  data.tar.gz: 0be05f771642be3c26b954bd9980da454120932d
+  metadata.gz: eefefc30a709cd108ff7af5fc8665bdb3e233697
+  data.tar.gz: 86fd8708b347ac2331d691ec9974fcbbaf589984
 SHA512:
-  metadata.gz: 325f170d3e5f6e3eb7452dcf4acb19f5dbcb8e0666e4fd2d3254b33a8d0084da230956fb88a40391ecd1fea835db03d17d39cd89d2163622ba36f6cfaa528a64
-  data.tar.gz: 547481f001ce67eab29bba5c81c63e5bd588708c239e76a352178b3b3ff062af9abefc8dad2936b3c3a3b84f75a4428225bde83a1833b17f4c57efe03bafea81
+  metadata.gz: 3b44da9604d392b41a91dd785e934ff6cc930a463309ec6ce86d4a30cd0bc51ce4709ddfd355f523ad46b7d9373d51c0f5da03656b1d4ea79df3485776cbf4f0
+  data.tar.gz: a73d4e34ff10f4e955cce90609c9dc1af28853ae135c5e262483c0d41eebc2688d4c90e9279542e316e15b13144155dc821dea36d656ba0f2c25cdb9e2fd4be7

data/Gemfile

@@ -4,3 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'byebug' if RUBY_VERSION >= '2.0.0'
+gem 'pry'

data/README.md

@@ -98,7 +98,7 @@ git diff -z --name-only origin/master.. \
      --require rubocop/formatter/checkstyle_formatter \
      --format RuboCop::Formatter::CheckstyleFormatter \
  | checkstyle_filter-git diff origin/master.. \
- | saddler run \
+ | saddler report \
      --require github/pull-request-comment-formatter \
      --format Github::PullRequestCommentFormatter
 ```
@@ -119,6 +119,26 @@ Or install it yourself as:
 
     $ gem install checkstyle_filter-git
 
+## Help
+
+```
+$ checkstyle_filter-git
+Commands:
+  checkstyle_filter-git diff            # Filter using `git diff`
+  checkstyle_filter-git help [COMMAND]  # Describe available commands or one specific command
+  checkstyle_filter-git version         # Show the CheckstyleFilter/Git version
+
+$ checkstyle_filter-git help diff
+Usage:
+  checkstyle_filter-git diff
+
+Options:
+  [--data=DATA]
+  [--file=FILE]
+
+Filter using `git diff`
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment. Run `bundle exec checkstyle_filter-git` to use the code located in this directory, ignoring other installed copies of this gem.
@@ -127,7 +147,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/checkstyle_filter-git/fork )
+1. Fork it ( https://github.com/packsaddle/ruby-checkstyle_filter-git/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/checkstyle_filter-git.gemspec

@@ -27,5 +27,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.8'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'test-unit'
+  spec.add_development_dependency 'nori'
 end

data/lib/checkstyle_filter/git.rb

@@ -1,9 +1,8 @@
-require 'checkstyle_filter/git/version'
 require 'git/diff/parser'
-require 'checkstyle_filter/git/diff_parser'
+require 'checkstyle_filter/git/version'
+require 'checkstyle_filter/git/filter'
 
 module CheckstyleFilter
   module Git
-    # Your code goes here...
   end
 end

data/lib/checkstyle_filter/git/cli.rb

@@ -26,23 +26,7 @@ module CheckstyleFilter
 
         command = ['git', 'diff', '--no-color', commit_ish].compact
         git_diff, _, _ = Open3.capture3(*command)
-        parsed = ::CheckstyleFilter::Git::DiffParser.parse(git_diff)
-
-        # TODO: split to class
-        require 'rexml/document'
-        document = REXML::Document.new data
-        document.elements.each('/checkstyle/file') do |file_element|
-          file_name = file_element.attribute('name').value
-          next unless file_element_file_in_git_diff?(file_name, parsed)
-          file_element.elements.each('error') do |error_element|
-            line = error_element.attribute('line') && error_element.attribute('line').value.to_i
-            if file_element_error_line_no_in_modified?(file_name, parsed, line)
-              error_element.remove
-            end
-          end
-        end
-
-        puts document.to_s
+        puts ::CheckstyleFilter::Git::Filter.filter(data, git_diff)
       end
 
       desc 'version', 'Show the CheckstyleFilter/Git version'
@@ -51,32 +35,6 @@ module CheckstyleFilter
       def version
         puts "CheckstyleFilter/Git version #{::CheckstyleFilter::Git::VERSION}"
       end
-
-      no_commands do
-        def file_element_file_in_git_diff?(file_name, parsed_git_diff)
-          require 'pathname'
-          diff_files = parsed_git_diff.map { |one| one[:file_name] }
-          diff_files
-            .map { |file| Pathname.new(file).expand_path }
-            .include?(Pathname.new(file_name).expand_path)
-        end
-
-        def file_element_error_line_no_in_modified?(file_name, parsed_git_diff, line_no)
-          require 'pathname'
-          diff_pairs = parsed_git_diff
-                       .select do |diff|
-            Pathname.new(diff[:file_name]).expand_path == Pathname.new(file_name).expand_path
-          end
-          return false if diff_pairs.empty?
-          modified_lines = Set.new
-          diff_pairs.map do |diff_pair|
-            diff_pair[:patch].changed_lines.map do |line|
-              modified_lines << line.number
-            end
-          end
-          modified_lines.include?(line_no)
-        end
-      end
     end
   end
 end

data/lib/checkstyle_filter/git/filter.rb

@@ -0,0 +1,57 @@
+require 'rexml/document'
+require 'pathname'
+
+module CheckstyleFilter
+  module Git
+    class Filter
+      def self.filter(data, git_diff)
+        patches = ::Git::Diff::Parser.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_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)
+                error_element.remove
+              end
+            end
+          else
+            file_element.elements.each('error') do |error_element|
+              error_element.remove
+            end
+          end
+        end
+
+        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
+        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
+end

data/lib/checkstyle_filter/git/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: checkstyle_filter-git
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors:
 - sanemat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -67,7 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nori
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -100,13 +114,12 @@ files:
 - bin/setup
 - checkstyle_filter-git.gemspec
 - example/example1.xml
-- example/github-pull-requests-files-response.json
 - example/invalid.rb
 - example/simple.rb
 - exe/checkstyle_filter-git
 - lib/checkstyle_filter/git.rb
 - lib/checkstyle_filter/git/cli.rb
-- lib/checkstyle_filter/git/diff_parser.rb
+- lib/checkstyle_filter/git/filter.rb
 - lib/checkstyle_filter/git/version.rb
 homepage: https://github.com/packsaddle/ruby-checkstyle_filter-git
 licenses:

data/example/github-pull-requests-files-response.json

@@ -1,26 +0,0 @@
-[
-  {
-    "sha": "80adf33bacc9f387b6ac2e099945326b3e699fda",
-    "filename": "lib/tachikoma/settings.rb",
-    "status": "modified",
-    "additions": 23,
-    "deletions": 2,
-    "changes": 25,
-    "blob_url": "https://github.com/sanemat/tachikoma/blob/216e050fac8cb7133b8b19a1c0292f48e5994645/lib/tachikoma/settings.rb",
-    "raw_url": "https://github.com/sanemat/tachikoma/raw/216e050fac8cb7133b8b19a1c0292f48e5994645/lib/tachikoma/settings.rb",
-    "contents_url": "https://api.github.com/repos/sanemat/tachikoma/contents/lib/tachikoma/settings.rb?ref=216e050fac8cb7133b8b19a1c0292f48e5994645",
-    "patch": "@@ -1,6 +1,27 @@\n require 'pathname'\n+\n module Tachikoma\n-  def self.root\n-    Pathname.new(File.dirname(File.dirname(File.dirname(__FILE__))))\n+  def self.root_path\n+    @root_path ||= Pathname.new(File.dirname(File.dirname(File.dirname(__FILE__))))\n+  end\n+\n+  def self.root_path=(root_path)\n+    @root_path = Pathname.new File.expand_path(root_path)\n+  end\n+\n+  def self.data_path\n+    @data_path ||= root_path.parent.join('data')\n+  end\n+\n+  def self.data_path=(data_path)\n+    @data_path = Pathname.new File.expand_path(data_path)\n+  end\n+\n+  def self.repos_path\n+    @repos_path ||= root_path.parent.join('repos')\n+  end\n+\n+  def self.repos_path=(repos_path)\n+    @repos_path = Pathname.new File.expand_path(repos_path)\n   end\n end"
-  },
-  {
-    "sha": "d71ff33adad9125f0939681435e2ad3531ca26cb",
-    "filename": "lib/tasks/app.rake",
-    "status": "modified",
-    "additions": 9,
-    "deletions": 11,
-    "changes": 20,
-    "blob_url": "https://github.com/sanemat/tachikoma/blob/216e050fac8cb7133b8b19a1c0292f48e5994645/lib/tasks/app.rake",
-    "raw_url": "https://github.com/sanemat/tachikoma/raw/216e050fac8cb7133b8b19a1c0292f48e5994645/lib/tasks/app.rake",
-    "contents_url": "https://api.github.com/repos/sanemat/tachikoma/contents/lib/tasks/app.rake?ref=216e050fac8cb7133b8b19a1c0292f48e5994645",
-    "patch": "@@ -2,12 +2,10 @@ require 'httparty'\n require 'multi_json'\n require 'safe_yaml'\n require 'uri'\n+require 'tachikoma'\n \n namespace :tachikoma do\n   @default_timestamp_format = '%Y%m%d%H%M%S'\n-  @root_path = File.expand_path(File.join(__FILE__, '..', '..', '..'))\n-  @data_path = File.join(@root_path, 'data')\n-  @repos_path = File.join(@root_path, 'repos')\n \n   # build_for = fenix-knight, github_token_key = TOKEN_FENIX_KNIGHT\n   def github_token_key(build_for)\n@@ -50,9 +48,9 @@ namespace :tachikoma do\n     if ENV['LOCAL_DATA_PATH'] && ENV['LOCAL_DATA_REMOTE_URL']\n       raise \"local data path is empty\"                     if ENV['LOCAL_DATA_PATH'] == ''\n       raise \"remote git repository of local data is empty\" if ENV['LOCAL_DATA_REMOTE_URL'] == ''\n-      @data_path = File.absolute_path(ENV['LOCAL_DATA_PATH'])\n-      rm_rf(@data_path) if Dir.exists?(@data_path)\n-      sh \"git clone #{ENV['LOCAL_DATA_REMOTE_URL']} #{@data_path}\"\n+      Tachikoma.data_path = File.absolute_path(ENV['LOCAL_DATA_PATH'])\n+      rm_rf(Tachikoma.data_path) if Dir.exists?(Tachikoma.data_path)\n+      sh \"git clone #{ENV['LOCAL_DATA_REMOTE_URL']} #{Tachikoma.data_path}\"\n       raise \"failed to clone remote repo: perhaps wrong git clone URL? #{ENV['LOCAL_DATA_REMOTE_URL']}\" unless $?.success?\n     else\n       warn \"`fetch_data` task requires LOCAL_DATA_PATH and LOCAL_DATA_REMOTE_URL environment variables\"\n@@ -65,7 +63,7 @@ namespace :tachikoma do\n     @git_name = 'bot-motoko'\n     @git_email = 'bot-motoko@al.sane.jp'\n     @configure =\n-      YAML.load_file(File.join(@data_path, \"#{@build_for}.yaml\"))\n+      YAML.load_file(File.join(Tachikoma.data_path, \"#{@build_for}.yaml\"))\n     @fetch_url = @configure['url']\n     @base_remote_branch = 'origin/master'\n     @authorized_url = authorized_url_with_type(@fetch_url, @configure['type'], @github_token, @git_name)\n@@ -90,18 +88,18 @@ namespace :tachikoma do\n   end\n \n   task :clean do\n-    rm_rf(Dir.glob('repos/*'))\n+    rm_rf(Dir.glob(Tachikoma.repos_path.to_s))\n   end\n \n   desc 'fetch'\n   task fetch: :clean do\n-    mkdir_p('repos')\n-    sh \"git clone #{@fetch_url} repos/#{@build_for}\"\n+    mkdir_p(Tachikoma.repos_path.to_s)\n+    sh \"git clone #{@fetch_url} #{Tachikoma.repos_path.to_s}/#{@build_for}\"\n   end\n \n   desc 'bundle'\n   task :bundle do\n-    Dir.chdir(\"repos/#{@build_for}\") do\n+    Dir.chdir(\"#{Tachikoma.repos_path.to_s}/#{@build_for}\") do\n       Bundler.with_clean_env do\n         sh %Q!sed -i -e 's/^ruby/#ruby/' Gemfile!\n         sh \"git config user.name #{@git_name}\""
-  }
-]

data/lib/checkstyle_filter/git/diff_parser.rb

@@ -1,39 +0,0 @@
-module CheckstyleFilter
-  module Git
-    class DiffParser
-      def self.parse(contents)
-        body = false
-        file_name = ''
-        patch = []
-        lines = contents.lines
-        line_count = lines.count
-        parsed = []
-        lines.each_with_index do |line, count|
-          case line.chomp
-          when /^diff/
-            unless patch.empty?
-              parsed << { file_name: file_name,
-                          patch: ::Git::Diff::Parser::Patch.new(patch.join("\n")) }
-              patch.clear
-              file_name = ''
-            end
-            body = false
-          when /^\-\-\-/
-          when %r{^\+\+\+ b/(?<file_name>.*)}
-            file_name = Regexp.last_match[:file_name]
-            body = true
-          when /^(?<body>[\ @\+\-\\].*)/
-            patch << Regexp.last_match[:body] if body
-            if !patch.empty? && body && line_count == count + 1
-              parsed << { file_name: file_name,
-                          patch: ::Git::Diff::Parser::Patch.new(patch.join("\n")) }
-              patch.clear
-              file_name = ''
-            end
-          end
-        end
-        parsed
-      end
-    end
-  end
-end