refactor completions installer

Author: DannyBen

lib/bashly/commands/completions.rb

@@ -13,55 +13,32 @@ def run
         if args['--install']
           install_completions
         else
-          show_completions
+          puts script
         end
       end
 
+      def installer
+        @installer ||= Completely::Installer.new program: 'bashly', script_path: script_path
+      end
+
     private
 
       def install_completions
-        raise Error, 'Cannot find completions directory' unless compdir
-
-        target = "#{compdir}/bashly"
-
-        say "Installing completions to m`#{target}`"
-        command = %[cp "#{completions_path}" "#{target}"]
-        command = "sudo #{command}" unless root_user?
-        system command
+        success = installer.install force: true
+        raise Error, "Failed running command:\nnb`#{installer.command_string}`" unless success
 
+        say 'Completions installed.'
+        say "Source: m`#{installer.script_path}`"
+        say "Target: m`#{installer.target_path}`"
         say 'Restart your session for the changes to take effect'
       end
 
-      def show_completions
-        puts completions_script
-      end
-
-      def completions_path
-        @completions_path ||= asset('completions/bashly-completions.bash')
-      end
-
-      def completions_script
-        @completions_script ||= asset_content('completions/bashly-completions.bash')
-      end
-
-      def compdir
-        @compdir ||= compdir!
-      end
-
-      def compdir!
-        compdir_candidates.each { |dir| return dir if Dir.exist? dir }
-        nil
-      end
-
-      def compdir_candidates
-        @compdir_candidates ||= [
-          '/usr/share/bash-completion/completions',
-          '/usr/local/etc/bash_completion.d',
-        ]
+      def script_path
+        @script_path ||= asset('completions/bashly-completions.bash')
       end
 
-      def root_user?
-        Process.uid.zero?
+      def script
+        @script ||= asset_content('completions/bashly-completions.bash')
       end
     end
   end

spec/approvals/cli/completions/install

@@ -1,2 +1,4 @@
-Installing completions to /tmp/bashly
+Completions installed.
+Source: some-script-path
+Target: some-target-path
 Restart your session for the changes to take effect

spec/approvals/cli/completions/install-error

@@ -1 +1,2 @@
-#<Bashly::Error: Cannot find completions directory>
+#<Bashly::Error: Failed running command:
+nb`cp source target`>

spec/approvals/cli/completions/install-root

@@ -3,41 +3,55 @@
 describe Commands::Completions do
   subject { described_class.new }
 
+  let(:leeway) { RUBY_VERSION < '3.2.0' ? 0 : 5 }
   let(:completions_path) { File.expand_path 'lib/bashly/completions/bashly-completions.bash' }
   let(:completions_script) { File.read completions_path }
+  let :mock_installer do
+    instance_double Completely::Installer,
+      install:        true,
+      target_path:    'some-target-path',
+      script_path:    'some-script-path',
+      command_string: 'cp source target'
+  end
+
+  describe '#installer' do
+    it 'returns a properly configured Completely::Installer instance' do
+      expect(subject.installer).to be_a Completely::Installer
+      expect(subject.installer.program).to eq 'bashly'
+      expect(subject.installer.script_path).to end_with '/bashly-completions.bash'
+    end
+  end
 
   context 'with --help' do
     it 'shows long usage' do
-      expect { subject.execute %w[completions --help] }.to output_approval('cli/completions/help')
+      expect { subject.execute %w[completions --help] }
+        .to output_approval('cli/completions/help')
     end
   end
 
   context 'without arguments' do
     it 'shows the completions script' do
-      expect { subject.execute %w[completions] }.to output(completions_script).to_stdout
+      expect { subject.execute %w[completions] }
+        .to output(completions_script).to_stdout
     end
   end
 
   context 'with --install' do
     it 'installs the completions script to the completions directory' do
-      allow(subject).to receive(:compdir_candidates).and_return ['/tmp']
-      expect(subject).to receive(:system).with(%[sudo cp "#{completions_path}" "/tmp/bashly"])
-      expect { subject.execute %w[completions --install] }.to output_approval('cli/completions/install')
+      allow(subject).to receive(:installer).and_return mock_installer
+
+      expect { subject.execute %w[completions --install] }
+        .to output_approval('cli/completions/install')
     end
 
-    context 'when the completions directory is not found' do
+    context 'when the installer fails' do
       it 'raises an error' do
-        allow(Dir).to receive(:exist?).twice.and_return(false)
-        expect { subject.execute %w[completions --install] }.to raise_approval('cli/completions/install-error')
-      end
-    end
+        allow(subject).to receive(:installer).and_return mock_installer
+        allow(mock_installer).to receive(:install).and_return(false)
 
-    context 'when running as root' do
-      it 'installs the completions script to the completions directory without sudo' do
-        allow(subject).to receive(:compdir_candidates).and_return ['/tmp']
-        allow(subject).to receive(:root_user?).and_return true
-        expect(subject).to receive(:system).with(%[cp "#{completions_path}" "/tmp/bashly"])
-        expect { subject.execute %w[completions --install] }.to output_approval('cli/completions/install-root')
+        expect { subject.execute %w[completions --install] }
+          .to raise_approval('cli/completions/install-error')
+          .diff(leeway)
       end
     end
   end