ruby_fly 0.40.0.pre.3 → 0.40.0.pre.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c1192e6ffd74036a2bbe4c03f1ed9e398b82e0224b6cbe8ba8330b8bfb64ab4
-  data.tar.gz: 58458d790d965cb94e2d6412175a60167bd0034c051aee9724adbdd961ce44c2
+  metadata.gz: 7085daa7a409ae5b4301901607937f845c8bbb5d33376634c0cd470fc771b36c
+  data.tar.gz: c528f7720ed3055571eecfd7712cc2b9c50a814fa99c775995d081888ad075f2
 SHA512:
-  metadata.gz: 37e962dc0e7872f8cc11be31f3d5c35d7053f658e637a0a6e90e72a01e97b591414f51b2ec9ed5540ced5d9a67aa9e71373b5ee2b9b4863b4976fb443ab7a080
-  data.tar.gz: cc56c1fabb4695c6b58fbd69087cb0681f9fb7804c3133e7220b79aceacb3221e152f6a82b7b2cdc809fcd1b72800075e76cc588db7495cacfd58e888f9d26c9
+  metadata.gz: 13596da5ab82b0031be0de4832ae502c852d34e17546148b71177474cfc748d4bec6fcf0b8d54fd11da5dcac89ec8b28ecefa157a880d5b342f573b6dc2cf4e9
+  data.tar.gz: 5d64c42f89490067e0af69bd5d1abf20898d0d5b9ea1468486caf148b4dec267e771f130d573a6a28562407196d84bc47bf50a69cfcebb08c7102acdc7424093

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    ruby_fly (0.40.0.pre.3)
-      lino (~> 3.0)
+    ruby_fly (0.40.0.pre.5)
+      lino (>= 4.1.0.pre.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.1)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -17,55 +17,89 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.5)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
-    base64 (0.1.1)
-    bigdecimal (3.1.4)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    childprocess (5.0.0)
+    coderay (1.1.3)
     colored2 (3.1.2)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     docile (1.4.0)
-    drb (2.1.1)
-      ruby2_keywords
-    excon (0.104.0)
+    drb (2.2.1)
+    excon (0.111.0)
     fakefs (2.5.0)
-    faker (3.2.1)
+    faker (3.4.1)
       i18n (>= 1.8.11, < 2)
-    faraday (2.7.11)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
+    faraday (2.10.0)
+      faraday-net_http (>= 2.0, < 3.2)
+      logger
+    faraday-net_http (3.1.0)
+      net-http
+    ffi (1.17.0)
+    formatador (1.1.0)
     gem-release (2.2.2)
-    git (1.18.0)
+    git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
+    guard (2.18.1)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.13.0)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     immutable-struct (2.4.1)
-    json (2.6.3)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
-    lino (3.1.0)
+    lino (4.1.0.pre.1)
+      childprocess (~> 5.0.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
-    minitest (5.20.0)
-    mutex_m (0.1.2)
-    octokit (6.1.1)
+    listen (3.9.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.6.0)
+    lumberjack (1.2.10)
+    method_source (1.1.0)
+    minitest (5.24.1)
+    mutex_m (0.2.0)
+    nenv (0.3.0)
+    net-http (0.4.1)
+      uri
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    octokit (8.1.0)
+      base64
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     open4 (1.3.4)
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    parallel (1.25.1)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
-    public_suffix (5.0.3)
-    racc (1.7.1)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (6.0.0)
+    racc (1.8.0)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     rake_circle_ci (0.11.0)
       colored2 (~> 3.1)
       excon (~> 0.72)
@@ -74,76 +108,74 @@ GEM
     rake_factory (0.32.0.pre.2)
       activesupport (>= 4)
       rake (~> 13.0)
-    rake_git (0.1.0.pre.8)
+    rake_git (0.1.0.pre.10)
       colored2 (~> 3.1)
       git (~> 1.13, >= 1.13.2)
       rake_factory (= 0.32.0.pre.2)
-    rake_git_crypt (0.1.0.pre.27)
+    rake_git_crypt (0.1.0.pre.32)
       colored2 (~> 3.1)
       rake_factory (= 0.32.0.pre.2)
-      ruby_git_crypt (= 0.1.0.pre.2)
-      ruby_gpg2 (~> 0.6)
-    rake_github (0.11.0)
+      ruby_git_crypt (= 0.1.0.pre.8)
+      ruby_gpg2 (= 0.11.0.pre.6)
+    rake_github (0.13.0)
       colored2 (~> 3.1)
-      octokit (>= 4.16, < 7.0)
+      octokit (>= 4.16, < 9.0)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
-    rake_gpg (0.18.0)
+    rake_gpg (0.19.0.pre.6)
       rake_factory (~> 0.23)
-      ruby_gpg2 (~> 0.6)
+      ruby_gpg2 (= 0.11.0.pre.6)
     rake_ssh (0.10.0)
       colored2 (~> 3.1)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
+      ffi (~> 1.0)
     rchardet (1.8.0)
-    regexp_parser (2.8.2)
-    rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    regexp_parser (2.9.2)
+    rexml (3.3.1)
+      strscan
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    rubocop (1.57.2)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.65.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.19.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.24.0)
-      rubocop (~> 1.33)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.25.0)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
+    rubocop-rspec (3.0.3)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
-    ruby_git_crypt (0.1.0.pre.2)
+    ruby_git_crypt (0.1.0.pre.8)
       immutable-struct (~> 2.4)
-      lino (~> 3.0)
-    ruby_gpg2 (0.10.0)
-      lino (~> 3.0)
+      lino (>= 3.1)
+    ruby_gpg2 (0.11.0.pre.6)
+      lino (>= 3.1)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
+    shellany (0.0.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -151,9 +183,13 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     sshkey (2.0.0)
+    strscan (3.1.0)
+    terminal-notifier-guard (1.7.0)
+    thor (1.3.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
+    uri (0.13.0)
 
 PLATFORMS
   arm64-darwin-21
@@ -169,12 +205,14 @@ DEPENDENCIES
   fakefs
   faker
   gem-release
+  guard
+  guard-rspec
   rake
   rake_circle_ci
   rake_git
-  rake_git_crypt
+  rake_git_crypt (>= 0.1.0.pre.31)
   rake_github
-  rake_gpg
+  rake_gpg (>= 0.19.0.pre.6)
   rake_ssh
   rspec
   rubocop
@@ -182,6 +220,7 @@ DEPENDENCIES
   rubocop-rspec
   ruby_fly!
   simplecov
+  terminal-notifier-guard
 
 BUNDLED WITH
    2.4.17

data/Rakefile

@@ -146,7 +146,7 @@ end
 RakeGithub.define_repository_tasks(
   namespace: :github,
   repository: 'infrablocks/ruby_fly'
-) do |t, args|
+) do |t|
   github_config =
     YAML.load_file('config/secrets/github/config.yaml')
 
@@ -157,8 +157,6 @@ RakeGithub.define_repository_tasks(
       public_key: File.read('config/secrets/ci/ssh.public')
     }
   ]
-  t.branch_name = args.branch_name
-  t.commit_message = args.commit_message
 end
 
 namespace :pipeline do

data/lib/ruby_fly/commands/base.rb

@@ -1,46 +1,120 @@
 # frozen_string_literal: true
 
 require 'lino'
+require 'tempfile'
 
 module RubyFly
   module Commands
     class Base
-      attr_reader :binary, :stdin, :stdout, :stderr
-
-      def initialize(opts = {})
-        @binary = opts[:binary] || RubyFly.configuration.binary
+      def initialize(parameters = {})
+        @binary = parameters[:binary] || RubyFly.configuration.binary
         @stdin = stdin || RubyFly.configuration.stdin
         @stdout = stdout || RubyFly.configuration.stdout
         @stderr = stderr || RubyFly.configuration.stderr
       end
 
-      def execute(opts = {})
-        do_before(opts)
-        do_around(opts) do |new_opts|
-          configure_command(instantiate_builder, new_opts)
-            .build
-            .execute(stdin: stdin, stdout: stdout, stderr: stderr)
+      def execute(parameters = {}, invocation_options = {})
+        parameters = resolve_parameters(parameters)
+        invocation_options = resolve_invocation_options(invocation_options)
+
+        do_before(parameters, invocation_options)
+        result = do_around(parameters, invocation_options) do |p, io|
+          build_and_execute_command(p, io)
         end
-        do_after(opts)
+        result = do_after(result, parameters, invocation_options)
+        prepare_result(result, parameters, invocation_options)
       end
 
-      def instantiate_builder
-        Lino::CommandLineBuilder
-          .for_command(binary)
-          .with_option_separator('=')
+      private
+
+      attr_reader :binary, :stdin, :stdout, :stderr
+
+      def do_before(parameters, invocation_options); end
+
+      def do_around(parameters, invocation_options)
+        yield parameters, invocation_options
+      end
+
+      def do_after(result, _parameters, _invocation_options)
+        result
       end
 
-      def do_before(opts); end
+      def build_and_execute_command(parameters, invocation_options)
+        command = configure_command(instantiate_builder, parameters).build
+        stdout = resolve_stdout(invocation_options)
+        stderr = resolve_stderr(invocation_options)
+        begin
+          command.execute(stdin:, stdout:, stderr:)
+        rescue Lino::Errors::ExecutionError => e
+          raise e unless e.exit_code == 1
+        end
+        process_streams(invocation_options, stdout, stderr)
+      end
 
-      def do_around(opts, &block)
-        block.call(opts)
+      def instantiate_builder
+        Lino.builder_for_command(binary)
+            .with_option_separator('=')
       end
 
-      def configure_command(builder, _opts)
+      def configure_command(builder, _parameters)
         builder
       end
 
-      def do_after(opts); end
+      def process_result(result, _parameters, _invocation_options)
+        result
+      end
+
+      def parameter_defaults(_parameters)
+        {}
+      end
+
+      def parameter_overrides(_parameters)
+        {}
+      end
+
+      def invocation_option_defaults(_invocation_options)
+        { capture: [], result: :processed }
+      end
+
+      def resolve_parameters(parameters)
+        parameter_defaults(parameters)
+          .merge(parameters)
+          .merge(parameter_overrides(parameters))
+      end
+
+      def resolve_invocation_options(invocation_options)
+        invocation_option_defaults(invocation_options)
+          .merge(invocation_options)
+      end
+
+      def resolve_stdout(invocation_options)
+        invocation_options[:capture].include?(:stdout) ? Tempfile.new : @stdout
+      end
+
+      def resolve_stderr(invocation_options)
+        invocation_options[:capture].include?(:stderr) ? Tempfile.new : @stderr
+      end
+
+      def process_streams(invocation_options, stdout, stderr)
+        cap = invocation_options[:capture]
+        result = {}
+        add_contents_to_result(cap, result, :stdout, stdout, :output)
+        add_contents_to_result(cap, result, :stderr, stderr, :error)
+        result
+      end
+
+      def add_contents_to_result(capture, result, stream_name, stream, type)
+        return unless capture.include?(stream_name)
+
+        stream.rewind
+        result[type] = stream.read
+      end
+
+      def prepare_result(result, parameters, invocation_options)
+        return result if invocation_options[:result] == :raw
+
+        process_result(result, parameters, invocation_options)
+      end
     end
   end
 end

data/lib/ruby_fly/commands/destroy_pipeline.rb

@@ -11,20 +11,20 @@ module RubyFly
       include Mixins::Environment
       include Mixins::RequiredParams
 
-      def configure_command(builder, opts)
-        builder = super(builder, opts)
+      private
+
+      def configure_command(initial_builder, parameters)
+        builder = super
         builder
           .with_subcommand('destroy-pipeline') do |sub|
-          sub = with_target(sub, opts[:target])
-          sub = with_pipeline(sub, opts[:pipeline])
-          sub = with_team(sub, opts[:team])
-          sub = with_non_interactive(sub, opts[:non_interactive])
+          sub = with_target(sub, parameters[:target])
+          sub = with_pipeline(sub, parameters[:pipeline])
+          sub = with_team(sub, parameters[:team])
+          sub = with_non_interactive(sub, parameters[:non_interactive])
           sub
         end
       end
 
-      private
-
       def required_params
         %i[target pipeline]
       end

data/lib/ruby_fly/commands/get_pipeline.rb

@@ -11,12 +11,12 @@ module RubyFly
       include Mixins::Environment
       include Mixins::RequiredParams
 
-      def configure_command(builder, opts)
-        builder = super(builder, opts)
+      def configure_command(initial_builder, parameters)
+        builder = super
         builder
           .with_subcommand('get-pipeline') do |sub|
-          sub = with_target(sub, opts[:target])
-          sub = with_pipeline(sub, opts[:pipeline])
+          sub = with_target(sub, parameters[:target])
+          sub = with_pipeline(sub, parameters[:pipeline])
           sub
         end
       end

data/lib/ruby_fly/commands/login.rb

@@ -11,15 +11,15 @@ module RubyFly
       include Mixins::Environment
       include Mixins::RequiredParams
 
-      def configure_command(builder, opts)
-        builder = super(builder, opts)
+      def configure_command(initial_builder, parameters)
+        builder = super
         builder
           .with_subcommand('login') do |sub|
-            sub = with_target(sub, opts[:target])
-            sub = with_concourse_url(sub, opts[:concourse_url])
-            sub = with_username(sub, opts[:username])
-            sub = with_password(sub, opts[:password])
-            sub = with_team(sub, opts[:team])
+            sub = with_target(sub, parameters[:target])
+            sub = with_concourse_url(sub, parameters[:concourse_url])
+            sub = with_username(sub, parameters[:username])
+            sub = with_password(sub, parameters[:password])
+            sub = with_team(sub, parameters[:team])
             sub
           end
       end

data/lib/ruby_fly/commands/mixins/environment.rb

@@ -5,7 +5,7 @@ module RubyFly
     module Mixins
       module Environment
         def initialize(opts = {})
-          super(opts)
+          super
           @environment = opts[:environment]
         end
 
@@ -14,9 +14,9 @@ module RubyFly
           self
         end
 
-        def configure_command(builder, opts)
-          builder = super(builder, opts)
-          environment = opts[:environment] || @environment
+        def configure_command(initial_builder, parameters)
+          builder = super
+          environment = parameters[:environment] || @environment
           if environment
             builder =
               environment.to_a.inject(builder) do |b, environment_variable|

data/lib/ruby_fly/commands/mixins/required_params.rb

@@ -4,9 +4,9 @@ module RubyFly
   module Commands
     module Mixins
       module RequiredParams
-        def configure_command(builder, opts)
-          assert_required_params(opts)
-          super(builder, opts)
+        def configure_command(initial_builder, parameters)
+          assert_required_params(parameters)
+          super
         end
 
         def required_params
@@ -15,12 +15,12 @@ module RubyFly
 
         private
 
-        def missing_params(opts)
-          required_params.select { |param| opts[param].nil? }
+        def missing_params(parameters)
+          required_params.select { |param| parameters[param].nil? }
         end
 
-        def assert_required_params(opts)
-          missing_params = missing_params(opts)
+        def assert_required_params(parameters)
+          missing_params = missing_params(parameters)
           return if missing_params.empty?
 
           description = missing_params.map { |p| "'#{p}'" }.join(', ')

data/lib/ruby_fly/commands/set_pipeline.rb

@@ -13,17 +13,17 @@ module RubyFly
 
       # rubocop:disable Metrics/AbcSize
       # rubocop:disable Metrics/MethodLength
-      def configure_command(builder, opts)
-        builder = super(builder, opts)
+      def configure_command(initial_builder, parameters)
+        builder = super
         builder
           .with_subcommand('set-pipeline') do |sub|
-            sub = with_target(sub, opts[:target])
-            sub = with_pipeline(sub, opts[:pipeline])
-            sub = with_config(sub, opts[:config])
-            sub = with_team(sub, opts[:team])
-            sub = with_vars(sub, opts[:vars])
-            sub = with_var_files(sub, opts[:var_files])
-            sub = with_non_interactive(sub, opts[:non_interactive])
+            sub = with_target(sub, parameters[:target])
+            sub = with_pipeline(sub, parameters[:pipeline])
+            sub = with_config(sub, parameters[:config])
+            sub = with_team(sub, parameters[:team])
+            sub = with_vars(sub, parameters[:vars])
+            sub = with_var_files(sub, parameters[:var_files])
+            sub = with_non_interactive(sub, parameters[:non_interactive])
             sub
           end
       end

data/lib/ruby_fly/commands/status.rb

@@ -11,32 +11,28 @@ module RubyFly
       include Mixins::Environment
       include Mixins::RequiredParams
 
-      def initialize(*args)
-        super(*args)
-        @stdout = StringIO.new unless
-            defined?(@stdout) && @stdout.respond_to?(:string)
-        @stderr = StringIO.new unless
-            defined?(@stderr) && @stderr.respond_to?(:string)
+      private
+
+      def invocation_option_defaults(_invocation_options)
+        super.merge(capture: %i[stdout stderr])
       end
 
-      def configure_command(builder, opts)
-        builder = super(builder, opts)
+      def configure_command(initial_builder, parameters)
+        builder = super
         builder
           .with_subcommand('status') do |sub|
-            sub = with_target(sub, opts[:target])
-            sub
-          end
+          sub = with_target(sub, parameters[:target])
+          sub
+        end
       end
 
-      def do_around(opts, &block)
-        block.call(opts)
-      rescue Open4::SpawnError => e
-        raise e unless e.status.exitstatus == 1
+      def do_around(parameters, invocation_options, &block)
+        block.call(parameters, invocation_options)
       end
 
-      def do_after(_opts)
-        output = stdout.string
-        error = stderr.string
+      def process_result(result, _parameters, _invocation_options)
+        output = result[:output]
+        error = result[:error]
 
         return :logged_in if output =~ /logged in successfully/
         return :logged_out if error =~ /logged out/
@@ -46,8 +42,6 @@ module RubyFly
         :unknown_status
       end
 
-      private
-
       def required_params
         %i[target]
       end

data/lib/ruby_fly/commands/unpause_pipeline.rb

@@ -11,13 +11,13 @@ module RubyFly
       include Mixins::Environment
       include Mixins::RequiredParams
 
-      def configure_command(builder, opts)
-        builder = super(builder, opts)
+      def configure_command(initial_builder, parameters)
+        builder = super
         builder
           .with_subcommand('unpause-pipeline') do |sub|
-          sub = with_target(sub, opts[:target])
-          sub = with_pipeline(sub, opts[:pipeline])
-          sub = with_team(sub, opts[:team])
+          sub = with_target(sub, parameters[:target])
+          sub = with_pipeline(sub, parameters[:pipeline])
+          sub = with_team(sub, parameters[:team])
           sub
         end
       end

data/lib/ruby_fly/commands/version.rb

@@ -6,20 +6,20 @@ require_relative 'base'
 module RubyFly
   module Commands
     class Version < Base
-      def stdout
-        @version_string
-      end
+      private
 
-      def do_before(_opts)
-        @version_string = StringIO.new
+      def invocation_option_defaults(_invocation_options)
+        super.merge(capture: [:stdout])
       end
 
-      def configure_command(builder, _opts)
+      def configure_command(initial_builder, _parameters)
+        builder = super
         builder.with_flag('--version')
       end
 
-      def do_after(_opts)
-        @version_string.string.gsub("\n", '')
+      def process_result(result, _parameters, _invocation_options)
+        output = result[:output]
+        output.gsub("\n", '')
       end
     end
   end

data/lib/ruby_fly/rc.rb

@@ -59,7 +59,7 @@ module RubyFly
       def bearer_token=(value)
         @token = {
           type: 'bearer',
-          value: value
+          value:
         }
       end
 
@@ -103,7 +103,7 @@ module RubyFly
       contents = options[:contents] || try_load_rc_file_contents(path) || {}
       targets = try_load_rc_file_targets(path, contents) || []
 
-      RubyFly::RC.new(home: home, name: name, targets: targets)
+      RubyFly::RC.new(home:, name:, targets:)
     end
 
     class << self

data/lib/ruby_fly/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyFly
-  VERSION = '0.40.0.pre.3'
+  VERSION = '0.40.0.pre.5'
 end

data/lib/ruby_fly.rb

@@ -61,7 +61,7 @@ module RubyFly
 
     def initialize
       @binary = 'fly'
-      @stdin = ''
+      @stdin = nil
       @stdout = $stdout
       @stderr = $stderr
     end

data/ruby_fly.gemspec

@@ -34,26 +34,29 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.7'
+  spec.required_ruby_version = '>= 3.1'
 
-  spec.add_dependency 'lino', '~> 3.0'
+  spec.add_dependency 'lino', '>= 4.1.0.pre.1'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'fakefs'
   spec.add_development_dependency 'faker'
   spec.add_development_dependency 'gem-release'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rake_circle_ci'
   spec.add_development_dependency 'rake_git'
-  spec.add_development_dependency 'rake_git_crypt'
+  spec.add_development_dependency 'rake_git_crypt', '>= 0.1.0.pre.31'
   spec.add_development_dependency 'rake_github'
-  spec.add_development_dependency 'rake_gpg'
+  spec.add_development_dependency 'rake_gpg', '>= 0.19.0.pre.6'
   spec.add_development_dependency 'rake_ssh'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-rake'
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'terminal-notifier-guard'
 
   spec.metadata['rubygems_mfa_required'] = 'false'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ruby_fly
 version: !ruby/object:Gem::Version
-  version: 0.40.0.pre.3
+  version: 0.40.0.pre.5
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-30 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lino
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.1.0.pre.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.1.0.pre.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +156,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre.31
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre.31
 - !ruby/object:Gem::Dependency
   name: rake_github
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +184,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.0.pre.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.0.pre.6
 - !ruby/object:Gem::Dependency
   name: rake_ssh
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +276,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier-guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Wraps the concourse fly CLI so that fly can be invoked from a Ruby script
   or Rakefile.
 email:
@@ -292,14 +334,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: A simple Ruby wrapper for invoking fly commands.