obf 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8faab78bba51edf2380fb7fd4f08e42a856befe4
-  data.tar.gz: 4ef8daa755a432f35b564106d4ad25adb37cf68e
+  metadata.gz: 8454639e83fc8b2def96962a5ba2e31791a362e5
+  data.tar.gz: 7e1abb111236636a50c09a0304810513ab4d30f2
 SHA512:
-  metadata.gz: 46fe4f02a7214a189b6cf83ba403b774c9dfb8370d4a175a8351aee9fade357c29bf121db6f12726343217822466e4882693352b24c879fc48776e0185cd4023
-  data.tar.gz: d5ad2444bfbdc5c941a28cae7c884e1f405ce10feda7852b9984a0a44b92992e18bb3beef61172fa8af43082978b48c858b539d578ee060a6bcaf20e29f6ebdf
+  metadata.gz: 288c13639fdf253583cc2c826c0d52cc9e57a21937207883c70618ca4f7837d23920169806811b3f6fcfd827335336a395290393810160648f91e079fe859411
+  data.tar.gz: 14418e8801345139b24dee027718e2a4ad6a9b11ab0112a8485b17f8e206dba3f5d75913a0a551f93de38018e0967aaa654685911081390b3ee1933617d7b3be

data/lib/obf/utils.rb

@@ -265,6 +265,10 @@ module OBF::Utils
     def glob(path)
       @zipfile.glob(path)
     end
+    
+    def all_files
+      @zipfile.entries.select{|e| e.file? }.map{|e| e.to_s }
+    end
 
     def read_as_data(path)
       attrs = {}

data/lib/obf/validator.rb

@@ -193,17 +193,54 @@ module OBF
                 end
               end
             end
-            add_check('manifest_boards', 'manifest.json referenced boards') do
-            end
             
-            add_check('manifest_images', 'manifest.json referenced images') do
+            found_paths = ['manifest.json']
+            if json['paths'] && json['paths']['boards'] && json['paths']['boards'].is_a?(Hash)
+              json['paths']['boards'].each do |id, path|
+                add_check("manifest_boards[#{id}]", "manifest.json path.boards.#{id}") do
+                  found_paths << path
+                  if !zipper.glob(path)
+                    err "board path (#{path}) not found in the zip package"
+                  end
+                  board_json = JSON.parse(zipper.read(path)) rescue nil
+                  if !board_json || board_json['id'] != id
+                    err "board at path (#{path}) defined in manifest with id \"#{id}\" but actually has id \"#{board_json['id']}\""
+                  end
+                end
+              end
             end
 
-            add_check('manifest_sounds', 'manifest.json referenced sounds') do
+            if json['paths'] && json['paths']['images'] && json['paths']['images'].id_a?(Hash)
+              json['paths']['images'].each do |id, path|
+                add_check("manifest_images[#{id}]", "manifest.json path.images.#{id}") do
+                  found_paths << path
+                  if !zipper.glob(path)
+                    err "image path (#{path}) not found in the zip package"
+                  end
+                end
+              end
+            end            
+
+            if json['paths'] && json['paths']['sounds'] && json['paths']['sounds'].id_a?(Hash)
+              json['paths']['sounds'].each do |id, path|
+                add_check("manifest_sounds[#{id}]", "manifest.json path.sounds.#{id}") do
+                  found_paths << path
+                  if !zipper.glob(path)
+                    err "sound path (#{path}) not found in the zip package"
+                  end
+                end
+              end
+            end
+            
+            actual_paths = zipper.all_files
+            add_check('extra_paths', 'manifest.json extra paths') do
+              (actual_paths - found_paths).each do |path|
+                warn "the file \"#{path}\" isn't listed in manifest.json"
+              end
             end
             
             sub_results = []
-            if json['paths']['boards'] && json['paths']['boards'].is_a?(Hash)
+            if json['paths'] && json['paths']['boards'] && json['paths']['boards'].is_a?(Hash)
               json['paths']['boards'].each do |key, path|
                 sub = Validator.validate_obf(path, {'zipper' => zipper})
                 sub_results << sub
@@ -211,6 +248,7 @@ module OBF
             end
             @sub_checks = sub_results
           end
+          
           if zipper.glob('manifest.json').length > 0
             json = JSON.parse(zipper.read('manifest.json')) rescue nil
             if json['root'] && json['format'] && json['format'].match(/^open-board-/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Brian Whitmer