Icarus-Mod-Tools 2.0 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aba02b8c9f3f8a95dfaff8dc2a13914d9ec71153da336e2dc2ab954d6e5d6560
-  data.tar.gz: aad3f90f121957a893282dfc91cd424e21ecdbb155ecde1135f35644f86e8a3d
+  metadata.gz: 9c66a2adaabe6da3d7ef43db063f7d2924e182e574b4d9d77c1786a15aea1c8b
+  data.tar.gz: d28b3240fbfc0670ab652ac131bfad396f1e6e09e30fbd7c5c3dace8c51e1784
 SHA512:
-  metadata.gz: 54dd466afe7f4f01a2deb0999752cc298ee52a2b1f4da0e1abf26c82677ecabf1a9f293765dc081d6f5c5e05ea017c57da1cbf9ac114a287df922c8ab40ba696
-  data.tar.gz: b6f4a7bf87a62d190928cbf42ca57864c8651a2f7e353869e6221364f7f3e2c7ce59e51b69818636afe99c1ada9dfdbde4dcc29a43981b6caeab913856d1a779
+  metadata.gz: 35b823d39db613491f965a185a43bcf848629e84ca88fca358e2bc9412bbc42802c92a6fc6fe72870907e6d970415fe4d037035057a946bd19495b7bf9650a9c
+  data.tar.gz: 7e625e03b7d027a0d52f28d955b80abf3cab001f879a0169a7e500d0123775801580e9c7b8ef85438ba7eb7813b7ac02f37114ea37496e7b1beeec1e73bdd1d1

data/{CHANGES.md → CHANGELOG.md}

@@ -4,6 +4,18 @@ 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)
+
+
+### 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))
+
+### v2.0 - 2023-02-03
+
+- Converts to new `files` object, replacing fileType and fileURL
+
 ### v1.9 - 2023-01-28
 
 - Renamed `Progs` to `Tools`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    Icarus-Mod-Tools (2.0)
+    Icarus-Mod-Tools (2.0.3)
       google-cloud-firestore (~> 2.7)
       octokit (~> 6.0)
       paint (~> 2.3)
@@ -38,7 +38,7 @@ GEM
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.3.0)
-    google-cloud-firestore (2.9.0)
+    google-cloud-firestore (2.9.1)
       concurrent-ruby (~> 1.0)
       google-cloud-core (~> 1.5)
       google-cloud-firestore-v1 (~> 0.0)
@@ -50,7 +50,6 @@ GEM
     google-cloud-location (0.3.0)
       gapic-common (>= 0.16.0, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-protobuf (3.21.12-x86_64-darwin)
     google-protobuf (3.21.12-x86_64-linux)
     googleapis-common-protos (1.4.0)
       google-protobuf (~> 3.14)
@@ -65,9 +64,6 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    grpc (1.51.0-x86_64-darwin)
-      google-protobuf (~> 3.21)
-      googleapis-common-protos-types (~> 1.0)
     grpc (1.51.0-x86_64-linux)
       google-protobuf (~> 3.21)
       googleapis-common-protos-types (~> 1.0)
@@ -122,7 +118,7 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.1)
       rspec-support (~> 3.12.0)
     rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -177,4 +173,4 @@ DEPENDENCIES
   rubocop-rspec (~> 2.16)
 
 BUNDLED WITH
-   2.3.14
+   2.3.26

data/README.md

@@ -33,8 +33,10 @@ Create a file called `.imtconfig.json` in your home directory with the following
     },
     "collections": {
       "modinfo": "meta/modinfo",
+      "toolinfo": "meta/toolinfo",
       "repositories": "meta/repos",
-      "mods": "mods"
+      "mods": "mods",
+      "tools": "tools"
     }
   },
   "github": {
@@ -73,6 +75,7 @@ Commands:
   imt add modinfo         # Adds an entry to 'meta/modinfo/list'
   imt add toolinfo        # Adds an entry to 'meta/toolinfo/list'
   imt add repos           # Adds an entry to 'meta/repos/list'
+  imt add mod <filename>  # Adds an entry to 'mods' when given a modinfo.json file
 
 Options:
   -C, [--config=CONFIG]            # Path to the config file

data/icarus-mod-tools.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/main/CHANGES.md"
+  spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/main/CHANGELOG.md"
   spec.metadata["rubygems_mfa_required"] = "true"
 
   # Specify which files should be added to the gem when it is released.

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

@@ -11,7 +11,7 @@ module Icarus
         desc "modinfo", "Adds an entry to 'meta/modinfo/list'"
         def modinfo(item)
           firestore = Firestore.new
-          payload = [firestore.list(:modinfo), item].flatten.compact
+          payload = [firestore.modinfo, item].flatten.compact
 
           puts firestore.update(:modinfo, payload, merge: true) ? "Success" : "Failure"
         end
@@ -19,7 +19,7 @@ module Icarus
         desc "toolinfo", "Adds an entry to 'meta/toolinfo/list'"
         def toolinfo(item)
           firestore = Firestore.new
-          payload = [firestore.list(:toolinfo), item].flatten.compact
+          payload = [firestore.toolinfo, item].flatten.compact
 
           puts firestore.update(:toolinfo, payload, merge: true) ? "Success" : "Failure"
         end
@@ -27,7 +27,7 @@ module Icarus
         desc "repos", "Adds an entry to 'meta/repos/list'"
         def repos(item)
           firestore = Firestore.new
-          payload = [firestore.list(:repositories), item].flatten.compact
+          payload = [firestore.repositories, item].flatten.compact
 
           puts firestore.update(:repositories, payload, merge: true) ? "Success" : "Failure"
         end

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

@@ -10,21 +10,21 @@ module Icarus
       class List < SubcommandBase
         desc "modinfo", "Displays data from 'meta/modinfo/list'"
         def modinfo
-          modinfo_array = Firestore.new.list(:modinfo)
+          modinfo_array = Firestore.new.send(:modinfo)
           puts modinfo_array
           puts "Total: #{modinfo_array.count}" if verbose > 1
         end
 
         desc "toolinfo", "Displays data from 'meta/toolinfo/list'"
         def toolinfo
-          toolinfo_array = Firestore.new.list(:toolinfo)
+          toolinfo_array = Firestore.new.send(:toolinfo)
           puts toolinfo_array
           puts "Total: #{toolinfo_array.count}" if verbose > 1
         end
 
         desc "repos", "Displays data from 'meta/repos/list'"
         def repos
-          repos = Firestore.new.list(:repositories)
+          repos = Firestore.new.send(:repositories)
           puts repos
           puts "Total: #{repos.count}" if verbose > 1
         end
@@ -64,7 +64,7 @@ module Icarus
             puts "Sorted by #{sort_field}" if sort_field && verbose > 2
             puts "Filtered by #{filter_field} = #{filter_value}" if filter_field && verbose > 2
 
-            items = Firestore.new.list(type)
+            items = Firestore.new.send(type)
 
             # Filter by field
             items.select! { |item| item.send(filter_field).downcase =~ /#{filter_value&.downcase}/ } if filter_field

data/lib/icarus/mod/firestore.rb

@@ -13,10 +13,15 @@ module Icarus
       def initialize
         @client = Google::Cloud::Firestore.new(credentials: Config.firebase.credentials.to_h)
         @collections = Config.firebase.collections
+        @repositories = repositories
+        @modinfo = modinfo
+        @toolinfo = toolinfo
+        @mods = mods
+        @tools = tools
       end
 
-      def repos
-        @repos ||= list(:repositories)
+      def repositories
+        @repositories ||= list(:repositories)
       end
 
       def modinfo
@@ -36,35 +41,7 @@ module Icarus
       end
 
       def find_by_type(type:, name:, author:)
-        list(type).find { |obj| obj.name == name && obj.author == author }
-      end
-
-      def get_list(type)
-        raise "Invalid type: #{type} - unknown collection" unless collections.respond_to?(type)
-
-        @client.doc(collections.send(type)).get[:list]
-      end
-
-      def list(type)
-        case type.to_sym
-        when :modinfo, :toolinfo, :repositories
-          get_list(type)
-        when :mods, :tools
-          @client.col(collections.send(type)).get.map do |doc|
-            klass = type == :mods ? Icarus::Mod::Tools::Modinfo : Icarus::Mod::Tools::Toolinfo
-            klass.new(doc.data, id: doc.document_id, created: doc.create_time, updated: doc.update_time)
-          end
-        else
-          raise "Invalid type: #{type}"
-        end
-      end
-
-      def update_or_create(type, payload, merge:)
-        doc_id = payload.id || find_by_type(type:, name: payload.name, author: payload.author)&.id
-
-        return @client.doc("#{collections.send(type)}/#{doc_id}").set(payload.to_h, merge:) if doc_id
-
-        @client.col(collections.send(type)).add(payload.to_h)
+        instance_variable_get("@#{type}").find { |obj| obj.name == name && obj.author == author }
       end
 
       def update(type, payload, merge: false)
@@ -98,6 +75,28 @@ module Icarus
 
       private
 
+      def list(type)
+        case type.to_sym
+        when :modinfo, :toolinfo, :repositories
+          @client.doc(collections.send(type)).get[:list]
+        when :mods, :tools
+          @client.col(collections.send(type)).get.map do |doc|
+            klass = type == :mods ? Icarus::Mod::Tools::Modinfo : Icarus::Mod::Tools::Toolinfo
+            klass.new(doc.data, id: doc.document_id, created: doc.create_time, updated: doc.update_time)
+          end
+        else
+          raise "Invalid type: #{type}"
+        end
+      end
+
+      def update_or_create(type, payload, merge:)
+        doc_id = payload.id || find_by_type(type:, name: payload.name, author: payload.author)&.id
+
+        return @client.doc("#{collections.send(type)}/#{doc_id}").set(payload.to_h, merge:) if doc_id
+
+        @client.col(collections.send(type)).add(payload.to_h)
+      end
+
       def pluralize(type)
         type.to_s.end_with?("s") ? type.to_s : "#{type}s"
       end

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

@@ -9,15 +9,24 @@ module Icarus
       class Modinfo < Baseinfo
         HASHKEYS = %i[name author version compatibility description long_description files fileType fileURL imageURL readmeURL].freeze
 
+        # rubocop:disable Metrics/AbcSize
         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?
+          db_hash = HASHKEYS.each_with_object({}) do |key, hash|
+            # next if %i[fileType fileURL].include?(key.to_sym)
             next if key == :long_description && @data[:long_description].nil?
 
             hash[key] = @data[key]
           end
+
+          db_hash[:files] = { @data[:fileType].downcase.to_sym => @data[:fileURL] } if db_hash[:files].nil? && !@data[:fileType].nil?
+
+          # Remove this once all mods have been updated
+          db_hash[:fileType] = db_hash[:files].keys.first.to_s if db_hash[:fileType].nil? && !db_hash[:files].nil?
+          db_hash[:fileURL] = db_hash[:files].values.first if db_hash[:fileURL].nil? && !db_hash[:files].nil?
+
+          db_hash
         end
+        # rubocop:enable Metrics/AbcSize
 
         def file_types
           files&.keys || [@data[:fileType] || "pak"]

data/lib/icarus/mod/tools/sync/modinfo_list.rb

@@ -19,7 +19,7 @@ module Icarus
           end
 
           def repositories
-            @firestore.repos
+            @firestore.repositories
           end
 
           def update(modinfo_array)

data/lib/icarus/mod/tools/sync/toolinfo_list.rb

@@ -19,7 +19,7 @@ module Icarus
           end
 
           def repositories
-            @firestore.repos
+            @firestore.repositories
           end
 
           def update(toolinfo_array)

data/lib/icarus/mod/version.rb

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

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: Icarus-Mod-Tools
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: 2.0.3
 platform: ruby
 authors:
 - Donovan Young
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
 date: 2023-02-04 00:00:00.000000000 Z
@@ -76,11 +76,11 @@ extra_rdoc_files: []
 files:
 - ".rspec"
 - ".rubocop.yml"
-- CHANGES.md
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - Guardfile
-- LICENSE.md
+- LICENSE
 - README.md
 - Rakefile
 - exe/imt
@@ -113,9 +113,9 @@ licenses: []
 metadata:
   homepage_uri: https://github.com/DonovanMods/icarus-mod-tools
   source_code_uri: https://github.com/DonovanMods/icarus-mod-tools
-  changelog_uri: https://github.com/DonovanMods/icarus-mod-tools/blob/main/CHANGES.md
+  changelog_uri: https://github.com/DonovanMods/icarus-mod-tools/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.26
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Various tools for Icarus Modding
 test_files: []