lib/jets/builders/code_builder.rb in jets-1.4.5 vs lib/jets/builders/code_builder.rb in jets-1.4.6

- old
+ new

@@ -211,18 +211,18 @@ return unless Jets.rack? # Need to capture JETS_ROOT since can be changed by Turbo mode jets_root = Jets.root Bundler.with_clean_env do + # Switch gemfile for Afterburner mode gemfile = ENV['BUNDLE_GEMFILE'] ENV['BUNDLE_GEMFILE'] = "#{jets_root}/rack/Gemfile" - sh "cd #{jets_root} && bundle install" + ENV['BUNDLE_GEMFILE'] = gemfile + rails_assets(:clobber, jets_root: jets_root) rails_assets(:precompile, jets_root: jets_root) - - ENV['BUNDLE_GEMFILE'] = gemfile end end def rails_assets(cmd, jets_root:) # rake is available in both rails 4 and 5. rails command only in 5 @@ -258,11 +258,11 @@ FileUtils.mkdir_p("#{build_area}/stage") FileUtils.rm_rf("#{stage_area}/code") # remove current code folder move_node_modules(Jets.root, Jets.build_root) begin # puts "cp -r #{@full_project_path} #{"#{stage_area}/code"}".colorize(:yellow) # uncomment to debug - FileUtils.cp_r(@full_project_path, "#{stage_area}/code") + Jets::Util.cp_r(@full_project_path, "#{stage_area}/code") ensure move_node_modules(Jets.build_root, Jets.root) # move node_modules directory back end end @@ -305,16 +305,22 @@ memoize :rack_packager def package_ruby return if Jets.poly_only? + check_agree ruby_packager.install reconfigure_rails # call here after "#{stage_area}/code" is available rack_packager.install ruby_packager.finish # by this time we have a /tmp/jets/demo/stage/code/vendor/gems rack_packager.finish build_lambda_layer + end + + def check_agree + agree = Jets::Gems::Agree.new + agree.prompt end def build_lambda_layer return if Jets.poly_only? lambda_layer = LambdaLayer.new