Icarus-Mod-Tools 2.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aba02b8c9f3f8a95dfaff8dc2a13914d9ec71153da336e2dc2ab954d6e5d6560
-  data.tar.gz: aad3f90f121957a893282dfc91cd424e21ecdbb155ecde1135f35644f86e8a3d
+  metadata.gz: bc9f1796a92ebce3c0cdac2b87012e3c411f2f04e2308dc725872daf08846416
+  data.tar.gz: 707de57a940c21f20f2c47853f8083a121fceed70b6a5d8bbc358038c608a805
 SHA512:
-  metadata.gz: 54dd466afe7f4f01a2deb0999752cc298ee52a2b1f4da0e1abf26c82677ecabf1a9f293765dc081d6f5c5e05ea017c57da1cbf9ac114a287df922c8ab40ba696
-  data.tar.gz: b6f4a7bf87a62d190928cbf42ca57864c8651a2f7e353869e6221364f7f3e2c7ce59e51b69818636afe99c1ada9dfdbde4dcc29a43981b6caeab913856d1a779
+  metadata.gz: 11179ce087f3c5b1d6dc8d6a76758410513bba8d53a1a02a2b0fd44e3b3ab58c5a0f14c81667edfaffbdf129ea917bcb256b71a75a0b8bc2220ef3863ecfcb98
+  data.tar.gz: 45d746e5bd59b6342ec9cec813d72e520fbbc8d1cc55d41e8c725b745c377f3aaba135b56b746281a80f5a1588e66a9426a80026cf423c49a80c85f029f1d586

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    Icarus-Mod-Tools (2.0)
+    Icarus-Mod-Tools (2.0.1)
       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)
@@ -122,7 +122,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)

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/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.1"
   end
 end

metadata

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