reapack-index 1.2.2 → 1.2.3rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f9b62d7bee0df16d8de2903900ac49696ea2a3ee34ff698ac4160cde78588dc
-  data.tar.gz: 4e2285d7499f6f84b2ecf04fea0853e3e739c4e9d6e4cc8ce11226828122c64e
+  metadata.gz: 5326de32c33b763e737211b02a854e59c12fcd29982d3b835ae80d2c797d46c3
+  data.tar.gz: 20ee6a02cc538a3bcf6ffff3a0cae3f7e50f98252efcd89dbcef5ff054a86adc
 SHA512:
-  metadata.gz: ef43516204243d62b88d8f358c5fabc30a4bc66151fe167de54490ab39e0ac37373d7835226d436e6605bfbb6de6672a49614d6220bd5908a0a6fdbb4341caa7
-  data.tar.gz: aa8170e5582c87c1705bb42772014b75c4bc930e72f6d8519c996d2415ba0fc33740882c5f3e0b5245203ee428c38eb1538705a5cde296874dc3cc9f2cf0a887
+  metadata.gz: 7a2421af8f16e88a29cd7c86f5becfd96c5e22d04e344214e4fff22ef3821023d2e54cdb7bba54c4eeb4053b82f3724c98765e1674748ea4d3cd409957608cd4
+  data.tar.gz: f2668253f9110713cb107b779ca9adc52b36ca5449075e493f61f1881343de6f16bad76fda0cb7d6d6008622e6bd65c8e6a53fd5ea46c92f892a3ff26cf3a429

data/.travis.yml

@@ -4,8 +4,9 @@ rvm:
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
 before_install:
   - gem update bundler
-  - wget https://github.com/jgm/pandoc/releases/download/2.7.2/pandoc-2.7.2-1-amd64.deb -O pandoc.deb
+  - wget https://github.com/jgm/pandoc/releases/download/2.9.2/pandoc-2.9.2-1-amd64.deb -O pandoc.deb
   - sudo dpkg -i pandoc.deb
 cache: bundler

data/README.md

@@ -5,7 +5,6 @@ Subproject: [https://github.com/cfillion/metaheader](https://github.com/cfillion
 
 [![Gem Version](https://badge.fury.io/rb/reapack-index.svg)](http://badge.fury.io/rb/reapack-index)
 [![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)
 

data/lib/reapack/index.rb

@@ -120,8 +120,16 @@ class ReaPack::Index
     type = self.class.type_of path
     return unless type
 
-    mh = MetaHeader.parse contents
-    mh.strict = @strict
+    mh = if contents.is_a? MetaHeader
+      contents
+    else
+      mh = MetaHeader.parse contents
+      unless mh.has? :changelog
+        wp = WordpressChangelog.new mh
+        wp.parse contents
+      end
+      mh
+    end
 
     if mh[:noindex]
       remove path
@@ -139,7 +147,7 @@ class ReaPack::Index
     scanner = Scanner.new cat, pkg, mh, self
 
     begin
-      scanner.run
+      scanner.run @strict
     rescue Error
       backups.each {|var, value| instance_variable_set var, value }
       raise

data/lib/reapack/index/gem_version.rb

@@ -1,5 +1,5 @@
 module ReaPack
   class Index
-    VERSION = '1.2.2'
+    VERSION = '1.2.3rc1'
   end
 end

data/lib/reapack/index/git.rb

@@ -232,7 +232,7 @@ class ReaPack::Index
     end
 
     def new_header
-      @new_header ||= MetaHeader.new @new_content if new_content
+      @new_header ||= MetaHeader.parse @new_content if new_content
     end
   end
 end

data/lib/reapack/index/parsers.rb

@@ -1,4 +1,4 @@
-class WordpressChangelog < MetaHeader::Parser
+class WordpressChangelog
   CHANGELOG = /
     Changelog\s*:\n
     (.+?)\n\s*
@@ -7,11 +7,14 @@ class WordpressChangelog < MetaHeader::Parser
 
   VERSION = /\A[\s\*]*v([\d\.]+)(?:\s+(.+))?\Z/.freeze
 
+  def initialize(mh)
+    @header = mh
+  end
+
   def parse(input)
-    input = input.read
     input.encode! Encoding::UTF_8, invalid: :replace
 
-    ver, changes = header[:version], header[:changelog]
+    ver, changes = @header[:version], @header[:changelog]
     return if ver.nil? || changes || CHANGELOG.match(input).nil?
 
     $1.lines.each {|line| read line.lstrip }
@@ -19,15 +22,15 @@ class WordpressChangelog < MetaHeader::Parser
 
   def read(line)
     if line =~ VERSION
-      @current = $1 == header[:version]
+      @current = $1 == @header[:version]
     elsif @current
-      if header[:changelog]
-        header[:changelog] += "\n"
+      if @header[:changelog]
+        @header[:changelog] += "\n"
       else
-        header[:changelog] = String.new
+        @header[:changelog] = String.new
       end
 
-      header[:changelog] += line.chomp
+      @header[:changelog] += line.chomp
     end
   end
 end

data/lib/reapack/index/scanner.rb

@@ -52,10 +52,12 @@ class ReaPack::Index
       @self_overriden = false
     end
 
-    def run
+    def run(strict = false)
       @mh.alias HEADER_ALIASES
 
-      if errors = @mh.validate(HEADER_RULES)
+      errors = @mh.validate(HEADER_RULES, strict)
+
+      unless errors.empty?
         raise Error, errors.join("\n")
       end
 
@@ -108,11 +110,23 @@ class ReaPack::Index
         end
       end
 
-      template
-        .gsub('$path', URI::encode(path))
-        .gsub('$commit', @index.commit || 'master')
-        .gsub('$version', @ver.name)
-        .gsub('$package', @pkg.path)
+      substitutions = {
+        '$path'    => path,
+        '$commit'  => @index.commit || 'master',
+        '$version' => @ver.name,
+        '$package' => @pkg.path,
+      }
+
+      uri = Addressable::URI.parse template
+      [:host, :path, :query].each {|segment|
+        value = uri.send segment
+
+        if value
+          value.gsub! /\$\w+/, substitutions
+          uri.send "#{segment}=", value
+        end
+      }
+      uri.normalize.to_s
     end
 
     def parse_provides(provides)
@@ -182,7 +196,7 @@ class ReaPack::Index
               src.detect_sections @pkg
             end
 
-            src.file = target if line.target
+            src.file = target if line.target && expanded != file
             @self_overriden = true
           else
             if line.url_template

data/lib/reapack/index/source.rb

@@ -11,6 +11,7 @@ class ReaPack::Index
       windows: :all, win32: :windows, win64: :windows,
       darwin: :all, darwin32: :darwin, darwin64: :darwin,
       linux: :all, linux32: :linux, linux64: :linux,
+      'linux-armv7l': :linux, 'linux-aarch64': :linux
     }.freeze
 
     SECTIONS = [

data/reapack-index.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'reapack-index'
   spec.version       = ReaPack::Index::VERSION
   spec.authors       = ['cfillion']
-  spec.email         = ['reapack-index@cfillion.tk']
+  spec.email         = ['reapack-index@cfillion.ca']
   spec.summary       = 'Package indexer for git-based ReaPack repositories'
   spec.homepage      = 'https://github.com/cfillion/reapack-index'
   spec.license       = 'GPL-3.0+'
@@ -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.3'
+  spec.add_runtime_dependency 'metaheader', '~> 2.0'
   spec.add_runtime_dependency 'nokogiri', '~> 1.7'
   spec.add_runtime_dependency 'pandoc-ruby', '~> 2.0'
   spec.add_runtime_dependency 'rugged', '~> 0.25'

data/test/index/test_provides.rb

@@ -427,4 +427,18 @@ class TestIndex::Provides < MiniTest::Test
       @provides ../target.lua
     IN
   end
+
+  def test_rename_target_same_name
+    index = ReaPack::Index.new @dummy_path
+    index.files = ['Category/script.lua']
+    index.url_template = 'http://host/$path'
+
+    index.scan index.files.first, <<-IN
+      @version 1.0
+      @provides . > script.lua
+    IN
+
+    index.write!
+    refute_match 'file=', File.read(index.path)
+  end
 end

data/test/scanner/test_makeurl.rb

@@ -93,10 +93,10 @@ class TestScanner::TestMakeUrl < MiniTest::Test
 
   def test_repeat
     @index.expect :files, ['Category/script.lua']
-    @index.expect :url_template, '$path $path'
+    @index.expect :url_template, '$path$path'
     @index.expect :commit, 'C0FF33'
 
-    assert_equal 'Category/script.lua Category/script.lua',
+    assert_equal 'Category/script.luaCategory/script.lua',
       @scanner.make_url('Category/script.lua')
   end
 end

data/test/scanner/test_validation.rb

@@ -8,7 +8,7 @@ class TestScanner::TestValidation < MiniTest::Test
     @pkg.expect :type, :script
     @pkg.expect :path, 'cat/test'
 
-    @mh = MetaHeader.new String.new
+    @mh = MetaHeader.new
     @mh[:version] = '1.0'
 
     @index = MiniTest::Mock.new
@@ -20,7 +20,7 @@ class TestScanner::TestValidation < MiniTest::Test
   def test_validation
     mh_mock = MiniTest::Mock.new
     mh_mock.expect :alias, nil, [Hash]
-    mh_mock.expect :validate, ['first', 'second'], [Hash]
+    mh_mock.expect :validate, ['first', 'second'], [Hash, false]
 
     @scanner.instance_variable_set :@mh, mh_mock
 

data/test/test_parsers.rb

@@ -2,7 +2,7 @@ require File.expand_path '../helper', __FILE__
 
 class TestParsers < MiniTest::Test
   def test_wordpress
-    mh = MetaHeader.new <<-IN
+    input = <<-IN
 /**
  * Version: 1.1
  */
@@ -23,12 +23,17 @@ class TestParsers < MiniTest::Test
  Test\x97
     IN
 
+    mh = MetaHeader.parse input
     assert_equal '1.1', mh[:version]
+    refute mh.has?(:changelog)
+
+    parser = WordpressChangelog.new mh
+    parser.parse input
     assert_equal "+ Line 3\n+ Line 4", mh[:changelog]
   end
 
   def test_wordpress_no_date
-    mh = MetaHeader.new <<-IN
+    input = <<-IN
 /**
  * Version: 1.1
  */
@@ -49,12 +54,14 @@ class TestParsers < MiniTest::Test
  Test\x97
     IN
 
-    assert_equal '1.1', mh[:version]
+    mh = MetaHeader.parse input
+    parser = WordpressChangelog.new mh
+    parser.parse input
     assert_equal "+ Line 3\n+ Line 4", mh[:changelog]
   end
 
   def test_wordpress_noprefix
-    mh = MetaHeader.new <<-IN
+    input = <<-IN
 --[[
 Version: 1.1
 --]]
@@ -76,7 +83,9 @@ v1.0 (2012-01-01)
  Test\x97
     IN
 
-    assert_equal '1.1', mh[:version]
+    mh = MetaHeader.parse input
+    parser = WordpressChangelog.new mh
+    parser.parse input
     assert_equal "+ Line 3\n+ Line 4", mh[:changelog]
   end
 end

data/test/test_provides.rb

@@ -35,7 +35,7 @@ class TestProvides < MiniTest::Test
   def test_platforms
     assert_equal [:windows, :win32, :win64,
                   :darwin, :darwin32, :darwin64,
-                  :linux, :linux32, :linux64],
+                  :linux, :linux32, :linux64, :'linux-armv7l', :'linux-aarch64'],
       [
         '[windows] file',
         '[win32] file',
@@ -46,6 +46,8 @@ class TestProvides < MiniTest::Test
         '[linux] file',
         '[linux32] file',
         '[linux64] file',
+        '[linux-armv7l] file',
+        '[linux-aarch64] file',
       ].map {|l| ReaPack::Index::Provides.parse(l).platform }
   end
 

data/test/test_scanner.rb

@@ -6,7 +6,7 @@ class TestScanner < MiniTest::Test
   def setup
     @mock = MiniTest::Mock.new
 
-    @mh = MetaHeader.new String.new
+    @mh = MetaHeader.new
     @mh[:version] = '1.0'
 
     @doc = Nokogiri::XML <<-XML

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reapack-index
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3rc1
 platform: ruby
 authors:
 - cfillion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ dependencies:
         version: '1.1'
 description: 
 email:
-- reapack-index@cfillion.tk
+- reapack-index@cfillion.ca
 executables:
 - reapack-index
 extensions: []
@@ -260,9 +260,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.2
 signing_key: