Icarus-Mod-Tools 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe1b8b682bc6fad9f3f3e1ff5d59ce91c01d0b0bbc2829559d02de377b6aa2cd
-  data.tar.gz: a603939b3a22718bf4ade414b948b7e61a9e63fbe8fc2f6d91d5e19a44c8ab87
+  metadata.gz: 6b11076691550f236dbbe8cffc43ab3f4e87d0d6bc3796a05249586884df9af7
+  data.tar.gz: 7c0c0dbeee725796ebea01ea3b8f0d1fd11418fc92aaad54ceca055ef36c83f0
 SHA512:
-  metadata.gz: 5f6233e58dfcc6813490c722c815de710bebd68fc63d41183f3ee2ca50ed99b30ce17c0d126c53e87725716e94bd0a6df86ee115e3a469d24a4fe04988c08a4b
-  data.tar.gz: d6f40ff2935cd7d01db4a0b8e1c734c25ea3735e3dd090b3621e1f5c765abc6bdc60c964a43bb2f3c24c24452b37ab1e31adca786f5cc9d487699bfa1748f820
+  metadata.gz: bb68f166b13d2d62e696d880a7ce63da51a0d941fd00211a6c63df28109808ee85f390090dcbf0c5bad35f5905b79d05b902a4be72b3366cc31a96ee908cc9d7
+  data.tar.gz: 55e3a9b353561d231cc58f6081f06f98d0204b9229d1fe1f404b0516e2dbd8e37a82297bb0bd610a3e11afc6f5409020409f9d3aec524d26c44b90b3790abfc7

data/CHANGELOG.md

@@ -4,13 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## History (reverse chronological order)
 
-## [2.0.2](https://github.com/DonovanMods/icarus-mod-tools/compare/v2.0.1...v2.0.2) (2023-02-04)
+### v2.1 - 2023-02-11
 
-
-### Bug Fixes
-
-* Create fileType and fileURL along with files ([a5294a4](https://github.com/DonovanMods/icarus-mod-tools/commit/a5294a479bcc68f6e4125f5062db9a0dbd48bdf8))
-* Create fileType and fileURL along with files ([db5620f](https://github.com/DonovanMods/icarus-mod-tools/commit/db5620fafefd750196d6470f00e4000971adae1f))
+- Remove support for `fileType` and `fileURL` in `modinfo.json` files
+- bugfixes
 
 ### v2.0 - 2023-02-03
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    Icarus-Mod-Tools (2.1.1)
+    Icarus-Mod-Tools (2.1.2)
       google-cloud-firestore (~> 2.7)
       octokit (~> 6.0)
       paint (~> 2.3)

data/lib/icarus/mod/tools/baseinfo.rb

@@ -75,14 +75,12 @@ module Icarus
           return true if @validated
 
           validate_version
-          validate_files if @data.key?(:files)
-          validate_filetype(fileType) if @data.key?(:fileType)
 
           %w[name author description].each do |key|
             @errors << "#{key.capitalize} cannot be blank" unless validate_string(@data[key.to_sym])
           end
 
-          %w[fileURL imageURL readmeURL].each do |key|
+          %w[imageURL readmeURL].each do |key|
             @errors << "Invalid URL #{key.capitalize}: #{@data[key.to_sym] || "blank"}" unless validate_url(@data[key.to_sym])
           end
 
@@ -128,8 +126,8 @@ module Icarus
         end
 
         def validate_files
-          @errors << "This mod uses deprecated fields (fileType and fileURL)" if @data.key?(:file_type) || @data.key?(:file_url)
-          @errors << "files cannot be blank" if @data.key?(:files) && @data[:files].keys.empty?
+          @warnings << "This mod uses deprecated fields (fileType and fileURL)" if @data.key?(:fileType) || @data.key?(:fileURL)
+          @warnings << "files should not be empty" if file_types.empty?
 
           file_types.each { |file_type| validate_filetype(file_type) }
 

data/lib/icarus/mod/tools/modinfo.rb

@@ -14,19 +14,13 @@ module Icarus
           db_hash
         end
 
-        def file_types
-          files&.keys || [@data[:fileType] || "pak"]
-        end
+        def validate
+          return true if @validated
 
-        def file_urls
-          files&.values || [@data[:fileURL]].compact
-        end
+          validate_files
 
-        # rubocop:disable Naming/MethodName
-        def fileType
-          @data[:fileType] || "pak"
+          super
         end
-        # rubocop:enable Naming/MethodName
       end
     end
   end

data/lib/icarus/mod/tools/toolinfo.rb

@@ -24,6 +24,15 @@ module Icarus
         def filetype_pattern
           /(zip|exe)/i
         end
+
+        def validate
+          return true if @validated
+
+          validate_filetype(fileType)
+          @errors << "Invalid fileURL: #{@data[:fileURL] || "blank"}" unless validate_url(fileURL)
+
+          super
+        end
       end
     end
   end

data/lib/icarus/mod/version.rb

@@ -2,6 +2,6 @@
 
 module Icarus
   module Mod
-    VERSION = "2.1.1"
+    VERSION = "2.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Icarus-Mod-Tools
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Donovan Young