M lib/assemblage/assembly_builder.rb +4 -2
@@ 280,8 280,10 @@ class Assemblage::AssemblyBuilder
end
self.add_build_log "Executing %s" % [ script ]
- cmd = TTY::Command.new
- cmd.run( script )
+ cmd = TTY::Command.new( output: self.build_log, printer: :quiet, color: false )
+ result = cmd.run!( script )
+
+ break unless result.success?
end
end
end
M lib/assemblage/command/simulate.rb +7 -2
@@ 1,6 1,7 @@
# -*- ruby -*-
# frozen_string_literal: true
+require 'pp'
require 'socket'
require 'assemblage/cli' unless defined?( Assemblage::CLI )
require 'assemblage/assembly_builder'
@@ 42,7 43,7 @@ module Assemblage::CLI::SimulateCommand
revision: 'tip', # :TODO: Allow specification; auto-determine based on repo type?
}
- builder = Assemblage::AssemblyBuilder.new( directory, assembly )
+ builder = Assemblage::AssemblyBuilder.new( directory, **assembly )
builder.start
stage = nil
@@ 59,8 60,12 @@ module Assemblage::CLI::SimulateCommand
res = builder.final_result
log = res.delete( :log )
+ res_pp = String.new
+ PP.pp( res, res_pp )
- pp res
+ prompt.say( headline_string "Result Struct:" )
+ prompt.say( res_pp )
+ prompt.say( headline_string "Log" )
prompt.say( log )
end
end