changit 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9bf79ac4c29a50011f960a3087ae267347014be
-  data.tar.gz: 43c7ec5b8cfad72701db0b6f04b12c3b2b1e1e51
+  metadata.gz: 372f010fb7fc1efe5ddaaba7a9ff3a7f7e498d0d
+  data.tar.gz: ec1d0128d5a9918ad1edb7605bcce4c523582c13
 SHA512:
-  metadata.gz: 342448f498b87b8a5834782e0ceaa217e5d8ec58d023539094f858093b5f143477da2abfe2d67590ad194fcd627ac23d4e93400b7fb6deab097cf3b80e5b4b51
-  data.tar.gz: a6a1a5af52b4df8c79419b0bf03d02ba80648155f5c6e3cec0d6ac835fb4a24c6323533d916007fd2b3e5b4514b18c65ff5c21fea0d195b175a8e408c3d922fa
+  metadata.gz: 19fe3ed541cc2c97c30f59593d256aad6b5d665d5ea961d9039c1f30df7c3a6180ef5a7a2bc853c7145051fec50813c2e8a80980be7acd855ee84ec3472a5aa3
+  data.tar.gz: af5b46096c6b14c07bdf661799687887327702e3678e6fe7b86a1b1bd86d94b9250687ec232e6c36a79439b737a059d8ea4a7051eff1bbd3bdb755e32be264c8

data/lib/changit/config_merger.rb

@@ -0,0 +1,38 @@
+module Changit
+  class ConfigMerger
+    def initialize(src_config, target_config)
+      @src = src_config
+      @target = target_config
+    end
+
+    # comapre and merge src_config into target_config into a lexer
+    def merge
+      src_lexer = Lexer.new(@src)
+      src_token_hash = src_lexer.token_hash
+
+      target_lexer = Lexer.new(@target)
+      target_token_hash = target_lexer.token_hash
+
+      if target_token_hash.empty?
+        target_lexer = src_lexer
+      else
+        target_token_hash.each do |k, v|
+          if src_token_hash[k]
+            target_token_hash[k].merge!(src_token_hash[k])
+          end
+        end
+
+        config_difference = hash_difference(src_token_hash, target_token_hash)
+        target_token_hash.merge!(config_difference)
+        target_lexer.reconstruct_tokens_from_hash!
+      end
+
+      target_lexer
+    end
+
+    # return the difference between two hashes
+    def hash_difference(src_token_hash, target_token_hash)
+      src_token_hash.dup.delete_if { |k, _| target_token_hash.key?(k) }
+    end
+  end
+end

data/lib/changit/config_writer.rb

@@ -6,36 +6,12 @@ module Changit
       @config = config
       @config_files = config_files
     end
-    
-    def write
-      config_lexer = Lexer.new(@config)
-      config_token_hash = config_lexer.token_hash
 
+    def write
       @config_files.each do |path|
-        file_lexer = Lexer.new(File.read(path))
-        file_token_hash = file_lexer.token_hash
-
-        unless file_token_hash.empty?
-          file_token_hash.each do |k, v|
-            if config_token_hash[k]
-              # calling `sort!` changes the order of the key_value pairs
-              config_token_hash[k].sort!
-              file_token_hash[k].sort!
-
-              config_token_hash[k].each_with_index do |e, i|
-                if v.include?(e)
-                  # update it
-                  file_token_hash[k][i].rhs = e.rhs
-                else
-                  # push it
-                  file_token_hash[k].push(e)
-                end
-              end
-            end
-          end
-        end
+        merged_config = ConfigMerger.new(@config, File.read(path)).merge
 
-        File.open(path, 'w') { |f| f.write(config_lexer.to_s); f.close }
+        File.open(path, 'w') { |f| f.write(merged_config.to_s); f.close }
       end
     end
   end

data/lib/changit/lexer/key_value_token.rb

@@ -1,8 +1,6 @@
 module Changit
   class Lexer
     class KeyValueToken
-      include Comparable
-
       attr_reader :lhs    # left-hand side
       attr_accessor :rhs  # right-hand side
 
@@ -13,10 +11,6 @@ module Changit
       def to_s
         "\t#{@lhs} = #{@rhs}\n"
       end
-
-      def <=>(another)
-        self.lhs <=> another.lhs
-      end
     end
   end
 end

data/lib/changit/lexer/section_token.rb

@@ -1,7 +1,7 @@
 module Changit
   class Lexer
     class SectionToken
-      attr_reader :value
+      attr_accessor :section
 
       def initialize(section)
         @section = section

data/lib/changit/lexer.rb

@@ -17,6 +17,16 @@ module Changit
       @tokens.map(&:to_s).join
     end
 
+    def reconstruct_tokens_from_hash!
+      tokens = []
+      @token_hash.each do |section, key_value|
+        tokens << SectionToken.new(section)
+        key_value.each { |lhs, rhs| tokens << KeyValueToken.new("#{lhs} = #{rhs}") }
+      end
+
+      @tokens = tokens
+    end
+
     private
 
     def tokenize
@@ -42,9 +52,9 @@ module Changit
 
       @tokens.map do |token|
         if token.class == SectionToken
-          token_hash[token] = []
+          token_hash[token.section] = {}
         else
-          token_hash[token_hash.to_a.last[0]].push(token)
+          token_hash[token_hash.to_a.last[0]][token.lhs] = token.rhs
         end
       end
 

data/lib/changit/version.rb

@@ -1,3 +1,3 @@
 module Changit
-  VERSION='0.2.0'
+  VERSION='0.2.2'
 end

data/lib/changit.rb

@@ -1,9 +1,10 @@
 require 'changit/version'
-require 'changit/git_dir_finder'
-require 'changit/config_reader'
 require 'changit/lexer/section_token'
 require 'changit/lexer/key_value_token'
 require 'changit/lexer'
+require 'changit/git_dir_finder'
+require 'changit/config_merger'
+require 'changit/config_reader'
 require 'changit/config_writer'
 
 module Changit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: changit
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - aaooki
@@ -27,6 +27,7 @@ files:
 - changit.gemspec
 - demo.gif
 - lib/changit.rb
+- lib/changit/config_merger.rb
 - lib/changit/config_reader.rb
 - lib/changit/config_writer.rb
 - lib/changit/git_dir_finder.rb