reapack-index 1.1rc6 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17df7d7c772845d36de713e8bb7c27cf496a017e
-  data.tar.gz: 68dac2cec218dc4c2377055ddf5416b8cf7dbf74
+  metadata.gz: dd904ac44e1103ecec541683a97a3a4cce44fa32
+  data.tar.gz: 5c0bcfb7ca38662c267993920846a6bdf270580f
 SHA512:
-  metadata.gz: 2865f37adea5f2e8c9a06357224971fcadc3c184adca8db2f11fe5ad06fdc46535f8ad9d3681ae971cab3be9c13b3a135ba608db33cdb5d9c3d699d34f069c0d
-  data.tar.gz: cfb214c725502628ddb19ce13746fdd3de9600ed0bbe309fa0e91605b0cf6603432dc83b7fcac93949b60cb10402b959feaa2dd191a858e3b388ed78c20d9029
+  metadata.gz: 07e3ffd47e2b8ea8dcbbba7ec78178ed2144f07c26b93b867b90f587ba0cc3b6550d02931ee426878d55b8d32fa4b066ddb596ecf4012a2e6d287a52be943ecd
+  data.tar.gz: 9cf9cae21b26317a80b70ee11f7e9aa5a17de84be34901263279b611ff9939164e076c4e1e20cd1d9b8fe09f2143136c2e003957dfcd760a63b707e57ac0fc54

data/.gitignore

@@ -1,4 +1,4 @@
-coverage/
-doc/
-pkg/
-Gemfile.lock
+/coverage/
+/doc/
+/pkg/
+/Gemfile.lock

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.3.0
+  - 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

data/Rakefile

@@ -1,7 +1,8 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rake/testtask'
 
-task :default => [:test]
+task default: :test
+
 Rake::TestTask.new do |t|
   t.test_files = FileList['test/**/test_*.rb']
   t.warning = false

data/lib/reapack/index/cli.rb

@@ -345,7 +345,7 @@ private
 
   def indent(input)
     output = String.new
-    input.lines {|l| output += "\x20\x20#{l}" }
+    input.each_line {|l| output += "\x20\x20#{l}" }
     output
   end
 end

data/lib/reapack/index/gem_version.rb

@@ -1,6 +1,6 @@
 module ReaPack
   class Index
     # bump in setup/reapack-index.nsi too
-    VERSION = '1.1rc6'
+    VERSION = '1.1'
   end
 end

data/lib/reapack/index/git.rb

@@ -27,9 +27,8 @@ class ReaPack::Index
 
       walker = Rugged::Walker.new @repo
       walker.sorting Rugged::SORT_TOPO | Rugged::SORT_REVERSE
-      walker.push @repo.head.target_id
-
       walker.hide sha if fetch_commit sha
+      walker.push @repo.head.target_id
 
       walker.map {|c| Commit.new c, @repo }
     end
@@ -104,7 +103,7 @@ class ReaPack::Index
         end
       }
 
-      hash = Rugged::Commit.create @repo, \
+      hash = Rugged::Commit.create @repo,
         tree: new_index.write_tree(@repo),
         message: message,
         parents: [target].compact,
@@ -163,7 +162,7 @@ class ReaPack::Index
     end
 
     def summary
-      message.lines.first.chomp
+      @commit.summary
     end
 
     def time

data/lib/reapack/index/package.rb

@@ -80,9 +80,10 @@ class ReaPack::Index
         ver = @versions[name]
       else
         @versions.each_key {|other|
-          normalized = [other.dup, name.dup].each {|ver|
-            ver.gsub! /(?<![\d\w])0+/, ''
-            ver.gsub! /[^\d\w]+/, '.'
+          normalized = [other, name].map {|ver|
+            ver.scan(/(\d+)|([a-zA-Z]+)/).map {|match|
+              match.first ? match.first.to_i : match.last
+            }.join '.'
           }
 
           if normalized.uniq.size < 2

data/lib/reapack/index/scanner.rb

@@ -195,7 +195,7 @@ class ReaPack::Index
       tag ||= type
 
       @pkg.metadata.replace_links type do
-        @mh[tag].to_s.lines {|line|
+        @mh[tag].to_s.each_line {|line|
           line.strip!
           @pkg.metadata.push_link type, *Link.split(line) unless line.empty?
         }

data/lib/reapack/index/source.rb

@@ -55,7 +55,7 @@ class ReaPack::Index
       @sections = []
 
       if (@type || pkg.type) == :script
-        @sections << \
+        @sections <<
           case pkg.topdir.downcase
           when 'midi editor'
             :midi_editor

data/reapack-index.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   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 'nokogiri', '~> 1.6.8'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.7'
   spec.add_runtime_dependency 'pandoc-ruby', '~> 2.0'
-  spec.add_runtime_dependency 'rugged', '~> 0.24'
+  spec.add_runtime_dependency 'rugged', '~> 0.25'
   spec.add_runtime_dependency 'stable_sort', '~> 1.1'
 end

data/setup/reapack-index.nsi

@@ -4,7 +4,7 @@ Unicode true
 !include Sections.nsh
 !include StrRep.nsh
 
-!define VERSION "1.1rc6"
+!define VERSION "1.1"
 !define NAME "reapack-index ${VERSION}"
 !define LONG_VERSION "0.1.0.0"
 
@@ -18,10 +18,10 @@ Unicode true
 !define PANDOC_URL \
   "https://github.com/jgm/pandoc/releases/download/${PANDOC_VERSION}/${PANDOC_FILE}"
 
-!define RUGGED_VERSION "0.24.0"
+!define RUGGED_VERSION "0.25.1"
 !define RUGGED_FILE "rugged-${RUGGED_VERSION}-%PLATFORM%.gem"
 !define RUGGED_URL \
-  "https://github.com/cfillion/reapack-index/releases/download/v1.0beta4/${RUGGED_FILE}"
+  "https://github.com/cfillion/reapack-index/releases/download/v1.1/${RUGGED_FILE}"
 
 Name "${NAME}"
 OutFile "reapack-index-${VERSION}.exe"
@@ -35,7 +35,7 @@ VIAddVersionKey "ProductName" "${NAME}"
 VIAddVersionKey "ProductVersion" "${LONG_VERSION}"
 VIAddVersionKey "FileDescription" "${NAME} Setup"
 VIAddVersionKey "FileVersion" "${LONG_VERSION}"
-VIAddVersionKey "LegalCopyright" "Copyright (C) 2015-2016  Christian Fillion"
+VIAddVersionKey "LegalCopyright" "Copyright (C) 2015-2017  Christian Fillion"
 
 !define ABORT_MSG "Installation aborted."
 

data/test/test_git.rb

@@ -75,8 +75,8 @@ class TestGit < MiniTest::Test
   end
 
   def test_commit_info
-    commit = @git.create_commit "initial commit\ndescription", [mkfile('file')]
-    assert_equal "initial commit\ndescription", commit.message
+    commit = @git.create_commit "initial commit\n\ndescription", [mkfile('file')]
+    assert_equal "initial commit\n\ndescription", commit.message
     assert_equal 'initial commit', commit.summary
 
     assert commit.id.start_with?(commit.short_id)

data/test/test_package.rb

@@ -135,6 +135,20 @@ class TestPackage < MiniTest::Test
       pkg.version '1//1'
     end
     assert_equal 'version 1//1 is a duplicate of version 1.01', error.message
+
+    pkg.version '1.0.1' # should not be mistaken for 1.1
+    error = assert_raises ReaPack::Index::Error do
+      pkg.version '1.000.1'
+    end
+    assert_equal 'version 1.000.1 is a duplicate of version 1.0.1', error.message
+
+    pkg.version '01pre1'
+    error = assert_raises ReaPack::Index::Error do
+      pkg.version '1.pre01'
+    end
+    assert_equal 'version 1.pre01 is a duplicate of version 01pre1', error.message
+
+    pkg.version '1PRE1' # not the same as 01pre1
   end
 
   def test_category_and_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reapack-index
 version: !ruby/object:Gem::Version
-  version: 1.1rc6
+  version: '1.1'
 platform: ruby
 authors:
 - cfillion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: pandoc-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
 - !ruby/object:Gem::Dependency
   name: stable_sort
   requirement: !ruby/object:Gem::Requirement
@@ -263,12 +263,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.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Package indexer for git-based ReaPack repositories