reapack-index 1.1beta3 → 1.1beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fe0c0ad52b4938c414bacfff63b2981614c2df2
-  data.tar.gz: 4c799d2fd3f4d7823bad7ac142cc08146c029c60
+  metadata.gz: 68a03118ab26b00e4fd7969dc54c9b2b350f517a
+  data.tar.gz: 2bc39e1d5de9c718b69f8f8efbcd4c10fcc3e496
 SHA512:
-  metadata.gz: 8c0f24e952b9c836e5db6172928bcd5366f60dba50388fee7d54bd6159b9b3afcbf8c954af8613235a99b463a339a7d561fca7928930dbcab2d7b8649eb7eb53
-  data.tar.gz: 84acc8f432d45f95d51053c05e2a0233ea4b961e933c2c849cdb471e11f8b93c60d68ebbc86b0624d80547beefaccc85a34941cdddb0e52964c7ea24a63d1afa
+  metadata.gz: 88efa5f4a1116dd6ad47cb3fe2bf3418eac5621a6c2e5031e7d33284b66a5540977bc11a1e89ba4e9f60cbeccc91409841a6b64c0a227dbdd75945950baa1395
+  data.tar.gz: 8fd0bcb5dba3dcc5f20dd5eccc0e82f21f4ec4017bd1ca2cf6e85fb7e6b9ffe23cb1b69c9d3b23c5045c27efcdb149a546c640c3280cfc24b8588ca5c9d8ad2f

data/.travis.yml

@@ -3,6 +3,6 @@ rvm:
   - 2.3.0
 before_install:
   - gem update bundler
-  - sudo apt-get -qq update
-  - sudo apt-get install -y pandoc
+  - wget https://github.com/jgm/pandoc/releases/download/1.17.2/pandoc-1.17.2-1-amd64.deb -O pandoc.deb
+  - sudo dpkg -i pandoc.deb
 cache: bundler

data/README.md

@@ -32,7 +32,7 @@ Modes:
     -s, --scan [FILE|COMMIT]         Scan new commits (default), a file or a commit
         --rebuild                    Clear the index and rescan the whole git history
 Indexer options:
-    -a, --[no-]amend                 Reindex existing versions
+    -a, --[no-]amend                 Update existing versions
     -i, --ignore PATH                Don't check or index any file starting with PATH
     -o, --output FILE=./index.xml    Set the output filename and path for the index
         --[no-]strict                Enable strict validation mode

data/bin/reapack-index

@@ -5,4 +5,4 @@ Signal.trap('INT') { abort }
 require 'reapack/index'
 
 String.disable_colorization = !STDOUT.tty? || !STDERR.tty?
-exit !!ReaPack::Index::CLI.new(ARGV).run
+exit !!catch(:stop) { ReaPack::Index::CLI.new(ARGV).run }

data/lib/reapack/index.rb

@@ -298,10 +298,15 @@ private
 
   def sort(node)
     node.element_children.map {|n| sort n }
-    return if node.name == Package.tag
 
     sorted = node.element_children
-      .stable_sort_by {|n| n[:name].to_s.downcase }
+      .stable_sort_by {|n|
+        if n.name == Version.tag
+          '' # don't sort version tags by name attribute value
+        else
+          n[:name].to_s.downcase
+        end
+      }
       .stable_sort_by {|n| n.name.downcase }
 
     sorted.each {|n| node << n }

data/lib/reapack/index/cli.rb

@@ -2,16 +2,13 @@ class ReaPack::Index::CLI
   attr_reader :index
 
   def initialize(argv = [])
-    @opts = parse_options(argv)
-    path = argv.last || Dir.pwd
+    @opts = parse_options argv
 
-    return unless @exit.nil?
+    @git = ReaPack::Index::Git.new argv.first || Dir.pwd
+    log "found git repository in #{@git.path}"
 
-    @git = ReaPack::Index::Git.new path
     @opts = parse_options(read_config).merge @opts unless @opts[:noconfig]
-
     @opts = DEFAULTS.merge @opts
-    return unless @exit.nil?
 
     log Hash[@opts.sort].inspect
 
@@ -21,12 +18,10 @@ class ReaPack::Index::CLI
     set_url_template
   rescue Rugged::OSError, Rugged::RepositoryError, ReaPack::Index::Error => e
     $stderr.puts e.message
-    @exit = false
+    throw :stop, false
   end
 
   def run
-    return @exit unless @exit.nil?
-
     if @opts[:check]
       return do_check
     end
@@ -45,7 +40,7 @@ class ReaPack::Index::CLI
 
     unless @index.modified?
       $stderr.puts 'Nothing to do!' unless @opts[:quiet]
-      return success_code
+      return
     end
 
     # changelog will be cleared by Index#write!
@@ -54,15 +49,10 @@ class ReaPack::Index::CLI
 
     @index.write!
     commit changelog
-
-    success_code
+    true
   end
 
 private
-  def success_code
-    @exit.nil? ? true : @exit
-  end
-
   def set_url_template
     tpl = @opts[:url_template]
     is_custom = tpl != DEFAULTS[:url_template]
@@ -92,9 +82,8 @@ private
         elsif c = @git.get_commit(hash)
           c
         else
-          $stderr.puts "--scan: bad file or revision: '%s'" % @opts[:scan]
-          @exit = false
-          nil
+          $stderr.puts "--scan: bad file or revision: '%s'" % hash
+          throw :stop, false
         end
       }.compact
     end

data/lib/reapack/index/cli/options.rb

@@ -72,7 +72,7 @@ class ReaPack::Index::CLI
 
       op.separator 'Indexer options:'
 
-      op.on '-a', '--[no-]amend', 'Reindex existing versions' do |bool|
+      op.on '-a', '--[no-]amend', 'Update existing versions' do |bool|
         opts[:amend] = bool
       end
 
@@ -171,14 +171,12 @@ class ReaPack::Index::CLI
 
       op.on_tail '-v', '--version', 'Display version information' do
         puts op.ver
-        @exit = true
-        return opts
+        throw :stop, true
       end
 
       op.on_tail '-h', '--help', 'Prints this help' do
         puts op
-        @exit = true
-        return opts
+        throw :stop, true
       end
     end.parse! args
 
@@ -186,7 +184,6 @@ class ReaPack::Index::CLI
   rescue OptionParser::ParseError => e
     $stderr.puts "#{PROGRAM_NAME}: #{e.message}"
     $stderr.puts "Try '#{PROGRAM_NAME} --help' for more information."
-    @exit = false
-    opts
+    throw :stop, false
   end
 end

data/lib/reapack/index/gem_version.rb

@@ -1,5 +1,5 @@
 module ReaPack
   class Index
-    VERSION = '1.1beta3'
+    VERSION = '1.1beta4'
   end
 end

data/lib/reapack/index/git.rb

@@ -158,7 +158,7 @@ class ReaPack::Index
     end
 
     def inspect
-      "#<#{self.class} #{id} #{message}>"
+      "#<#{self.class} #{id} #{summary}>"
     end
 
   private

data/lib/reapack/index/metadata.rb

@@ -143,12 +143,12 @@ class ReaPack::Index
     end
 
     def make_rtf(content)
-      PandocRuby.new(content).to_rtf :standalone
+      PandocRuby.new(content).to_rtf :standalone, f: :commonmark
     rescue Errno::ENOENT
       raise Error, [
         "RTF conversion failed because the pandoc executable " \
           "cannot be found in your PATH.",
-        "Try again after installing pandoc from <http://pandoc.org/>."
+        "Try again after installing pandoc <http://pandoc.org/>."
       ].join("\n")
     end
 

data/lib/reapack/index/scanner.rb

@@ -38,7 +38,7 @@ class ReaPack::Index
     HEADER_ALIASES = {
       [:reascript_name, :jsfx_name, :theme_name,
         :extension_name, :desc] => :description,
-      :links => :link,
+      [:links, :website] => :link,
       :screenshots => :screenshot,
     }.freeze
 
@@ -129,7 +129,15 @@ class ReaPack::Index
           raise Error, "file not found '#{line.file_pattern}'" if files.empty?
         else
           # use the relative path for external urls
-          files = [line.file_pattern]
+          if line.file_pattern.start_with? '/'
+            prefix = []
+            dirs = File.split(@pkg.category).size - 1
+            dirs.times { prefix << '..' }
+
+            files = [File.join(*prefix, line.file_pattern)]
+          else
+            files = [line.file_pattern]
+          end
         end
 
         files.map {|file|

data/reapack-index.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'addressable', '~> 2.4'
   spec.add_runtime_dependency 'colorize', '~> 0.7'
   spec.add_runtime_dependency 'gitable', '~> 0.3'
-  spec.add_runtime_dependency 'metaheader', '~> 1.3beta2'
+  spec.add_runtime_dependency 'metaheader', '~> 1.3beta4'
   spec.add_runtime_dependency 'nokogiri', '~> 1.6.8'
   spec.add_runtime_dependency 'pandoc-ruby', '~> 2.0'
   spec.add_runtime_dependency 'rugged', '~> 0.24'

data/setup/reapack-index.nsi

@@ -1,9 +1,11 @@
+Unicode true
+
 !include MUI2.nsh
 !include Sections.nsh
 !include StrRep.nsh
 
-!define VERSION "1.1beta3"
-!define NAME "ReaPack Index ${VERSION}"
+!define VERSION "1.1beta4"
+!define NAME "reapack-index ${VERSION}"
 !define LONG_VERSION "0.1.0.0"
 
 !define RUBY_VERSION "2.3.1"
@@ -11,8 +13,8 @@
 !define RUBYINSTALLER_URL \
   "http://dl.bintray.com/oneclick/rubyinstaller/${RUBYINSTALLER_FILE}"
 
-!define PANDOC_VERSION "1.17.1"
-!define PANDOC_FILE "pandoc-${PANDOC_VERSION}-1-windows.msi"
+!define PANDOC_VERSION "1.17.2"
+!define PANDOC_FILE "pandoc-${PANDOC_VERSION}-windows.msi"
 !define PANDOC_URL \
   "https://github.com/jgm/pandoc/releases/download/${PANDOC_VERSION}/${PANDOC_FILE}"
 
@@ -74,7 +76,7 @@ VIAddVersionKey "LegalCopyright" "Copyright (C) 2015-2016  Christian Fillion"
 !macro RELOAD_PATH
   ; reload the path to use the one freshly set by the ruby installer
   ReadRegStr $R1 HKCU "Environment" "Path"
-  System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("Path", R1).r2'
+  System::Call 'Kernel32::SetEnvironmentVariable(t, t) i("Path", R1).r2'
 !macroend
 
 Section /o "Ruby for Windows" InstallRuby
@@ -125,7 +127,7 @@ Section /o "Pandoc" InstallPandoc
   !insertmacro EXEC_GUI '"msiexec" /i $R0 /passive' ${PANDOC_FILE}
 SectionEnd
 
-Section "ReaPack Index" InstallMain
+Section "reapack-index" InstallMain
   SectionIn RO
 
   DetailPrint "Installing reapack-index... (this can take a while)"
@@ -162,10 +164,9 @@ Function .onInit
   nsExec::ExecToStack '"pandoc" --version'
   Pop $0
 
-  StrCmp $0 "error" 0 +5 ; failed to launch pandoc
+  StrCmp $0 "error" 0 +4 ; failed to launch pandoc
     SectionGetFlags ${InstallPandoc} $1
     IntOp $1 $1 | ${SF_SELECTED}
-    IntOp $1 $1 | ${SF_RO}
     SectionSetFlags ${InstallPandoc} $1
 
   SectionGetFlags ${InstallMain} $1
@@ -184,5 +185,5 @@ FunctionEnd
     "Install Pandoc to enable automatic conversion from various document formats into RTF."
 
   !insertmacro MUI_DESCRIPTION_TEXT ${InstallMain} \
-    "Install ReaPack's Package Indexer v${VERSION} on your computer."
+    "Install Package indexer for git-based ReaPack repositories v${VERSION} on your computer."
 !insertmacro MUI_FUNCTION_DESCRIPTION_END

data/test/cli/test_check.rb

@@ -66,7 +66,7 @@ Finished checks for 2 packages with 1 failure
     wrapper ['--check'], setup: setup do
       mkfile 'Chunky/Bacon.lua', "@version 1.0\n@provides ../background.png"
 
-      capture_io { assert_equal true, @cli.run }
+      capture_io { @cli.run }
     end
   end
 
@@ -112,9 +112,7 @@ Finished checks for 1 package with 0 failures
       mkfile 'Directory/test/1.lua', 'konnichiwa'
       mkfile 'Directory/test2.lua', '@version 1.0'
 
-      assert_output nil, expected do
-        @cli.run
-      end
+      assert_output(nil, expected) { @cli.run }
     end
   end
 
@@ -148,9 +146,7 @@ Finished checks for 1 package with 0 failures
 
   def test_unset_name_warning
     wrapper ['--check'] do
-      assert_output nil, /index is unnamed/i do
-        @cli.run
-      end
+      assert_output(nil, /index is unnamed/i) { @cli.run }
     end
   end
 
@@ -187,7 +183,7 @@ Finished checks for 2 packages with 1 failure
       wrapper ['--check'], setup: setup do
         mkfile 'test.lua', '@version 1.0'
 
-        assert_equal true, @cli.run
+        @cli.run
       end
     end
 

data/test/cli/test_metadata.rb

@@ -7,19 +7,14 @@ class TestCLI::Metadata < MiniTest::Test
 
   def test_website_link
     wrapper ['-l http://cfillion.tk'] do
-      assert_output "1 new website link, empty index\n" do
-        assert_equal true, @cli.run
-      end
-
+      assert_output("1 new website link, empty index\n") { @cli.run }
       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, @cli.run
-      end
+      assert_output("1 new donation link, empty index\n") { @cli.run }
 
       assert_match 'rel="donation" href="http://cfillion.tk">Link Label</link>',
         read_index
@@ -28,9 +23,7 @@ class TestCLI::Metadata < MiniTest::Test
 
   def test_screenshot_link
     wrapper ['--screenshot-link', 'Link Label http://cfillion.tk'] do
-      assert_output "1 new screenshot link, empty index\n" do
-        assert_equal true, @cli.run
-      end
+      assert_output("1 new screenshot link, empty index\n") { @cli.run }
 
       assert_match 'rel="screenshot" href="http://cfillion.tk">Link Label</link>',
         read_index
@@ -41,9 +34,7 @@ class TestCLI::Metadata < MiniTest::Test
     wrapper ['--link', 'shinsekai yori', '--donation-link', 'hello world',
              '--screenshot-link', 'chunky bacon',
              '--link', 'http://cfillion.tk'] do
-      stdout, stderr = capture_io do
-        assert_equal true, @cli.run
-      end
+      stdout, stderr = capture_io { @cli.run }
 
       assert_equal "1 new website link, empty index\n", stdout
       assert_match /warning: --link: invalid link 'shinsekai yori'/i, stderr
@@ -55,10 +46,7 @@ class TestCLI::Metadata < MiniTest::Test
 
   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, @cli.run
-      end
-
+      assert_output("1 new website link, 1 removed website link, empty index\n") { @cli.run }
       refute_match 'rel="website">http://test.com</link>', read_index
     end
   end
@@ -77,7 +65,7 @@ class TestCLI::Metadata < MiniTest::Test
 
     wrapper ['--ls-links'], setup: setup do
       stdin, stderr = capture_io do
-        assert_equal true, @cli.run
+        @cli.run
       end
 
       expected = <<-OUT
@@ -96,9 +84,7 @@ class TestCLI::Metadata < MiniTest::Test
     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, @cli.run
-      end
+      assert_output("1 modified metadata, empty index\n") { @cli.run }
 
       assert_match 'Hello World', read_index
     end
@@ -109,7 +95,7 @@ class TestCLI::Metadata < MiniTest::Test
     wrapper ['--about=404.md'] do
       assert_output "empty index\n",
           /warning: --about: no such file or directory - 404.md/i do
-        assert_equal true, @cli.run
+        @cli.run
       end
     end
   end
@@ -126,7 +112,7 @@ class TestCLI::Metadata < MiniTest::Test
     wrapper opts, setup: setup do
       assert_output "empty index\n", /pandoc executable cannot be found/i do
         ENV['PATH'] = String.new
-        assert_equal true, @cli.run
+        @cli.run
       end
     end
   ensure
@@ -145,10 +131,7 @@ class TestCLI::Metadata < MiniTest::Test
     }
 
     wrapper ['--remove-about'], setup: setup do
-      assert_output "1 modified metadata\n" do
-        assert_equal true, @cli.run
-      end
-
+      assert_output("1 modified metadata\n") { @cli.run }
       refute_match 'Hello World', read_index
     end
   end
@@ -165,17 +148,13 @@ class TestCLI::Metadata < MiniTest::Test
     }
 
     wrapper ['--dump-about'], setup: setup do
-      assert_output 'Hello World' do
-        assert_equal true, @cli.run
-      end
+      assert_output('Hello World') { @cli.run }
     end
   end
 
   def test_unset_name_warning
     wrapper do
-      _, stderr = capture_io do
-        assert_equal true, @cli.run
-      end
+      _, stderr = capture_io { @cli.run }
 
       assert_match /index is unnamed/i, stderr
       refute_match File.dirname($0), stderr
@@ -185,9 +164,7 @@ class TestCLI::Metadata < MiniTest::Test
 
   def test_set_name
     wrapper ['--name=Hello World'] do
-      _, stderr = capture_io do
-        assert_equal true, @cli.run
-      end
+      _, stderr = capture_io { @cli.run }
 
       refute_match /index is unnamed/i, stderr
       assert_match 'name="Hello World"', read_index
@@ -196,9 +173,7 @@ class TestCLI::Metadata < MiniTest::Test
 
   def test_set_name_invalid
     wrapper ['--name=Hello/World'] do
-      _, stderr = capture_io do
-        assert_equal true, @cli.run
-      end
+      _, stderr = capture_io { @cli.run }
 
       refute_match /The name of this index is unset/i, stderr
       assert_match /invalid name 'Hello\/World'/i, stderr

data/test/cli/test_scan.rb

@@ -34,9 +34,7 @@ class TestCLI::Scan < MiniTest::Test
         mkfile('Category/Sub/test2.lua', '@version 1.0'),
       ]
 
-      assert_output "2 new categories, 2 new packages, 2 new versions\n" do
-        assert_equal true, @cli.run
-      end
+      assert_output("2 new categories, 2 new packages, 2 new versions\n") { @cli.run }
 
       assert_equal @git.last_commit.id, @cli.index.commit
       assert_equal @git.last_commit.time, @cli.index.time
@@ -47,7 +45,7 @@ class TestCLI::Scan < MiniTest::Test
   def test_empty_branch
     wrapper do
       assert_output nil, /the current branch does not contains any commit/i do
-        assert_equal true, @cli.run
+        @cli.run
       end
     end
   end
@@ -60,10 +58,7 @@ class TestCLI::Scan < MiniTest::Test
       Dir.mkdir mkpath('test')
       Dir.chdir mkpath('test')
 
-      assert_output /1 new package/ do
-        assert_equal true, @cli.run
-      end
-
+      assert_output(/1 new package/) { @cli.run }
       assert_match 'test1.lua', read_index
     end
   end
@@ -85,7 +80,7 @@ class TestCLI::Scan < MiniTest::Test
         File.delete mkpath('cat/test.lua')
         @git.create_commit 'third commit', [mkpath('cat/test.lua')]
 
-        assert_equal true, @cli.run
+        @cli.run
       end
     end
 
@@ -108,7 +103,7 @@ processing [a-f0-9]{7}: third commit
       @git.create_commit 'initial commit', [mkfile('README.md', '# Hello World')]
 
       stdout, stderr = capture_io do
-        assert_equal true, @cli.run
+        @cli.run
       end
 
       assert_equal "empty index\n", stdout
@@ -122,7 +117,7 @@ processing [a-f0-9]{7}: third commit
         [mkfile('cat/test.lua', 'no version tag in this script!')]
 
       assert_output nil, /warning: cat\/test\.lua:\n\x20\x20missing tag/i do
-        assert_equal true, @cli.run
+        @cli.run
       end
     end
   end
@@ -133,7 +128,7 @@ processing [a-f0-9]{7}: third commit
         [mkfile('cat/test.lua', 'no version tag in this script!')]
 
       _, stderr = capture_io do
-        assert_equal true, @cli.run
+        @cli.run
       end
 
       refute_match /warning/i, stderr
@@ -145,9 +140,7 @@ processing [a-f0-9]{7}: third commit
       @git.create_commit 'initial commit',
         [mkfile('cat/test.lua', 'no version tag in this script!')]
 
-      assert_output nil, /warning/i do
-        assert_equal true, @cli.run
-      end
+      assert_output(nil, /warning/i) { @cli.run }
     end
   end
 
@@ -166,9 +159,7 @@ processing [a-f0-9]{7}: third commit
       @git.create_commit 'second commit',
         [mkfile('cat/test2.lua', '@version 1.0')]
 
-      assert_output nil, '' do
-        assert_equal true, @cli.run
-      end
+      assert_output(nil, '') { @cli.run }
 
       refute_match 'test1.lua', read_index
       assert_match 'test2.lua', read_index
@@ -177,7 +168,7 @@ processing [a-f0-9]{7}: third commit
 
   def test_amend
     wrapper ['--amend'] do
-      assert_equal true, @cli.index.amend
+      @cli.index.amend
     end
   end
 
@@ -199,7 +190,7 @@ processing [a-f0-9]{7}: third commit
       ]
 
       assert_output "1 new category, 1 new package, 1 new version\n" do
-        assert_equal true, @cli.run
+        @cli.run
       end
 
       refute_match 'Hello/World.lua', read_index
@@ -216,10 +207,7 @@ processing [a-f0-9]{7}: third commit
       File.delete mkpath('cat/test.lua')
       @git.create_commit 'second commit', [mkpath('cat/test.lua')]
 
-      assert_output /1 removed package/i do
-        assert_equal true, @cli.run
-      end
-
+      assert_output(/1 removed package/i) { @cli.run }
       refute_match 'test.lua', read_index
     end
   end
@@ -240,7 +228,7 @@ processing [a-f0-9]{7}: third commit
       ]
 
       _, stderr = capture_io do
-        assert_equal true, @cli.run
+        @cli.run
       end
 
       refute_match 'conflict', stderr
@@ -262,7 +250,7 @@ processing [a-f0-9]{7}: third commit
       ]
 
       _, stderr = capture_io do
-        assert_equal true, @cli.run
+        @cli.run
       end
 
       refute_match 'conflict', stderr
@@ -286,7 +274,7 @@ processing [a-f0-9]{7}: third commit
     }
 
     wrapper options, setup: setup do
-      capture_io { assert_equal true, @cli.run }
+      capture_io { @cli.run }
 
       refute_match 'test1.lua', read_index, 'The initial commit was scanned'
       assert_match 'test2.lua', read_index
@@ -311,7 +299,7 @@ processing [a-f0-9]{7}: third commit
     }
 
     wrapper options, setup: setup do
-      capture_io { assert_equal true, @cli.run }
+      capture_io { @cli.run }
 
       refute_match 'test1.lua', read_index, 'The initial commit was scanned'
       assert_match 'test2.lua', read_index
@@ -330,7 +318,7 @@ processing [a-f0-9]{7}: third commit
     }
 
     wrapper options, setup: setup do
-      capture_io { assert_equal true, @cli.run }
+      capture_io { @cli.run }
 
       assert_equal false, @cli.index.auto_bump_commit
       refute_match %Q[commit="#{options[1]}"], read_index
@@ -354,7 +342,7 @@ processing [a-f0-9]{7}: third commit
     }
 
     wrapper options, setup: setup do
-      capture_io { assert_equal true, @cli.run }
+      capture_io { @cli.run }
 
       refute_match 'version name="1"', read_index, 'The initial commit was scanned'
       assert_match 'version name="2"', read_index
@@ -378,7 +366,7 @@ processing [a-f0-9]{7}: third commit
     }
 
     wrapper options, setup: setup do
-      capture_io { assert_equal true, @cli.run }
+      capture_io { @cli.run }
       assert_match 'test1.lua', read_index
     end
   end
@@ -393,7 +381,7 @@ processing [a-f0-9]{7}: third commit
     }
 
     wrapper options, setup: setup do
-      capture_io { assert_equal true, @cli.run }
+      capture_io { @cli.run }
     end
   end
 
@@ -403,12 +391,25 @@ processing [a-f0-9]{7}: third commit
         @git.create_commit 'initial commit', [mkfile('README.md')]
 
         assert_output nil, /--scan: bad file or revision: '#{Regexp.escape hash}'/i do
-          assert_equal false, @cli.run
+          assert_throws(:stop, false) { @cli.run }
         end
       end
     }
   end
 
+  def test_report_right_invalid_hash
+    wrapper ['--scan', 'README.md', '--scan', INVALID_HASHES.first] do
+      @git.create_commit 'initial commit', [mkfile('README.md')]
+
+      _, stderr = capture_io do
+        assert_throws(:stop, false) { @cli.run }
+      end
+      
+      refute_match 'README.md', stderr
+      assert_match INVALID_HASHES.first, stderr
+    end
+  end
+
   def test_rebuild
     setup = proc {
       @git.create_commit 'initial commit',
@@ -428,9 +429,7 @@ processing [a-f0-9]{7}: third commit
       @git.create_commit 'second commit',
         [mkfile('cat/test2.lua', '@version 1.0')]
 
-      assert_output nil, '' do
-        assert_equal true, @cli.run
-      end
+      assert_output(nil, '') { @cli.run }
 
       contents = read_index
       assert_match 'test1.lua', contents
@@ -457,9 +456,7 @@ processing [a-f0-9]{7}: third commit
       @git.create_commit 'second commit',
         [mkfile('cat/test2.lua', '@version 1.0')]
 
-      assert_output nil, '' do
-        assert_equal true, @cli.run
-      end
+      assert_output(nil, '') { @cli.run }
 
       contents = read_index
       refute_match 'test1.lua', contents

data/test/index/test_provides.rb

@@ -87,19 +87,6 @@ class TestIndex::Provides < MiniTest::Test
     assert_equal expected, File.read(index.path)
   end
 
-  def test_invalid_options
-    index = ReaPack::Index.new @dummy_path
-    index.url_template = 'http://host/$path'
-
-    error = assert_raises ReaPack::Index::Error do
-      index.scan 'cat/test.lua', <<-IN
-        @version 1.0
-        @provides
-          [hello] test.png
-      IN
-    end
-  end
-
   def test_custom_url
     index = ReaPack::Index.new @dummy_path
     index.files = ['Category/script.lua']
@@ -108,11 +95,14 @@ class TestIndex::Provides < MiniTest::Test
       @version 1.0
       @provides
         script.lua http://google.com/download/$commit/$version/$path
+        /root http://google.com/download/$commit/$version/$path
     IN
 
     index.write!
-    assert_match 'http://google.com/download/master/1.0/Category/script.lua',
-      File.read(index.path)
+
+    xml = File.read index.path
+    assert_match 'http://google.com/download/master/1.0/Category/script.lua', xml
+    assert_match 'file="../root"', xml
   end
 
   def test_empty_tag

data/test/test_cli.rb

@@ -5,22 +5,19 @@ class TestCLI < MiniTest::Test
 
   def test_help
     assert_output /--help/, '' do
-      i = ReaPack::Index::CLI.new ['--help']
-      assert_equal true, i.run # does nothing
+      assert_throws(:stop, true) { ReaPack::Index::CLI.new ['--help'] }
     end
   end
 
   def test_version
     assert_output /#{Regexp.escape ReaPack::Index::VERSION.to_s}/, '' do
-      i = ReaPack::Index::CLI.new ['--version']
-      assert_equal true, i.run # does nothing
+      assert_throws(:stop, true) { ReaPack::Index::CLI.new ['--version'] }
     end
   end
 
   def test_help_version
     stdout, _ = capture_io do
-      i = ReaPack::Index::CLI.new ['--help', '--version']
-      assert_equal true, i.run # does nothing
+      assert_throws(:stop, true) { ReaPack::Index::CLI.new ['--help', '--version'] }
     end
 
     refute_match ReaPack::Index::VERSION.to_s, stdout
@@ -28,22 +25,19 @@ class TestCLI < MiniTest::Test
 
   def test_invalid_option
     assert_output '', /reapack-index: invalid option: --hello-world/i do
-      i = ReaPack::Index::CLI.new ['--hello-world']
-      assert_equal false, i.run
+      assert_throws(:stop, false) { ReaPack::Index::CLI.new ['--hello-world'] }
     end
   end
 
   def test_ambiguous_option
     assert_output '', /reapack-index: ambiguous option: --c/i do
-      i = ReaPack::Index::CLI.new ['--c']
-      assert_equal false, i.run
+      assert_throws(:stop, false) { ReaPack::Index::CLI.new ['--c'] }
     end
   end
 
   def test_missing_argument
     assert_output nil, /missing argument/ do
-      i = ReaPack::Index::CLI.new ['--output']
-      assert_equal false, i.run # does nothing
+      assert_throws(:stop, false) { ReaPack::Index::CLI.new ['--output'] }
     end
   end
 
@@ -96,10 +90,12 @@ class TestCLI < MiniTest::Test
   end
 
   def test_config
-    assert_output /--help/, '' do
-      wrapper [], setup: proc {
-        mkfile '.reapack-index.conf', '--help'
-      }
+    catch :stop do
+      assert_output /--help/, '' do
+        wrapper [], setup: proc {
+          mkfile '.reapack-index.conf', '--help'
+        }
+      end
     end
   end
 
@@ -124,7 +120,7 @@ class TestCLI < MiniTest::Test
           mkfile('cat/test.lua', 'no version tag in this script!')
         ]
 
-        assert_equal true, @cli.run
+        @cli.run
       end
     end
 
@@ -140,7 +136,7 @@ class TestCLI < MiniTest::Test
       Dir.chdir File.join(@git.path, 'Category')
 
       assert_output /--help/ do
-        ReaPack::Index::CLI.new
+        catch :stop do ReaPack::Index::CLI.new end
       end
     end
   end
@@ -168,21 +164,18 @@ class TestCLI < MiniTest::Test
     end
 
     assert_output '', no_such_file do
-      i = ReaPack::Index::CLI.new ['/hello/world']
-      assert_equal false, i.run
+      assert_throws(:stop, false) { ReaPack::Index::CLI.new ['/hello/world'] }
     end
 
     assert_output '', /could not find repository/i do
-      i = ReaPack::Index::CLI.new ['/']
-      assert_equal false, i.run
+      assert_throws(:stop, false) { ReaPack::Index::CLI.new ['/'] }
     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
+      assert_throws(:stop, false) { wrapper [], setup: setup do end }
     end
   end
 
@@ -192,7 +185,7 @@ class TestCLI < MiniTest::Test
         [mkfile('README.md', '# Hello World')]
 
       stdout, stderr = capture_io do
-        assert_equal true, @cli.run
+        @cli.run
       end
 
       assert_equal "empty index\n", stdout
@@ -225,9 +218,7 @@ class TestCLI < MiniTest::Test
         [mkfile('cat/test.lua', 'no version tag in this script!')]
 
       # must output a new line before 'warning:'
-      assert_output nil, /\nwarning:/i do
-        assert_equal true, @cli.run
-      end
+      assert_output(nil, /\nwarning:/i) { @cli.run }
     end
   end
 
@@ -236,9 +227,7 @@ class TestCLI < MiniTest::Test
       @git.create_commit 'initial commit',
         [mkfile('cat/test.lua', 'no version tag in this script!')]
 
-      assert_output '', '' do
-        assert_equal true, @cli.run
-      end
+      assert_output('', '') { @cli.run }
     end
   end
 

data/test/test_git.rb

@@ -164,9 +164,10 @@ class TestGit < MiniTest::Test
   end
 
   def test_inspect_commit
-    c = @git.create_commit 'message', []
+    c = @git.create_commit "summary\n\nlong message", []
     assert_match c.class.name, c.inspect
     assert_match c.id, c.inspect
-    assert_match c.message, c.inspect
+    assert_match c.summary, c.inspect
+    refute_match c.message, c.inspect
   end
 end

data/test/test_index.rb

@@ -253,7 +253,7 @@ class TestIndex < MiniTest::Test
     assert_match /bee.+zebra/m, File.read(index.path)
   end
 
-  def test_dont_sort_versions
+  def test_do_not_sort_versions
     original = <<-XML
 <?xml version="1.0" encoding="utf-8"?>
 <index version="1">
@@ -273,6 +273,31 @@ class TestIndex < MiniTest::Test
     assert_equal original, File.read(index.path)
   end
 
+  def test_sort_package_tags
+    original = <<-XML
+<?xml version="1.0" encoding="utf-8"?>
+<index version="1">
+  <category name="Other">
+    <reapack name="test.lua">
+      <version name="z"/>
+      <metadata>
+        <link/>
+        <description/>
+      </metadata>
+    </reapack>
+  </category>
+</index>
+    XML
+
+    File.write @dummy_path, original
+    index = ReaPack::Index.new @dummy_path
+    index.write!
+
+    contents = File.read index.path
+    assert_match /metadata.+version/m, contents
+    assert_match /description.+link/m, contents
+  end
+
   def test_dont_mess_with_link_ordering
     # https://bugs.ruby-lang.org/issues/11907
     original = <<-XML

data/test/test_metadata.rb

@@ -482,6 +482,23 @@ class TestMetadata < MiniTest::Test
     assert_equal false, md.modified?
   end
 
+  def test_about_markdown_blank_before_header
+    before = make_node '<index/>'
+    md = ReaPack::Index::Metadata.new before
+    md.about = "First Line\n# Header\n* List"
+
+    refute_match 'Firstn Line # Header * List', before.to_s
+    assert_match "\\bullet", before.to_s
+  end
+
+  def test_about_markdown_no_4_space_rule
+    before = make_node '<index/>'
+    md = ReaPack::Index::Metadata.new before
+    md.about = "- a\n- b\n  - c\n- d"
+
+    assert_match "\\endash", before.to_s # nested list (c)
+  end
+
   def test_pandoc_not_found
     old_path = ENV['PATH']
     ENV['PATH'] = String.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reapack-index
 version: !ruby/object:Gem::Version
-  version: 1.1beta3
+  version: 1.1beta4
 platform: ruby
 authors:
 - cfillion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3beta2
+        version: 1.3beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3beta2
+        version: 1.3beta4
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement