reapack-index 1.1rc3 → 1.1rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d74129191d5d7a07762ebdab7f566c7cd885872
-  data.tar.gz: 54ed24d5a0674024502fafb3f0a498d0d3fac519
+  metadata.gz: 055dade2288572ca9c5ba6b088830910e4c02ba4
+  data.tar.gz: c0a47135f969d857dd62758411e24c3c55ee11b6
 SHA512:
-  metadata.gz: e8becc15eba83d516c6ef4a4a69f44987b162316af47352705c54ca496b45f824444d6a2731464b8afe97ec754fe89e296b3d766e6c8aa4f023eff48f5628050
-  data.tar.gz: db0ff137c68b50b83e69902946141149d133cdabd0b769ab0e4baa69b8c0af97a0cc3ba499d2d8a3676dd6959401c303a138e6f80da33d76a4a85ef3df2a7a3a
+  metadata.gz: b36c261cb78483239b8c7130f60ed1140e82b439ed3d7b63b37a70f829575cab3c4811384bfac35f6420e9102f27b620aba1baf512ad396d9c90675c59d11434
+  data.tar.gz: 76444bacda5d294b627caf9f53167675dd6980f1edb5ff4771f73db4c1438d51ed7ccaa906b9d90ce96ef09af2746ac7bd553678aada64190c9b375165944c91

data/lib/reapack/index/gem_version.rb

@@ -1,5 +1,5 @@
 module ReaPack
   class Index
-    VERSION = '1.1rc3'
+    VERSION = '1.1rc4'
   end
 end

data/lib/reapack/index/scanner.rb

@@ -157,7 +157,13 @@ class ReaPack::Index
             line.url_template ? expanded : file
 
           if file == @pkg.path
-            src.detect_sections @pkg if line.main.nil? && !metapackage?
+            if metapackage?
+              # the current file is still added as a source even if @metapackage
+              # is enabled but won't be added to the Action List unless specified
+            elsif line.main.nil?
+              # not a metapackage? then the current file is registered by default
+              src.detect_sections @pkg
+            end
           else
             if line.url_template
               src.file = file

data/lib/reapack/index/source.rb

@@ -55,8 +55,13 @@ class ReaPack::Index
       @sections = []
 
       if (@type || pkg.type) == :script
-        topdir = pkg.topdir.downcase
-        @sections << (topdir == 'midi editor' ? :midi_editor : :main)
+        @sections << \
+          case pkg.topdir.downcase
+          when 'midi editor'
+            :midi_editor
+          else
+            :main
+          end
       end
 
       @sections.freeze # force going through sections=() for validation

data/lib/reapack/index.rb

@@ -41,6 +41,9 @@ class ReaPack::Index
 
   FS_ROOT = File.expand_path('/').freeze
 
+  NAME_REGEX = /\A[^*\\:<>?\/|"[:cntrl:]]{4,24}\Z/.freeze
+  NAME_INVALID = /\A(:?[\.\x20].+|.+[\.\x20]|CLOCK\$|COM\d|LPT\d)\Z/i.freeze
+
   attr_reader :path, :url_template, :cdetector
   attr_accessor :amend, :commit, :files, :time, :strict
   attr_accessor :auto_bump_commit
@@ -223,7 +226,7 @@ class ReaPack::Index
   end
 
   def name=(newName)
-    if !/\A[^~#%&*{}\\:<>?\/+|"]+\Z/.match(newName) || /\A\.+\Z/.match(newName)
+    if !NAME_REGEX.match(newName) || NAME_INVALID.match(newName)
       raise Error, "invalid name '#{newName}'"
     end
 

data/reapack-index.gemspec

@@ -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.3beta4'
+  spec.add_runtime_dependency 'metaheader', '~> 1.3'
   spec.add_runtime_dependency 'nokogiri', '~> 1.6.8'
   spec.add_runtime_dependency 'pandoc-ruby', '~> 2.0'
   spec.add_runtime_dependency 'rugged', '~> 0.24'

data/setup/reapack-index.nsi

@@ -4,7 +4,7 @@ Unicode true
 !include Sections.nsh
 !include StrRep.nsh
 
-!define VERSION "1.1rc3"
+!define VERSION "1.1rc4"
 !define NAME "reapack-index ${VERSION}"
 !define LONG_VERSION "0.1.0.0"
 
@@ -13,7 +13,7 @@ Unicode true
 !define RUBYINSTALLER_URL \
   "http://dl.bintray.com/oneclick/rubyinstaller/${RUBYINSTALLER_FILE}"
 
-!define PANDOC_VERSION "1.17.2"
+!define PANDOC_VERSION "1.18"
 !define PANDOC_FILE "pandoc-${PANDOC_VERSION}-windows.msi"
 !define PANDOC_URL \
   "https://github.com/jgm/pandoc/releases/download/${PANDOC_VERSION}/${PANDOC_FILE}"

data/test/index/test_metadata.rb

@@ -95,10 +95,7 @@ class TestIndex::Metadata < MiniTest::Test
     index.name = 'Hello World'
     assert_equal '1 modified metadata, empty index', index.changelog
 
-    error = assert_raises ReaPack::Index::Error do index.name = '.'; end
-    assert_raises ReaPack::Index::Error do index.name = 'hello/world'; end
-    assert_equal "invalid name '.'", error.message
-
+    assert_raises ReaPack::Index::Error do index.name = '.'; end
     assert_equal 'Hello World', index.name
 
     expected = <<-XML
@@ -109,4 +106,44 @@ class TestIndex::Metadata < MiniTest::Test
     index.write!
     assert_equal expected, File.read(index.path)
   end
+
+  def test_name_valid
+    index = ReaPack::Index.new @dummy_path
+
+    [
+      '1234',
+      'hello world',
+      'hello_world',
+      'Новая папка',
+      'Hello ~World~',
+      'Repository #1',
+    ].each {|name| index.name = name }
+  end
+
+  def test_name_invalid
+    index = ReaPack::Index.new @dummy_path
+
+    [
+      '',
+      'ab/cd',
+      'ab\\cd',
+      '..',
+      '.',
+      '....',
+      '.hidden',
+      'trailing.',
+      '   leading',
+      'trailing   ',
+      "ctrl\0chars",
+
+      # Windows device names...
+      "CLOCK$",
+      "COM1",
+      "LPT2",
+      "lpt1",
+    ].each {|name|
+      error = assert_raises(ReaPack::Index::Error, name) do index.name = name end
+      assert_equal "invalid name '#{name}'", error.message
+    }
+  end
 end

data/test/index/test_provides.rb

@@ -332,11 +332,7 @@ class TestIndex::Provides < MiniTest::Test
   def test_main_self
     index = ReaPack::Index.new @dummy_path
     index.url_template = 'http://host/$path'
-    index.files = [
-      'Category/script.lua',
-      'Category/a.dat',
-      'Category/b.dat',
-    ]
+    index.files = ['Category/script.lua']
 
     index.scan index.files.first, <<-IN
       @version 1.0
@@ -346,4 +342,22 @@ class TestIndex::Provides < MiniTest::Test
     index.write!
     assert_match 'main="main"', File.read(index.path)
   end
+
+  def test_metapackage_override
+    index = ReaPack::Index.new @dummy_path
+    index.url_template = 'http://host/$path'
+    index.files = ['Category/script.lua']
+
+    index.scan index.files.first, <<-IN
+      @metapackage
+      @version 1.0
+      @provides .
+    IN
+
+    index.write!
+    contents = File.read index.path
+
+    refute_match 'main="main"', contents
+    assert_match '<source>http://host/Category/script.lua</source>', contents
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reapack-index
 version: !ruby/object:Gem::Version
-  version: 1.1rc3
+  version: 1.1rc4
 platform: ruby
 authors:
 - cfillion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3beta4
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3beta4
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement