reapack-index 1.0beta4 → 1.0rc2

data/lib/reapack/index/gem_version.rb

@@ -1,5 +1,5 @@
 module ReaPack
   class Index
-    VERSION = '1.0beta4'
+    VERSION = '1.0rc2'
   end
 end

data/lib/reapack/index/git.rb

@@ -12,6 +12,10 @@ class ReaPack::Index
       File.expand_path @repo.workdir
     end
 
+    def commits
+      commits_since nil
+    end
+
     def commits_since(sha)
       return [] if empty?
 
@@ -39,7 +43,7 @@ class ReaPack::Index
       return unless remote
 
       uri = Gitable::URI.parse remote.url
-      return unless uri.path =~ /\A\/?(?<user>[^\/]+)\/(?<repo>[^\/]+)\.git\Z/
+      return unless uri.path =~ /\A\/?(?<user>[^\/]+)\/(?<repo>[^\/]+)(\.git)?\Z/
 
       tpl = uri.to_web_uri
       tpl.path += '/raw/$commit/$path'

data/lib/reapack/index/provides.rb

@@ -1,5 +1,5 @@
 class ReaPack::Index
-  Provides = Struct.new :file_pattern, :url_template, :platform, :type do
+  Provides = Struct.new :file_pattern, :url_template, :platform, :type, :main do
     PROVIDES_REGEX = /
       \A
       ( \[ \s* (?<options> .+? ) \s* \] )?
@@ -9,6 +9,8 @@ class ReaPack::Index
       \z
     /x.freeze
 
+    alias :main? :main
+
     class << self
       def parse_each(input)
         if block_given?
@@ -28,14 +30,16 @@ class ReaPack::Index
           user_opt.strip!
           next if user_opt.empty?
 
-          opt = user_opt.downcase.to_sym
+          opt = user_opt.downcase
 
           if Source.is_platform? opt
-            instance.platform = opt
+            instance.platform = opt.to_sym
           elsif type = ReaPack::Index.resolve_type(opt)
             instance.type = type
+          elsif opt =~ /\A(no)?main\Z/
+            instance.main = !$1
           else
-            raise Error, "unknown option (platform or type) '#{user_opt}'"
+            raise Error, "unknown option '#{user_opt}'"
           end
         }
 

data/lib/reapack/index/scanner.rb

@@ -0,0 +1,129 @@
+class ReaPack::Index
+  class Scanner
+    PROVIDES_VALIDATOR = proc {|value|
+      begin
+        Provides.parse_each(value).to_a and nil
+      rescue Error => e
+        e.message
+      end
+    }
+
+    HEADER_RULES = {
+      # package-wide tags
+      :version => [
+        MetaHeader::REQUIRED, MetaHeader::VALUE, MetaHeader::SINGLELINE, /\d/],
+
+      # version-specific tags
+      :author => [MetaHeader::VALUE, MetaHeader::SINGLELINE],
+      :changelog => [MetaHeader::VALUE],
+      :provides => [MetaHeader::VALUE, PROVIDES_VALIDATOR],
+      :noindex => [MetaHeader::BOOLEAN],
+      :metapackage => [MetaHeader::BOOLEAN],
+    }.freeze
+
+    WITH_MAIN = [:script, :effect].freeze
+
+    def initialize(cat, pkg, mh, index)
+      @cat, @pkg, @mh, @index = cat, pkg, mh, index
+      @is_main = !@mh[:metapackage] && WITH_MAIN.include?(pkg.type)
+      @cselector = @index.cdetector[pkg.path]
+    end
+
+    def run
+      if errors = @mh.validate(HEADER_RULES)
+        raise Error, errors.join("\n")
+      end
+
+      @pkg.version @mh[:version] do |ver|
+        next unless ver.is_new? || @index.amend
+
+        @ver = ver
+
+        ver.author = @mh[:author]
+        ver.time = @index.time if @index.time && ver.is_new?
+        ver.changelog = @mh[:changelog]
+
+        ver.replace_sources do
+          @cselector.clear
+          sources = parse_provides @mh[:provides]
+
+          if @is_main && sources.none? {|src| src.file.nil? }
+            # add the package itself as a main source
+            src = Source.new make_url(@pkg.path), true
+            sources.unshift src
+
+            @cselector.push @pkg.type, src.platform, @pkg.path
+          end
+
+          sources.each {|src| ver.add_source src }
+        end
+      end
+
+      if cons = @cselector.resolve
+        raise Error, cons.first unless cons.empty?
+      end
+    end
+
+    def make_url(path, template = nil)
+      unless template
+        unless template = @index.url_template
+          raise Error, 'unable to generate download links: empty url template'
+        end
+
+        unless @index.files.include? path
+          raise Error, "file not found '#{path}'"
+        end
+      end
+
+      template
+        .gsub('$path', path)
+        .gsub('$commit', @index.commit || 'master')
+        .gsub('$version', @ver.name)
+        .gsub('$package', @pkg.path)
+    end
+
+    def parse_provides(provides)
+      pathdir = Pathname.new @pkg.category
+
+      Provides.parse_each(provides).map {|line|
+        line.file_pattern = @pkg.name if line.file_pattern == '.'
+
+        expanded = ReaPack::Index.expand line.file_pattern, @pkg.category
+
+        if expanded == @pkg.path
+          # always resolve path even when an url template is set
+          files = [expanded]
+        elsif line.url_template.nil?
+          files = @index.files.select {|f|
+            File.fnmatch expanded, f, File::FNM_PATHNAME | File::FNM_EXTGLOB
+          }
+          raise Error, "file not found '#{line.file_pattern}'" if files.empty?
+        else
+          # use the relative path for external urls
+          files = [line.file_pattern]
+        end
+
+        files.map {|file|
+          src = Source.new make_url(file, line.url_template), line.main?
+          src.platform = line.platform
+          src.type = line.type
+
+          @cselector.push src.type || @pkg.type, src.platform,
+            line.url_template ? expanded : file
+
+          if file == @pkg.path
+            src.main = @is_main if line.main.nil?
+          else
+            if line.url_template
+              src.file = file
+            else
+              src.file = Pathname.new(file).relative_path_from(pathdir).to_s
+            end
+          end
+
+          src
+        }
+      }.flatten
+    end
+  end
+end

data/lib/reapack/index/source.rb

@@ -4,6 +4,7 @@ class ReaPack::Index
     PLATFORM = 'platform'.freeze
     TYPE = 'type'.freeze
     FILE = 'file'.freeze
+    MAIN = 'main'.freeze
 
     PLATFORMS = {
       all: nil,
@@ -17,13 +18,17 @@ class ReaPack::Index
       end
     end
 
-    def initialize(url = nil)
+    def initialize(url, main = false)
       @url = url
+      @main = main
       @platform = :all
     end
 
     attr_reader :platform, :type
     attr_accessor :file, :url
+    attr_writer :main
+
+    def main?; @main; end
 
     def platform=(new_platform)
       new_platform ||= :all
@@ -47,10 +52,11 @@ class ReaPack::Index
 
     def make_node(parent)
       @node = Nokogiri::XML::Node.new TAG, parent.document
-      @node[PLATFORM] = @platform
+      @node[MAIN] = true if @main
+      @node[PLATFORM] = @platform if @platform != :all
       @node[TYPE] = @type if @type
       @node[FILE] = @file if @file
-      @node.content = Addressable::URI.encode @url
+      @node.content = Addressable::URI.parse(@url).normalize.to_s
       @node.parent = parent
     rescue Addressable::URI::InvalidURIError => e
       raise Error, e.message

data/lib/reapack/index/version.rb

@@ -75,7 +75,7 @@ class ReaPack::Index
   private
     def hash_sources(nodes)
       nodes.map {|src|
-        [src[Source::PLATFORM], src[Source::FILE], src.content]
+        [src[Source::PLATFORM] || 'all', src[Source::FILE], src.content]
       }
     end
   end

data/reapack-index.gemspec

@@ -29,8 +29,9 @@ 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.1'
+  spec.add_runtime_dependency 'metaheader', '~> 1.2'
   spec.add_runtime_dependency 'nokogiri', '~> 1.6.8.rc2'
   spec.add_runtime_dependency 'pandoc-ruby', '~> 2.0'
   spec.add_runtime_dependency 'rugged', '~> 0.24'
+  spec.add_runtime_dependency 'stable_sort', '~> 1.1'
 end

data/setup/reapack-index.nsi

@@ -2,11 +2,11 @@
 !include Sections.nsh
 !include StrRep.nsh
 
-!define VERSION "1.0beta4"
+!define VERSION "1.0rc2"
 !define NAME "ReaPack Index ${VERSION}"
 !define LONG_VERSION "0.1.0.0"
 
-!define RUBY_VERSION "2.3.0"
+!define RUBY_VERSION "2.3.1"
 !define RUBYINSTALLER_FILE "rubyinstaller-${RUBY_VERSION}.exe"
 !define RUBYINSTALLER_URL \
   "http://dl.bintray.com/oneclick/rubyinstaller/${RUBYINSTALLER_FILE}"
@@ -86,6 +86,19 @@ Section /o "Ruby for Windows" InstallRuby
   !insertmacro EXEC_GUI '"$R0" /VERYSILENT /TASKS=MODPATH' ${RUBYINSTALLER_FILE}
 
   !insertmacro RELOAD_PATH
+
+  nsExec::ExecToStack 'ruby -v'
+  Pop $0
+
+  StrCmp $0 "error" 0 +6 ; failed to launch ruby
+  MessageBox MB_YESNO|MB_ICONQUESTION "This computer need to be rebooted \
+      in order to complete the installation process. Reboot now?" IDNO +3
+    WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\RunOnce" \
+      "reapack-index installer" "$EXEPATH"
+    Reboot
+
+    DetailPrint "Relaunch reapack-index installer after rebooting your computer."
+    Abort
 SectionEnd
 
 Section /o "Rugged (libgit2)" InstallRugged

data/test/cli/test_check.rb

@@ -15,8 +15,8 @@ Finished checks for 2 packages with 0 failures
     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'
+      mkfile 'cat/test1.lua', '@version 1.0'
+      mkfile 'cat/test2.lua', '@version 1.0'
 
       assert_output nil, expected do
         assert_equal true, @cli.run
@@ -47,22 +47,16 @@ Finished checks for 2 packages with 1 failure
     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
-
+  def test_ignore_current_index
     setup = proc {
+      mkfile 'background.png'
       mkfile 'index.xml', <<-XML
 <index name="test">
   <category name="Hello">
     <reapack name="World.lua" type="script">
-      <version name="1.0"/>
+      <version name="1.0">
+        <source file="../background.png"/>
+      </version>
     </reapack>
   </category>
 </index>
@@ -70,11 +64,9 @@ Finished checks for 1 package with 1 failure
     }
 
     wrapper ['--check'], setup: setup do
-      mkfile 'Hello/World.lua', "@version 1.0\n@provides background.png"
+      mkfile 'Chunky/Bacon.lua', "@version 1.0\n@provides ../background.png"
 
-      assert_output nil, expected do
-        assert_equal false, @cli.run
-      end
+      capture_io { assert_equal true, @cli.run }
     end
   end
 
@@ -165,7 +157,7 @@ Finished checks for 1 package with 0 failures
   def test_verbose
     expected = <<-STDERR
 Path/To/test1.lua: failed
-test2.lua: passed
+cat/test2.lua: passed
 
 1) Path/To/test1.lua failed:
   missing tag 'version'
@@ -179,7 +171,7 @@ Finished checks for 2 packages with 1 failure
     _, stderr = capture_io do
       wrapper ['--check', '--verbose'], setup: setup do
         mkfile 'Path/To/test1.lua', '@author'
-        mkfile 'test2.lua', '@version 1.0'
+        mkfile 'cat/test2.lua', '@version 1.0'
 
         assert_equal false, @cli.run
       end
@@ -187,4 +179,18 @@ Finished checks for 2 packages with 1 failure
 
     assert_match expected, stderr
   end
+
+  def test_ignore_root
+    setup = proc { mkfile 'index.xml', '<index name="test"/>' }
+
+    _, stderr = capture_io do
+      wrapper ['--check'], setup: setup do
+        mkfile 'test.lua', '@version 1.0'
+
+        assert_equal true, @cli.run
+      end
+    end
+
+    assert_match 'Finished checks for 0 packages with 0 failures', stderr
+  end
 end

data/test/cli/test_scan.rb

@@ -225,7 +225,7 @@ processing [a-f0-9]{7}: third commit
   end
 
   def test_specify_commit
-    # --progress to check for FloatDomainError: Infinity errors
+    # --progress is enabled to check for FloatDomainError: Infinity errors
     options = ['--progress', '--scan']
 
     setup = proc {
@@ -320,6 +320,64 @@ processing [a-f0-9]{7}: third commit
     }
   end
 
+  def test_rebuild
+    setup = proc {
+      @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" name="hello" commit="#{@git.last_commit.id}">
+  <category name="Other">
+    <reapack name="Hello.lua" type="script" />
+  </category>
+</index>
+      XML
+    }
+
+    wrapper ['--rebuild'], setup: setup do
+      @git.create_commit 'second commit',
+        [mkfile('cat/test2.lua', '@version 1.0')]
+
+      assert_output nil, '' do
+        assert_equal true, @cli.run
+      end
+
+      contents = read_index
+      assert_match 'test1.lua', contents
+      refute_match 'Hello.lua', contents
+    end
+  end
+
+  def test_rebuild_override
+    setup = proc {
+      @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" name="hello" commit="#{@git.last_commit.id}">
+  <category name="Other">
+    <reapack name="Hello.lua" type="script" />
+  </category>
+</index>
+      XML
+    }
+
+    wrapper ['--rebuild', '--scan'], setup: setup do
+      @git.create_commit 'second commit',
+        [mkfile('cat/test2.lua', '@version 1.0')]
+
+      assert_output nil, '' do
+        assert_equal true, @cli.run
+      end
+
+      contents = read_index
+      refute_match 'test1.lua', contents
+      assert_match 'Hello.lua', contents
+    end
+  end
+
   def test_no_arguments
     wrapper ['--scan'] do; end
   end