revert renaming of noindex to index, remove @main and validate @metap…

…ackage
cfillion · May 20, 2016 · 5af06f4 · 5af06f4
1 parent e71e410
commit 5af06f4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 23 deletions.
diff --git a/lib/reapack/index.rb b/lib/reapack/index.rb
@@ -108,7 +108,7 @@ def scan(path, contents)
 
     mh = MetaHeader.new contents
 
-    if mh[:index] == false
+    if mh[:noindex]
       remove path
       return
     end

diff --git a/lib/reapack/index/scanner.rb b/lib/reapack/index/scanner.rb
@@ -17,8 +17,8 @@ class Scanner
       :author => [MetaHeader::VALUE, MetaHeader::SINGLELINE],
       :changelog => [MetaHeader::VALUE],
       :provides => [MetaHeader::VALUE, PROVIDES_VALIDATOR],
-      :index => [MetaHeader::BOOLEAN],
-      :main => [MetaHeader::BOOLEAN],
+      :noindex => [MetaHeader::BOOLEAN],
+      :metapackage => [MetaHeader::BOOLEAN],
     }.freeze
 
     WITH_MAIN = [:script, :effect].freeze
@@ -49,7 +49,7 @@ def run
 
           if @is_main && sources.none? {|src| src.file.nil? }
             # add the package itself as a main source
-            src = Source.new make_url(@pkg.path), @mh[:main, true]
+            src = Source.new make_url(@pkg.path), true
             sources.unshift src
 
             @cselector.push @pkg.type, src.platform, @pkg.path

diff --git a/test/data/noindex.lua b/test/data/noindex.lua
diff --git a/test/index/test_scan.rb b/test/index/test_scan.rb
@@ -150,7 +150,7 @@ def test_author
   def test_noindex
     index = ReaPack::Index.new @real_path
 
-    index.scan 'script.lua', '@index false'
+    index.scan 'script.lua', '@noindex'
 
     assert_equal false, index.modified?
   end
@@ -159,7 +159,7 @@ def test_noindex_autoremove
     index = ReaPack::Index.new @real_path
     index.commit = @commit
 
-    index.scan 'Category Name/Hello World.lua', '@index false'
+    index.scan 'Category Name/Hello World.lua', '@noindex'
 
     assert_equal true, index.modified?
     assert_equal '1 removed package', index.changelog
@@ -183,17 +183,6 @@ def test_metapackage
     assert_equal 'no files provided', error.message
   end
 
-  def test_nomain
-    index = ReaPack::Index.new @dummy_path
-    index.url_template = 'http://host/$path'
-    index.files = ['Category/script.lua', 'Category/test']
-
-    index.scan index.files.first, "@version 1.0\n@main false"
-    index.write!
-
-    refute_match 'main="true"', File.read(index.path)
-  end
-
   def test_version_time
     index = ReaPack::Index.new @dummy_path
     index.url_template = 'http://host/$path'

diff --git a/test/test_scanner.rb b/test/test_scanner.rb
@@ -177,15 +177,15 @@ def test_provides
     end
 
     def test_index
-      @mh[:index] = 'value'
+      @mh[:noindex] = 'value'
       error = assert_raises(ReaPack::Index::Error) { @scanner.run }
-      assert_equal "tag 'index' cannot have a value", error.message
+      assert_equal "tag 'noindex' cannot have a value", error.message
     end
 
-    def test_main
-      @mh[:main] = 'value'
+    def test_metapackage
+      @mh[:metapackage] = 'value'
       error = assert_raises(ReaPack::Index::Error) { @scanner.run }
-      assert_equal "tag 'main' cannot have a value", error.message
+      assert_equal "tag 'metapackage' cannot have a value", error.message
     end
   end
 end