reapack-index 1.1rc5 → 1.1rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 521e9cf95253116fdbdae336d5e103e412800a63
-  data.tar.gz: 0ba6258b623ec7dc4daefc2055ba8cd9e5a147a8
+  metadata.gz: 17df7d7c772845d36de713e8bb7c27cf496a017e
+  data.tar.gz: 68dac2cec218dc4c2377055ddf5416b8cf7dbf74
 SHA512:
-  metadata.gz: 0cbe24ed175822879c0dc9fff484b6311c7d3a53d4000d8ee7036d885184e85b448f8f953fb5ca5f50b872556cc826e2b521845166fca18637867d98f9dc5624
-  data.tar.gz: a747dc392326879db9980f449ac483d13b92d8a6d0de0e003f2b6242957cf23e718f24ea8cc4b9af68b6d5f55f20ffdc2e48770b95a504ae3543120e300adcc3
+  metadata.gz: 2865f37adea5f2e8c9a06357224971fcadc3c184adca8db2f11fe5ad06fdc46535f8ad9d3681ae971cab3be9c13b3a135ba608db33cdb5d9c3d699d34f069c0d
+  data.tar.gz: cfb214c725502628ddb19ce13746fdd3de9600ed0bbe309fa0e91605b0cf6603432dc83b7fcac93949b60cb10402b959feaa2dd191a858e3b388ed78c20d9029

data/.travis.yml

@@ -3,6 +3,6 @@ rvm:
   - 2.3.0
 before_install:
   - gem update bundler
-  - wget https://github.com/jgm/pandoc/releases/download/1.17.2/pandoc-1.17.2-1-amd64.deb -O pandoc.deb
+  - 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

data/lib/reapack/index.rb

@@ -37,7 +37,8 @@ class ReaPack::Index
     effect: %w{jsfx},
     data: %w{data},
     theme: %w{theme},
-    langpack: %w{ReaperLangPack},
+    langpack: %w{reaperlangpack},
+    webinterface: %w{www},
   }.freeze
 
   FS_ROOT = File.expand_path('/').freeze
@@ -57,10 +58,11 @@ class ReaPack::Index
     def type_of(path)
       # don't treat files in the root directory as packages
       # because they don't have a category
-      return if File.dirname(path) == '.'
 
-      ext = File.extname(path)[1..-1]
-      PKG_TYPES.find {|_, v| v.include? ext }&.first if ext
+      if File.dirname(path) != '.' && (ext = File.extname(path)[1..-1])
+        ext.downcase!
+        PKG_TYPES.find {|_, v| v.include? ext }&.first
+      end
     end
 
     alias :is_package? :type_of

data/lib/reapack/index/gem_version.rb

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

data/lib/reapack/index/scanner.rb

@@ -37,12 +37,13 @@ class ReaPack::Index
 
     HEADER_ALIASES = {
       [:reascript_name, :jsfx_name, :theme_name,
-        :extension_name, :desc, :name] => :description,
+        :extension_name, :langpack_name, :webinterface_name,
+        :desc, :name] => :description,
       [:links, :website] => :link,
       :screenshots => :screenshot,
     }.freeze
 
-    META_TYPES = [:extension, :data, :theme].freeze
+    META_TYPES = [:extension, :data, :theme, :webinterface].freeze
 
     def initialize(cat, pkg, mh, index)
       @cat, @pkg, @mh, @index = cat, pkg, mh, index

data/setup/reapack-index.nsi

@@ -4,16 +4,16 @@ Unicode true
 !include Sections.nsh
 !include StrRep.nsh
 
-!define VERSION "1.1rc5"
+!define VERSION "1.1rc6"
 !define NAME "reapack-index ${VERSION}"
 !define LONG_VERSION "0.1.0.0"
 
-!define RUBY_VERSION "2.3.1"
+!define RUBY_VERSION "2.3.3"
 !define RUBYINSTALLER_FILE "rubyinstaller-${RUBY_VERSION}.exe"
 !define RUBYINSTALLER_URL \
   "http://dl.bintray.com/oneclick/rubyinstaller/${RUBYINSTALLER_FILE}"
 
-!define PANDOC_VERSION "1.18"
+!define PANDOC_VERSION "1.19.1"
 !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_scan.rb

@@ -252,4 +252,31 @@ class TestIndex::Scan < MiniTest::Test
     index.write!
     assert_equal expected, File.read(index.path)
   end
+
+  def test_webinterface
+    index = ReaPack::Index.new @dummy_path
+    index.url_template = 'http://host/$path'
+    index.files = ['Web Interfaces/Test.www']
+
+    index.scan index.files.first, <<-IN
+    @version 1.0
+    @provides test.html http://host/test.html
+    IN
+
+    expected = <<-XML
+<?xml version="1.0" encoding="utf-8"?>
+<index version="1">
+  <category name="Web Interfaces">
+    <reapack name="Test.www" type="webinterface">
+      <version name="1.0">
+        <source file="test.html">http://host/test.html</source>
+      </version>
+    </reapack>
+  </category>
+</index>
+    XML
+
+    index.write!
+    assert_equal expected, File.read(index.path)
+  end
 end

data/test/test_cdetector.rb

@@ -162,7 +162,7 @@ class TestConflictDetector < MiniTest::Test
     cd['test'].clear
     cd['test'].push :grp, :all, 'file'
 
-    assert_equal nil, cd.resolve(:grp, 'test')
+     assert_nil cd.resolve(:grp, 'test')
   end
 
   def test_clone
@@ -185,7 +185,7 @@ class TestConflictDetector < MiniTest::Test
     cd.clear
     cd['test'].push :grp, :all, 'file'
 
-    assert_equal nil, cd.resolve(:grp, 'test')
+    assert_nil cd.resolve(:grp, 'test')
   end
 
   def test_load_xml

data/test/test_index.rb

@@ -9,10 +9,13 @@ class TestIndex < MiniTest::Test
   end
 
   def test_type_of
+    [
+      'src/main.cpp',
+      'src/noext',
+      'in_root',
+    ].each {|fn| assert_nil ReaPack::Index.type_of(fn) }
+
     {
-      'src/main.cpp'   => nil,
-      'src/noext'      => nil,
-      'in_root'        => nil,
       'Cat/test.lua'   => :script,
       'Cat/test.eel'   => :script,
       'Cat/test.py'    => :script,
@@ -20,7 +23,9 @@ class TestIndex < MiniTest::Test
       'Cat/test.jsfx'  => :effect,
       'Cat/test.data'  => :data,
       'Cat/test.theme' => :theme,
+      'Cat/test.reaperlangpack' => :langpack,
       'Cat/test.ReaperLangPack' => :langpack,
+      'Cat/test.www'   => :webinterface,
     }.each {|fn, type|
       actual = ReaPack::Index.type_of fn
       assert_equal type, actual,
@@ -30,19 +35,22 @@ class TestIndex < MiniTest::Test
   end
 
   def test_resolve_type
+    assert_nil ReaPack::Index.resolve_type('hello')
+
     {
-      'hello'     => nil,
-      :script     => :script,
-      'lua'       => :script,
-      'eel'       => :script,
-      'effect'    => :effect,
-      :jsfx       => :effect,
-      'jsfx'      => :effect,
-      'extension' => :extension,
-      'ext'       => :extension,
-      'data'      => :data,
-      'theme'     => :theme,
-      'langpack'  => :langpack,
+      :script        => :script,
+      'lua'          => :script,
+      'eel'          => :script,
+      'effect'       => :effect,
+      :jsfx          => :effect,
+      'jsfx'         => :effect,
+      'extension'    => :extension,
+      'ext'          => :extension,
+      'data'         => :data,
+      'theme'        => :theme,
+      'langpack'     => :langpack,
+      'www'          => :webinterface,
+      'webinterface' => :webinterface,
     }.each {|input, type|
       actual = ReaPack::Index.resolve_type input
       assert_equal type, actual,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reapack-index
 version: !ruby/object:Gem::Version
-  version: 1.1rc5
+  version: 1.1rc6
 platform: ruby
 authors:
 - cfillion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Package indexer for git-based ReaPack repositories