Icarus-Mod-Tools 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b11076691550f236dbbe8cffc43ab3f4e87d0d6bc3796a05249586884df9af7
-  data.tar.gz: 7c0c0dbeee725796ebea01ea3b8f0d1fd11418fc92aaad54ceca055ef36c83f0
+  metadata.gz: c6d319cdda834c36f092c7e2ec601beccba56c07c982d515039566a0dfcde470
+  data.tar.gz: ab8646c60970f163bc749d2a42267a122454d6fe13f9e7cd2a717ff841f57182
 SHA512:
-  metadata.gz: bb68f166b13d2d62e696d880a7ce63da51a0d941fd00211a6c63df28109808ee85f390090dcbf0c5bad35f5905b79d05b902a4be72b3366cc31a96ee908cc9d7
-  data.tar.gz: 55e3a9b353561d231cc58f6081f06f98d0204b9229d1fe1f404b0516e2dbd8e37a82297bb0bd610a3e11afc6f5409020409f9d3aec524d26c44b90b3790abfc7
+  metadata.gz: 9f4ca058de03df31d7791de1a3e5ecbf77cbb43d0ad6f7c646e22c9ac4183ee2bd7081383c55f08cc555e5ff74267c4e910bacf5e9aaec37f462644ceb807288
+  data.tar.gz: 226221b51db91108f1bc4c41f2fe7f9f360f492b0bf4374eb38a6d9214952ef943f10ae6465c934376e894b6c5c1eacb6395f9ebe75ff5f34cb88e872f3d171a

data/Gemfile

@@ -14,4 +14,5 @@ group :develop do
   gem "rspec", "~> 3.12"
   gem "rubocop", "~> 1.41"
   gem "rubocop-rspec", "~> 2.16", require: false
+  gem "standard"
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    Icarus-Mod-Tools (2.1.2)
+    Icarus-Mod-Tools (2.1.3)
       google-cloud-firestore (~> 2.7)
       octokit (~> 6.0)
       paint (~> 2.3)
@@ -14,17 +14,17 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
     faraday (2.7.4)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    faraday-retry (2.0.0)
+    faraday-retry (2.1.0)
       faraday (~> 2.0)
     ffi (1.15.5)
     formatador (1.1.0)
-    gapic-common (0.17.1)
+    gapic-common (0.18.0)
       faraday (>= 1.9, < 3.a)
       faraday-retry (>= 1.0, < 3.a)
       google-protobuf (~> 3.14)
@@ -37,34 +37,38 @@ GEM
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.0)
-    google-cloud-firestore (2.10.0)
+    google-cloud-errors (1.3.1)
+    google-cloud-firestore (2.11.0)
       concurrent-ruby (~> 1.0)
       google-cloud-core (~> 1.5)
-      google-cloud-firestore-v1 (~> 0.0)
+      google-cloud-firestore-v1 (~> 0.10)
       rbtree (~> 0.4.2)
-    google-cloud-firestore-v1 (0.8.0)
-      gapic-common (>= 0.10, < 2.a)
+    google-cloud-firestore-v1 (0.10.0)
+      gapic-common (>= 0.17.1, < 2.a)
       google-cloud-errors (~> 1.0)
-      google-cloud-location (>= 0.0, < 2.a)
-    google-cloud-location (0.3.0)
-      gapic-common (>= 0.16.0, < 2.a)
+      google-cloud-location (>= 0.4, < 2.a)
+    google-cloud-location (0.4.0)
+      gapic-common (>= 0.17.1, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-protobuf (3.21.12-x86_64-darwin)
+    google-protobuf (3.22.2-x86_64-darwin)
+    google-protobuf (3.22.2-x86_64-linux)
     googleapis-common-protos (1.4.0)
       google-protobuf (~> 3.14)
       googleapis-common-protos-types (~> 1.2)
       grpc (~> 1.27)
     googleapis-common-protos-types (1.5.0)
       google-protobuf (~> 3.14)
-    googleauth (1.3.0)
+    googleauth (1.5.0)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    grpc (1.52.0-x86_64-darwin)
+    grpc (1.53.0-x86_64-darwin)
+      google-protobuf (~> 3.21)
+      googleapis-common-protos-types (~> 1.0)
+    grpc (1.53.0-x86_64-linux)
       google-protobuf (~> 3.21)
       googleapis-common-protos-types (~> 1.0)
     guard (2.18.0)
@@ -83,6 +87,7 @@ GEM
       rspec (>= 2.99.0, < 4.0)
     json (2.6.3)
     jwt (2.7.0)
+    language_server-protocol (3.17.0.3)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -94,13 +99,13 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (6.0.1)
+    octokit (6.1.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     os (1.1.4)
     paint (2.3.0)
     parallel (1.22.1)
-    parser (3.2.1.0)
+    parser (3.2.1.1)
       ast (~> 2.4.1)
     pry (0.14.2)
       coderay (~> 1.1)
@@ -123,28 +128,31 @@ GEM
     rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+    rspec-mocks (3.12.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.45.1)
+    rubocop (1.48.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.26.0)
+    rubocop-ast (1.28.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.17.0)
+    rubocop-capybara (2.17.1)
       rubocop (~> 1.41)
-    rubocop-rspec (2.18.1)
+    rubocop-performance (1.16.0)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rspec (2.19.0)
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
@@ -155,6 +163,10 @@ GEM
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
+    standard (1.25.3)
+      language_server-protocol (~> 3.17.0.2)
+      rubocop (~> 1.48.1)
+      rubocop-performance (~> 1.16.0)
     thor (1.2.1)
     unicode-display_width (2.4.2)
 
@@ -171,6 +183,7 @@ DEPENDENCIES
   rspec (~> 3.12)
   rubocop (~> 1.41)
   rubocop-rspec (~> 2.16)
+  standard
 
 BUNDLED WITH
    2.3.26

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

@@ -57,8 +57,12 @@ module Icarus
             $firestore ||= Firestore.new
           end
 
+          def success_or_failure(status)
+            format("%<status>10s", status: status ? Paint["Success", :green] : Paint["Failure", :red])
+          end
+
           def sync_info(type)
-            sync = (type == :modinfo ? Icarus::Mod::Tools::Sync::ModinfoList : Icarus::Mod::Tools::Sync::ToolinfoList).new(client: firestore)
+            sync = ((type == :modinfo) ? Icarus::Mod::Tools::Sync::ModinfoList : Icarus::Mod::Tools::Sync::ToolinfoList).new(client: firestore)
 
             puts "Retrieving repository Data..." if verbose?
             repositories = sync.repositories
@@ -71,19 +75,19 @@ module Icarus
             raise Icarus::Mod::Tools::Error, "no .json files found for #{type}" unless info_array&.any?
 
             if options[:dry_run]
-              puts "Dry run; no changes will be made"
+              puts Paint["Dry run; no changes will be made", :orange, :bright]
               return
             end
 
-            puts "Saving to Firestore..." if verbose?
+            puts Paint["Saving to Firestore...", :black] if verbose?
             response = sync.update(info_array)
-            puts response ? "Success" : "Failure (may be no changes)" if verbose?
+            puts response ? Paint["Success", :green, :bright] : Paint["Failure (may be no changes)", :red, :bright] if verbose?
           rescue Icarus::Mod::Tools::Error => e
             warn e.message
           end
 
           def sync_list(type)
-            sync = (type == :mods ? Icarus::Mod::Tools::Sync::Mods : Icarus::Mod::Tools::Sync::Tools).new(client: firestore)
+            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
 
@@ -100,11 +104,18 @@ module Icarus
               verb = "Creating"
 
               puts "Validating Info Data for #{list.uniq_name}..." if verbose > 2
-              warn "Skipping List #{list.uniq_name} due to validation errors" && next unless list.valid?
+              unless list.valid?
+                warn Paint["Skipping List #{list.uniq_name} due to validation errors", :yellow, :bright]
+                if verbose > 1
+                  warn list.errors.map { |error| Paint[error, :red] }.join("\n")
+                end
+
+                next
+              end
 
               doc_id = sync.find(list)
               if doc_id
-                puts "Found existing list #{list.name} at #{doc_id}" if verbose > 2
+                puts Paint["Found existing list #{list.name} at #{doc_id}", :black] if verbose > 2
                 list.id = doc_id
                 verb = "Updating"
               end
@@ -112,16 +123,16 @@ module Icarus
               print format("#{verb} %-<name>60s", name: "'#{list.author || "NoOne"}/#{list.name || "Unnamed"}'") if verbose > 1
 
               if options[:dry_run]
-                puts "Dry run; no changes will be made" if verbose > 1
+                puts Paint["Dry run; no changes will be made", :yellow] if verbose > 1
                 next
               end
 
               response = sync.update(list)
-              puts format("%<status>10s", status: response ? "Success" : "Failure") if verbose > 1
+              puts success_or_failure(status: response) if verbose > 1
             end
 
             if options[:dry_run]
-              puts "Dry run; no changes will be made" if verbose?
+              puts Paint["Dry run; no changes will be made", :white] if verbose?
               return
             end
 
@@ -135,7 +146,7 @@ module Icarus
             delete_array.each do |list|
               print format("Deleting %-<name>60s", name: "'#{list.author || "NoOne"}/#{list.name || "Unnamed'"}") if verbose > 1
               response = sync.delete(list)
-              puts format("%<status>10s", status: response ? "Success" : "Failure") if verbose > 1
+              puts success_or_failure(status: response) if verbose > 1
             end
 
             puts "Deleted #{delete_array.count} outdated items" if verbose?

data/lib/icarus/mod/firestore.rb

@@ -48,16 +48,16 @@ module Icarus
         raise "You must specify a payload to update" if payload&.empty? || payload.nil?
 
         response = case type.to_sym
-                   when :modinfo, :toolinfo
-                     update_array = (send(type) + [payload]).flatten.uniq
-                     @client.doc(collections.meta.send(type)).set({ list: update_array }, merge:) if update_array.any?
-                   when :repositories
-                     @client.doc(collections.meta.repositories).set({ list: payload }, merge:)
-                   when :mod, :tool
-                     create_or_update(pluralize(type), payload, merge:)
-                   else
-                     raise "Invalid type: #{type}"
-                   end
+        when :modinfo, :toolinfo
+          update_array = (send(type) + [payload]).flatten.uniq
+          @client.doc(collections.meta.send(type)).set({list: update_array}, merge:) if update_array.any?
+        when :repositories
+          @client.doc(collections.meta.repositories).set({list: payload}, merge:)
+        when :mod, :tool
+          create_or_update(pluralize(type), payload, merge:)
+        else
+          raise "Invalid type: #{type}"
+        end
 
         response.is_a?(Google::Cloud::Firestore::DocumentReference) || response.is_a?(Google::Cloud::Firestore::CommitResponse::WriteResult)
       end
@@ -81,7 +81,7 @@ module Icarus
           @client.doc(collections.meta.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 = (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

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

@@ -21,7 +21,7 @@ module Icarus
 
           def info_array
             @info_array ||= @firestore.modinfo.map do |url|
-              retrieve_from_url(url)[:mods].map { |mod| Icarus::Mod::Tools::Modinfo.new(mod) if mod[:name] =~ /[a-z0-9]+/i }
+              retrieve_from_url(url)[:mods].map { |mod| Icarus::Mod::Tools::Modinfo.new(mod) if mod[:name].match?(/[a-z0-9]+/i) }
             rescue Icarus::Mod::Tools::Sync::RequestFailed
               warn "Skipped; Failed to retrieve #{url}"
               next

data/lib/icarus/mod/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Icarus-Mod-Tools
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Donovan Young
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-12 00:00:00.000000000 Z
+date: 2023-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-firestore