mry 0.48.1.0 → 0.48.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d544dfdefd04a24b0f94fe178dc31c29b81e12ac
-  data.tar.gz: 369e43c41ed43a63442bee1e5aa09059fd2dad48
+  metadata.gz: 291cc5401e23fa34ddb2c23101b0f6515f42a334
+  data.tar.gz: e29f4ae20a421e26df677a757c8e583f149ca295
 SHA512:
-  metadata.gz: 81d8f739324ccc13a7145c1bc6edb072a61262c7c67c269655ed1bad6f729b9f821b2eb7137916ee675b6bf79040f638ba668fd22737329ae503b7299bff1b6e
-  data.tar.gz: 461f6e7f95fb942a5cd463e284a4e6b4b84309151ec2343e343403f2c54928332a06672f0bfd3edefe54decb619e52e7337787757c7ec674c2269e4732ba2b32
+  metadata.gz: 9c5028bb9a6dc27867ea83bf7ef6dc33590749bf0cfba658834d2a30afb7614d86550a139b95c2906eb03ebc2bb7ef333a3996595431486ff9f4959be356dc8a
+  data.tar.gz: 975a700bef34934dc856653fd54d52901d691c7996687cc489fc101b6adfdaec2c77aac294a595ca40d3c97b5ac4391c8f76fabc95c50643009f7aa8b1770312

data/README.md

@@ -5,7 +5,7 @@ Mry Migrates .Rubocop.Yml :muscle:
 
 RuboCop has many many breaking changes, because it is before version 1.0.
 So, if you update RuboCop version, in many cases .rubocop.yml breaks...
-This tool supports migrating `.rubocop.yml`.  With this tool, you do not have to be afraid of updating RuboCop anymore.
+This tool supports migrating `.rubocop.yml`. It automatically rename the configuration in your `.rubocop.yml` that is renamed by updating RuboCop. So, with this tool, you do not have to be afraid of updating RuboCop anymore!
 
 ## Installation
 
@@ -37,6 +37,11 @@ Update `.rubocop.yml` to version 0.48.0:
 $ mry --target=0.48.0 .rubocop.yml
 ```
 
+### Example
+
+
+![Example Animation](https://cloud.githubusercontent.com/assets/4361134/25322816/8188f21a-28f5-11e7-9915-93f72034e3ea.gif)
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/mry/cli.rb

@@ -4,8 +4,12 @@ module Mry
       # @param argv [Array<String>]
       # @return [Integer] exit code
       def run(argv)
-        target = parse_option(argv)
-        Runner.run(argv, target)
+        parse_option(argv)
+        if argv.empty?
+          puts option.help
+          return 1
+        end
+        Runner.run(argv, @target)
         return 0
       end
 
@@ -13,14 +17,21 @@ module Mry
       private
 
       def parse_option(argv)
-        target = Gem::Version.new('10000000000000000000')
+        @target = nil
+        option.parse!(argv)
+      end
+
+      def option
         opt = OptionParser.new
+        opt.banner = 'Usage: mry [options] [.rubocop.yml]'
         opt.on('-t=TARGET_VERSION', '--target=TARGET_VERSION') do |t|
-          target = Gem::Version.new(t)
+          @target =
+            if t == 'master'
+              :master
+            else
+              Gem::Version.new(t)
+            end
         end
-        opt.parse!(argv)
-
-        return target
       end
     end
   end

data/lib/mry/rewriter_master.rb

@@ -0,0 +1,80 @@
+module Mry
+  class Rewriter_Master < YAMLRewriter::Rewriter
+    layout_cops = %w[
+      Layout/AccessModifierIndentation
+      Layout/AlignArray
+      Layout/AlignHash
+      Layout/AlignParameters
+      Layout/BlockEndNewline
+      Layout/CaseIndentation
+      Layout/ClosingParenthesisIndentation
+      Layout/CommentIndentation
+      Layout/DotPosition
+      Layout/ElseAlignment
+      Layout/EmptyLineAfterMagicComment
+      Layout/EmptyLineBetweenDefs
+      Layout/EmptyLinesAroundAccessModifier
+      Layout/EmptyLinesAroundBeginBody
+      Layout/EmptyLinesAroundBlockBody
+      Layout/EmptyLinesAroundClassBody
+      Layout/EmptyLinesAroundExceptionHandlingKeywords
+      Layout/EmptyLinesAroundMethodBody
+      Layout/EmptyLinesAroundModuleBody
+      Layout/EmptyLines
+      Layout/EndOfLine
+      Layout/ExtraSpacing
+      Layout/FirstArrayElementLineBreak
+      Layout/FirstHashElementLineBreak
+      Layout/FirstMethodArgumentLineBreak
+      Layout/FirstMethodParameterLineBreak
+      Layout/FirstParameterIndentation
+      Layout/IndentArray
+      Layout/IndentAssignment
+      Layout/IndentationConsistency
+      Layout/IndentationWidth
+      Layout/IndentHash
+      Layout/IndentHeredoc
+      Layout/InitialIndentation
+      Layout/LeadingCommentSpace
+      Layout/MultilineArrayBraceLayout
+      Layout/MultilineAssignmentLayout
+      Layout/MultilineBlockLayout
+      Layout/MultilineHashBraceLayout
+      Layout/MultilineMethodCallBraceLayout
+      Layout/MultilineMethodCallIndentation
+      Layout/MultilineMethodDefinitionBraceLayout
+      Layout/MultilineOperationIndentation
+      Layout/RescueEnsureAlignment
+      Layout/SpaceAfterColon
+      Layout/SpaceAfterComma
+      Layout/SpaceAfterMethodName
+      Layout/SpaceAfterNot
+      Layout/SpaceAfterSemicolon
+      Layout/SpaceAroundBlockParameters
+      Layout/SpaceAroundEqualsInParameterDefault
+      Layout/SpaceAroundKeyword
+      Layout/SpaceAroundOperators
+      Layout/SpaceBeforeBlockBraces
+      Layout/SpaceBeforeComma
+      Layout/SpaceBeforeComment
+      Layout/SpaceBeforeFirstArg
+      Layout/SpaceBeforeSemicolon
+      Layout/SpaceInLambdaLiteral
+      Layout/SpaceInsideArrayPercentLiteral
+      Layout/SpaceInsideBlockBraces
+      Layout/SpaceInsideBrackets
+      Layout/SpaceInsideHashLiteralBraces
+      Layout/SpaceInsideParens
+      Layout/SpaceInsidePercentLiteralDelimiters
+      Layout/SpaceInsideRangeLiteral
+      Layout/SpaceInsideStringInterpolation
+      Layout/Tab
+      Layout/TrailingBlankLines
+      Layout/TrailingWhitespace
+    ]
+
+    layout_cops.each do |cop|
+      define_rule [cop.sub('Layout', 'Style') => cop]
+    end
+  end
+end

data/lib/mry/runner.rb

@@ -8,9 +8,14 @@ module Mry
 
     class << self
       def run(files, target)
-        rewriters = Rewriters
-          .select{|key, _value| target >= key}
-          .values.reverse
+        rewriters =
+          if target == :master
+            (Rewriters.values + [Rewriter_Master]).reverse
+          else
+            Rewriters
+              .select{|key, _value| target >= key}
+              .values.reverse
+          end
 
         files.each do |file|
           yaml = File.read(file)

data/lib/mry/version.rb

@@ -1,3 +1,3 @@
 module Mry
-  VERSION = "0.48.1.0"
+  VERSION = "0.48.1.1"
 end

data/lib/mry.rb

@@ -2,6 +2,7 @@ require 'yaml_rewriter'
 require 'optparse'
 
 require "mry/version"
+require 'mry/rewriter_master'
 require 'mry/rewriter_0_47_0'
 require 'mry/rewriter_0_46_0'
 require 'mry/rewriter_0'

data/lib/yaml_rewriter/mark_handler.rb

@@ -8,8 +8,9 @@ module YAMLRewriter
     end
 
     def scalar(value, anchor, tag, plain, quoted, style)
+        mark = @parser.mark
       super.tap do |scalar|
-        scalar.mark = @parser.mark
+        scalar.mark = mark
       end
     end
   end

data/lib/yaml_rewriter/rewriter.rb

@@ -47,7 +47,8 @@ module YAMLRewriter
         index = key.mark.index + @offset
         prev = key.value
         new = rule.last[prev]
-        @yaml[(index-prev.size-1)..index-2] = new
+        start_index = @yaml.rindex(prev, index)
+        @yaml[start_index..(start_index+prev.size-1)] = new
         @offset += new.size-prev.size
       end
     end

data/lib/yaml_rewriter.rb

@@ -1,4 +1,4 @@
-require 'yaml'
+require 'psych'
 require 'yaml_rewriter/scalar_with_mark'
 require 'yaml_rewriter/mark_handler'
 require 'yaml_rewriter/parser'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mry
 version: !ruby/object:Gem::Version
-  version: 0.48.1.0
+  version: 0.48.1.1
 platform: ruby
 authors:
 - Masataka Kuwabara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-22 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,6 +131,7 @@ files:
 - lib/mry/rewriter_0.rb
 - lib/mry/rewriter_0_46_0.rb
 - lib/mry/rewriter_0_47_0.rb
+- lib/mry/rewriter_master.rb
 - lib/mry/runner.rb
 - lib/mry/version.rb
 - lib/yaml_rewriter.rb