mry 0.52.0.0 → 0.53.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bd762e726ed1b37d981d592c615ef04ec49e2e3e
-  data.tar.gz: 0d75d6869075114267dbf6e632de91f971420824
+SHA256:
+  metadata.gz: 2eaf029a8c3e25b5f2735db4b479a3938238c37ea11268ef6455fb246c490a4c
+  data.tar.gz: 06b2dc193c00736aa14a8ef7be5d97447e61ccfe43345bd602ea034873521cd0
 SHA512:
-  metadata.gz: 84b6dfb378db69f13820789269f831ac43e09708d5f46bb444b70bcc57bc991df404556dd5fc58e7445fc86bbe1141f79bf7242530ac910326a30a2a264dc278
-  data.tar.gz: ce570da53bd36e88fb8eed66064b9b2117d0d5b2015c548d37cfb0b7eb67e4810a6be99f3de4e282cb4382ee3d235c03a6953540571d2c2498001eceabe24c6a
+  metadata.gz: 2c206cf61303233db93407ab7f75fbdb87acde94dc5388628dad70d61ae4b940cef28968659e18e615912b1b481d7cc356b01d3d0c1744c1bc92f6f5ad50c0cc
+  data.tar.gz: f53feb055daffede768686d88b918ecf71207634c0e1c428ff0897339de67b94ca370cbcb18c9734f2460517230114bfa75ad9dc0b454e5d8d7dcf7472c5719f

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 
 rvm:
-  - 2.3.5
-  - 2.4.2
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
   - ruby-head
 
 cache: bundler
@@ -10,6 +11,12 @@ bundler_args: --jobs=4 --retry=3
 sudo: false
 
 
+before_install: 'gem update --system'
 
 script:
   - bundle exec rake test
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+  fast_finish: true

data/bin/check_rubocop_update

@@ -0,0 +1,94 @@
+#!/usr/bin/env ruby
+
+# Usage: bin/check_rubocop_update v0.52.1 v0.53.0
+
+require 'open3'
+require 'yaml'
+require 'tmpdir'
+
+def debug_print(mes)
+  $stdout.puts mes
+end
+
+def sh!(*cmd)
+  debug_print 'sh!: ' + cmd.join(' ')
+  system(*cmd, exception: true)
+end
+
+def capture3!(*cmd)
+  debug_print 'capture3!: ' + cmd.join(' ')
+  Open3.capture3(*cmd).tap do |out, err, status|
+    raise "#{out} #{err}" unless status.success?
+  end
+end
+
+def each_commit(before, after, &block)
+  return enum_for(__method__, before, after) unless block_given?
+
+  commits = capture3!('git', 'log', "#{before}..#{after}", '--format=tformat:%H').yield_self do |stdout, _stderr, _status|
+    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
+  end
+end
+
+def has_gemfile_change?(commit)
+  capture3!('git', 'show', '--name-only', '--format=tformat:', commit).yield_self do |stdout, _stderr, _status|
+    stdout.each_line.any? do |fname|
+      fname.chomp!
+      fname == 'Gemfile' || fname == 'rubocop.gemspec'
+    end
+  end
+end
+
+def chtmpdir(&block)
+  Dir.mktmpdir do |dir|
+    Dir.chdir(dir) do
+      block.call
+    end
+  end
+end
+
+def main(before, after)
+  {}.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
+      end
+    end
+  end
+end
+
+before = ARGV[0]
+after = ARGV[1]
+
+out = main(before, after)
+res = YAML.dump(out)
+puts res
+fname = '/tmp/mry_check_rubocop_update_log.yaml'
+File.write(fname, res)
+puts "Wrote: #{fname}"

data/lib/mry/added_cops.rb

@@ -1,6 +1,22 @@
 module Mry
   module AddedCops
     Cops = {
+      Gem::Version.new('0.53.0') => %w[
+        Rails/ActiveRecordAliases
+        Style/EmptyLineAfterGuardClause
+        Naming/MemoizedInstanceVariableName
+        Style/ExpandPathArguments
+        Lint/OrderedMagicComments
+        Layout/EmptyComment
+        Style/TrailingBodyOnModule
+        Style/TrailingBodyOnClass
+        Lint/NumberConversion
+        Lint/UnneededCopEnableDirective
+        Naming/UncommunicativeBlockParamName
+        Naming/UncommunicativeMethodArgName
+        Security/Open
+        Lint/BigDecimalNew
+      ],
       Gem::Version.new('0.52.0') => %w[
         Style/StringHashKeys
         Style/RandomWithOffset
@@ -18,7 +34,6 @@ module Mry
         Style/ColonMethodDefinition
         Layout/ClassStructure
         Rails/CreateTableWithTimestamps
-        Style/ExtendSelf
         Rails/RedundantReceiverInWithOptions
         Style/EvalWithLocation
         Layout/EmptyLinesAroundArguments

data/lib/mry/rewriters.rb

@@ -3,6 +3,15 @@ module Mry
     class Rewriter_Master < YAMLRewriter::Rewriter
     end
 
+    class Rewriter_0_53_0 < YAMLRewriter::Rewriter
+      define_rule ['Naming/UncommunicativeMethodArgName' => 'Naming/UncommunicativeMethodParamName']
+      define_rule ['Lint/ConditionPosition' => 'Layout/ConditionPosition']
+      define_rule ['Lint/BlockAlignment' => 'Layout/BlockAlignment']
+      define_rule ['Lint/DefEndAlignment' => 'Layout/DefEndAlignment']
+      define_rule ['Lint/EndAlignment' => 'Layout/EndAlignment']
+      define_rule ['Lint/UnneededDisable' => 'Lint/UnneededCopDisableDirective']
+    end
+
     class Rewriter_0_52_0 < YAMLRewriter::Rewriter
       define_rule ['Lint/RescueWithoutErrorClass' => 'Style/RescueStandardError']
     end
@@ -150,7 +159,8 @@ module Mry
     end
 
     Rewriters = {
-      Gem::Version.new('0.52.0') => Rewriter_0_51_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,
       Gem::Version.new('0.50.0') => Rewriter_0_50_0,
       Gem::Version.new('0.49.0') => Rewriter_0_49_0,

data/lib/mry/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mry
 version: !ruby/object:Gem::Version
-  version: 0.52.0.0
+  version: 0.53.0.0
 platform: ruby
 authors:
 - Masataka Kuwabara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -138,6 +138,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/check_rubocop_update
 - bin/console
 - bin/setup
 - exe/mry
@@ -174,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Mry Migrates .Rubocop.Yml