mry 0.48.1.2 → 0.48.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b48a06c411f93ea868e4e94aeaec3f076286b05
-  data.tar.gz: c6a065c83a75edcae15ec6f6c59ac0a8943616c4
+  metadata.gz: d415c40a4beeefad120b1b85cb2ced332c3ebb68
+  data.tar.gz: 8f55ba2c7857a4616021713e8791adf244e2f6c5
 SHA512:
-  metadata.gz: d7cd89207a7efcb82fc6bc572064850173425aaf018ad8cd5bd7b5e13bae4b4742cf9da5ee8fecac94feb749b2e4598e25cb9c49855f3c2fcd25b7f73ce73f1f
-  data.tar.gz: c635916d93fb0b6e3c74b7027f16dcb0e8e17bcbcc2680a970b2e634cc0dc0de8e37b52042cb2f8f519cd44030ae60e12f8ef607cc45ac55974c59d0e3120479
+  metadata.gz: 7deb835c75e56e136700d681fc5ef5eb19c631bf802e2d9ec93dbb4673b1b34a5dc4b9bbb408875ce329dac685934825a73a34f6d7c3a178dcb44bc458cd5482
+  data.tar.gz: 3f7cc6aab1e6f9ac26d7f4efcc31f9c0960766dd36ca2c04aa9d92c619b3e7bba48aa13cf2075c6cd9e1ff6c5f70719d547d330c39db08d099cc85436578731a

data/CHANGELOG.md

@@ -2,11 +2,17 @@
 
 ## master (unreleased)
 
+## 0.48.1.3 (2017-05-15)
+
+### New Features
+
+- [#10](https://github.com/pocke/mry/pull/10): Support downgrading RuboCop version. ([@pocke][])
+
 ## 0.48.1.2 (2017-05-5)
 
 ### Bug fixes
 
-- [#7](https://github.com/pocke/mry/issues/7): Prevent mry command from breaking without `--target` option ([@pocke][])
+- [#7](https://github.com/pocke/mry/issues/7): Prevent mry command from breaking without `--target` option. ([@pocke][])
 
 
 

data/lib/mry/runner.rb

@@ -8,23 +8,31 @@ module Mry
 
     class << self
       def run(files, target)
-        rewriters =
-          if target == :master
-            (Rewriters.values + [Rewriter_Master]).reverse
-          else
-            Rewriters
-              .select{|key, _value| target >= key}
-              .values.reverse
-          end
+        rewriters, reverse_rewriters = *rewriters(target)
 
         files.each do |file|
           yaml = File.read(file)
+          reverse_rewriters.each do |r|
+            yaml = r.new(yaml, reverse: true).rewrite
+          end
           rewriters.each do |r|
             yaml = r.new(yaml).rewrite
           end
           File.write(file, yaml)
         end
       end
+
+
+      private
+
+      # @return [Array<Array<Rewriter>>]
+      def rewriters(target)
+        return [(Rewriters.values + [Rewriter_Master]).reverse, []] if target == :master
+
+        Rewriters
+          .partition{|key, _value| target >= key}
+          .map{|rewriters| rewriters.map{|k, v| v}.reverse}
+      end
     end
   end
 end

data/lib/mry/version.rb

@@ -1,3 +1,3 @@
 module Mry
-  VERSION = "0.48.1.2"
+  VERSION = "0.48.1.3"
 end

data/lib/yaml_rewriter/rewriter.rb

@@ -1,15 +1,33 @@
 module YAMLRewriter
+  # Usage:
+  #   class MyRewriter < YAMLRewriter::Rewriter
+  #     define_rule ['foo' => 'bar']
+  #     define_rule ['one', 'two', 'threeee' => 'three']
+  #   end
+  #
+  #   MyRewriter.new('foo: baz').rewrite # => 'bar: baz'
+  #
+  #   rewriter = MyRewriter.new(<<-END)
+  #     one:
+  #       two:
+  #         threeee: 123
+  #   END
+  #   rewriter.rewrite # => one:
+  #                           two:
+  #                             three: 123
   class Rewriter
     using ScalarWithMark
     # @param yaml [String]
-    def initialize(yaml)
+    # @param reverse [true|false]
+    def initialize(yaml, reverse: false)
       @yaml = yaml.dup
+      @reverse = reverse
       @offset = 0
     end
 
     # @param rule [Array]
     def self.define_rule(rule)
-      rules.push(rule)
+      rules.push(Rule.new(rule))
     end
 
     def self.rules
@@ -42,20 +60,15 @@ module YAMLRewriter
 
     def rewrite_yaml(path, key)
       self.class.rules.each do |rule|
-        next unless match_rule(rule, path)
+        next unless rule.match?(path, reverse: @reverse)
 
         index = key.mark.index + @offset
         prev = key.value
-        new = rule.last[prev]
+        new = rule.replacement(prev, reverse: @reverse)
         start_index = @yaml.rindex(prev, index)
         @yaml[start_index..(start_index+prev.size-1)] = new
         @offset += new.size-prev.size
       end
     end
-
-    def match_rule(rule, path)
-      rule_path = rule[0..-2] + [rule.last.keys.first]
-      rule_path == (path[(path.size-rule.size)..-1])
-    end
   end
 end

data/lib/yaml_rewriter/rule.rb

@@ -0,0 +1,19 @@
+module YAMLRewriter
+  class Rule
+    def initialize(rule)
+      @rule = rule
+    end
+
+    def match?(path, reverse:)
+      rule_path = @rule[0..-2] +
+        (reverse ? [@rule.last.values.first] : [@rule.last.keys.first])
+      rule_path == (path[(path.size-@rule.size)..-1])
+    end
+
+    def replacement(key, reverse:)
+      reverse ?
+        @rule.last.invert[key] :
+        @rule.last[key]
+    end
+  end
+end

data/lib/yaml_rewriter.rb

@@ -1,4 +1,5 @@
 require 'psych'
+require 'yaml_rewriter/rule'
 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.2
+  version: 0.48.1.3
 platform: ruby
 authors:
 - Masataka Kuwabara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,8 +139,8 @@ files:
 - lib/yaml_rewriter/mark_handler.rb
 - lib/yaml_rewriter/parser.rb
 - lib/yaml_rewriter/rewriter.rb
+- lib/yaml_rewriter/rule.rb
 - lib/yaml_rewriter/scalar_with_mark.rb
-- lib/yaml_rewriter/traverser.rb
 - mry.gemspec
 homepage: https://github.com/pocke/mry
 licenses:

data/lib/yaml_rewriter/traverser.rb

@@ -1,7 +0,0 @@
-module YAMLRewriter
-  class Traverser
-    def traverse(tree, path = [])
-
-    end
-  end
-end