fix rubocop offenses

Author: DannyBen

Gemfile

@@ -2,12 +2,12 @@ source 'https://rubygems.org'
 
 group :development do
   # gem 'debug'
+  gem 'completely'
   gem 'rspec'
   gem 'rspec_approvals'
   gem 'runfile', require: false
   gem 'runfile-tasks', require: false
   gem 'simplecov'
-  gem 'completely'
 end
 
 gemspec

lib/bashly.rb

@@ -12,7 +12,7 @@ module Bashly
   ]
 
   autoloads 'bashly/concerns', %i[
-    AssetHelper Renderable ValidationHelpers
+    AssetHelper Renderable SettingsCompletions ValidationHelpers
   ]
 
   module Script

lib/bashly/concerns/settings_completions.rb

@@ -0,0 +1,37 @@
+module Bashly
+  module SettingsCompletions
+    COMPLETION_SHELLS = %w[bash zsh].freeze
+
+    def completions
+      @completions ||= get :completions
+    end
+
+    def completions?
+      completions == 'minimal' || completion_shells.any?
+    end
+
+    def completion_shells
+      case completions
+      when nil, false, 'minimal' then []
+      when 'full' then COMPLETION_SHELLS
+      when String then validate_completion_shells completions
+      else invalid_completions
+      end
+    end
+
+  private
+
+    def validate_completion_shells(value)
+      shells = value.split(',', -1).map(&:strip)
+      valid = shells.any? && (shells - COMPLETION_SHELLS).empty?
+      return shells if valid && shells.uniq == shells
+
+      invalid_completions
+    end
+
+    def invalid_completions
+      raise ConfigurationError,
+        "completions must be false, minimal, full, or a comma-separated list of: #{COMPLETION_SHELLS.join ', '}"
+    end
+  end
+end

lib/bashly/config_validator.rb

@@ -2,6 +2,8 @@ module Bashly
   class ConfigValidator
     include ValidationHelpers
 
+    COMPLETION_OPTIONS = %w[files directories no-space].freeze
+
     attr_reader :data
 
     def initialize(data)
@@ -97,7 +99,7 @@ def assert_completions(key, value)
       assert_array "#{key}.options", value['options'], of: :string
 
       Array(value['options']).each do |option|
-        assert %w[files directories no-space].include?(option),
+        assert COMPLETION_OPTIONS.include?(option),
           "#{key}.options contains an unknown option: #{option}"
       end
     end

lib/bashly/settings.rb

@@ -1,9 +1,10 @@
 module Bashly
   class Settings
-    COMPLETION_SHELLS = %w[bash zsh].freeze
+    COMPLETION_SHELLS = SettingsCompletions::COMPLETION_SHELLS
 
     class << self
       include AssetHelper
+      include SettingsCompletions
 
       attr_writer(
         :argfile_var,
@@ -52,28 +53,6 @@ def compact_short_flags
         @compact_short_flags ||= get :compact_short_flags
       end
 
-      def completions
-        @completions ||= get :completions
-      end
-
-      def completions?
-        completions == 'minimal' || completion_shells.any?
-      end
-
-      def completion_shells
-        value = completions
-        return [] if value.nil? || value == false || value == 'minimal'
-        return COMPLETION_SHELLS if value == 'full'
-
-        shells = value.split(',', -1).map(&:strip) if value.is_a? String
-        valid = shells&.any? && shells.all? { |shell| COMPLETION_SHELLS.include? shell }
-        unique = shells&.uniq == shells
-        return shells if valid && unique
-
-        raise ConfigurationError,
-          "completions must be false, minimal, full, or a comma-separated list of: #{COMPLETION_SHELLS.join ', '}"
-      end
-
       def conjoined_flag_args
         @conjoined_flag_args ||= get :conjoined_flag_args
       end

spec/bashly/commands/completions_spec.rb

@@ -17,5 +17,4 @@
         .to output(completions_script).to_stdout
     end
   end
-
 end

spec/bashly/integration/completion_script_bash_spec.rb

@@ -19,7 +19,7 @@ def complete_with_bash(*words, trace_options: false)
     )
   end
 
-  context 'generation' do
+  context 'when generating the script' do
     let(:cli) { File.expand_path 'spec/tmp/cli' }
 
     before(:context) do
@@ -66,7 +66,7 @@ def complete_with_bash(*words, trace_options: false)
     end
   end
 
-  context 'configured options' do
+  context 'with configured options' do
     before(:context) do
       Settings.completions = 'full'
       reset_tmp_dir

spec/bashly/integration/completion_script_zsh_spec.rb

@@ -44,7 +44,7 @@ def complete_with_zsh(*words, trace_files: false)
     )
   end
 
-  context 'generation' do
+  context 'when generating the script' do
     let(:cli) { File.expand_path 'spec/tmp/cli' }
 
     before(:context) do
@@ -87,7 +87,7 @@ def complete_with_zsh(*words, trace_files: false)
     end
   end
 
-  context 'configured options' do
+  context 'with configured options' do
     before(:context) do
       Settings.completions = 'full'
       reset_tmp_dir

spec/bashly/integration/runtime_completions_spec.rb

@@ -4,7 +4,7 @@
   workspaces.each do |workspace|
     context File.basename(workspace) do
       examples = YAML.trusted_load_file "#{workspace}/examples.yml"
-      cli = File.expand_path 'spec/tmp/cli'
+      let(:cli) { File.expand_path 'spec/tmp/cli' }
 
       before(:context) do
         Settings.completions = 'minimal'
@@ -24,7 +24,7 @@
 
       examples.each do |name, example|
         describe name do
-          it 'works' do
+          it 'returns the expected completions' do
             stdout, stderr, status = Open3.capture3(
               cli, '__complete', *example['words']
             )
@@ -38,5 +38,4 @@
       end
     end
   end
-
 end

spec/bashly/library_spec.rb

@@ -24,7 +24,7 @@
 
       it 'delegates the request to the custom handler' do
         expect(subject.files).to contain_exactly(
-          path: 'spec/tmp/src/help_command.sh',
+          path:    'spec/tmp/src/help_command.sh',
           content: include('help_function=download_usage')
         )
       end