mry 0.53.0.0 → 0.54.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2eaf029a8c3e25b5f2735db4b479a3938238c37ea11268ef6455fb246c490a4c
-  data.tar.gz: 06b2dc193c00736aa14a8ef7be5d97447e61ccfe43345bd602ea034873521cd0
+  metadata.gz: b98260ee2465b409a676c987c01451b2770c09a2770e19ceb37a3b5697ada4d0
+  data.tar.gz: 6a4aeb56cd615e3b46f093dc6ab8006a6e18570ba429991a34903ef0bcad6eda
 SHA512:
-  metadata.gz: 2c206cf61303233db93407ab7f75fbdb87acde94dc5388628dad70d61ae4b940cef28968659e18e615912b1b481d7cc356b01d3d0c1744c1bc92f6f5ad50c0cc
-  data.tar.gz: f53feb055daffede768686d88b918ecf71207634c0e1c428ff0897339de67b94ca370cbcb18c9734f2460517230114bfa75ad9dc0b454e5d8d7dcf7472c5719f
+  metadata.gz: 189f6063053bcd4ecc3de1eb9045b09b40af0ab1ce0fb6c6258a441cedaf258e08c5a611b18df2fe1466e3f52f784d55169fead61dd57c207fa00f9e285417c2
+  data.tar.gz: 345f674c312596fe2d5de953893169a8568a2b41aef3bdd548b42b9065605aa6881d84015bf4521dfebfd57c3b3747572732609ccda3bb3feae5049d67c31c1f

data/bin/check_rubocop_update

@@ -1,23 +1,24 @@
 #!/usr/bin/env ruby
 
-# Usage: bin/check_rubocop_update v0.52.1 v0.53.0
+# Usage: bin/check_rubocop_update v0.52.1 v0.53.0 ~/path/to/rubocop/
 
 require 'open3'
 require 'yaml'
 require 'tmpdir'
+require 'etc'
 
 def debug_print(mes)
   $stdout.puts mes
 end
 
-def sh!(*cmd)
+def sh!(*cmd, **opt)
   debug_print 'sh!: ' + cmd.join(' ')
-  system(*cmd, exception: true)
+  system(*cmd, opt.merge(exception: true))
 end
 
-def capture3!(*cmd)
+def capture3!(*cmd, **opt)
   debug_print 'capture3!: ' + cmd.join(' ')
-  Open3.capture3(*cmd).tap do |out, err, status|
+  Open3.capture3(*cmd, **opt).tap do |out, err, status|
     raise "#{out} #{err}" unless status.success?
   end
 end
@@ -29,15 +30,12 @@ def each_commit(before, after, &block)
     stdout.each_line.map(&:chomp)
   end
   commits.each do |commit|
-    sh! 'rm', '-f', 'Gemfile.lock' if File.exist?('Gemfile.lock')
-    sh! 'bundle', 'install' if has_gemfile_change?(commit)
-    sh! 'git', 'checkout', commit
-    block.call
+    block.call commit
   end
 end
 
-def has_gemfile_change?(commit)
-  capture3!('git', 'show', '--name-only', '--format=tformat:', commit).yield_self do |stdout, _stderr, _status|
+def has_gemfile_change?(commit, repo)
+  capture3!('git', 'show', '--name-only', '--format=tformat:', commit, chdir: repo).yield_self do |stdout, _stderr, _status|
     stdout.each_line.any? do |fname|
       fname.chomp!
       fname == 'Gemfile' || fname == 'rubocop.gemspec'
@@ -53,40 +51,81 @@ def chtmpdir(&block)
   end
 end
 
-def main(before, after)
+def with_repositories(remote, &block)
+  if File.directory?(remote)
+    Dir.chdir(remote) do
+      sh! 'git', 'fetch', 'origin'
+    end
+  end
+
+  chtmpdir do
+    repos = Array.new(Etc.nprocessors*2) do |idx|
+      sh! 'git', 'clone', remote, idx.to_s
+      File.join(Dir.pwd, idx.to_s)
+    end
+    block.call(repos)
+  end
+end
+
+def cops_each_commit(before, after, remote)
+  with_repositories(remote) do |repos|
+    q = Thread::Queue.new
+    [].tap do |result|
+      Dir.chdir(repos.first) do
+        each_commit(before + '~', after).each.with_index do |commit, idx|
+          q << [commit, idx]
+        end
+      end
+      q.close
+      repos.map do |repo|
+        Thread.new do
+          while v = q.pop
+            commit, idx = *v
+            sh! 'rm', '-f', 'Gemfile.lock', chdir: repo if File.exist?(File.join repo, 'Gemfile.lock')
+            if has_gemfile_change?(commit, repo)
+              begin
+                sh! 'bundle', 'install', '--local', chdir: repo
+              rescue RuntimeError
+                sh! 'bundle', 'install', chdir: repo
+              end
+            end
+            sh! 'git', 'checkout', commit, chdir: repo
+            capture3!('bin/rubocop', '--show-cops', chdir: repo).tap do |stdout, _, _|
+              result << [idx, YAML.load(stdout)]
+            end
+          end
+        end
+      end.each(&:join)
+    end.sort_by(&:first).map{|_, v| v}
+  end
+end
+
+def main(before, after, remote)
   {}.tap do |result|
     result[:added] = []
     result[:renamed] = []
     result[:deleted] = []
 
-    chtmpdir do
-      sh! 'git', 'clone', 'git@github.com:bbatsov/rubocop.git'
-      Dir.chdir('./rubocop') do
-        cops = each_commit(before + '~', after).map do
-          capture3!('bin/rubocop', '--show-cops').yield_self do |stdout, _, _|
-            YAML.load(stdout)
-          end
-        end
-        cops.each_cons(2) do |new, old|
-          added = new.keys - old.keys
-          removed = old.keys - new.keys
-          if added.size > removed.size && removed.size == 0
-            result[:added].concat added
-          elsif added.size < removed.size && added.size == 0
-            result[:deleted].concat removed
-          elsif added.size != 0 && removed.size != 0
-            result[:renamed] << {before: removed, after: added}
-          end
-        end
+    cops = cops_each_commit(before, after, remote)
+    cops.each_cons(2) do |new, old|
+      added = new.keys - old.keys
+      removed = old.keys - new.keys
+      if added.size > removed.size && removed.size == 0
+        result[:added].concat added
+      elsif added.size < removed.size && added.size == 0
+        result[:deleted].concat removed
+      elsif added.size != 0 && removed.size != 0
+        result[:renamed] << {before: removed, after: added}
       end
     end
   end
 end
 
-before = ARGV[0]
-after = ARGV[1]
+before = ARGV[0] || raise
+after  = ARGV[1] || raise
+remote = ARGV[2] || raise
 
-out = main(before, after)
+out = main(before, after, remote)
 res = YAML.dump(out)
 puts res
 fname = '/tmp/mry_check_rubocop_update_log.yaml'

data/lib/mry/added_cops.rb

@@ -1,6 +1,9 @@
 module Mry
   module AddedCops
     Cops = {
+      Gem::Version.new('0.54.0') => %w[
+        Style/UnpackFirst
+      ],
       Gem::Version.new('0.53.0') => %w[
         Rails/ActiveRecordAliases
         Style/EmptyLineAfterGuardClause

data/lib/mry/rewriters.rb

@@ -3,6 +3,9 @@ module Mry
     class Rewriter_Master < YAMLRewriter::Rewriter
     end
 
+    class Rewriter_0_54_0 < YAMLRewriter::Rewriter
+    end
+
     class Rewriter_0_53_0 < YAMLRewriter::Rewriter
       define_rule ['Naming/UncommunicativeMethodArgName' => 'Naming/UncommunicativeMethodParamName']
       define_rule ['Lint/ConditionPosition' => 'Layout/ConditionPosition']
@@ -159,6 +162,7 @@ module Mry
     end
 
     Rewriters = {
+      Gem::Version.new('0.54.0') => Rewriter_0_54_0,
       Gem::Version.new('0.53.0') => Rewriter_0_53_0,
       Gem::Version.new('0.52.0') => Rewriter_0_52_0,
       Gem::Version.new('0.51.0') => Rewriter_0_51_0,

data/lib/mry/version.rb

@@ -1,3 +1,3 @@
 module Mry
-  VERSION = "0.53.0.0"
+  VERSION = "0.54.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mry
 version: !ruby/object:Gem::Version
-  version: 0.53.0.0
+  version: 0.54.0.0
 platform: ruby
 authors:
 - Masataka Kuwabara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop