Icarus-Mod-Tools 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6d319cdda834c36f092c7e2ec601beccba56c07c982d515039566a0dfcde470
-  data.tar.gz: ab8646c60970f163bc749d2a42267a122454d6fe13f9e7cd2a717ff841f57182
+  metadata.gz: d6567527e650542f138580d498b0096d41595a10703b25a572ffc624baba6610
+  data.tar.gz: '09e582fbbd638e722b5bd54a232f491f94d190226015d9d95ca0c26d126d57c8'
 SHA512:
-  metadata.gz: 9f4ca058de03df31d7791de1a3e5ecbf77cbb43d0ad6f7c646e22c9ac4183ee2bd7081383c55f08cc555e5ff74267c4e910bacf5e9aaec37f462644ceb807288
-  data.tar.gz: 226221b51db91108f1bc4c41f2fe7f9f360f492b0bf4374eb38a6d9214952ef943f10ae6465c934376e894b6c5c1eacb6395f9ebe75ff5f34cb88e872f3d171a
+  metadata.gz: 615be569c373d31071b5ee747a4ad28183d5db7cefc0409105a42511bd853ec9a3a89aff3c187a1908b0ca16f83e2f613db88899b329ca3358804542fe0f31fd
+  data.tar.gz: f496b73c26b7b98afbcc7a8521b1d955116dfb7fedc8b0999d87baaefcb917128310ff0122f35aa8c492f7e358f0c4e59d7e68361cc49ff5a59f700aa4ce9490

data/.standard.yml

@@ -0,0 +1,2 @@
+extend_config:
+  - .standard_rubocop_extensions.yml

data/.standard_rubocop_extensions.yml

@@ -0,0 +1,10 @@
+require:
+  - rubocop-rspec
+
+AllCops:
+  TargetRubyVersion: 3.1
+  NewCops: enable
+  SuggestExtensions: false
+
+RSpec/MultipleMemoizedHelpers:
+  Max: 10

data/Gemfile

@@ -8,6 +8,7 @@ gemspec
 gem "rake", "~> 13.0"
 
 group :develop do
+  gem "fuubar"
   gem "guard", "~> 2.18"
   gem "guard-rspec", "~> 4.7"
   gem "pry", "~> 0.14.1"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    Icarus-Mod-Tools (2.1.3)
+    Icarus-Mod-Tools (2.1.4)
       google-cloud-firestore (~> 2.7)
       octokit (~> 6.0)
       paint (~> 2.3)
@@ -24,6 +24,9 @@ GEM
       faraday (~> 2.0)
     ffi (1.15.5)
     formatador (1.1.0)
+    fuubar (2.5.1)
+      rspec-core (~> 3.0)
+      ruby-progressbar (~> 1.4)
     gapic-common (0.18.0)
       faraday (>= 1.9, < 3.a)
       faraday-retry (>= 1.0, < 3.a)
@@ -50,7 +53,6 @@ GEM
     google-cloud-location (0.4.0)
       gapic-common (>= 0.17.1, < 2.a)
       google-cloud-errors (~> 1.0)
-    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)
@@ -65,9 +67,6 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    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)
@@ -176,6 +175,7 @@ PLATFORMS
 
 DEPENDENCIES
   Icarus-Mod-Tools!
+  fuubar
   guard (~> 2.18)
   guard-rspec (~> 4.7)
   pry (~> 0.14.1)

data/Rakefile

@@ -3,14 +3,10 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 require "rspec/core/rake_task"
-require "rubocop/rake_task"
+require "standard/rake"
 
-RuboCop::RakeTask.new
-
-# Default directory to look in is `/specs`
-# Run with `rake spec`
 RSpec::Core::RakeTask.new(:spec) do |task|
-  task.rspec_opts = ["--color", "--format", "doc"]
+  task.rspec_opts = ["--color", "--format", "Fuubar"]
 end
 
-task default: %i[spec rubocop]
+task default: %i[spec standard]

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

@@ -11,12 +11,12 @@ module Icarus
       # The Base CLI class for Icarus Mod Tools. This is inherited by all subcommands.
       class Base < Thor
         class_option :config,
-                     aliases: "-C", type: :string, default: File.join(Dir.home, "/.imtconfig.json"),
-                     desc: "Path to the config file"
+          aliases: "-C", type: :string, default: File.join(Dir.home, "/.imtconfig.json"),
+          desc: "Path to the config file"
 
         class_option :version,
-                     aliases: "-V", type: :boolean,
-                     desc: "Print the version and exit"
+          aliases: "-V", type: :boolean,
+          desc: "Print the version and exit"
 
         def self.exit_on_failure?
           true

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

@@ -45,10 +45,10 @@ module Icarus
 
         no_commands do
           def list_for_type(type)
-            klass = type == :mods ? Icarus::Mod::Tools::Modinfo : Icarus::Mod::Tools::Toolinfo
+            klass = (type == :mods) ? Icarus::Mod::Tools::Modinfo : Icarus::Mod::Tools::Toolinfo
             valid_keys = klass::HASHKEYS + [:updated_at]
             sort_field = options[:sort]&.to_sym
-            filter     = !options[:filter].empty?
+            filter = !options[:filter].empty?
 
             if filter
               filter_field = options[:filter].first&.to_sym
@@ -90,7 +90,7 @@ module Icarus
             end
 
             # Sort by field, optionally subsorting by name
-            (sort_field == :name ? items.sort_by(&:name) : items.sort_by { |item| [item.send(sort_field), item.name] }).each do |item|
+            ((sort_field == :name) ? items.sort_by(&:name) : items.sort_by { |item| [item.send(sort_field), item.name] }).each do |item|
               data_format = "%-<name>50s %-<author>20s v%-<version>10s%-<updated_at>20s"
               data_format += " %-<id>20s %<description>s" if verbose > 1
 

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

@@ -8,8 +8,8 @@ module Icarus
       # Base class for all subcommands
       class SubcommandBase < Base
         class_option :verbose,
-                     aliases: "-v", type: :boolean, repeatable: true, default: [true],
-                     desc: "Increase verbosity. May be repeated for even more verbosity."
+          aliases: "-v", type: :boolean, repeatable: true, default: [true],
+          desc: "Increase verbosity. May be repeated for even more verbosity."
 
         no_commands do
           def check_false

data/lib/icarus/mod/github.rb

@@ -34,7 +34,7 @@ module Icarus
         use_cache = @resources.any? && cache
 
         if use_cache
-          @resources.each { |file| block.call(file) } if block_given?
+          @resources.each { |file| block.call(file) } if block
         else
           @client.contents(repository, path:).each do |entry|
             if entry[:type] == "dir"
@@ -42,16 +42,16 @@ module Icarus
               next # we don't need directories in our output
             end
 
-            block.call(entry) if block_given?
+            block&.call(entry)
             @resources << entry # cache the file
           end
         end
 
-        @resources unless block_given?
+        @resources unless block
       end
 
       def find(pattern)
-        all_files { |file| return file if file[:name] =~ /#{pattern}/i }
+        all_files { |file| return file if /#{pattern}/i.match?(file[:name]) }
       end
 
       def get_contents(url)

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

@@ -102,11 +102,11 @@ module Icarus
         end
 
         def method_missing(method_name, *_args, &_block)
-          @data[method_name.to_sym] if @data.keys.include?(method_name.to_sym)
+          @data[method_name.to_sym] if @data.key?(method_name.to_sym)
         end
 
         def respond_to_missing?(method_name, include_private = false)
-          @data.keys.include?(method_name.to_sym) || super
+          @data.key?(method_name.to_sym) || super
         end
 
         private
@@ -144,7 +144,7 @@ module Icarus
           if version.nil?
             @warnings << "Version was nil, it has been defaulted to 1.0"
           else
-            @warnings << "Version should be a version string" unless version =~ /^\d+[.\d+]*/
+            @warnings << "Version should be a version string" unless /^\d+[.\d+]*/.match?(version)
           end
         end
       end

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

@@ -9,7 +9,7 @@ module Icarus
       class Modinfo < Baseinfo
         def to_h
           db_hash = super
-          db_hash[:meta] = { status: } # Add metadata
+          db_hash[:meta] = {status:} # Add metadata
 
           db_hash
         end

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

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

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

@@ -9,13 +9,13 @@ module Icarus
 
         def initialize(type)
           @array = case type
-                   when :modinfo
-                     Sync::Mods.new.info_array
-                   when :toolinfo
-                     Sync::Tools.new.info_array
-                   else
-                     raise ArgumentError, "Invalid type: #{type}"
-                   end
+          when :modinfo
+            Sync::Mods.new.info_array
+          when :toolinfo
+            Sync::Tools.new.info_array
+          else
+            raise ArgumentError, "Invalid type: #{type}"
+          end
         end
       end
     end

data/lib/icarus/mod/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Icarus-Mod-Tools
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Donovan Young
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-26 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-firestore
@@ -75,8 +75,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rspec"
-- ".rubocop.yml"
 - ".ruby-version"
+- ".standard.yml"
+- ".standard_rubocop_extensions.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock

data/.rubocop.yml

@@ -1,61 +0,0 @@
-require: rubocop-rspec
-
-AllCops:
-  TargetRubyVersion: 3.1
-  NewCops: enable
-  SuggestExtensions: false
-
-Style/StringLiterals:
-  Enabled: true
-  EnforcedStyle: double_quotes
-
-Style/StringLiteralsInInterpolation:
-  Enabled: true
-  EnforcedStyle: double_quotes
-
-Layout/LineLength:
-  Max: 160
-
-Style/FrozenStringLiteralComment:
-  Exclude:
-    - Guardfile
-    - spec/**/*_spec.rb
-
-Metrics/CyclomaticComplexity:
-  Max: 15
-  Exclude:
-    - spec/**/*_spec.rb
-    - lib/icarus/mod/cli/*.rb # Thor command files
-
-Metrics/PerceivedComplexity:
-  Max: 15
-  Exclude:
-    - spec/**/*_spec.rb
-    - lib/icarus/mod/cli/*.rb # Thor command files
-
-Metrics/AbcSize:
-  Max: 35
-  Exclude:
-    - lib/icarus/mod/cli/*.rb # Thor command files
-
-Metrics/BlockLength:
-  Enabled: false
-
-Metrics/ClassLength:
-  Enabled: false
-
-Metrics/MethodLength:
-  Enabled: false
-
-Naming/BlockForwarding:
-  EnforcedStyle: explicit
-
-RSpec/MultipleMemoizedHelpers:
-  Enabled: false
-
-Style/Documentation:
-  Exclude:
-    - lib/icarus/mod/cli/*.rb # Thor command files
-
-Style/OpenStructUse:
-  Enabled: false