xrt 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f297398d1b9757376b533d456353e069ad6c852
-  data.tar.gz: a953d05e896c259e4c46fa2414cff70d66407969
+  metadata.gz: 4ebf55387c6ecfe4b9df158408b759f0b1ee8106
+  data.tar.gz: 82976c5d15a8b57a072272f727a913e60c1c3737
 SHA512:
-  metadata.gz: d0ed3a59d292aa21d82f91d7c6277a19793d0f0fd8f9c7c1c7008a557f7408628d7e6355b922d0e5ff2fb4cd4642039ee2032aa8ffd77e88e20ca99f17f738fa
-  data.tar.gz: 4a39005f378374d91efcda18bf016744873bb07778c5e1579b90f00e06516796e40b38a4484b9c71322c189653f0ae5d7dfce52dcc1710c0bdb0bc1cc9f80c52
+  metadata.gz: 1af7ab32ea83cdc03d6af6da7b10099efb26bdb7ecb1621477981e41b6de063b7795429eb845d15f9c6cc6313a292f908bba6014438560dc809b03e637eef0ab
+  data.tar.gz: 89609aba1c70bb9856b0c8ed65de38b9724c275e889acbd076275c6998dea00bfa11a689944a5f89d090e95beb853acdd6f10c532312d8beda8ed81ab8b45220

data/lib/xrt/cli.rb

@@ -12,6 +12,9 @@ module XRT
       when 'extract'
         success = XRT::Command::Extract.new.execute(*args)
         exit success ? 0 : 1
+      when 'lcs'
+        success = XRT::Command::LCS.new.execute(*args)
+        exit success ? 0 : 1
       else
         warn "command not found"
         exit 1

data/lib/xrt/command/dump.rb

@@ -0,0 +1,22 @@
+require 'xrt/depth_checker'
+
+module XRT
+  module Command
+    class Dump
+      def execute(files)
+        files.each{|file|
+          puts annotate_file file, STDOUT.tty?
+        }
+      end
+
+      def annotate_file target_file, enable_color=nil
+        checker = XRT::DepthChecker.new
+        parsed, annotated_source = checker.check open(target_file).read, enable_color
+        unless parsed
+          raise "Failed to parse #{target_file}"
+        end
+        annotated_source
+      end
+    end
+  end
+end

data/lib/xrt/command/extract.rb

@@ -0,0 +1,51 @@
+require 'pathname'
+require 'xrt/parser'
+require 'xrt/transaction'
+
+module XRT
+  module Command
+
+    class Extract
+      # xrt extract templates/blogs/index.html '[% IF pager' 'templates/' 'blogs/_pager.tt'
+      def execute(from_file, target_block, templates_directory, to_file_name)
+        transaction = as_transaction(from_file, target_block, templates_directory, to_file_name)
+        transaction.commit!
+        true
+      end
+
+      def as_transaction(from_file, target_block, templates_directory, to_file_name)
+        transaction = XRT::Transaction.new
+        from_source = open(from_file).read
+        parser = XRT::Parser.new(from_source)
+        from_doc = parser.document
+
+        found_blocks = from_doc.find_blocks.select{|block|
+          block.content.index(target_block) == 0
+        }
+
+        if found_blocks.length == 0
+          raise "target_block not found"
+        end
+
+        if found_blocks.length > 1
+          raise "ambiguous target_block"
+        end
+
+        found_block = found_blocks.first
+
+        replace_to_node = XRT::Parser.new(%Q{[% INCLUDE "#{to_file_name}" %]}).document
+
+        from_doc.replace_child(replace_to_node, found_block)
+
+        content_to_overwrite = from_doc.content
+        content_for_new_file = found_block.auto_indent + "\n"
+
+        transaction.edit from_file, content_to_overwrite
+
+        transaction.new_file transaction.full_path(templates_directory, to_file_name), content_for_new_file
+
+        transaction
+      end
+    end
+  end
+end

data/lib/xrt/command/lcs.rb

@@ -0,0 +1,32 @@
+require 'xrt/depth_checker'
+
+module XRT
+  module Command
+    class LCS
+      def execute(*files)
+        lcs = collect(*files)
+        if lcs.length > 0
+          puts lcs.join("\n---\n")
+          true
+        else
+          false
+        end
+      end
+
+      def collect(*files)
+        products = statements(files.shift)
+        while files.length > 0
+          products = products.product(statements(files.shift))
+        end
+
+        products.select{|pairs|
+          pairs.flatten.uniq.length == 1
+        }.map{|pairs| pairs.first }.sort_by{|s| s.length}
+      end
+
+      def statements(file)
+        XRT::Parser.new(open(file).read).document.find_blocks.map{|s| s.auto_indent }
+      end
+    end
+  end
+end

data/lib/xrt/commands.rb

@@ -1,70 +1,4 @@
-require 'pathname'
 require 'xrt/depth_checker'
-
-module XRT
-  module Command
-    class Dump
-      def execute(files)
-        files.each{|file|
-          dump_file file
-        }
-      end
-
-      def dump_file target_file
-        warn "Dumping #{target_file}"
-        checker = XRT::DepthChecker.new
-        parsed, annotated_source = checker.check open(target_file).read
-        puts annotated_source
-        unless parsed
-          raise "Failed to parser #{target_file} (#{index}/#{target_files.length})"
-        end
-      end
-    end
-
-    class Extract
-      # xrt extract templates/blogs/index.html '[% IF pager' 'templates/' 'blogs/_pager.tt'
-      def execute(from_file, target_block, templates_directory, to_file_name)
-        from_source = open(from_file).read
-        parser = XRT::Parser.new(from_source)
-        from_doc = parser.document
-
-        found_blocks = from_doc.find_blocks.select{|block|
-          block.content.index(target_block) == 0
-        }
-
-        if found_blocks.length == 0
-          raise "target_block not found"
-        end
-
-        if found_blocks.length > 1
-          raise "ambiguous target_block"
-        end
-
-        found_block = found_blocks.first
-
-        replace_to_node = XRT::Parser.new(%Q{[% INCLUDE "#{to_file_name}" %]}).document
-
-        from_doc.replace_child(replace_to_node, found_block)
-
-        content_to_overwrite = from_doc.content
-        content_for_new_file = found_block.auto_indent
-
-        open(from_file, 'w'){|f|
-          f.write content_to_overwrite
-        }
-
-        new_file = Pathname(templates_directory).join(to_file_name)
-
-        if new_file.exist?
-          raise 'TO_FILE_NAME exists.'
-        end
-
-        open(new_file, 'w'){|f|
-          f.puts content_for_new_file
-        }
-
-        true
-      end
-    end
-  end
-end
+require 'xrt/command/dump'
+require 'xrt/command/extract'
+require 'xrt/command/lcs'

data/lib/xrt/depth_checker.rb

@@ -3,7 +3,7 @@ require 'xrt/syntax'
 
 module XRT
   class DepthChecker
-    def check source
+    def check source, enable_color=nil
       annotated_source = ''
       parser = XRT::Parser.new(source)
       syntax = XRT::Syntax.new
@@ -14,8 +14,8 @@ module XRT
         current_level += diff
         annotated_source += statement
 
-        color = 44 + diff
-        if STDOUT.tty?
+        if enable_color
+          color = 44 + diff
           annotated_source += "\e[#{color}m#{current_level}\e[0m"
         else
           annotated_source += current_level.to_s

data/lib/xrt/statement.rb

@@ -45,6 +45,10 @@ module XRT
       nil
     end
 
+    def statements
+      children.concat(children.map{|child| child.children }.flatten)
+    end
+
     def find_blocks
       children.select{|child|
         child.kind_of? XRT::Statement::Block

data/lib/xrt/transaction.rb

@@ -0,0 +1,47 @@
+module XRT
+  class Transaction
+    attr_reader :files
+    def initialize
+      @files = {}
+    end
+
+    def edit(path, content)
+      unless full_path(path).exist?
+        raise 'Editing new file'
+      end
+      if full_path(path).read == content
+        return
+      end
+      add(path, content)
+    end
+
+    def new_file(path, content)
+      if full_path(path).exist?
+        if full_path(path).read == content
+          # nothing will change
+          return
+        else
+          raise "File #{path} already exists"
+        end
+      end
+
+      add(path, content)
+    end
+
+    def full_path(*fragments)
+      Pathname(fragments.shift).join(*fragments)
+    end
+
+    def commit!
+      files.each_pair{|path, content|
+        full_path(path).open('w') {|f|
+          f.write content
+        }
+      }
+    end
+
+    def add(path, content)
+      @files[path.to_s] = content
+    end
+  end
+end

data/lib/xrt/version.rb

@@ -1,3 +1,3 @@
 module Xrt
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/test-command-dump.rb

@@ -0,0 +1,26 @@
+require 'test/unit'
+require 'tmpdir'
+require 'xrt/command/dump'
+
+class TestParser < Test::Unit::TestCase
+  def test_annotate
+    Dir.mktmpdir{|dir|
+      Pathname(dir).join('if1.pm').open('w'){ |f| f.write %q{[% IF 1 %]nested[% END %]} }
+
+      command = XRT::Command::Dump.new
+      source = command.annotate_file Pathname(dir).join('if1.pm')
+      assert_equal %q{[% IF 1 %]1nested1[% END %]0}, source
+    }
+  end
+
+  def test_annotate_broken_template
+    Dir.mktmpdir{|dir|
+      Pathname(dir).join('if1.pm').open('w'){ |f| f.write %q{[% IF 1 %]nested[% END %} }
+
+      command = XRT::Command::Dump.new
+      assert_raise {
+        command.annotate_file Pathname(dir).join('if1.pm')
+      }
+    }
+  end
+end

data/test/test-command-extract.rb

@@ -0,0 +1,34 @@
+require 'test/unit'
+require 'tmpdir'
+require 'xrt/command/extract'
+
+class TestCommandExtract < Test::Unit::TestCase
+  def test_extract
+    Dir.mktmpdir{|dir|
+      templates_dir = Pathname(dir).join('templates')
+      templates_dir.mkdir
+      templates_dir.join('if1.pm').open('w'){ |f| f.write %q{[% IF 1 %]nested[% END %]} }
+
+      command = XRT::Command::Extract.new
+      command.execute(templates_dir.join('if1.pm').to_s, %q{[% IF 1 %]}, templates_dir.to_s, '_if.tt')
+
+      assert_equal '[% INCLUDE "_if.tt" %]', templates_dir.join('if1.pm').open.read
+      assert_equal %Q{[% IF 1 %]nested[% END %]\n}, templates_dir.join('_if.tt').open.read
+    }
+  end
+
+  def test_as_transaction
+    Dir.mktmpdir{|dir|
+      templates_dir = Pathname(dir).join('templates')
+      templates_dir.mkdir
+      templates_dir.join('if1.pm').open('w'){ |f| f.write %q{[% IF 1 %]nested[% END %]} }
+
+      command = XRT::Command::Extract.new
+      transaction = command.as_transaction(templates_dir.join('if1.pm').to_s, %q{[% IF 1 %]}, templates_dir.to_s, '_if.tt')
+      assert_equal({
+        templates_dir.join('if1.pm').to_s => '[% INCLUDE "_if.tt" %]',
+        templates_dir.join('_if.tt').to_s => %Q{[% IF 1 %]nested[% END %]\n},
+      }, transaction.files)
+    }
+  end
+end

data/test/test-command-lcs.rb

@@ -0,0 +1,16 @@
+require 'test/unit'
+require 'tmpdir'
+require 'xrt/command/lcs'
+
+class TestCommandLCS < Test::Unit::TestCase
+  def test_annotate
+    Dir.mktmpdir{|dir|
+      Pathname(dir).join('if1.pm').open('w'){ |f| f.write %q{aaa[% IF 1 %]nested[% END %]bbb} }
+      Pathname(dir).join('if2.pm').open('w'){ |f| f.write %q{ccc[% IF 1 %]nested[% END %]ddd} }
+
+      command = XRT::Command::LCS.new
+      lcs = command.collect(Pathname(dir).join('if1.pm').to_s, Pathname(dir).join('if2.pm').to_s)
+      assert_equal [%q{[% IF 1 %]nested[% END %]}], lcs
+    }
+  end
+end

data/test/test-statement.rb

@@ -114,6 +114,18 @@ HTML
     assert_equal nil, document.depth(not_child)
   end
 
+  def test_statements
+    document = XRT::Statement::Document.new
+    assert_equal [], document.find_blocks, 'when there is no block'
+
+    text_block = XRT::Statement::Text.new('1')
+    document << text_block
+    if_block = XRT::Statement::Block.new('[% IF a %]')
+    document << if_block
+
+    assert_equal [ text_block, if_block ], document.statements, 'returns statements'
+  end
+
   def test_find_blocks
     document = XRT::Statement::Document.new
     assert_equal [], document.find_blocks, 'when there is no block'

data/test/test-transaction.rb

@@ -0,0 +1,97 @@
+require 'test/unit'
+require 'xrt/transaction'
+require 'tmpdir'
+require 'pathname'
+
+class TestTransaction < Test::Unit::TestCase
+  def test_initialize
+    Dir.mktmpdir{|dir|
+      transaction = XRT::Transaction.new
+      assert transaction
+      assert_equal({}, transaction.files)
+    }
+  end
+
+  def test_full_path
+    transaction = XRT::Transaction.new
+    assert_equal Pathname('/tmp/xrt/a.txt'), transaction.full_path('/tmp/xrt', 'a.txt')
+    assert_equal Pathname('/tmp/xrt/somedir/a.txt'), transaction.full_path('/tmp/xrt', 'somedir', 'a.txt')
+  end
+
+  def test_new_file_without_conflict
+    Dir.mktmpdir{|dir|
+      transaction = XRT::Transaction.new
+      transaction.new_file transaction.full_path(dir, 'hello.txt').to_s, 'Hello!'
+      transaction.commit!
+      assert_equal 'Hello!', transaction.full_path(dir, 'hello.txt').open.read
+    }
+  end
+
+  def test_new_file_throws_error_when_conflict
+    Dir.mktmpdir{|dir|
+      Pathname(dir).join('hello.txt').open('w'){ |f| f.write 'existing content' }
+      transaction = XRT::Transaction.new
+
+      # when content doesn't match existing content
+      assert_raise {
+        transaction.new_file transaction.full_path(dir, 'hello.txt').to_s, 'Hello!'
+      }
+
+      # when content matches existing content
+      assert_nothing_raised {
+        transaction.new_file transaction.full_path(dir, 'hello.txt').to_s, 'existing content'
+      }
+      assert_equal transaction.files, {}, 'nothing added'
+    }
+  end
+
+  def test_edit_when_editing_existing_file
+    Dir.mktmpdir{|dir|
+      Pathname(dir).join('hello.txt').open('w'){ |f| f.write 'existing content' }
+      transaction = XRT::Transaction.new
+      assert_nothing_raised {
+        transaction.edit transaction.full_path(dir, 'hello.txt').to_s, 'Hello!'
+      }
+      assert_equal({
+        transaction.full_path(dir, 'hello.txt').to_s => 'Hello!',
+      }, transaction.files)
+    }
+  end
+
+  def test_edit_when_content_is_same
+    Dir.mktmpdir{|dir|
+      Pathname(dir).join('hello.txt').open('w'){ |f| f.write 'existing content' }
+      transaction = XRT::Transaction.new
+      assert_nothing_raised {
+        transaction.edit transaction.full_path(dir, 'hello.txt').to_s, 'existing content'
+      }
+      assert_equal({}, transaction.files)
+    }
+  end
+
+  def test_edit_when_editing_new_file
+    Dir.mktmpdir{|dir|
+      transaction = XRT::Transaction.new
+      assert_raise {
+        transaction.edit transaction.full_path(dir, 'hello.txt').to_s, 'Hello!'
+      }
+      assert_equal({}, transaction.files)
+    }
+  end
+
+  def _test_add_commit
+    Dir.mktmpdir{|dir|
+      transaction = XRT::Transaction.new
+      transaction.add transaction.full_path(dir, 'hello.txt').to_s, 'Hello!'
+      assert_equal({
+        transaction.full_path(dir, 'hello.txt').to_s => 'Hello!',
+      }, transaction.files)
+      assert_equal false, transaction.full_path(dir, 'hello.txt').exist?, 'not exist yet'
+
+      transaction.commit!
+
+      assert_equal true, transaction.full_path(dir, 'hello.txt').exist?, 'now exists'
+      assert_equal 'Hello!', transaction.full_path(dir, 'hello.txt').open.read
+    }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xrt
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - hitode909
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2016-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,11 +69,15 @@ files:
 - bin/xrt
 - lib/xrt.rb
 - lib/xrt/cli.rb
+- lib/xrt/command/dump.rb
+- lib/xrt/command/extract.rb
+- lib/xrt/command/lcs.rb
 - lib/xrt/commands.rb
 - lib/xrt/depth_checker.rb
 - lib/xrt/parser.rb
 - lib/xrt/statement.rb
 - lib/xrt/syntax.rb
+- lib/xrt/transaction.rb
 - lib/xrt/version.rb
 - sketch/dump_blocks.rb
 - sketch/dump_max_depth.rb
@@ -81,10 +85,14 @@ files:
 - sketch/find_block.rb
 - sketch/replace_block.rb
 - test/run-test.rb
+- test/test-command-dump.rb
+- test/test-command-extract.rb
+- test/test-command-lcs.rb
 - test/test-depth_checker.rb
 - test/test-parser.rb
 - test/test-statement.rb
 - test/test-syntax.rb
+- test/test-transaction.rb
 - xrt.gemspec
 homepage: https://github.com/hitode909/xrt
 licenses:
@@ -112,7 +120,11 @@ specification_version: 4
 summary: Refactoring Tool for Text::Xslate
 test_files:
 - test/run-test.rb
+- test/test-command-dump.rb
+- test/test-command-extract.rb
+- test/test-command-lcs.rb
 - test/test-depth_checker.rb
 - test/test-parser.rb
 - test/test-statement.rb
 - test/test-syntax.rb
+- test/test-transaction.rb