reapack-index 1.0beta3 → 1.0beta4

data/lib/reapack/index/source.rb

@@ -0,0 +1,59 @@
+class ReaPack::Index
+  class Source
+    TAG = 'source'.freeze
+    PLATFORM = 'platform'.freeze
+    TYPE = 'type'.freeze
+    FILE = 'file'.freeze
+
+    PLATFORMS = {
+      all: nil,
+      windows: :all, win32: :windows, win64: :windows,
+      darwin: :all, darwin32: :darwin, darwin64: :darwin,
+    }.freeze
+
+    class << self
+      def is_platform?(input)
+        PLATFORMS.has_key? input&.to_sym
+      end
+    end
+
+    def initialize(url = nil)
+      @url = url
+      @platform = :all
+    end
+
+    attr_reader :platform, :type
+    attr_accessor :file, :url
+
+    def platform=(new_platform)
+      new_platform ||= :all
+
+      unless self.class.is_platform? new_platform
+        raise Error, "invalid platform '#{new_platform}'"
+      end
+
+      @platform = new_platform.to_sym
+    end
+
+    def type=(new_type)
+      return @type = new_type if new_type.nil?
+
+      unless ReaPack::Index.is_type? new_type
+        raise Error, "invalid type '#{new_type}'"
+      end
+
+      @type = new_type.to_sym
+    end
+
+    def make_node(parent)
+      @node = Nokogiri::XML::Node.new TAG, parent.document
+      @node[PLATFORM] = @platform
+      @node[TYPE] = @type if @type
+      @node[FILE] = @file if @file
+      @node.content = Addressable::URI.encode @url
+      @node.parent = parent
+    rescue Addressable::URI::InvalidURIError => e
+      raise Error, e.message
+    end
+  end
+end

data/lib/reapack/index/version.rb

@@ -5,9 +5,8 @@ class ReaPack::Index
     AUTHOR = 'author'.freeze
     TIME = 'time'.freeze
 
-    def initialize(node, parent = nil)
+    def initialize(node)
       super
-
       @changelog = Changelog.new @node
     end
 
@@ -64,13 +63,10 @@ class ReaPack::Index
       new_sources = hash_sources children(Source::TAG)
       @dirty = was_dirty || old_sources != new_sources
 
-      if new_sources.empty?
-        raise Error, 'no sources found. @provides tag missing?'
-      end
+      raise Error, 'no files provided' if new_sources.empty?
     end
 
-    def add_source(src, file = nil, url = nil)
-      src = Source.new src, file, url unless src.is_a? Source
+    def add_source(src)
       src.make_node @node
 
       @dirty = true
@@ -84,51 +80,6 @@ class ReaPack::Index
     end
   end
 
-  class Source
-    TAG = 'source'.freeze
-    PLATFORM = 'platform'.freeze
-    FILE = 'file'.freeze
-
-    PLATFORMS = [
-      :all,
-      :windows, :win32, :win64,
-      :darwin, :darwin32, :darwin64,
-    ].freeze
-
-    def self.validate_platform(platform)
-      return unless platform # nil platform will be replaced by the default
-
-      unless PLATFORMS.include? platform.to_sym
-        raise Error, 'invalid platform %s' % platform
-      end
-    end
-
-    def initialize(platform = nil, file = nil, url = nil)
-      self.platform = platform
-      self.file = file
-      self.url = url
-    end
-
-    def platform=(new_platform)
-      new_platform = :all if new_platform.nil?
-
-      self.class.validate_platform new_platform
-
-      @platform = new_platform
-    end
-
-    attr_reader :platform
-    attr_accessor :file, :url
-
-    def make_node(parent)
-      @node = Nokogiri::XML::Node.new TAG, parent.document
-      @node.parent = parent
-      @node[PLATFORM] = @platform
-      @node[FILE] = @file if @file
-      @node.content = Addressable::URI.encode @url
-    end
-  end
-
   class Changelog
     TAG = 'changelog'.freeze
 

data/reapack-index.gemspec

@@ -9,18 +9,19 @@ Gem::Specification.new do |spec|
   spec.version       = ReaPack::Index::VERSION
   spec.authors       = ['cfillion']
   spec.email         = ['reapack-index@cfillion.tk']
-  spec.summary       = 'Package indexer for ReaPack-based repositories'
+  spec.summary       = 'Package indexer for git-based ReaPack repositories'
   spec.homepage      = 'https://github.com/cfillion/reapack-index'
-  spec.license       = "GPL-3.0+"
+  spec.license       = 'GPL-3.0+'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
+
+  spec.required_ruby_version = '>= 2.3'
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'coveralls', '~> 0.8'
-  spec.add_development_dependency 'git', '~> 1.3'
   spec.add_development_dependency 'minitest', '~> 5.8'
   spec.add_development_dependency 'rake', '~> 11.0'
   spec.add_development_dependency 'simplecov', '~> 0.11'
@@ -28,8 +29,8 @@ 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.0'
-  spec.add_runtime_dependency 'nokogiri', '~> 1.6'
+  spec.add_runtime_dependency 'metaheader', '~> 1.1'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.6.8.rc2'
   spec.add_runtime_dependency 'pandoc-ruby', '~> 2.0'
   spec.add_runtime_dependency 'rugged', '~> 0.24'
 end

data/setup/reapack-index.nsi

@@ -2,11 +2,11 @@
 !include Sections.nsh
 !include StrRep.nsh
 
-!define VERSION "1.0beta3"
+!define VERSION "1.0beta4"
 !define NAME "ReaPack Index ${VERSION}"
 !define LONG_VERSION "0.1.0.0"
 
-!define RUBY_VERSION "2.2.4"
+!define RUBY_VERSION "2.3.0"
 !define RUBYINSTALLER_FILE "rubyinstaller-${RUBY_VERSION}.exe"
 !define RUBYINSTALLER_URL \
   "http://dl.bintray.com/oneclick/rubyinstaller/${RUBYINSTALLER_FILE}"
@@ -19,7 +19,7 @@
 !define RUGGED_VERSION "0.24.0"
 !define RUGGED_FILE "rugged-${RUGGED_VERSION}-%PLATFORM%.gem"
 !define RUGGED_URL \
-  "https://github.com/cfillion/reapack-index/releases/download/v${VERSION}/${RUGGED_FILE}"
+  "https://github.com/cfillion/reapack-index/releases/download/v1.0beta4/${RUGGED_FILE}"
 
 Name "${NAME}"
 OutFile "reapack-index-${VERSION}.exe"
@@ -124,11 +124,15 @@ SectionEnd
 Function .onInit
   !insertmacro RELOAD_PATH
   nsExec::ExecToStack '"ruby" -e " \
+    rubyver = Gem::Version.new(RUBY_VERSION); \
+    exit 2 unless rubyver >= Gem::Version.new(\"${RUBY_VERSION}\"); \
+    ; \
     spec = Gem::Specification.find_all_by_name(\"rugged\").first; \
     req = Gem::Requirement.new(\"~> ${RUGGED_VERSION}\"); \
-    raise unless spec && req =~ spec.version'
+    exit 3 unless spec && req =~ spec.version'
   Pop $0
 
+  StrCmp $0 "2" +2 0 ; ruby out of date
   StrCmp $0 "error" 0 +6 ; failed to launch ruby
     SectionGetFlags ${InstallRuby} $1
     IntOp $1 $1 | ${SF_SELECTED}
@@ -136,7 +140,7 @@ Function .onInit
     SectionSetFlags ${InstallRuby} $1
     Goto +2 ; also install rugged
 
-  StrCmp $0 "1" 0 +5 ; rugged is not installed
+  StrCmp $0 "3" 0 +5 ; rugged missing/out of date
     SectionGetFlags ${InstallRugged} $1
     IntOp $1 $1 | ${SF_SELECTED}
     IntOp $1 $1 | ${SF_RO}

data/test/cli/test_check.rb

@@ -0,0 +1,190 @@
+require File.expand_path '../../helper', __FILE__
+
+TestCLI ||= Class.new MiniTest::Test
+
+class TestCLI::Check < MiniTest::Test
+  include CLIHelper
+
+  def test_pass
+    expected = <<-STDERR
+..
+
+Finished checks for 2 packages with 0 failures
+    STDERR
+
+    setup = proc { mkfile 'index.xml', '<index name="test"/>' }
+
+    wrapper ['--check'], setup: setup do
+      mkfile 'test1.lua', '@version 1.0'
+      mkfile 'test2.lua', '@version 1.0'
+
+      assert_output nil, expected do
+        assert_equal true, @cli.run
+      end
+    end
+  end
+
+  def test_failure
+    expected = <<-STDERR
+F.
+
+1) cat/test1.lua failed:
+  missing tag 'version'
+  missing value for tag 'author'
+
+Finished checks for 2 packages with 1 failure
+    STDERR
+
+    setup = proc { mkfile 'index.xml', '<index name="test"/>' }
+
+    wrapper ['--check'], setup: setup do
+      mkfile 'cat/test1.lua', '@author'
+      mkfile 'cat/test2.lua', '@version 1.0'
+
+      assert_output nil, expected do
+        assert_equal false, @cli.run
+      end
+    end
+  end
+
+  def test_uses_scan
+    expected = <<-STDERR
+F
+
+1) Hello/World.lua failed:
+  file not found 'background.png'
+
+Finished checks for 1 package with 1 failure
+    STDERR
+
+    setup = proc {
+      mkfile 'index.xml', <<-XML
+<index name="test">
+  <category name="Hello">
+    <reapack name="World.lua" type="script">
+      <version name="1.0"/>
+    </reapack>
+  </category>
+</index>
+      XML
+    }
+
+    wrapper ['--check'], setup: setup do
+      mkfile 'Hello/World.lua', "@version 1.0\n@provides background.png"
+
+      assert_output nil, expected do
+        assert_equal false, @cli.run
+      end
+    end
+  end
+
+  def test_quiet
+    expected = <<-STDERR
+1) cat/test1.lua failed:
+  missing tag 'version'
+  missing value for tag 'author'
+
+2) cat/test2.lua failed:
+  missing tag 'version'
+    STDERR
+
+    setup = proc { mkfile 'index.xml', '<index name="test"/>' }
+
+    wrapper ['--check', '--quiet'], setup: setup do
+      mkfile 'cat/test1.lua', '@author'
+      mkfile 'cat/test2.lua'
+      mkfile 'cat/test3.lua', '@version 1.0'
+
+      assert_output nil, expected do
+        assert_equal false, @cli.run
+      end
+    end
+  end
+
+  def test_ignore
+    setup = proc {
+      Dir.chdir @git.path
+      mkfile 'index.xml', '<index name="test"/>'
+    }
+
+    expected = <<-STDERR
+.
+
+Finished checks for 1 package with 0 failures
+    STDERR
+
+    wrapper ['--check', '--ignore=Hello', '--ignore=Chunky/Bacon.lua',
+             '--ignore=test2.lua', '--ignore=Directory/test'], setup: setup do
+      mkfile 'Hello/World.lua', 'konnichiwa'
+      mkfile 'Chunky/Bacon.lua', 'konnichiwa'
+      mkfile 'Directory/test/1.lua', 'konnichiwa'
+      mkfile 'Directory/test2.lua', '@version 1.0'
+
+      assert_output nil, expected do
+        @cli.run
+      end
+    end
+  end
+
+  def test_ignore_from_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
+
+      mkfile 'index.xml', '<index name="test"/>'
+    }
+
+    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
+        @cli.run
+      end
+    end
+  end
+
+  def test_unset_name_warning
+    wrapper ['--check'] do
+      assert_output nil, /index is unnamed/i do
+        @cli.run
+      end
+    end
+  end
+
+  def test_verbose
+    expected = <<-STDERR
+Path/To/test1.lua: failed
+test2.lua: passed
+
+1) Path/To/test1.lua failed:
+  missing tag 'version'
+  missing value for tag 'author'
+
+Finished checks for 2 packages with 1 failure
+    STDERR
+
+    setup = proc { mkfile 'index.xml', '<index name="test"/>' }
+
+    _, stderr = capture_io do
+      wrapper ['--check', '--verbose'], setup: setup do
+        mkfile 'Path/To/test1.lua', '@author'
+        mkfile 'test2.lua', '@version 1.0'
+
+        assert_equal false, @cli.run
+      end
+    end
+
+    assert_match expected, stderr
+  end
+end

data/test/cli/test_metadata.rb

@@ -0,0 +1,194 @@
+require File.expand_path '../../helper', __FILE__
+
+TestCLI ||= Class.new MiniTest::Test
+
+class TestCLI::Metadata < MiniTest::Test
+  include CLIHelper
+
+  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_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_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, @cli.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, @cli.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, @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_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, @cli.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, @cli.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, @cli.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, @cli.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, @cli.run
+      end
+    end
+  end
+
+  def test_unset_name_warning
+    wrapper do
+      _, stderr = capture_io do
+        assert_equal true, @cli.run
+      end
+
+      assert_match /index is unnamed/i, stderr
+      refute_match File.dirname($0), stderr
+      refute_match 'name', read_index
+    end
+  end
+
+  def test_set_name
+    wrapper ['--name=Hello World'] do
+      _, stderr = capture_io do
+        assert_equal true, @cli.run
+      end
+
+      refute_match /index is unnamed/i, stderr
+      assert_match 'name="Hello World"', read_index
+    end
+  end
+
+  def test_set_name_invalid
+    wrapper ['--name=Hello/World'] do
+      _, stderr = capture_io do
+        assert_equal true, @cli.run
+      end
+
+      refute_match /The name of this index is unset/i, stderr
+      assert_match /invalid name 'Hello\/World'/i, stderr
+    end
+  end
+end