Icarus-Mod-Tools 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daeaf600cc95360b7002385ce3c955b75ef0de606893bf5b73d34ce5d76dbba7
-  data.tar.gz: 8ca92cb968f6d7f1cd23a14fc3a393b32d8acac0ac10039b91d8265a5a8bdd9d
+  metadata.gz: da25ba84ba4828a4e4124bda2485f6673a23993a390b0f674f83ce8c185282c3
+  data.tar.gz: 1e33e3d09e97954e5639f0a0f880bad54bd7e5a79c2d650f41d2ee80cb097159
 SHA512:
-  metadata.gz: '094d0be08425875bbdc181e3a01f70b63b082e08903ab9d8da6795e0813c85102d34a0c37e37e7de4319f8ae7d37e372b37f2cb1f4a2669d873814a9c45f9211'
-  data.tar.gz: c9904e4b40ba8f8bd72818146c8edfa9c07d9150152aa087e9c2aa13292fd20425b4ef85426dada71e99ada4983ac40c347889c8c2bafef9e508bf0e1ebd2ee2
+  metadata.gz: d915eb7c9846df40a57aef8474e2681ce7a5724ca3e1f04cb8a999f4eab9c3c557ae64445cac0a809874a067866c3ca3db2f29586294b93193ac2a20fe9f7009
+  data.tar.gz: 3fbea0d34dc3b5d4a5e457ad4092a00a5f1529405ea4461c3e4a79aff3b73ce3c332759ad4f1ac7cbfabad38e74f4ae3b8ee763e4cd3654bbb8d7fb805ca1f12

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    Icarus-Mod-Tools (1.3.1)
+    Icarus-Mod-Tools (1.3.3)
       google-cloud-firestore (~> 2.7)
       octokit (~> 6.0)
       thor (~> 1.2)

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

@@ -23,15 +23,21 @@ module Icarus
         method_option :filter, type: :array, default: [], desc: "Filter by field (name, author, etc.)"
         def mods
           valid_keys = Icarus::Mod::Tools::Modinfo::HASHKEYS + [:updated_at]
-          sort_field = options[:sort].to_sym
-          filter_field = options[:filter].first.to_sym
-          filter_value = options[:filter].last.to_s
 
-          raise "Invalid filter option" unless options[:filter]&.count == 2
+          sort_field = options[:sort]&.to_sym
 
-          raise "Invalid filter field '#{filter_field}'" unless filter_field && valid_keys.include?(filter_field)
+          filter = !options[:filter].empty?
 
-          raise "Invalid sort field '#{sort_field}'" unless valid_keys.include?(sort_field)
+          if filter
+            filter_field = options[:filter].first&.to_sym
+            filter_value = options[:filter].last&.to_s
+
+            raise Icarus::Mod::Tools::Error, "Invalid filter option #{options[:filter]}" unless options[:filter].empty? || options[:filter]&.count == 2
+
+            raise Icarus::Mod::Tools::Error, "Invalid filter field '#{filter_field}'" unless filter_field && valid_keys.include?(filter_field)
+          end
+
+          raise Icarus::Mod::Tools::Error, "Invalid sort field '#{sort_field}'" unless valid_keys.include?(sort_field)
 
           puts "Sorted by #{sort_field}" if sort_field && verbose > 2
           puts "Filtered by #{filter_field} = #{filter_value}" if filter_field && verbose > 2
@@ -70,7 +76,7 @@ module Icarus
           end
 
           puts "Total: #{mods.count}" if verbose?
-        rescue StandardError => e
+        rescue Icarus::Mod::Tools::Error => e
           puts e.message
           exit 1
         end

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

@@ -15,12 +15,12 @@ module Icarus
           puts "Retrieving repository Data..." if verbose?
           repositories = modinfo_sync.repositories
 
-          raise "Unable to find any repositories!" unless repositories.any?
+          raise Icarus::Mod::Tools::Error, "Unable to find any repositories!" unless repositories.any?
 
           puts "Retrieving modinfo Array..." if verbose?
           modinfo_array = modinfo_sync.modinfo_data(repositories, verbose: verbose > 1)&.map(&:download_url)&.compact
 
-          raise "Unable to find any modinfo.json files!" unless modinfo_array&.any?
+          raise Icarus::Mod::Tools::Error, "Unable to find any modinfo.json files!" unless modinfo_array&.any?
 
           puts "Saving to Firestore..." if verbose?
           response = modinfo_sync.update(modinfo_array)
@@ -67,6 +67,9 @@ module Icarus
           end
 
           puts "Deleted #{delete_array.count} outdated mods" if verbose?
+        rescue Icarus::Mod::Tools::Error => e
+          warn e.message
+          exit 1
         end
       end
     end

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

@@ -12,7 +12,7 @@ module Icarus
         def retrieve_from_url(url)
           res = Net::HTTP.get_response(URI(url))
 
-          raise "HTTP Request failed (#{res.code}): #{res.message}" unless res&.code == "200"
+          raise Icarus::Mod::Tools::Error, "HTTP Request failed for #{url} (#{res.code}): #{res.message}" unless res&.code == "200"
 
           JSON.parse(res.body, symbolize_names: true)
         end

data/lib/icarus/mod/version.rb

@@ -2,6 +2,6 @@
 
 module Icarus
   module Mod
-    VERSION = "1.3.1"
+    VERSION = "1.3.3"
   end
 end

metadata

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