reapack-index 1.0beta4 → 1.0rc2

data/test/test_cli.rb

@@ -280,5 +280,11 @@ class TestCLI < MiniTest::Test
       assert_match /finished checks/i, stderr
       assert_raises(Errno::ENOENT) { read_index }
     end
+
+    wrapper ['--check', '--rebuild'] do
+      _, stderr = capture_io { @cli.run }
+      refute_match /finished checks/i, stderr
+      read_index # index exists
+    end
   end
 end

data/test/test_git.rb

@@ -31,6 +31,10 @@ class TestGit < MiniTest::Test
     assert_match "https://github.com/User/Repo/raw/$commit/$path",
       @git.guess_url_template
 
+    @repo.remotes.set_url 'origin', 'https://github.com/User/Repo'
+    assert_match "https://github.com/User/Repo/raw/$commit/$path",
+      @git.guess_url_template
+
     @repo.remotes.set_url 'origin', 'scp://weird/url'
     assert_nil @git.guess_url_template
   end
@@ -100,6 +104,7 @@ class TestGit < MiniTest::Test
 
   def test_commits_since
     assert_equal [], @git.commits_since(nil)
+    assert_equal [], @git.commits
     c1 = @git.create_commit 'first', []
 
     assert_equal [c1], @git.commits_since(nil)
@@ -107,6 +112,7 @@ class TestGit < MiniTest::Test
 
     c2 = @git.create_commit 'second', []
     assert_equal [c1, c2], @git.commits_since(nil)
+    assert_equal [c1, c2], @git.commits
     assert_equal [c2], @git.commits_since(c1.id)
 
     INVALID_HASHES.each {|hash|

data/test/test_index.rb

@@ -56,6 +56,9 @@ class TestIndex < MiniTest::Test
     assert_match "missing $path placeholder in 'test'", error.message
     assert_equal 'https://google.com/$path', index.url_template
 
+    index.url_template = 'https://google.com/sp ace/$path'
+    assert_equal 'https://google.com/sp ace/$path', index.url_template
+
     index.url_template = nil
     assert_nil index.url_template
   end
@@ -82,7 +85,7 @@ class TestIndex < MiniTest::Test
     index = ReaPack::Index.new @real_path
 
     assert_equal 1, index.version
-    assert_equal 'f572d396fae9206628714fb2ce00f72e94f2258f', index.commit
+    assert_equal 'f572d396fae9206628714fb2ce00f72e94f2258f', index.last_commit
   end
 
   def test_read_invalid
@@ -117,7 +120,7 @@ class TestIndex < MiniTest::Test
     index = ReaPack::Index.new @real_path
 
     index.write @dummy_path
-    assert_equal File.read(@real_path), File.read(@dummy_path)
+    assert_equal File.read(@real_path), File.binread(@dummy_path)
   end
 
   def test_mkdir
@@ -134,55 +137,7 @@ class TestIndex < MiniTest::Test
     FileUtils.rm_r dirname if File.exist? dirname
   end
 
-  def test_make_url_defaut_branch
-    index = ReaPack::Index.new @dummy_path
-    index.files = ['Category/script.lua']
-    index.url_template = 'http://host/$commit/$path'
-    index.commit = nil
-
-    assert_match 'http://host/master/Category/script.lua',
-      index.make_url('Category/script.lua')
-  end
-
-  def test_make_url_without_template
-    index = ReaPack::Index.new @dummy_path
-    index.files = ['script.lua']
-
-    assert_equal nil, index.url_template
-    index.make_url 'script.lua', 'ok if explicit template'
-
-    error = assert_raises ReaPack::Index::Error do
-      index.make_url 'script.lua'
-    end
-
-    assert_match /url template/i, error.message
-  end
-
-  def test_make_url_commit
-    index = ReaPack::Index.new @dummy_path
-    index.files = ['Category/script.lua']
-    index.url_template = 'http://host/$commit/$path'
-    index.commit = @commit
-
-    assert_equal "http://host/#{@commit}/Category/script.lua",
-      index.make_url('Category/script.lua')
-  end
-
-  def test_make_url_unlisted
-    index = ReaPack::Index.new @dummy_path
-    index.commit = @commit
-    index.url_template = 'http://google.com/$path'
-
-    index.make_url 'unlisted.lua', 'ok with url template'
-
-    error = assert_raises ReaPack::Index::Error do
-     index.make_url 'unlisted.lua'
-    end
-
-    assert_equal "file not found 'unlisted.lua'", error.message
-  end
-
-  def test_reset_index_after_error
+  def test_reset_after_error
     index = ReaPack::Index.new @dummy_path
     index.commit = @commit
     index.url_template = 'http://host/$path'
@@ -207,13 +162,22 @@ class TestIndex < MiniTest::Test
     assert_equal true, index.modified?
     assert_equal '1 removed package', index.changelog
 
-    expected = <<-XML
-<?xml version="1.0" encoding="utf-8"?>
-<index version="1" commit="#{@commit}"/>
-    XML
+    index.write @dummy_path
+    contents = File.read @dummy_path
+
+    assert_match @commit, contents
+    refute_match '<category', contents
+  end
 
+  def test_retain_last_commit
+    index = ReaPack::Index.new @real_path
+    assert_nil index.commit
+
+    index.remove 'Category Name/Hello World.lua'
     index.write @dummy_path
-    assert_equal expected, File.read(@dummy_path)
+
+    refute_nil index.last_commit
+    assert_match index.last_commit, File.read(@dummy_path)
   end
 
   def test_remove_inexistant
@@ -252,13 +216,14 @@ class TestIndex < MiniTest::Test
 <index>
   <category name="zebra"/>
   <category name="bee"/>
+  <category name="Cat"/>
 </index>
     XML
 
     index = ReaPack::Index.new @dummy_path
     index.write!
 
-    assert_match /bee.+zebra/m, File.read(index.path)
+    assert_match /bee.+Cat.+zebra/m, File.read(index.path)
   end
 
   def test_sort_packages
@@ -296,4 +261,71 @@ class TestIndex < MiniTest::Test
 
     assert_equal original, File.read(index.path)
   end
+
+  def test_dont_mess_with_link_ordering
+    # https://bugs.ruby-lang.org/issues/11907
+    original = <<-XML
+<?xml version="1.0" encoding="utf-8"?>
+<index version="1">
+  <metadata>
+    <link>1</link>
+    <link>2</link>
+    <link>3</link>
+    <link>4</link>
+    <link>5</link>
+    <link>6</link>
+    <description><![CDATA[
+    ]]></description>
+  </metadata>
+</index>
+    XML
+
+    File.write @dummy_path, original
+    index = ReaPack::Index.new @dummy_path
+    assert_output '' do
+    index.write!
+    end
+
+    expected = original.sub /(<link.+?)(\s+?)(<description.+?<\/description>)/m, "\\3\\2\\1"
+    assert_equal expected, File.read(index.path)
+  end
+
+  def test_clear
+    index = ReaPack::Index.new @real_path
+    index.commit = @commit
+
+    index.clear
+
+    index.write @dummy_path
+    contents = File.read @dummy_path
+
+    refute_match @commit, contents
+    refute_match '<category', contents
+    assert_match 'name="Test"', contents
+    assert_match '<description', contents
+  end
+
+  def test_clear_reset_cdetector
+    index = ReaPack::Index.new @real_path
+    index.commit = @commit
+    index.files = ['Category Name/test.lua', 'Category Name/Hello World.lua']
+    index.url_template = 'http://host/$path'
+
+    index.clear
+
+    # no error because of fake conflict:
+    index.scan index.files.first, "@version 1.0\n@provides Hello World.lua"
+  end
+
+  def test_move_no_conflicts
+    index = ReaPack::Index.new @dummy_path
+    index.files = ['cat/testz.lua', 'cat/testa.lua', 'cat/file1', 'cat/file2']
+    index.url_template = 'http://host/$path'
+
+    contents = "@version 1.0\n@provides\n\tfile1\n\t[effect] file2"
+
+    index.scan 'cat/testz.lua', contents
+    index.remove 'cat/testz.lua'
+    index.scan 'cat/testa.lua', contents
+  end
 end

data/test/test_provides.rb

@@ -42,12 +42,6 @@ class TestProvides < MiniTest::Test
         ' [ darwin32 ] file',
         '[win32, darwin64] file',
       ].map {|l| ReaPack::Index::Provides.parse(l).platform }
-
-    error = assert_raises ReaPack::Index::Error do
-      ReaPack::Index::Provides.parse '[HeLlO] file'
-    end
-
-    assert_equal "unknown option (platform or type) 'HeLlO'", error.message
   end
 
   def test_types
@@ -59,10 +53,27 @@ class TestProvides < MiniTest::Test
         '[,windows,,] file',
       ].map {|l| ReaPack::Index::Provides.parse(l).type }
 
-    error = assert_raises ReaPack::Index::Error do
-      ReaPack::Index::Provides.parse '[, Test] file'
-    end
+  end
 
-    assert_equal "unknown option (platform or type) 'Test'", error.message
+  def test_main
+    assert_equal [true, false, nil, false],
+      [
+        '[main] file',
+        '[nomain] file',
+        'file',
+        '[main, nomain] file',
+      ].map {|l| ReaPack::Index::Provides.parse(l).main? }
+  end
+
+  def test_invalid_options
+    assert_equal ["unknown option 'HeLlO'", "unknown option 'Test'"],
+      [
+        '[HeLlO] file',
+        '[, Test] file',
+      ].map {|l|
+        assert_raises ReaPack::Index::Error do
+          ReaPack::Index::Provides.parse l
+        end.message
+      }
   end
 end

data/test/test_scanner.rb

@@ -0,0 +1,191 @@
+require File.expand_path '../helper', __FILE__
+
+class TestScanner < MiniTest::Test
+  class TestMakeUrl < MiniTest::Test
+    def setup
+      @cat = MiniTest::Mock.new
+
+      @pkg = MiniTest::Mock.new
+      @pkg.expect :type, :script
+      @pkg.expect :path, 'Hello/World.lua'
+      @pkg.expect :path, 'Hello/World.lua'
+
+      @ver = MiniTest::Mock.new
+      @ver.expect :name, '1.0'
+
+      @mh = MiniTest::Mock.new
+      @mh.expect :[], nil, [:metapackage]
+
+      @cdetector = MiniTest::Mock.new
+      @cdetector.expect :[], nil, ['Hello/World.lua']
+
+      @index = MiniTest::Mock.new
+      @index.expect :cdetector, @cdetector
+
+      @scanner = ReaPack::Index::Scanner.new @cat, @pkg, @mh, @index
+      @scanner.instance_variable_set :@ver, @ver
+    end
+
+    def teardown
+      [@cat, @pkg, @ver, @mh, @index, @cdetector].each {|mock| mock.verify }
+    end
+
+    def test_path
+      @index.expect :files, ['Category/script.lua']
+      @index.expect :url_template, '$path'
+      @index.expect :commit, 'C0FF33'
+
+      assert_equal 'Category/script.lua', @scanner.make_url('Category/script.lua')
+    end
+
+    def test_commit
+      @index.expect :files, ['Hello/World.lua']
+      @index.expect :url_template, '$commit'
+      @index.expect :commit, 'C0FF33'
+
+      assert_equal 'C0FF33', @scanner.make_url('Hello/World.lua')
+    end
+
+    def test_defaut_branch
+      @index.expect :commit, nil
+
+      assert_match 'master', @scanner.make_url('Category/script.lua', '$commit')
+    end
+
+    def test_version
+      @index.expect :files, ['Category/script.lua']
+      @index.expect :url_template, '$version'
+      @index.expect :commit, 'C0FF33'
+
+      assert_equal '1.0', @scanner.make_url('Category/script.lua')
+    end
+
+    def test_package
+      @index.expect :files, ['Category/script.lua']
+      @index.expect :url_template, '$package'
+      @index.expect :commit, 'C0FF33'
+
+      assert_equal 'Hello/World.lua', @scanner.make_url('Category/script.lua')
+    end
+
+    def test_without_template
+      @index.expect :commit, nil
+      @scanner.make_url 'script.lua', 'ok if explicit template'
+
+      @index.expect :url_template, nil
+      error = assert_raises ReaPack::Index::Error do
+        @scanner.make_url 'script.lua'
+      end
+
+      assert_match /url template/i, error.message
+    end
+
+    def test_unlisted
+      @index.expect :commit, nil
+      @index.expect :files, []
+      @index.expect :url_template, 'http://implicit/url/template'
+
+      @scanner.make_url 'unlisted.lua', 'ok with explicit url template'
+
+      error = assert_raises ReaPack::Index::Error do
+        @scanner.make_url 'unlisted.lua'
+      end
+
+      assert_equal "file not found 'unlisted.lua'", error.message
+    end
+
+    def test_repeat
+      @index.expect :files, ['Category/script.lua']
+      @index.expect :url_template, '$path $path'
+      @index.expect :commit, 'C0FF33'
+
+      assert_equal 'Category/script.lua Category/script.lua',
+        @scanner.make_url('Category/script.lua')
+    end
+  end
+
+  class TestValidation < MiniTest::Test
+    def setup
+      @pkg = MiniTest::Mock.new
+      @pkg.expect :type, :script
+      @pkg.expect :path, 'cat/test'
+
+      @mh = MetaHeader.new String.new
+      @mh[:version] = '1.0'
+
+      @index = MiniTest::Mock.new
+      @index.expect :cdetector, ReaPack::Index::ConflictDetector.new
+
+      @scanner = ReaPack::Index::Scanner.new nil, @pkg, @mh, @index
+    end
+
+    def test_validation
+      mh_mock = MiniTest::Mock.new
+      mh_mock.expect :validate, ['first', 'second'], [Hash]
+
+      @scanner.instance_variable_set :@mh, mh_mock
+
+      error = assert_raises(ReaPack::Index::Error) { @scanner.run }
+
+      assert_equal "first\nsecond", error.message
+      mh_mock.verify
+    end
+
+    def test_version
+      @mh.delete :version
+      error = assert_raises(ReaPack::Index::Error) { @scanner.run }
+      assert_equal "missing tag 'version'", error.message
+
+      @mh[:version] = 'no.numbers'
+      error = assert_raises(ReaPack::Index::Error) { @scanner.run }
+      assert_equal "invalid value for tag 'version'", error.message
+
+      @mh[:version] = true
+      error = assert_raises(ReaPack::Index::Error) { @scanner.run }
+      assert_equal "missing value for tag 'version'", error.message
+
+      @mh[:version] = "hello\nworld"
+      error = assert_raises(ReaPack::Index::Error) { @scanner.run }
+      assert_equal "tag 'version' must be singleline", error.message
+    end
+
+    def test_author
+      @mh[:author] = true
+      error = assert_raises(ReaPack::Index::Error) { @scanner.run }
+      assert_equal "missing value for tag 'author'", error.message
+
+      @mh[:author] = "hello\nworld"
+      error = assert_raises(ReaPack::Index::Error) { @scanner.run }
+      assert_equal "tag 'author' must be singleline", error.message
+    end
+
+    def test_changelog
+      @mh[:changelog] = true
+      error = assert_raises(ReaPack::Index::Error) { @scanner.run }
+      assert_equal "missing value for tag 'changelog'", error.message
+    end
+
+    def test_provides
+      @mh[:provides] = true
+      error = assert_raises(ReaPack::Index::Error) { @scanner.run }
+      assert_equal "missing value for tag 'provides'", error.message
+
+      @mh[:provides] = '[hello] world'
+      error = assert_raises(ReaPack::Index::Error) { @scanner.run }
+      assert_equal "invalid value for tag 'provides': unknown option 'hello'",
+        error.message
+    end
+
+    def test_index
+      @mh[:noindex] = 'value'
+      error = assert_raises(ReaPack::Index::Error) { @scanner.run }
+      assert_equal "tag 'noindex' cannot have a value", error.message
+    end
+
+    def test_metapackage
+      @mh[:metapackage] = 'value'
+      error = assert_raises(ReaPack::Index::Error) { @scanner.run }
+      assert_equal "tag 'metapackage' cannot have a value", error.message
+    end
+  end
+end