reapack-index 1.0beta3 → 1.0beta4

data/test/test_cdetector.rb

@@ -0,0 +1,214 @@
+class TestConflictDetector < MiniTest::Test
+  include XMLHelper
+
+  def test_unique
+    cd = ReaPack::Index::ConflictDetector.new
+    cd['grp', 'pkg'].push :all, 'file1.lua'
+    cd['grp', 'pkg'].push :all, 'file2.lua'
+
+    assert_nil cd.resolve('grp', 'pkg')
+    assert_nil cd.resolve('grp')
+  end
+
+  def test_duplicates
+    cd = ReaPack::Index::ConflictDetector.new
+    cd['grp', 'pkg'].push :all, 'file1.lua'
+    cd['grp', 'pkg'].push :all, 'file1.lua'
+    cd['grp', 'pkg'].push :all, 'file2.lua'
+    cd['grp', 'pkg'].push :all, 'file2.lua'
+
+    assert_equal ["duplicate file 'file1.lua'", "duplicate file 'file2.lua'"],
+      cd.resolve('grp', 'pkg')
+  end
+
+  def test_same_platform
+    cd = ReaPack::Index::ConflictDetector.new
+    cd['grp', 'test'].push :windows, 'file.lua'
+    cd['grp', 'test'].push :windows, 'file.lua'
+
+    assert_equal ["duplicate file 'file.lua' on windows"], cd.resolve('grp')
+    assert_nil cd.resolve('other bucket')
+  end
+
+  def test_unmatching_platform
+    cd = ReaPack::Index::ConflictDetector.new
+    cd['grp', 'test'].push :darwin, 'file.lua'
+    cd['grp', 'test'].push :windows, 'file.lua'
+
+    assert_nil cd.resolve('grp')
+  end
+
+  def test_subplatform
+    cd = ReaPack::Index::ConflictDetector.new
+    cd['grp', 'test'].push :all, 'file.lua'
+    cd['grp', 'test'].push :windows, 'file.lua'
+
+    assert_equal ["duplicate file 'file.lua' on windows"], cd.resolve('grp')
+  end
+
+  def test_subsubplatform
+    cd = ReaPack::Index::ConflictDetector.new
+    cd['grp', 'test'].push :all, 'file.lua'
+    cd['grp', 'test'].push :win32, 'file.lua'
+
+    assert_equal ["duplicate file 'file.lua' on win32"], cd.resolve('grp')
+  end
+
+  def test_conflicts
+    cd = ReaPack::Index::ConflictDetector.new
+    cd['grp', 'package1.lua'].push :all, 'file1.lua'
+
+    cd['grp', 'package2.lua'].push :all, 'file1.lua'
+    cd['grp', 'package2.lua'].push :all, 'file2.lua'
+
+    cd['grp', 'package3.lua'].push :windows, 'file2.lua'
+
+    cd['grp', 'package4.lua'].push :darwin, 'file1.lua'
+
+    assert_nil cd.resolve('grp', 'not_specified.lua'), 'id = not_specified'
+
+    assert_equal ["'file1.lua' conflicts with 'package2.lua'"],
+      cd.resolve('grp', 'package1.lua'), 'id = package1'
+
+    assert_equal ["'file1.lua' conflicts with 'package1.lua'",
+                  "'file2.lua' conflicts with 'package3.lua' on windows"],
+      cd.resolve('grp', 'package2.lua'), 'id = package2'
+
+    assert_equal ["'file2.lua' conflicts with 'package2.lua'"],
+      cd.resolve('grp', 'package3.lua'), 'id = package3'
+
+    # this conflict might happen on every platform,
+    # so it should not be reported it as darwin-only
+    assert_equal ["'file1.lua' conflicts with 'package1.lua'"],
+      cd.resolve('grp', 'package4.lua'), 'id = package4'
+  end
+
+  def test_conflicts_bidirectional
+    cd1 = ReaPack::Index::ConflictDetector.new
+
+    a1 = cd1['grp', 'a']
+    a1.push :all, 'file.lua'
+
+    b1 = cd1['grp', 'b']
+    b1.push :windows, 'file.lua'
+
+    assert_equal ["'file.lua' conflicts with 'b' on windows"],
+      a1.resolve, 'id = a'
+    assert_equal ["'file.lua' conflicts with 'a'"],
+      b1.resolve, 'id = b'
+
+    cd2 = ReaPack::Index::ConflictDetector.new
+    a2 = cd1['grp', 'a']
+    a2.push :windows, 'file.lua'
+
+    b2 = cd1['grp', 'b']
+    b2.push :all, 'file.lua'
+
+    assert_equal a1.resolve, a2.resolve
+    assert_equal b1.resolve, b2.resolve
+  end
+
+  def test_conflicts_platform_selection
+    cd1 = ReaPack::Index::ConflictDetector.new
+    cd1['grp', 'a'].push :all, 'file.lua'
+    cd1['grp', 'b'].push :windows, 'file.lua'
+    cd1['grp', 'c'].push :win32, 'file.lua'
+
+    assert_equal ["'file.lua' conflicts with 'b' on windows"],
+      cd1.resolve('grp', 'a'), 'id = a'
+  end
+
+  def test_duplicate_platform_selection
+    cd = ReaPack::Index::ConflictDetector.new
+    cd['grp', 'test'].push :windows, 'file.lua'
+    cd['grp', 'test'].push :all, 'file.lua'
+    assert_equal ["duplicate file 'file.lua' on windows"], cd.resolve('grp')
+
+    cd['grp', 'test'].push :all, 'file.lua'
+    assert_equal ["duplicate file 'file.lua'"], cd.resolve('grp')
+  end
+
+  def test_platform_same_level
+    cd1 = ReaPack::Index::ConflictDetector.new
+    cd1['grp', 'test'].push :all, 'file.lua'
+    cd1['grp', 'test'].push :win32, 'file.lua' # win32 first
+    cd1['grp', 'test'].push :darwin32, 'file.lua'
+
+    assert_equal ["duplicate file 'file.lua' on win32"], cd1.resolve('grp')
+
+    cd2 = ReaPack::Index::ConflictDetector.new
+    cd2['grp', 'test'].push :all, 'file.lua'
+    cd2['grp', 'test'].push :darwin32, 'file.lua' # darwin32 first
+    cd2['grp', 'test'].push :win32, 'file.lua'
+
+    assert_equal cd1.resolve('grp'), cd2.resolve('grp')
+  end
+
+  def test_remove_by_key
+    cd = ReaPack::Index::ConflictDetector.new
+    cd['grp', 'test'].push :all, 'file'
+
+    cd['grp', 'test'].clear
+    cd['grp', 'test'].push :all, 'file'
+
+    assert_equal nil, cd.resolve('grp', 'test')
+  end
+
+  def test_clone
+    cd1 = ReaPack::Index::ConflictDetector.new
+    cd1['grp', 'test'].push :all, 'file'
+
+    cd2 = cd1.clone
+
+    cd1['grp', 'test'].push :all, 'file'
+    assert_nil cd2.resolve('grp')
+
+    cd2['grp', 'test'].push :all, 'file'
+    refute_nil cd2.resolve('grp')
+  end
+
+  def test_load_xml
+    xml = <<-XML
+<index version="1">
+  <category name="Other">
+    <reapack name="test1.lua" type="script">
+      <version name="1.0">
+        <source platform="all">http://irrelevant/url</source>
+        <source platform="all" file="background.png">http://google.com</source>
+        <source platform="win32" file="background.png">http://duplicate/file/</source>
+      </version>
+    </reapack>
+    <reapack name="test2.lua" type="script">
+      <version name="1.0">
+        <source platform="all" file="test1.lua">http://oops/conflict/</source>
+      </version>
+    </reapack>
+    <reapack name="empty_ver.lua" type="script">
+      <version name="a"/>
+    </reapack>
+    <reapack name="empty_pkg.lua"/>
+  </category>
+  <category name="Scripts">
+    <reapack name="test3.lua" type="script">
+      <version name="1.0">
+        <source platform="all" file="../Other/test1.lua">http://cross/category</source>
+      </version>
+    </reapack>
+  </category>
+</index>
+    XML
+
+    cd = ReaPack::Index::ConflictDetector.new
+    cd.load_xml make_node(xml)
+
+    assert_equal ["'Other/test1.lua' conflicts with 'Other/test2.lua'",
+                  "duplicate file 'Other/background.png' on win32"],
+      cd.resolve(:script, 'Other/test1.lua'), 'test1'
+
+    assert_equal ["'Other/test1.lua' conflicts with 'Other/test1.lua'"],
+      cd.resolve(:script, 'Other/test2.lua'), 'test2'
+
+    assert_equal ["'Other/test1.lua' conflicts with 'Other/test1.lua'"],
+      cd.resolve(:script, 'Scripts/test3.lua'), 'test3'
+  end
+end

data/test/test_cli.rb

@@ -1,64 +1,7 @@
 require File.expand_path '../helper', __FILE__
 
-require 'git'
-
-module CLIUtils
-  class FakeIO
-    def initialize
-      @getch = 'n'
-    end
-
-    attr_accessor :getch
-  end
-
-  def fake_input
-    stdin = $stdin
-    $stdin = FakeIO.new
-
-    yield $stdin
-  ensure
-    $stdin = stdin
-  end
-
-  def wrapper(args = [], options = {})
-    path = Dir.mktmpdir 'test-repository'
-    old_pwd = Dir.pwd
-
-    @git = Git.init path
-    @git.config('user.name', 'John Doe')
-    @git.config('user.email', 'john@doe.com')
-
-    if options[:remote] != false
-      options[:remote] ||= 'git@github.com:cfillion/test-repository.git'
-      @git.add_remote 'origin', options[:remote]
-    end
-
-    options[:setup].call if options.has_key? :setup
-
-    @indexer = ReaPack::Index::CLI.new \
-      ['--no-progress', '--no-commit'] + args + ['--', path]
-
-    yield if block_given?
-  ensure
-    @git = @indexer = nil
-    Dir.chdir old_pwd
-    FileUtils.rm_r path
-  end
-
-  def mkfile(file, content = String.new)
-    fn = File.join @git.dir.to_s, file
-    FileUtils.mkdir_p File.dirname(fn)
-    File.write fn, content
-    fn
-  end
-
-  def read_index(file = 'index.xml')
-    File.read File.expand_path(file, @git.dir.to_s)
-  end
-end
-
 class TestCLI < MiniTest::Test
-  include CLIUtils
+  include CLIHelper
 
   def test_help
     assert_output /--help/, '' do
@@ -97,308 +40,6 @@ class TestCLI < MiniTest::Test
     end
   end
 
-  def test_empty_branch
-    wrapper do
-      assert_output nil, /the current branch does not contains any commit/i do
-        assert_equal true, @indexer.run
-      end
-    end
-  end
-
-  def test_scan_initial_commit
-    wrapper do
-      @git.add mkfile('test1.lua', '@version 1.0')
-      @git.add mkfile('Category/test2.lua', '@version 1.0')
-      @git.add mkfile('Category/Sub/test3.lua', '@version 1.0')
-      @git.commit 'initial commit'
-
-      assert_output /3 new packages/ do
-        assert_equal true, @indexer.run
-      end
-
-      assert_match 'Category/test2.lua', read_index
-      assert_match "raw/#{@git.log(1).last.sha}/test1.lua", read_index
-      assert_match 'https://github.com/cfillion/test-repository/raw', read_index
-
-      assert_match @git.log(1).last.date.utc.iso8601, read_index
-    end
-  end
-
-  def test_scan_normal_commit
-    wrapper do
-      @git.add mkfile('README.md', '# Hello World')
-      @git.commit 'initial commit'
-
-      @git.add mkfile('test1.lua', '@version 1.0')
-      @git.add mkfile('Category/test2.lua', '@version 1.0')
-      @git.add mkfile('Category/Sub/test3.lua', '@version 1.0')
-      @git.commit 'second commit'
-
-      assert_output "3 new categories, 3 new packages, 3 new versions\n" do
-        assert_equal true, @indexer.run
-      end
-
-      assert_match 'Category/test2.lua', read_index
-    end
-  end
-
-  def test_pwd_is_subdirectory
-    wrapper do
-      @git.add mkfile('test1.lua', '@version 1.0')
-      @git.commit 'initial commit'
-
-      pwd = File.join(@git.dir.to_s, 'test')
-      Dir.mkdir pwd
-      Dir.chdir pwd
-
-      assert_output /1 new package/ do
-        assert_equal true, @indexer.run
-      end
-
-      assert_match 'test1.lua', read_index
-    end
-  end
-
-  def test_verbose
-    stdout, stderr = capture_io do
-      wrapper ['--verbose'] do
-        @git.add mkfile('test.lua', '@version 1.0')
-        @git.add mkfile('test.png')
-        @git.commit 'initial commit'
-
-        assert_equal true, @indexer.run
-      end
-    end
-
-    assert_equal "1 new category, 1 new package, 1 new version\n", stdout
-    assert_match /reading configuration from .+\.reapack-index\.conf/i, stderr
-    assert_match /processing [a-f0-9]{7}: initial commit/i, stderr
-    assert_match /indexing new file test.lua/, stderr
-    refute_match /indexing new file test.png/, stderr
-  end
-
-  def test_verbose_override
-    wrapper ['--verbose', '--no-verbose'] do
-      @git.add mkfile('README.md', '# Hello World')
-      @git.commit 'initial commit'
-
-      stdout, stderr = capture_io do
-        assert_equal true, @indexer.run
-      end
-
-      assert_equal "empty index\n", stdout
-      refute_match /processing [a-f0-9]{7}: initial commit/i, stderr
-    end
-  end
-
-  def test_invalid_metadata
-    wrapper do
-      @git.add mkfile('test.lua', 'no version tag in this script!')
-      @git.commit 'initial commit'
-
-      assert_output nil, /Warning: test\.lua: Invalid metadata/i do
-        assert_equal true, @indexer.run
-      end
-    end
-  end
-
-  def test_no_warnings
-    wrapper ['-w'] do
-      @git.add mkfile('test.lua', 'no version tag in this script!')
-      @git.commit 'initial commit'
-
-      _, stderr = capture_io do
-        assert_equal true, @indexer.run
-      end
-
-      refute_match /Warning: test\.lua: Invalid metadata/i, stderr
-    end
-  end
-
-  def test_no_warnings_override
-    wrapper ['-w', '-W'] do
-      @git.add mkfile('test.lua', 'no version tag in this script!')
-      @git.commit 'initial commit'
-
-      assert_output nil, /Warning: test\.lua: Invalid metadata/i do
-        assert_equal true, @indexer.run
-      end
-    end
-  end
-
-  def test_index_from_last
-    setup = proc {
-      @git.add mkfile('test1.lua', '@version 1.0')
-      @git.commit 'initial commit'
-
-      mkfile 'index.xml', <<-XML
-<?xml version="1.0" encoding="utf-8"?>
-<index version="1" name="hello" commit="#{@git.log(1).last.sha}"/>
-      XML
-    }
-
-    wrapper [], setup: setup do
-      @git.add mkfile('test2.lua', '@version 1.0')
-      @git.commit 'second commit'
-
-      assert_output nil, '' do
-        assert_equal true, @indexer.run
-      end
-
-      refute_match 'test1.lua', read_index
-      assert_match 'test2.lua', read_index
-    end
-  end
-
-  def test_index_from_invalid
-    setup = proc {
-      @git.add mkfile('test1.lua', '@version 1.0')
-      @git.commit 'initial commit'
-
-      mkfile 'index.xml', <<-XML
-<?xml version="1.0" encoding="utf-8"?>
-<index version="1" name="hello" commit="hello world"/>
-      XML
-    }
-
-    wrapper [], setup: setup do
-      @git.add mkfile('test2.lua', '@version 1.0')
-      @git.commit 'second commit'
-
-      assert_output nil, '' do
-        assert_equal true, @indexer.run
-      end
-
-      assert_match 'test1.lua', read_index
-      assert_match 'test2.lua', read_index
-    end
-  end
-
-  def test_index_from_inexistent
-    setup = proc {
-      @git.add mkfile('test.lua', '@version 1.0')
-      @git.commit 'initial commit'
-
-      mkfile 'index.xml', <<-XML
-<?xml version="1.0" encoding="utf-8"?>
-<index version="1" commit="0000000000000000000000000000000000000000"/>
-      XML
-    }
-
-    wrapper [], setup: setup do
-      assert_output nil, nil do
-        assert_equal true, @indexer.run
-      end
-    end
-  end
-
-  def test_index_from_long_hash
-    setup = proc {
-      @git.add mkfile('test.lua', '@version 1.0')
-      @git.commit 'initial commit'
-
-      mkfile 'index.xml', <<-XML
-<?xml version="1.0" encoding="utf-8"?>
-<index version="1" commit="0000000000000000000000000000000000000deadbeef"/>
-      XML
-    }
-
-    wrapper [], setup: setup do
-      assert_output nil, nil do
-        assert_equal true, @indexer.run
-      end
-    end
-  end
-
-  def test_no_amend
-    setup = proc {
-      @git.add mkfile('Test/test.lua', '@version 1.0')
-      @git.commit 'initial commit'
-      
-      mkfile 'index.xml', <<-XML
-<?xml version="1.0" encoding="utf-8"?>
-<index version="1" commit="#{@git.log(1).last.sha}">
-  <category name="Test">
-    <reapack name="test.lua" type="script">
-      <version name="1.0"/>
-    </reapack>
-  </category>
-</index>
-      XML
-    }
-
-    wrapper ['--no-amend'], setup: setup do
-      @git.add mkfile('Test/test.lua', "@version 1.0\n@author cfillion")
-      @git.commit 'second commit'
-
-      assert_output '', /nothing to do/i do
-        assert_equal true, @indexer.run
-      end
-
-      refute_match 'cfillion', read_index
-    end
-  end
-
-  def test_amend
-    setup = proc {
-      @git.add mkfile('Test/test.lua', '@version 1.0')
-      @git.commit 'initial commit'
-      
-      mkfile 'index.xml', <<-XML
-<?xml version="1.0" encoding="utf-8"?>
-<index version="1" name="hello" commit="#{@git.log(1).last.sha}">
-  <category name="Test">
-    <reapack name="test.lua" type="script">
-      <version name="1.0"/>
-    </reapack>
-  </category>
-</index>
-      XML
-    }
-
-    wrapper ['--amend'], setup: setup do
-      @git.add mkfile('Test/test.lua', "@version 1.0\n@author cfillion")
-      @git.commit 'second commit'
-
-      assert_output /1 modified package/i, '' do
-        assert_equal true, @indexer.run
-      end
-
-      assert_match 'cfillion', read_index
-    end
-  end
-
-  def test_remove
-    wrapper do
-      script = mkfile 'test.lua', '@version 1.0'
-
-      @git.add script
-      @git.commit 'initial commit'
-
-      @git.remove script
-      @git.commit 'second commit'
-
-      assert_output /1 removed package/i do
-        assert_equal true, @indexer.run
-      end
-
-      refute_match 'test.lua', read_index
-    end
-  end
-
-  def test_output
-    wrapper ['-o output.xml'] do
-      @git.add mkfile('test.lua', '@version 1.0')
-      @git.commit 'initial commit'
-
-      capture_io do
-        assert_equal true, @indexer.run
-      end
-
-      assert_match 'test.lua', read_index('output.xml')
-    end
-  end
-
   def test_missing_argument
     assert_output nil, /missing argument/ do
       i = ReaPack::Index::CLI.new ['--output']
@@ -406,92 +47,51 @@ class TestCLI < MiniTest::Test
     end
   end
 
-  def test_multibyte_filename
-    wrapper do
-      script = mkfile("\342\200\224.lua")
-
-      @git.add script
-      @git.commit 'initial commit'
-
-      @git.remove script
-      @git.commit 'remove test'
-
-      assert_output { @indexer.run }
-    end
-  end
-
-  def test_invalid_unicode_sequence
-    wrapper do
-      @git.add mkfile('.gitkeep')
-      @git.commit 'initial commit'
-
-      @git.add mkfile('test.lua', "@version 1.0\n\n\x97")
-      @git.commit 'second commit'
-
-      assert_output { @indexer.run }
+  def test_output
+    wrapper ['-o output.xml'] do
+      assert_equal mkpath('output.xml'), @cli.index.path
     end
   end
 
   def test_create_commit
     wrapper ['--commit'] do
-      @git.add mkfile('.gitkeep')
-      @git.commit 'initial commit'
-
-      mkfile 'ignored1'
-      @git.add mkfile('ignored2')
-
-      assert_output("empty index\n", /commit created\n/) { @indexer.run }
+      assert_output("empty index\n", /commit created\n/) { @cli.run }
       
-      commit = @git.log(1).last
+      commit = @git.last_commit
       assert_equal 'index: empty index', commit.message
-      assert_equal ['index.xml'], commit.diff_parent.map {|d| d.path }
-    end
-  end
-
-  def test_create_initial_commit
-    wrapper ['--commit'] do
-      mkfile 'ignored1'
-      @git.add mkfile('ignored2')
-
-      assert_output("empty index\n", /commit created\n/) { @indexer.run }
-
-      commit = @git.log(1).last
-      assert_equal 'index: empty index', commit.message
-      assert_equal ['index.xml'], commit.gtree.files.keys
+      assert_equal ['index.xml'], commit.each_diff.map {|d| d.file }
     end
   end
 
   def test_create_commit_accept
     wrapper ['--prompt-commit'] do
-      @git.add mkfile('.gitkeep')
-      @git.commit 'initial commit'
+      @git.create_commit 'initial commit', [mkfile('.gitkeep')]
 
       fake_input do |fio|
         fio.getch = 'y'
-        _, stderr = capture_io { @indexer.run }
+        _, stderr = capture_io { @cli.run }
         assert_match /commit created/i, stderr
       end
 
-      commit = @git.log(1).last
+      commit = @git.last_commit
       assert_equal 'index: empty index', commit.message
-      assert_equal ['index.xml'], commit.diff_parent.map {|d| d.path }
+      assert_equal ['index.xml'], commit.each_diff.map {|d| d.file }
     end
   end
 
   def test_create_commit_decline
     wrapper ['--prompt-commit'] do
-      @git.add mkfile('.gitkeep')
-      @git.commit 'initial commit'
+      @git.create_commit 'initial commit', [mkfile('.gitkeep')]
 
       fake_input do |fio|
         fio.getch = 'n'
-        _, stderr = capture_io { @indexer.run }
+        _, stderr = capture_io { @cli.run }
         refute_match /commit created/i, stderr
       end
 
-      commit = @git.log(1).last
+      commit = @git.last_commit
       refute_equal 'index: empty index', commit.message
-      refute_equal ['index.xml'], commit.diff_parent.map {|d| d.path }
+      refute_equal ['index.xml'], commit.each_diff.map {|d| d.file }
     end
   end
 
@@ -520,10 +120,11 @@ class TestCLI < MiniTest::Test
 
     _, stderr = capture_io do
       wrapper ['--warnings'], setup: setup do
-        @git.add mkfile('test.lua', 'no version tag in this script!')
-        @git.commit 'initial commit'
+        @git.create_commit 'initial commit', [
+          mkfile('cat/test.lua', 'no version tag in this script!')
+        ]
 
-        assert_equal true, @indexer.run
+        assert_equal true, @cli.run
       end
     end
 
@@ -536,7 +137,7 @@ class TestCLI < MiniTest::Test
       mkfile '.reapack-index.conf', '--help'
       mkfile 'Category/.gitkeep'
 
-      Dir.chdir File.join(@git.dir.to_s, 'Category')
+      Dir.chdir File.join(@git.path, 'Category')
 
       assert_output /--help/ do
         ReaPack::Index::CLI.new
@@ -546,11 +147,12 @@ class TestCLI < MiniTest::Test
 
   def test_working_directory_with_options
     wrapper do
-      @git.add mkfile('README.md', '# Hello World')
-      @git.commit 'initial commit'
+      @git.create_commit 'initial commit',
+        [mkfile('README.md', '# Hello World')]
 
-      Dir.chdir @git.dir.to_s
+      Dir.chdir @git.path
 
+      # no error = repository is found
       assert_output '', '' do
         i2 = ReaPack::Index::CLI.new ['--no-commit', '--quiet']
         i2.run
@@ -576,13 +178,21 @@ class TestCLI < MiniTest::Test
     end
   end
 
+  def test_invalid_index
+    assert_output '', /\A'.+index\.xml' is not a ReaPack index file\Z/ do
+      setup = proc { mkfile 'index.xml', "\0" }
+      wrapper [], setup: setup do
+      end
+    end
+  end
+
   def test_progress
     wrapper ['--progress'] do
-      @git.add mkfile('README.md', '# Hello World')
-      @git.commit 'initial commit'
+      @git.create_commit 'initial commit',
+        [mkfile('README.md', '# Hello World')]
 
       stdout, stderr = capture_io do
-        assert_equal true, @indexer.run
+        assert_equal true, @cli.run
       end
 
       assert_equal "empty index\n", stdout
@@ -593,420 +203,82 @@ class TestCLI < MiniTest::Test
 
   def test_progress_no_new_commit
     setup = proc {
-      @git.add mkfile('test1.lua', '@version 1.0')
-      @git.commit 'initial commit'
+      @git.create_commit 'initial commit',
+        [mkfile('cat/test1.lua', '@version 1.0')]
 
       mkfile 'index.xml', <<-XML
 <?xml version="1.0" encoding="utf-8"?>
-<index version="1" commit="#{@git.log(1).last.sha}"/>
+<index version="1" commit="#{@git.last_commit.id}"/>
       XML
     }
 
     wrapper ['--progress'], setup: setup do
-      assert_output '', /Nothing to do!\n/ do
-        @indexer.run
+      assert_output '', /nothing to do/i do
+        @cli.run
       end
     end
   end
 
   def test_progress_warnings
     wrapper ['--progress'] do
-      @git.add mkfile('test.lua', 'no version tag in this script!')
-      @git.commit 'initial commit'
+      @git.create_commit 'initial commit',
+        [mkfile('cat/test.lua', 'no version tag in this script!')]
 
-      assert_output nil, /\nWarning:/i do
-        assert_equal true, @indexer.run
+      # must output a new line before 'warning:'
+      assert_output nil, /\nwarning:/i do
+        assert_equal true, @cli.run
       end
     end
   end
 
   def test_quiet_mode
     wrapper ['--verbose', '--progress', '--quiet'] do
-      @git.add mkfile('test.lua', 'no version tag in this script!')
-      @git.commit 'initial commit'
+      @git.create_commit 'initial commit',
+        [mkfile('cat/test.lua', 'no version tag in this script!')]
 
       assert_output '', '' do
-        assert_equal true, @indexer.run
-      end
-    end
-  end
-
-  def test_website_link
-    wrapper ['-l http://cfillion.tk'] do
-      assert_output "1 new website link, empty index\n" do
-        assert_equal true, @indexer.run
-      end
-
-      assert_match 'rel="website">http://cfillion.tk</link>', read_index
-    end
-  end
-
-  def test_donation_link
-    wrapper ['--donation-link', 'Link Label=http://cfillion.tk'] do
-      assert_output "1 new donation link, empty index\n" do
-        assert_equal true, @indexer.run
-      end
-
-      assert_match 'rel="donation" href="http://cfillion.tk">Link Label</link>',
-        read_index
-    end
-  end
-
-  def test_invalid_link
-    wrapper ['--link', 'shinsekai yori', '--donation-link', 'hello world',
-             '--link', 'http://cfillion.tk'] do
-      stdout, stderr = capture_io do
-        assert_equal true, @indexer.run
-      end
-
-      assert_equal "1 new website link, empty index\n", stdout
-      assert_match /warning: --link: invalid link: shinsekai yori/i, stderr
-      assert_match /warning: --donation-link: invalid link: hello world/i, stderr
-      assert_match 'rel="website">http://cfillion.tk</link>', read_index
-    end
-  end
-
-  def test_remove_link
-    wrapper ['--link', 'http://test.com', '--link', '-http://test.com'] do
-      assert_output "1 new website link, 1 removed website link, empty index\n" do
-        assert_equal true, @indexer.run
-      end
-
-      refute_match 'rel="website">http://test.com</link>', read_index
-    end
-  end
-
-  def test_list_links
-    setup = proc {
-      mkfile 'index.xml', <<-XML
-<?xml version="1.0" encoding="utf-8"?>
-<index version="1">
-  <metadata>
-    <link rel="website" href="http://anidb.net/a9002">Shinsekai Yori</link>
-    <link rel="donation" href="http://paypal.com">Donate!</link>
-    <link rel="website">http://cfillion.tk</link>
-      XML
-    }
-
-    wrapper ['--ls-links'], setup: setup do
-      stdin, stderr = capture_io do
-        assert_equal true, @indexer.run
+        assert_equal true, @cli.run
       end
-
-      expected = <<-OUT
-[website] Shinsekai Yori (http://anidb.net/a9002)
-[website] http://cfillion.tk
-[donation] Donate! (http://paypal.com)
-      OUT
-
-      assert_equal expected, stdin
-      assert_empty stderr
-    end
-  end
-
-  def test_no_git_remote
-    wrapper [], remote: '*' do
-      # no crash :)
-      assert_output { @indexer.run }
-    end
-  end
-
-  def test_weird_git_remote_url
-    wrapper [], remote: 'scp://hello.world/$path' do
-      _, stderr = capture_io { @indexer.run }
-      refute_match /invalid url/i, stderr
-      refute_match '$path', stderr
-    end
-  end
-
-  def test_auto_url_template_ssh
-    wrapper [], remote: 'git@github.com:User/Repo.git' do
-      @git.add mkfile('hello.lua', '@version 1.0')
-      @git.commit 'initial commit'
-
-      assert_output { @indexer.run }
-      assert_match "https://github.com/User/Repo/raw/#{@git.log(1).last.sha}/hello.lua", read_index
-    end
-  end
-
-  def test_auto_url_template_https
-    wrapper [], remote: 'https://github.com/User/Repo.git' do
-      @git.add mkfile('hello.lua', '@version 1.0')
-      @git.commit 'initial commit'
-
-      assert_output { @indexer.run }
-      assert_match "https://github.com/User/Repo/raw/#{@git.log(1).last.sha}/hello.lua", read_index
     end
   end
 
   def test_url_template
-    wrapper ['--url-template=http://host/$path'], remote: false do
-      @git.add mkfile('hello.lua', '@version 1.0')
-      @git.commit 'initial commit'
-
-      assert_output { @indexer.run }
-      assert_match 'http://host/hello.lua', read_index
-    end
-  end
-
-  def test_url_template_override_git
-    wrapper ['--url-template=http://host/$path'] do
-      @git.add mkfile('hello.lua', '@version 1.0')
-      @git.commit 'initial commit'
-
-      assert_output { @indexer.run }
-      assert_match 'http://host/hello.lua', read_index
-    end
-  end
-
-  def test_url_template_invalid
-    wrapper ['--url-template=minoshiro'] do
-      @git.add mkfile('hello.lua', '@version 1.0')
-      @git.commit 'initial commit'
-
-      _, stderr = capture_io { @indexer.run }
-      assert_match /--url-template: \$path placeholder is missing/i, stderr
-    end
-  end
-
-  def test_about
-    opts = ['--about']
-    setup = proc { opts << mkfile('README.md', '# Hello World') }
-
-    wrapper opts, setup: setup do
-      assert_output "1 modified metadata, empty index\n" do
-        assert_equal true, @indexer.run
-      end
-
-      assert_match 'Hello World', read_index
-    end
-  end
-
-  def test_about_file_not_found
-    # 404.md is read in the working directory
-    wrapper ['--about=404.md'] do
-      assert_output "empty index\n",
-          /warning: --about: no such file or directory - 404.md/i do
-        assert_equal true, @indexer.run
-      end
-    end
-  end
-
-  def test_about_pandoc_not_found
-    old_path = ENV['PATH']
-
-    opts = ['--about']
-
-    setup = proc {
-      opts << mkfile('README.md', '# Hello World')
-    }
-
-    wrapper opts, setup: setup do
-      assert_output "empty index\n", /pandoc executable cannot be found/i do
-        ENV['PATH'] = String.new
-        assert_equal true, @indexer.run
-      end
-    end
-  ensure
-    ENV['PATH'] = old_path
-  end
-
-  def test_about_clear
-    setup = proc {
-      mkfile 'index.xml', <<-XML
-<index>
-  <metadata>
-    <description><![CDATA[Hello World]]></description>
-  </metadata>
-</index>
-      XML
-    }
-
-    wrapper ['--remove-about'], setup: setup do
-      assert_output "1 modified metadata\n" do
-        assert_equal true, @indexer.run
-      end
-
-      refute_match 'Hello World', read_index
-    end
-  end
-
-  def test_about_dump
-    setup = proc {
-      mkfile 'index.xml', <<-XML
-<index>
-  <metadata>
-    <description><![CDATA[Hello World]]></description>
-  </metadata>
-</index>
-      XML
-    }
-
-    wrapper ['--dump-about'], setup: setup do
-      assert_output 'Hello World' do
-        assert_equal true, @indexer.run
-      end
-    end
-  end
-
-  def test_check_pass
-    expected = <<-STDERR
-..
-
-Finished checks for 2 packages with 0 failures
-    STDERR
-
-    wrapper ['--check'] do
-      mkfile 'test1.lua', '@version 1.0'
-      mkfile 'test2.lua', '@version 1.0'
-
-      assert_output nil, expected do
-        assert_equal true, @indexer.run
-      end
-    end
-  end
-
-  def test_check_failure
-    expected = <<-STDERR
-F.
-
-test1.lua contains invalid metadata:
-  - missing tag "version"
-  - invalid value for tag "author"
-
-Finished checks for 2 packages with 1 failure
-    STDERR
-
-    wrapper ['--check'] do
-      mkfile 'test1.lua', '@author'
-      mkfile 'test2.lua', '@version 1.0'
-
-      assert_output nil, expected do
-        assert_equal false, @indexer.run
-      end
-    end
-  end
-
-  def test_check_quiet
-    expected = <<-STDERR
-test1.lua contains invalid metadata:
-  - missing tag "version"
-  - invalid value for tag "author"
-
-test2.lua contains invalid metadata:
-  - missing tag "version"
-    STDERR
-
-    wrapper ['--check', '--quiet'] do
-      mkfile 'test1.lua', '@author'
-      mkfile 'test2.lua'
-      mkfile 'test3.lua', '@version 1.0'
-
-      assert_output nil, expected do
-        assert_equal false, @indexer.run
+    assert_output '', '' do
+      wrapper ['--url-template=http://host/$path'], remote: false do
+        assert_equal 'http://host/$path', @cli.index.url_template
       end
     end
   end
 
-  def test_check_ignore
-    setup = proc { Dir.chdir @git.dir.to_s }
-
-    expected = <<-STDERR
-.
-
-Finished checks for 1 package with 0 failures
-    STDERR
-
-    wrapper ['--check', '--ignore=Hello',
-             '--ignore=Chunky/Bacon.lua', '--ignore=test2.lua'], setup: setup do
-      mkfile 'Hello/World.lua', 'konnichiwa'
-      mkfile 'Chunky/Bacon.lua', 'konnichiwa'
-      mkfile 'Directory/test2.lua', '@version 1.0'
-
-      assert_output nil, expected do
-        @indexer.run
+  def test_url_template_override_vcs
+    assert_output '', '' do
+      wrapper ['--url-template=http://host/$path'] do
+        assert_equal 'http://host/$path', @cli.index.url_template
       end
     end
   end
 
-  def test_ignore_config
-    expected = <<-STDERR
-.
-
-Finished checks for 1 package with 0 failures
-    STDERR
-
-    setup = proc {
-      mkfile '.reapack-index.conf', <<-CONFIG
---ignore=Hello
---ignore=Chunky/Bacon.lua
---ignore=test2.lua
-      CONFIG
-    }
-
-    wrapper ['--check'], setup: setup do
-      mkfile 'Hello/World.lua', 'konnichiwa'
-      mkfile 'Chunky/Bacon.lua', 'konnichiwa'
-      mkfile 'Directory/test2.lua', '@version 1.0'
-
-      assert_output nil, expected do
-        @indexer.run
+  def test_url_template_invalid
+    _, stderr = capture_io do
+      wrapper ['--url-template=minoshiro'] do
+        assert_nil @cli.index.url_template
       end
     end
-  end
-
-  def test_scan_ignore
-    setup = proc { Dir.chdir @git.dir.to_s }
-
-    wrapper ['--ignore=Hello', '--ignore=Chunky/Bacon.lua',
-             '--ignore=test2.lua'], setup: setup do
-      @git.add mkfile('README.md', '# Hello World')
-      @git.commit 'initial commit'
 
-      @git.add mkfile('Hello/World.lua', 'konnichiwa')
-      @git.add mkfile('Chunky/Bacon.lua', 'konnichiwa')
-      @git.add mkfile('Directory/test2.lua', '@version 1.0')
-      @git.commit 'second commit'
-
-      assert_output "1 new category, 1 new package, 1 new version\n" do
-        assert_equal true, @indexer.run
-      end
-
-      refute_match 'Hello/World.lua', read_index
-      refute_match 'Chunky/Bacon.lua', read_index
-      assert_match 'Directory/test2.lua', read_index
-    end
+    assert_match /--url-template: .+\$path placeholder/i, stderr
   end
 
-  def test_noname
-    wrapper do
-      assert_output nil, /The name of this index is unset/i do
-        assert_equal true, @indexer.run
-      end
-
-      refute_match 'name', read_index
-    end
-  end
-
-  def test_set_name
-    wrapper ['--name=Hello World'] do
-      _, stderr = capture_io do
-        assert_equal true, @indexer.run
-      end
-
-      refute_match /The name of this index is unset/i, stderr
-      assert_match 'name="Hello World"', read_index
+  def test_scan_check_mutally_exclusive
+    wrapper ['--check', '--scan'] do
+      _, stderr = capture_io { @cli.run }
+      refute_match /finished checks/i, stderr
+      read_index # index exists
     end
-  end
-
-  def test_set_name_invalid
-    wrapper ['--name=Hello/World'] do
-      _, stderr = capture_io do
-        assert_equal true, @indexer.run
-      end
 
-      refute_match /The name of this index is unset/i, stderr
-      assert_match /invalid name: 'Hello\/World'/i, stderr
+    wrapper ['--scan', '--check'] do
+      _, stderr = capture_io { @cli.run }
+      assert_match /finished checks/i, stderr
+      assert_raises(Errno::ENOENT) { read_index }
     end
   end
 end