reapack-index 1.1rc2 → 1.1rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45a5d393aea0b960659f4bb459bf40adfb0abc0c
-  data.tar.gz: 5f3955b073c091771b71383f1ce9fcb679593950
+  metadata.gz: 6d74129191d5d7a07762ebdab7f566c7cd885872
+  data.tar.gz: 54ed24d5a0674024502fafb3f0a498d0d3fac519
 SHA512:
-  metadata.gz: 34198f4f8e78724ae0036a4c7c1b421530c88f10446a0d60f6cc057fca43e12c80713874b95e57010e24b1a850c3f0bd7da0a2ccc504ca7d8ebf7aea90c97e12
-  data.tar.gz: a68176f901401b24fab087eae9e0507fc9fd9dccf8eebb479d2c482503a7621c15c7443c58ed5cc8ab5b3b6daad9fab2f3342d283308ce54b7c57a200ffda181
+  metadata.gz: e8becc15eba83d516c6ef4a4a69f44987b162316af47352705c54ca496b45f824444d6a2731464b8afe97ec754fe89e296b3d766e6c8aa4f023eff48f5628050
+  data.tar.gz: db0ff137c68b50b83e69902946141149d133cdabd0b769ab0e4baa69b8c0af97a0cc3ba499d2d8a3676dd6959401c303a138e6f80da33d76a4a85ef3df2a7a3a

data/lib/reapack/index/gem_version.rb

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

data/lib/reapack/index/package.rb

@@ -8,6 +8,8 @@ class ReaPack::Index
 
     TYPE_ATTR = 'type'.freeze
     DESC_ATTR = 'desc'.freeze
+    DIR_SEPARATOR = Regexp.union(
+      *[File::SEPARATOR, File::ALT_SEPARATOR].compact).freeze
 
     def initialize(node)
       super
@@ -24,6 +26,10 @@ class ReaPack::Index
       @node.parent[NAME_ATTR]
     end
 
+    def topdir
+      category&.split(DIR_SEPARATOR)&.first
+    end
+
     def path
       @path ||= File.join category, name if category && name
     end

data/lib/reapack/index/provides.rb

@@ -28,7 +28,7 @@ class ReaPack::Index
 
         instance = self.new pattern, url_tpl
 
-        options and options.split(',').each {|user_opt|
+        options and options.split("\x20").each {|user_opt|
           user_opt.strip!
           next if user_opt.empty?
 
@@ -38,8 +38,14 @@ class ReaPack::Index
             instance.platform = opt.to_sym
           elsif type = ReaPack::Index.resolve_type(opt)
             instance.type = type
-          elsif opt =~ /\A(no)?main\Z/
-            instance.main = !$1
+          elsif opt =~ /\A(nomain)|main(?:=(.+))?\Z/
+            if $1 # nomain
+              instance.main = false
+            elsif $2 # explicit sections
+              instance.main = $2.split(',').reject(&:empty?).map {|s| s.to_sym }
+            else # implicit sections
+              instance.main = true
+            end
           else
             raise Error, "unknown option '#{user_opt}'"
           end

data/lib/reapack/index/scanner.rb

@@ -78,7 +78,8 @@ class ReaPack::Index
 
           if !metapackage? && sources.none? {|src| src.file.nil? }
             # add the package itself as a main source
-            src = Source.new make_url(@pkg.path), true
+            src = Source.new make_url(@pkg.path)
+            src.detect_sections @pkg
             sources.unshift src
 
             @cselector.push @pkg.type, src.platform, @pkg.path
@@ -141,15 +142,22 @@ class ReaPack::Index
         end
 
         files.map {|file|
-          src = Source.new make_url(file, line.url_template), line.main?
+          src = Source.new make_url(file, line.url_template)
           src.platform = line.platform
           src.type = line.type
 
+          case line.main?
+          when true
+            src.detect_sections @pkg
+          when Array
+            src.sections = line.main?
+          end
+
           @cselector.push src.type || @pkg.type, src.platform,
             line.url_template ? expanded : file
 
           if file == @pkg.path
-            src.main = !metapackage? if line.main.nil?
+            src.detect_sections @pkg if line.main.nil? && !metapackage?
           else
             if line.url_template
               src.file = file

data/lib/reapack/index/source.rb

@@ -12,23 +12,24 @@ class ReaPack::Index
       darwin: :all, darwin32: :darwin, darwin64: :darwin,
     }.freeze
 
+    SECTIONS = [
+      :main, :midi_editor
+    ].freeze
+
     class << self
       def is_platform?(input)
         PLATFORMS.has_key? input&.to_sym
       end
     end
 
-    def initialize(url, main = false)
+    def initialize(url)
       @url = url
-      @main = main
+      @sections = []
       @platform = :all
     end
 
-    attr_reader :platform, :type
+    attr_reader :platform, :type, :sections
     attr_accessor :file, :url
-    attr_writer :main
-
-    def main?; @main; end
 
     def platform=(new_platform)
       new_platform ||= :all
@@ -50,9 +51,30 @@ class ReaPack::Index
       @type = new_type.to_sym
     end
 
+    def detect_sections(pkg)
+      @sections = []
+
+      if (@type || pkg.type) == :script
+        topdir = pkg.topdir.downcase
+        @sections << (topdir == 'midi editor' ? :midi_editor : :main)
+      end
+
+      @sections.freeze # force going through sections=() for validation
+    end
+
+    def sections=(new_sections)
+      new_sections.each {|s|
+        unless SECTIONS.include? s
+          raise Error, "invalid Action List section '#{s}'"
+        end
+      }
+
+      @sections = new_sections.sort {|s| SECTIONS.index s }.freeze
+    end
+
     def make_node(parent)
       @node = Nokogiri::XML::Node.new TAG, parent.document
-      @node[MAIN] = true if @main
+      @node[MAIN] = @sections.join "\x20" unless @sections.empty?
       @node[PLATFORM] = @platform if @platform != :all
       @node[TYPE] = @type if @type
       @node[FILE] = @file if @file

data/setup/reapack-index.nsi

@@ -4,7 +4,7 @@ Unicode true
 !include Sections.nsh
 !include StrRep.nsh
 
-!define VERSION "1.1rc2"
+!define VERSION "1.1rc3"
 !define NAME "reapack-index ${VERSION}"
 !define LONG_VERSION "0.1.0.0"
 

data/test/index/test_provides.rb

@@ -28,7 +28,7 @@ class TestIndex::Provides < MiniTest::Test
   <category name="Category">
     <reapack name="script.lua" type="script">
       <version name="1.0">
-        <source main="true">http://host/Category/script.lua?Category/script.lua</source>
+        <source main="main">http://host/Category/script.lua?Category/script.lua</source>
         <source platform="windows" file="../Resources/unicode.dat">http://host/Resources/unicode.dat?Category/script.lua</source>
         <source file="test.png">http://host/Category/test.png?Category/script.lua</source>
       </version>
@@ -75,8 +75,8 @@ class TestIndex::Provides < MiniTest::Test
   <category name="Category">
     <reapack name="script.lua" type="script">
       <version name="1.0">
-        <source main="true" platform="darwin">http://host/Category/script.lua</source>
-        <source main="true" platform="win64">http://host/Category/script.lua</source>
+        <source main="main" platform="darwin">http://host/Category/script.lua</source>
+        <source main="main" platform="win64">http://host/Category/script.lua</source>
       </version>
     </reapack>
   </category>
@@ -142,7 +142,7 @@ class TestIndex::Provides < MiniTest::Test
   <category name="Category">
     <reapack name="script.lua" type="script">
       <version name="1.0">
-        <source main="true">http://host/Category/script.lua</source>
+        <source main="main">http://host/Category/script.lua</source>
         <source platform="windows" file="Data/a.dat">http://host/Category/Data/a.dat</source>
         <source platform="windows" file="Data/b.dat">http://host/Category/Data/b.dat</source>
         <source file="test.txt">http://host/Category/test.txt</source>
@@ -297,6 +297,7 @@ class TestIndex::Provides < MiniTest::Test
       'Category/script.lua',
       'Category/a.dat',
       'Category/b.dat',
+      'Category/c.dat',
     ]
 
     index.scan index.files.first, <<-IN
@@ -305,6 +306,7 @@ class TestIndex::Provides < MiniTest::Test
         [main] a.dat
         [nomain] .
         [nomain] b.dat
+        [main=midi_editor] c.dat
     IN
 
     expected = <<-XML
@@ -313,9 +315,10 @@ class TestIndex::Provides < MiniTest::Test
   <category name="Category">
     <reapack name="script.lua" type="script">
       <version name="1.0">
-        <source main="true" file="a.dat">http://host/Category/a.dat</source>
+        <source main="main" file="a.dat">http://host/Category/a.dat</source>
         <source>http://host/Category/script.lua</source>
         <source file="b.dat">http://host/Category/b.dat</source>
+        <source main="midi_editor" file="c.dat">http://host/Category/c.dat</source>
       </version>
     </reapack>
   </category>
@@ -341,6 +344,6 @@ class TestIndex::Provides < MiniTest::Test
     IN
 
     index.write!
-    assert_match 'main="true"', File.read(index.path)
+    assert_match 'main="main"', File.read(index.path)
   end
 end

data/test/index/test_scan.rb

@@ -44,7 +44,7 @@ class TestIndex::Scan < MiniTest::Test
     <reapack name="Instrument Track.lua" type="script">
       <version name="1.0">
         <changelog><![CDATA[Hello World]]></changelog>
-        <source main="true">http://host/Category/Path/Instrument%20Track.lua</source>
+        <source main="main">http://host/Category/Path/Instrument%20Track.lua</source>
       </version>
     </reapack>
   </category>
@@ -165,7 +165,7 @@ class TestIndex::Scan < MiniTest::Test
   <category name="Dynamics">
     <reapack name="super_compressor.jsfx" type="effect">
       <version name="1.0">
-        <source main="true">http://host/Dynamics/super_compressor.jsfx</source>
+        <source>http://host/Dynamics/super_compressor.jsfx</source>
       </version>
     </reapack>
   </category>

data/test/test_package.rb

@@ -141,11 +141,13 @@ class TestPackage < MiniTest::Test
     pkg1 = ReaPack::Index::Package.new make_node('<reapack/>')
     assert_nil pkg1.category
     assert_nil pkg1.path
+    assert_nil pkg1.topdir
 
     pkg2 = ReaPack::Index::Package.create 'test',
       make_node('<category name="Hello/World"/>')
 
     assert_equal 'Hello/World', pkg2.category
     assert_equal 'Hello/World/test', pkg2.path
+    assert_equal 'Hello', pkg2.topdir
   end
 end

data/test/test_provides.rb

@@ -40,7 +40,7 @@ class TestProvides < MiniTest::Test
         '[win64] file',
         '[Darwin]file',
         ' [ darwin32 ] file',
-        '[win32, darwin64] file',
+        '[win32 darwin64] file',
       ].map {|l| ReaPack::Index::Provides.parse(l).platform }
   end
 
@@ -48,20 +48,21 @@ class TestProvides < MiniTest::Test
     assert_equal [:script, :data, nil, nil],
       vals = [
         '[script] file',
-        '[windows,Data] file',
+        '[windows Data] file',
         '[windows] file',
-        '[,windows,,] file',
+        '[ windows  ] file',
       ].map {|l| ReaPack::Index::Provides.parse(l).type }
 
   end
 
   def test_main
-    assert_equal [true, false, nil, false],
+    assert_equal [true, false, nil, false, [:main, :midi_editor, :abc]],
       [
         '[main] file',
         '[nomain] file',
         'file',
-        '[main, nomain] file',
+        '[main nomain] file',
+        '[main=main,midi_editor,,abc] file',
       ].map {|l| ReaPack::Index::Provides.parse(l).main? }
   end
 
@@ -69,7 +70,7 @@ class TestProvides < MiniTest::Test
     assert_equal ["unknown option 'HeLlO'", "unknown option 'Test'"],
       [
         '[HeLlO] file',
-        '[, Test] file',
+        '[  Test] file',
       ].map {|l|
         assert_raises ReaPack::Index::Error do
           ReaPack::Index::Provides.parse l

data/test/test_source.rb

@@ -135,22 +135,60 @@ class TestSource < MiniTest::Test
     before = make_node '<version name="1.0"/>'
     after = <<-XML
 <version name="1.0">
-  <source main="true">http://host/</source>
+  <source main="main midi_editor">http://host/</source>
 </version>
     XML
 
-    assert_equal true, ReaPack::Index::Source.new('http://host/', true).main?
-
     src = ReaPack::Index::Source.new 'http://host/'
-    assert_equal false, src.main?
-    src.main = true
-    assert_equal true, src.main?
+    assert_empty src.sections
+    src.sections = [:midi_editor, :main]
+    assert_equal [:main, :midi_editor], src.sections
+
+    assert_raises ReaPack::Index::Error do
+      src.sections = [:abc]
+    end
 
     src.make_node before
 
     assert_equal after.chomp, before.to_s
   end
 
+  def test_auto_main_pkg_type
+    pkg = MiniTest::Mock.new
+    pkg.expect :type, :script
+    pkg.expect :topdir, 'Category'
+
+    src = ReaPack::Index::Source.new 'http://host/'
+    src.detect_sections pkg
+    assert_equal [:main], src.sections
+
+    pkg.verify
+  end
+
+  def test_auto_main_type_override
+    pkg = MiniTest::Mock.new
+    pkg.expect :topdir, 'Category'
+
+    src = ReaPack::Index::Source.new 'http://host/'
+    src.type = :script
+    src.detect_sections pkg
+    assert_equal [:main], src.sections
+
+    pkg.verify
+  end
+
+  def test_auto_main_midi_editor
+    pkg = MiniTest::Mock.new
+    pkg.expect :type, :script
+    pkg.expect :topdir, 'MIDI Editor'
+
+    src = ReaPack::Index::Source.new 'http://host/'
+    src.detect_sections pkg
+    assert_equal [:midi_editor], src.sections
+
+    pkg.verify
+  end
+
   def test_is_platform
     assert_equal [false, true, true, false],
       [nil, :windows, 'windows', :atari].map {|p|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reapack-index
 version: !ruby/object:Gem::Version
-  version: 1.1rc2
+  version: 1.1rc3
 platform: ruby
 authors:
 - cfillion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler