reapack-index 1.0rc2 → 1.0rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cbcf419229c7231caca844f3b7f9e6800261b24
-  data.tar.gz: e3a8eabd17b759e7125f39276371383263130081
+  metadata.gz: 67af92b88949837fe5d43e305412534584ec85bc
+  data.tar.gz: a03bb75c38a4fe47fdad9dbf355a8fa1df0dc151
 SHA512:
-  metadata.gz: 7e04598f176942c766ade75dc7ec901793d3a58383e9e4e648d364f869d3798bdbc7b5239574ccc71b247bd115500c1c6c434de41353adc2611cbda46ed2bbf8
-  data.tar.gz: 42ebb6abbc5043e80b858d01ec64b94ec8c550e0a11a0c1daa964f3a7823b83a4282ef476d2c1e738b2242e781912d7cfe48bdcbba48bb943becb4bc3382a2f0
+  metadata.gz: 14b4b985db8bdb301b460745a63d8016998fd35348be92ce04bc4c9d0839c1d0d992d059c0adf56a4e9c4ebf50121837dfd56fef21c437f654e1fbd582c4a6ec
+  data.tar.gz: 4f5096ef94d75eee24eccc12b7fbd78fbd4477b921d2e5f2458dced3a7541652392c8e7c2f3419a8f5d9096f09d8ad3893137717e083372aa5181f5a2ffa31ed

data/README.md

@@ -7,6 +7,7 @@ Subproject: [https://github.com/cfillion/metaheader](https://github.com/cfillion
 [![Build Status](https://travis-ci.org/cfillion/reapack-index.svg?branch=master)](https://travis-ci.org/cfillion/reapack-index)
 [![Dependency Status](https://gemnasium.com/cfillion/reapack-index.svg)](https://gemnasium.com/cfillion/reapack-index)
 [![Coverage Status](https://coveralls.io/repos/cfillion/reapack-index/badge.svg?branch=master&service=github)](https://coveralls.io/github/cfillion/reapack-index?branch=master)
+[![Donate](https://www.paypalobjects.com/webstatic/en_US/btn/btn_donate_74x21.png)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=T3DEWBQJAV7WL&lc=CA&item_name=reapack-index%3a%20Package%20indexer%20for%20git-based%20ReaPack%20repositories&no_note=0&cn=Custom%20message&no_shipping=1&currency_code=CAD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted)
 
 ### Installation
 

data/lib/reapack/index.rb

@@ -106,7 +106,7 @@ class ReaPack::Index
     type = self.class.type_of path
     return unless type
 
-    mh = MetaHeader.new contents
+    mh = MetaHeader.parse contents
 
     if mh[:noindex]
       remove path
@@ -164,14 +164,19 @@ class ReaPack::Index
     @metadata.links type
   end
 
-  def eval_link(type, string)
-    if string.index('-') == 0
-      @metadata.remove_link type, string[1..-1]
+  def eval_link(type, input)
+    if input.index('-') == 0
+      @metadata.remove_link type, input[1..-1]
       log_change "removed #{type} link"
       return
     end
 
-    link = @metadata.push_link type, *string.split('=', 2)
+    separator = input.index('=')
+    if separator&.< input.index('://')
+      input = [input[0...separator], input[separator+1..-1]]
+    end
+
+    link = @metadata.push_link type, *input
 
     if link.is_new?
       log_change "new #{type} link"

data/lib/reapack/index/cli.rb

@@ -109,23 +109,26 @@ private
     @index.files = commit.filelist
 
     commit.each_diff
-      .sort_by {|diff| diff.status == :deleted ? 0 : 1 }
+      .select {|diff|
+        (not ignored? expand_path(diff.file)) &&
+          ReaPack::Index.type_of(diff.file)
+      }
+      .sort_by {|diff|
+        diff.status == :deleted || diff.new_header[:noindex] ? 0 : 1
+      }
       .each {|diff| process_diff diff }
   ensure
     bump_progress
   end
 
   def process_diff(diff)
-    return if ignored? expand_path(diff.file)
-    return unless ReaPack::Index.type_of diff.file
-
     log "-> indexing #{diff.status} file #{diff.file}"
 
     if diff.status == :deleted
       @index.remove diff.file
     else
       begin
-        @index.scan diff.file, diff.new_content
+        @index.scan diff.file, diff.new_header
       rescue ReaPack::Index::Error => e
         warn "#{diff.file}:\n#{indent e.message}"
       end
@@ -210,7 +213,7 @@ private
     # reiterate over the pkg list after registering every file
     pkgs.each_pair {|abs, rel|
       begin
-        @index.scan rel, File.read(abs)
+        @index.scan rel, MetaHeader.from_file(abs)
 
         if @opts[:verbose]
           $stderr.puts '%s: passed' % rel

data/lib/reapack/index/gem_version.rb

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

data/lib/reapack/index/git.rb

@@ -182,12 +182,17 @@ class ReaPack::Index
     attr_reader :status
 
     def file
-      @file[:path].force_encoding(Encoding::UTF_8)
+      @path ||= @file[:path].force_encoding(Encoding::UTF_8)
     end
     
     def new_content
       return if status == :deleted
-      @repo.lookup(@file[:oid]).content.force_encoding(Encoding::UTF_8)
+      @new_content ||=
+        @repo.lookup(@file[:oid]).content.force_encoding(Encoding::UTF_8)
+    end
+
+    def new_header
+      @new_header ||= MetaHeader.new @new_content if new_content
     end
   end
 end

data/lib/reapack/index/scanner.rb

@@ -11,7 +11,7 @@ class ReaPack::Index
     HEADER_RULES = {
       # package-wide tags
       :version => [
-        MetaHeader::REQUIRED, MetaHeader::VALUE, MetaHeader::SINGLELINE, /\d/],
+        MetaHeader::REQUIRED, MetaHeader::VALUE, MetaHeader::SINGLELINE, /\A\d/],
 
       # version-specific tags
       :author => [MetaHeader::VALUE, MetaHeader::SINGLELINE],
@@ -21,11 +21,13 @@ class ReaPack::Index
       :metapackage => [MetaHeader::BOOLEAN],
     }.freeze
 
-    WITH_MAIN = [:script, :effect].freeze
+    META_TYPES = [:extension, :data].freeze
 
     def initialize(cat, pkg, mh, index)
       @cat, @pkg, @mh, @index = cat, pkg, mh, index
-      @is_main = !@mh[:metapackage] && WITH_MAIN.include?(pkg.type)
+
+      @mh[:metapackage] = META_TYPES.include?(pkg.type) if mh[:metapackage].nil?
+
       @cselector = @index.cdetector[pkg.path]
     end
 
@@ -47,7 +49,7 @@ class ReaPack::Index
           @cselector.clear
           sources = parse_provides @mh[:provides]
 
-          if @is_main && sources.none? {|src| src.file.nil? }
+          if !@mh[:metapackage] && 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
@@ -112,7 +114,7 @@ class ReaPack::Index
             line.url_template ? expanded : file
 
           if file == @pkg.path
-            src.main = @is_main if line.main.nil?
+            src.main = !@mh[:metapackage] if line.main.nil?
           else
             if line.url_template
               src.file = file

data/reapack-index.gemspec

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

data/setup/reapack-index.nsi

@@ -2,7 +2,7 @@
 !include Sections.nsh
 !include StrRep.nsh
 
-!define VERSION "1.0rc2"
+!define VERSION "1.0rc3"
 !define NAME "ReaPack Index ${VERSION}"
 !define LONG_VERSION "0.1.0.0"
 
@@ -11,8 +11,8 @@
 !define RUBYINSTALLER_URL \
   "http://dl.bintray.com/oneclick/rubyinstaller/${RUBYINSTALLER_FILE}"
 
-!define PANDOC_VERSION "1.17.0.2"
-!define PANDOC_FILE "pandoc-${PANDOC_VERSION}-windows.msi"
+!define PANDOC_VERSION "1.17.1"
+!define PANDOC_FILE "pandoc-${PANDOC_VERSION}-1-windows.msi"
 !define PANDOC_URL \
   "https://github.com/jgm/pandoc/releases/download/${PANDOC_VERSION}/${PANDOC_FILE}"
 

data/test/cli/test_scan.rb

@@ -52,7 +52,7 @@ class TestCLI::Scan < MiniTest::Test
     end
   end
 
-  def test_wd_subdirectory
+  def test_workingdir_is_subdirectory
     wrapper do
       @git.create_commit 'initial commit',
         [mkfile('cat/test1.lua', '@version 1.0')]
@@ -193,8 +193,8 @@ processing [a-f0-9]{7}: third commit
     wrapper ['--ignore=Hello', '--ignore=Chunky/Bacon.lua',
              '--ignore=test2.lua'], setup: setup do
       @git.create_commit 'initial commit', [
-        mkfile('Hello/World.lua', 'konnichiwa'),
-        mkfile('Chunky/Bacon.lua', 'konnichiwa'),
+        mkfile('Hello/World.lua', '@version 1.0'),
+        mkfile('Chunky/Bacon.lua', '@version 1.0'),
         mkfile('Directory/test2.lua', '@version 1.0'),
       ]
 
@@ -224,6 +224,51 @@ processing [a-f0-9]{7}: third commit
     end
   end
 
+  def test_remove_before_scan
+    wrapper do
+      contents = "@version 1.0\n@provides file"
+
+      @git.create_commit 'initial commit', [
+        mkfile('cat/testz.lua', contents),
+        mkfile('cat/file'),
+      ]
+
+      File.delete mkpath('cat/testz.lua')
+      @git.create_commit 'second commit', [
+        mkpath('cat/testz.lua'),
+        mkfile('cat/testa.lua', contents),
+      ]
+
+      _, stderr = capture_io do
+        assert_equal true, @cli.run
+      end
+
+      refute_match 'conflict', stderr
+    end
+  end
+
+  def test_noindex_before_scan
+    wrapper do
+      contents = "@version 1.0\n@provides file"
+
+      @git.create_commit 'initial commit', [
+        mkfile('cat/testz.lua', contents),
+        mkfile('cat/file'),
+      ]
+
+      @git.create_commit 'second commit', [
+        mkfile('cat/testz.lua', contents .. "\n@noindex"),
+        mkfile('cat/testa.lua', contents),
+      ]
+
+      _, stderr = capture_io do
+        assert_equal true, @cli.run
+      end
+
+      refute_match 'conflict', stderr
+    end
+  end
+
   def test_specify_commit
     # --progress is enabled to check for FloatDomainError: Infinity errors
     options = ['--progress', '--scan']

data/test/index/test_metadata.rb

@@ -10,9 +10,10 @@ class TestIndex::Metadata < MiniTest::Test
 
     assert_equal 0, index.links(:website).size
     index.eval_link :website, 'http://test.com'
-    assert_equal 1, index.links(:website).size
+    index.eval_link :website, 'http://test.com?query=string'
+    assert_equal 2, index.links(:website).size
 
-    assert_equal '1 new website link, empty index', index.changelog
+    assert_equal '2 new website links, empty index', index.changelog
 
     index.write!
   end

data/test/index/test_scan.rb

@@ -171,10 +171,10 @@ class TestIndex::Scan < MiniTest::Test
     refute_match '<category', contents
   end
 
-  def test_metapackage
+  def test_metapackage_on
     index = ReaPack::Index.new @dummy_path
     index.url_template = 'http://host/$path'
-    index.files = ['Category/script.lua', 'Category/test']
+    index.files = ['Category/script.lua']
 
     error = assert_raises ReaPack::Index::Error do
       index.scan index.files.first, "@version 1.0\n@metapackage"
@@ -183,6 +183,14 @@ class TestIndex::Scan < MiniTest::Test
     assert_equal 'no files provided', error.message
   end
 
+  def test_metapackage_off
+    index = ReaPack::Index.new @dummy_path
+    index.url_template = 'http://host/$path'
+    index.files = ['Category/extension.ext']
+
+    index.scan index.files.first, "@version 1.0\n@metapackage false"
+  end
+
   def test_version_time
     index = ReaPack::Index.new @dummy_path
     index.url_template = 'http://host/$path'

data/test/test_scanner.rb

@@ -6,7 +6,6 @@ class TestScanner < MiniTest::Test
       @cat = MiniTest::Mock.new
 
       @pkg = MiniTest::Mock.new
-      @pkg.expect :type, :script
       @pkg.expect :path, 'Hello/World.lua'
       @pkg.expect :path, 'Hello/World.lua'
 
@@ -14,7 +13,7 @@ class TestScanner < MiniTest::Test
       @ver.expect :name, '1.0'
 
       @mh = MiniTest::Mock.new
-      @mh.expect :[], nil, [:metapackage]
+      @mh.expect :[], true, [:metapackage]
 
       @cdetector = MiniTest::Mock.new
       @cdetector.expect :[], nil, ['Hello/World.lua']
@@ -140,6 +139,10 @@ class TestScanner < MiniTest::Test
       error = assert_raises(ReaPack::Index::Error) { @scanner.run }
       assert_equal "invalid value for tag 'version'", error.message
 
+      @mh[:version] = 'v1.0'
+      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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reapack-index
 version: !ruby/object:Gem::Version
-  version: 1.0rc2
+  version: 1.0rc3
 platform: ruby
 authors:
 - cfillion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8.rc2
+        version: 1.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8.rc2
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: pandoc-ruby
   requirement: !ruby/object:Gem::Requirement