reapack-index 1.2rc1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: db912d74637f26faf3747b1efa0018a0f7c1bd17
-  data.tar.gz: da3003e1d50cc3020bd3d4dc74abcb4c23ca5a97
+SHA256:
+  metadata.gz: 395a21482f9f7c57d34491efa4afd7a32fa16f3fca18d42dff99b2ca3ef0cddf
+  data.tar.gz: d9f769fbcf286a5541efbeb8eb4f1a70ffb2308349249706d85cad27b7b3ec46
 SHA512:
-  metadata.gz: ce3c8c51d057eaed233bb2bdeff53db11895c8e13ee9a526d69730484967db1fd00d42386defc64d55c2f56dadc9db94ad5bc13ee2151567bb37056da81dfab8
-  data.tar.gz: af451fe2ec7c69a9d50d78e8d460c08064837bd25acff3cc3755e1050ee6f8e940646c8164a73537560b9093b0c100eabdcfbe8bfb9f8c02edcc925ab72e2961
+  metadata.gz: 5b21099ed8e39ced20a19bf40df2f21a919bc66fd30dd3876d27d19b22a1aad8f9ed235ed6f548f8cf3fd4bd1d885c601d21fd2e0eef1de4ecafef8d50f40e66
+  data.tar.gz: 3910b7e2954e9246b692a28621156418cbeaec0d74f6f62fcb42f42c168cb2c24a0532795d435e78ce77487262e2503e178adfe07680afcb2f925d46f6959f99

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+custom:
+  - "https://reapack.com/donate"
+  - "https://paypal.me/cfillion"

data/.github/workflows/test.yml

@@ -0,0 +1,17 @@
+name: test
+on: [push, pull_request]
+jobs:
+  rake:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Fetch repository
+      uses: actions/checkout@v2
+    - name: Install Pandoc
+      run:  sudo apt-get install -yy pandoc
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+        ruby-version: 2.7
+    - name: Run tests
+      run:  bundle exec rake

data/README.md

@@ -4,10 +4,8 @@ Parent project: [https://github.com/cfillion/reapack](https://github.com/cfillio
 Subproject: [https://github.com/cfillion/metaheader](https://github.com/cfillion/metaheader)
 
 [![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)
+[![Test status](https://github.com/cfillion/reapack-index/workflows/test/badge.svg)](https://github.com/cfillion/reapack-index/actions)
+[![Donate](https://www.paypalobjects.com/webstatic/en_US/btn/btn_donate_74x21.png)](https://reapack.com/donate)
 
 ### Installation
 

data/lib/reapack/index.rb

@@ -14,6 +14,7 @@ require 'rugged'
 require 'shellwords'
 require 'stable_sort'
 require 'time'
+require 'uri'
 
 require 'reapack/index/cdetector'
 require 'reapack/index/cli'
@@ -76,6 +77,15 @@ class ReaPack::Index
         .find {|name, exts| input.to_sym == name || exts.include?(input.to_s) }
         &.first
     end
+
+    def parse(contents)
+      mh = MetaHeader.parse contents
+      unless mh.has? :changelog
+        wp = WordpressChangelog.new mh
+        wp.parse contents
+      end
+      mh
+    end
   end
 
   def initialize(path)
@@ -119,8 +129,7 @@ class ReaPack::Index
     type = self.class.type_of path
     return unless type
 
-    mh = MetaHeader.parse contents
-    mh.strict = @strict
+    mh = contents.is_a?(MetaHeader) ? contents : self.class.parse(contents)
 
     if mh[:noindex]
       remove path
@@ -138,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,6 +1,5 @@
 module ReaPack
   class Index
-    # bump in setup/reapack-index.nsi too
-    VERSION = '1.2rc1'
+    VERSION = '1.2.3'
   end
 end

data/lib/reapack/index/git.rb

@@ -71,7 +71,7 @@ class ReaPack::Index
       return unless uri.path =~ /\A\/?(?<user>[^\/]+)\/(?<repo>[^\/]+)(\.git|\/)?\Z/
 
       tpl = uri.to_web_uri
-      tpl.path.chomp! '/'
+      tpl.path = tpl.path.chomp '/'
       tpl.path += '/raw/$commit/$path'
 
       tpl.to_s
@@ -146,7 +146,7 @@ class ReaPack::Index
         diff = @commit.diff
       end
 
-      @diffs ||= diff.each_delta.map {|delta| Git::Diff.new(delta, @parent.nil?, @repo) }
+      @diffs = diff.each_delta.map {|delta| Git::Diff.new(delta, @repo) }
       @diffs.each &block
     end
 
@@ -207,16 +207,11 @@ class ReaPack::Index
   end
 
   class Git::Diff
-    def initialize(delta, is_initial, repo)
+    def initialize(delta, repo)
       @delta, @repo = delta, repo
 
-      if is_initial
-        @status = :added
-        @file = delta.old_file
-      else
-        @status = delta.status.to_sym
-        @file = delta.new_file
-      end
+      @status = delta.status.to_sym
+      @file = delta.new_file
     end
 
     attr_reader :status
@@ -224,7 +219,7 @@ class ReaPack::Index
     def file
       @path ||= @file[:path].force_encoding(Encoding::UTF_8)
     end
-    
+
     def new_content
       return if status == :deleted
       @new_content ||=
@@ -232,7 +227,7 @@ class ReaPack::Index
     end
 
     def new_header
-      @new_header ||= MetaHeader.new @new_content if new_content
+      @new_header ||= ReaPack::Index.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', 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

@@ -9,8 +9,9 @@ class ReaPack::Index
     PLATFORMS = {
       all: nil,
       windows: :all, win32: :windows, win64: :windows,
-      darwin: :all, darwin32: :darwin, darwin64: :darwin,
+      darwin: :all, darwin32: :darwin, darwin64: :darwin, 'darwin-arm64': :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+'
@@ -20,18 +20,17 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3'
 
-  spec.add_development_dependency 'bundler', '~> 1.10'
-  spec.add_development_dependency 'coveralls', '~> 0.8'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'minitest', '~> 5.8'
-  spec.add_development_dependency 'rake', '~> 11.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'simplecov', '~> 0.11'
 
   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'
+  spec.add_runtime_dependency 'rugged', '~> 1.0'
   spec.add_runtime_dependency 'stable_sort', '~> 1.1'
 end

data/test/helper.rb

@@ -1,11 +1,7 @@
-require 'coveralls'
 require 'simplecov'
 
-Coveralls::Output.silent = true
-
 SimpleCov.formatters = [
   SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter,
 ]
 
 SimpleCov.start {

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/index/test_scan.rb

@@ -54,6 +54,36 @@ class TestIndex::Scan < MiniTest::Test
     assert_equal expected, File.read(index.path)
   end
 
+  def test_escape_path_uri
+    index = ReaPack::Index.new @dummy_path
+    index.files = ['Category/Hello World #1.lua']
+    index.url_template = 'http://host/$path'
+
+    index.scan index.files.first, '@version 1.0'
+
+    assert_equal true, index.modified?
+    assert_equal '1 new category, 1 new package, 1 new version', index.changelog
+
+    index.write!
+
+    assert_equal false, index.modified?
+
+    expected = <<-XML
+<?xml version="1.0" encoding="utf-8"?>
+<index version="1">
+  <category name="Category">
+    <reapack name="Hello World #1.lua" type="script">
+      <version name="1.0">
+        <source main="main">http://host/Category/Hello%20World%20%231.lua</source>
+      </version>
+    </reapack>
+  </category>
+</index>
+    XML
+
+    assert_equal expected, File.read(index.path)
+  end
+
   def test_package_in_root
     index = ReaPack::Index.new @dummy_path
     index.files = ['script.lua', 'Hello/World']

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

@@ -34,8 +34,8 @@ class TestProvides < MiniTest::Test
 
   def test_platforms
     assert_equal [:windows, :win32, :win64,
-                  :darwin, :darwin32, :darwin64,
-                  :linux, :linux32, :linux64],
+                  :darwin, :darwin32, :darwin64, :'darwin-arm64',
+                  :linux, :linux32, :linux64, :'linux-armv7l', :'linux-aarch64'],
       [
         '[windows] file',
         '[win32] file',
@@ -43,9 +43,12 @@ class TestProvides < MiniTest::Test
         '[Darwin]file',
         ' [ darwin32 ] file',
         '[win32 darwin64] file',
+        '[darwin-arm64] file',
         '[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.2rc1
+  version: 1.2.3
 platform: ruby
 authors:
 - cfillion
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-17 00:00:00.000000000 Z
+date: 2021-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +114,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
@@ -170,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: stable_sort
   requirement: !ruby/object:Gem::Requirement
@@ -192,16 +178,17 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-description: 
+description:
 email:
-- reapack-index@cfillion.tk
+- reapack-index@cfillion.ca
 executables:
 - reapack-index
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - COPYING
 - Gemfile
 - README.md
@@ -249,7 +236,7 @@ homepage: https://github.com/cfillion/reapack-index
 licenses:
 - GPL-3.0+
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -260,13 +247,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Package indexer for git-based ReaPack repositories
 test_files:

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-rvm:
-  - 2.4.0
-before_install:
-  - gem update bundler
-  - wget https://github.com/jgm/pandoc/releases/download/1.19.1/pandoc-1.19.1-1-amd64.deb -O pandoc.deb
-  - sudo dpkg -i pandoc.deb
-cache: bundler