changit 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b4a8ebb640fc22a9ebe8670d46e0573634e0c8b
-  data.tar.gz: 031dd2c48bbfbef3cd134dc0a965ceabda6b017d
+  metadata.gz: d9bf79ac4c29a50011f960a3087ae267347014be
+  data.tar.gz: 43c7ec5b8cfad72701db0b6f04b12c3b2b1e1e51
 SHA512:
-  metadata.gz: e56e10a4970f8063ca601941300660f72508ae23d91b7196b06e2d7a5696bb5dc555abfa3b73a80285ebb1cd8689e577c295b7871df81447b867f71fa694a0c7
-  data.tar.gz: 9068aed8fca24cdf5c173a3b66ac226a0596e7cdd1bcf6a482450dede815b71a0b8cd9c86acbaad7fa569b5e1e0e794e36bb6b87794dff8b9112b36932c41640
+  metadata.gz: 342448f498b87b8a5834782e0ceaa217e5d8ec58d023539094f858093b5f143477da2abfe2d67590ad194fcd627ac23d4e93400b7fb6deab097cf3b80e5b4b51
+  data.tar.gz: a6a1a5af52b4df8c79419b0bf03d02ba80648155f5c6e3cec0d6ac835fb4a24c6323533d916007fd2b3e5b4514b18c65ff5c21fea0d195b175a8e408c3d922fa

data/lib/changit/config_writer.rb

@@ -8,56 +8,35 @@ module Changit
     end
     
     def write
-      hsrc = parse(@config)
+      config_lexer = Lexer.new(@config)
+      config_token_hash = config_lexer.token_hash
 
       @config_files.each do |path|
-        hdst = parse(File.read(path))
-        hmerged = comp_and_merge(hsrc, hdst)
-
-        out = ""
-        hmerged.each do |k, v|
-          out += "#{k}\n"
-          v.each do |v_k, v_v|
-            out += "\t#{v_k} = #{v_v}\n"
+        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
 
-        File.open(path, 'w') { |f| f.write(out); f.close }
-      end
-    end
-
-    def parse(config)
-      h = Hash.new
-
-      config.each_line do |line|
-        line.strip!
-        line.gsub!(/\s+/, '')
-
-        if line =~ /^\[\w+\]$/
-          h[line] = {}
-        else
-          key, value = line.split('=') 
-          h[h.to_a.last[0]][key] = value
-        end
-      end
-
-      h
-    end
-
-    def comp_and_merge(hsrc, hdst)
-      hdifference = hsrc.dup.delete_if { |k, _| hdst.key?(k) }
-
-      hdst.each do |k, v|
-        if hsrc[k]
-          hdst[k] = hdst[k].merge(hsrc[k])
-        end
-      end
-
-      unless hdifference.empty?
-        hdst.merge!(hdifference)
+        File.open(path, 'w') { |f| f.write(config_lexer.to_s); f.close }
       end
-
-      hdst
     end
   end
 end

data/lib/changit/lexer/key_value_token.rb

@@ -0,0 +1,22 @@
+module Changit
+  class Lexer
+    class KeyValueToken
+      include Comparable
+
+      attr_reader :lhs    # left-hand side
+      attr_accessor :rhs  # right-hand side
+
+      def initialize(key_value)
+        @lhs, @rhs = key_value.split('=').map(&:strip)
+      end
+
+      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

@@ -0,0 +1,15 @@
+module Changit
+  class Lexer
+    class SectionToken
+      attr_reader :value
+
+      def initialize(section)
+        @section = section
+      end
+
+      def to_s
+        "#{@section}\n"
+      end
+    end
+  end
+end

data/lib/changit/lexer.rb

@@ -0,0 +1,54 @@
+module Changit
+  class Lexer
+    RULES = [
+      [/\[(.*?)\]/, SectionToken].freeze,
+      [/^[^(=|\[|\s)]*\s*\=\s*[^(=|\[|\])]*/, KeyValueToken].freeze
+    ].freeze
+
+    attr_reader :original_expression, :tokens, :token_hash
+
+    def initialize(expression)
+      @original_expression = expression
+      @tokens = tokenize
+      @token_hash = to_hash
+    end
+
+    def to_s
+      @tokens.map(&:to_s).join
+    end
+
+    private
+
+    def tokenize
+      expression = @original_expression.gsub(/\t/, '')
+
+      tokens = []
+      expression.each_line do |line|
+        RULES.each do |rule, token_type|
+          lexmeme = line.slice(rule)
+
+          if (lexmeme)
+            tokens << token_type.new(lexmeme)
+            break
+          end
+        end
+      end
+
+      tokens
+    end
+
+    def to_hash
+      token_hash = {}
+
+      @tokens.map do |token|
+        if token.class == SectionToken
+          token_hash[token] = []
+        else
+          token_hash[token_hash.to_a.last[0]].push(token)
+        end
+      end
+
+      token_hash
+    end
+  end
+end

data/lib/changit/version.rb

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

data/lib/changit.rb

@@ -1,6 +1,9 @@
 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/config_writer'
 
 module Changit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: changit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - aaooki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-12-03 00:00:00.000000000 Z
 dependencies: []
 description: An over-engineered tool to change git config for multiple projects at
   once.
@@ -30,6 +30,9 @@ files:
 - lib/changit/config_reader.rb
 - lib/changit/config_writer.rb
 - lib/changit/git_dir_finder.rb
+- lib/changit/lexer.rb
+- lib/changit/lexer/key_value_token.rb
+- lib/changit/lexer/section_token.rb
 - lib/changit/version.rb
 homepage: https://github.com/aaooki/changit
 licenses: []