brut 0.21.0.pre.1 → 0.21.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 465fa110056a12dd5c33e2fac0754dfbba25c5928f23e4fb08f3f5976cf9a384
-  data.tar.gz: 3c6598da1ce0bf9e2655c56fb4edce22293a90d98cfef9cab855df210e5964fb
+  metadata.gz: '049e10b89cc1f9493bdac64fcdf569064de7458a36757a57681c5de5beec2fbe'
+  data.tar.gz: 66dfee5973159e43bee8f1fe9a43efba162a3835df4a4fa7772fabcffca1dfef
 SHA512:
-  metadata.gz: 183335e5d4fc53b5d30ac5eb1c783bad929b782860d2de117ece54e1ac26e96f52466bfd36e8fc26d6e7209a1a88c8337e08a1c3cc30091ed5687baad063c137
-  data.tar.gz: 4c744e3e2d7f8c6e02d6ed6f3f0192af1184fea1aa4ccc66e068a68bade6ed0a4abf03b2a8a2562991dd39b1e4cad840bd3e28251ef0ab48c7cb8c6bc1cba100
+  metadata.gz: c1bb2e290674f713ef35fe6d91abf566e2076146d60307f4f5a75b2bb84d5927455d2b050c35608568f90c5aaa579eeeca7ca1241c2d370810f5c669b724b735
+  data.tar.gz: b3fbfbf1ffb662a3813a5aa30743e385efaaae6e95d2d265dbdb989b7cf8ad3ef8e48e4bab07139d68f2b0d5d633477ae32347d82103323260b420e567d48a3e

data/lib/brut/cli/apps/deploy.rb

@@ -47,10 +47,7 @@ class Brut::CLI::Apps::Deploy < Brut::CLI::Commands::BaseCommand
         end
         version = ""
         git_guess = %{git rev-parse HEAD}
-        system!(git_guess) do |output|
-          version << output
-        end
-        version = version.strip.chomp
+        version = capture!(git_guess).strip.chomp
         if version == ""
           fatal "Attempt to use git via command '#{git_guess}' to figure out the version failed"
           return 1
@@ -66,12 +63,12 @@ class Brut::CLI::Apps::Deploy < Brut::CLI::Commands::BaseCommand
         dockerfile = Brut.container.project_root / "deploy" / "Dockerfile"
         FileUtils.chdir Brut.container.project_root do
           command = %{docker build --build-arg app_git_sha1=#{version} --file #{dockerfile} --platform #{config.platform} --tag #{image_name} . 2>&1}
-          system!(command)
+          system!(command, output: :stream)
         end
         if options.build_only?
           puts "Not pushing image"
         else
-          system!("docker image push #{image_name}")
+          system!("docker image push #{image_name}", output: :stream)
         end
 
         0
@@ -139,10 +136,7 @@ class Brut::CLI::Apps::Deploy < Brut::CLI::Commands::BaseCommand
         config = AppDeployConfig.new
         version = ""
         git_guess = %{git rev-parse HEAD}
-        system!(git_guess) do |output|
-          version << output
-        end
-        version = version.strip.chomp
+        version = capture!(git_guess).strip.chomp
         if version == ""
           fatal "Attempt to use git via command '#{git_guess}' to figure out the version failed"
           return 1
@@ -161,14 +155,14 @@ class Brut::CLI::Apps::Deploy < Brut::CLI::Commands::BaseCommand
                            "--push"
                          end
           command = %{docker buildx build --provenance=false --build-arg app_git_sha1=#{version} --file #{process_dockerfile_path} --platform #{config.platform} #{push_or_load} --tag #{image_name} . 2>&1}
-          system!(command)
+          system!(command, output: :stream)
           names << process_description.name
         end
         deploy_command = "heroku container:release #{names.sort.join(' ')} -a #{Brut.container.app_id}"
         if options.build_only?
           puts "Not deploying"
         else
-          system!(deploy_command)
+          system!(deploy_command, output: :stream)
         end
 
         0
@@ -178,9 +172,12 @@ class Brut::CLI::Apps::Deploy < Brut::CLI::Commands::BaseCommand
       end
     end
   end
-  module DockerCompose
+  class DockerCompose < Brut::CLI::Commands::BaseCommand
+    def default_rack_env = "development"
+    def description = "Manage a docker-compose.yml file to be consistent with your deploy config"
     class Check < Brut::CLI::Commands::BaseCommand
       def description = "Check if the existing docker-compose.yml is consistent with the deploy config"
+      def default_rack_env = "development"
       def run
         docker_compose_path = Brut.container.project_root / "deploy" / "docker-compose.yml"
         if !docker_compose_path.exist?
@@ -265,6 +262,7 @@ class Brut::CLI::Apps::Deploy < Brut::CLI::Commands::BaseCommand
     end
     class Generate < Brut::CLI::Commands::BaseCommand
       def description = "Generate or update the existing docker-compose.yml based on current deploy config"
+      def default_rack_env = "development"
       def run
         docker_compose_path = Brut.container.project_root / "deploy" / "docker-compose.yml"
         deploy_config_path = Brut.container.project_root / "deploy" / "deploy_config.rb"

data/lib/brut/cli/apps/new/segments/docker_deploy.rb

@@ -8,8 +8,7 @@ class Brut::CLI::Apps::New::Segments::DockerDeploy < Brut::CLI::Apps::New::Base
   end
 
   def add!
-    operations = copy_files(@templates_dir, @project_root) + 
-                 other_operations
+    operations = copy_files(@templates_dir, @project_root)
 
     operations.each do |operation|
       operation.call

data/lib/brut/cli/commands/base_command.rb

@@ -136,19 +136,35 @@ private
   # @!visibility public
   def argv = self.execution_context.argv
 
-  # Convienience methods to defer to `Brut::CLI::Commands::ExecutionContext`'s `Brut::CLI::Executor#system!`.
-  # @!visibility public
-  def system!(*args,&block)
+  # Wraps `system!`, but captures the output and returns it
+  def capture!(*args)
     output = ""
-    block ||= ->(output_chunk) {
+    capture = ->(output_chunk) {
       output << output_chunk
     }
+    system!( *args, output: capture)
+    output
+  end
+
+  # Convienience methods to defer to `Brut::CLI::Commands::ExecutionContext`'s `Brut::CLI::Executor#system!`.
+  # @!visibility public
+  def system!(*args,output: :log)
+    command_output = ""
+    block = if output == :log
+              block ||= ->(output_chunk) {
+                command_output << output_chunk
+              }
+            elsif output.kind_of?(Proc)
+              block = output
+            else
+              nil
+            end
     begin
       self.execution_context.executor.system!(*args,&block)
     ensure
-      if output.length > 0
+      if command_output.length > 0
         progname = args.detect { it.kind_of?(String) }.split(" ")
-        output.lines.each do |line|
+        command_output.lines.each do |line|
           self.execution_context.logger.add(Logger::INFO, line.chomp, progname)
         end
       end

data/lib/brut/spec_support/cli_command_support.rb

@@ -24,12 +24,19 @@ module Brut::SpecSupport::CLICommandSupport
                   args
                 end
       @commands_executed << command
-      if @on_commands[command]
-        if @on_commands[command][:raise_error]
+      on_command = @on_commands.select { |it,_|
+        it == command || it.match?(command)
+      }.map { |_,it| it }.first
+      if on_command
+        if on_command[:raise_error]
           raise Brut::CLI::SystemExecError.new(command,1)
-        elsif @on_commands[command][:output]
-          output = @on_commands[command][:output]
-          yield(output)
+        elsif on_command[:output]
+          output = on_command[:output]
+          if block_given?
+            yield(output)
+          else
+            @out.puts output
+          end
         end
       end
       nil

data/lib/brut/version.rb

@@ -1,4 +1,4 @@
 module Brut
   # @!visibility private
-  VERSION = "0.21.0.pre.1"
+  VERSION = "0.21.0.pre.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brut
 version: !ruby/object:Gem::Version
-  version: 0.21.0.pre.1
+  version: 0.21.0.pre.2
 platform: ruby
 authors:
 - David Bryant Copeland