Icarus-Mod-Tools 1.9.0 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fba522a3f41d8d1c77402e95f59684594bb7be97a8227966e4b647777152f05
-  data.tar.gz: 933ee795c5f13f964e1a866c0ce06549912c6e99c06c78fd687e5c25886bf148
+  metadata.gz: aba02b8c9f3f8a95dfaff8dc2a13914d9ec71153da336e2dc2ab954d6e5d6560
+  data.tar.gz: aad3f90f121957a893282dfc91cd424e21ecdbb155ecde1135f35644f86e8a3d
 SHA512:
-  metadata.gz: 0cd6a08a77be86801059b2b63a81fb662583ca404391afa2fd9544dbda8549e0652ce4c7db9a5ff64edb04afd07b50b742e1473861639ea190eddd22dda70f03
-  data.tar.gz: 1f28bff449d31ea47fa9166586dd10b996c466ed898ff53449a2cfd84fff98a5454418214fa479fa9976c0700ca88b12724c8b1f166b059093658d32862ee938
+  metadata.gz: 54dd466afe7f4f01a2deb0999752cc298ee52a2b1f4da0e1abf26c82677ecabf1a9f293765dc081d6f5c5e05ea017c57da1cbf9ac114a287df922c8ab40ba696
+  data.tar.gz: b6f4a7bf87a62d190928cbf42ca57864c8651a2f7e353869e6221364f7f3e2c7ce59e51b69818636afe99c1ada9dfdbde4dcc29a43981b6caeab913856d1a779

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    Icarus-Mod-Tools (1.9.0)
+    Icarus-Mod-Tools (2.0)
       google-cloud-firestore (~> 2.7)
       octokit (~> 6.0)
       paint (~> 2.3)
@@ -86,7 +86,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     json (2.6.3)
-    jwt (2.6.0)
+    jwt (2.7.0)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)

data/lib/icarus/mod/cli/add.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "firestore"
+require "tools/modinfo"
 
 module Icarus
   module Mod
@@ -30,6 +31,29 @@ module Icarus
 
           puts firestore.update(:repositories, payload, merge: true) ? "Success" : "Failure"
         end
+
+        desc "mod", "Adds an entry to 'mods'"
+        method_option :modinfo, type: :string, required: true, default: "modinfo.json", desc: "Path to the modinfo.json file"
+        def mod
+          firestore = Firestore.new
+          data = options[:modinfo]
+
+          if data.nil? || !File.exist?(data)
+            warn "Invalid data file: #{data}"
+            exit 1
+          end
+
+          JSON.parse(File.read(data), symbolize_names: true)[:mods].each do |mod|
+            modinfo = Icarus::Mod::Tools::Modinfo.new(mod)
+
+            unless modinfo.valid?
+              warn "Invalid modinfo: #{modinfo.errors}"
+              exit 1
+            end
+
+            puts firestore.update(:mod, modinfo, merge: true) ? "Success" : "Failure"
+          end
+        end
       end
     end
   end

data/lib/icarus/mod/cli/sync.rb

@@ -85,6 +85,8 @@ module Icarus
           def sync_list(type)
             sync = (type == :mods ? Icarus::Mod::Tools::Sync::Mods : Icarus::Mod::Tools::Sync::Tools).new(client: firestore)
 
+            puts "Syncing #{type} to #{Config.firebase.collections.send(type)}" if verbose > 1
+
             puts "Retrieving Info Data..." if verbose?
             info_array = sync.info_array
 

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

@@ -7,7 +7,7 @@ module Icarus
       class Baseinfo
         attr_reader :data, :id, :created_at, :updated_at
 
-        HASHKEYS = %i[name author version compatibility description fileType fileURL imageURL readmeURL].freeze
+        HASHKEYS = %i[name author version compatibility description files imageURL readmeURL].freeze
 
         def initialize(data, id: nil, created: nil, updated: nil)
           @id = id
@@ -52,14 +52,14 @@ module Icarus
         end
 
         def valid?
-          @warnings << "Version should be a version string" unless validate_version(version)
+          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
 
-          @errors << "Invalid fileType: #{fileType || "blank"}" unless validate_filetype(fileType)
-
           %w[fileURL imageURL readmeURL].each do |key|
             @errors << "Invalid URL #{key.capitalize}: #{@data[key.to_sym] || "blank"}" unless validate_url(@data[key.to_sym])
           end
@@ -67,12 +67,20 @@ module Icarus
           !errors?
         end
 
+        def file_types
+          files&.keys || []
+        end
+
+        def file_urls
+          files&.values || []
+        end
+
         def method_missing(method_name, *_args, &_block)
-          @data[method_name.to_sym]&.strip
+          @data[method_name.to_sym] if @data.keys.include?(method_name.to_sym)
         end
 
         def respond_to_missing?(method_name, include_private = false)
-          HASHKEYS.include?(method_name.to_sym) || super
+          @data.keys.include?(method_name.to_sym) || super
         end
 
         private
@@ -81,22 +89,32 @@ module Icarus
           /(zip|pak|exmodz?)/i
         end
 
+        def validate_string(string)
+          !(string.nil? || string.empty?)
+        end
+
         def validate_url(url)
           return true if url.nil? || url.empty?
 
           url =~ URI::DEFAULT_PARSER.make_regexp
         end
 
-        def validate_filetype(filetype)
-          filetype.match?(filetype_pattern)
+        def validate_files
+          @errors << "files cannot be blank" if @data.key?(:files) && @data[:files].keys.empty?
+
+          file_types.each { |file_type| validate_filetype(file_type) }
+
+          file_urls.each do |file_url|
+            @errors << "Invalid URL: #{file_url}" unless validate_url(file_url)
+          end
         end
 
-        def validate_string(string)
-          !(string.nil? || string.empty?)
+        def validate_filetype(file_type)
+          @errors << "Invalid fileType: #{file_type.upcase}" unless file_type&.match?(filetype_pattern)
         end
 
-        def validate_version(version)
-          version =~ /\d+\.\d+[.\d+]?/
+        def validate_version
+          @warnings << "Version should be a version string" unless version =~ /^\d+[.\d+]*/
         end
       end
     end

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

@@ -7,7 +7,25 @@ module Icarus
     module Tools
       # Sync methods
       class Modinfo < Baseinfo
-        HASHKEYS = %i[name author version compatibility description long_description fileType fileURL imageURL readmeURL].freeze
+        HASHKEYS = %i[name author version compatibility description long_description files fileType fileURL imageURL readmeURL].freeze
+
+        def to_h
+          HASHKEYS.each_with_object({}) do |key, hash|
+            next if key == :files && @data[:files].nil?
+            next if %i[fileType fileURL].include?(key.to_sym) && !@data[:files].nil?
+            next if key == :long_description && @data[:long_description].nil?
+
+            hash[key] = @data[key]
+          end
+        end
+
+        def file_types
+          files&.keys || [@data[:fileType] || "pak"]
+        end
+
+        def file_urls
+          files&.values || [@data[:fileURL]].compact
+        end
 
         # rubocop:disable Naming/MethodName
         def fileType

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

@@ -7,6 +7,8 @@ module Icarus
     module Tools
       # Sync methods
       class Toolinfo < Baseinfo
+        HASHKEYS = %i[name author version compatibility description fileType fileURL imageURL readmeURL].freeze
+
         # rubocop:disable Naming/MethodName
         def fileType
           @data[:fileType] || "zip"

data/lib/icarus/mod/version.rb

@@ -2,6 +2,6 @@
 
 module Icarus
   module Mod
-    VERSION = "1.9.0"
+    VERSION = "2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Icarus-Mod-Tools
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: '2.0'
 platform: ruby
 authors:
 - Donovan Young
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-28 00:00:00.000000000 Z
+date: 2023-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-firestore