brut 0.16.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfc3d9ad3e55165ded7d3ea588c67390f92394c3b0b2c6e256417d552ec384f7
-  data.tar.gz: 6d9f2fa3aca410336dab2d5dd9142ab4fcace09c267eb33feb9fe5f0628e6acf
+  metadata.gz: a372a8718b78ecfcc1809b8fde106c6f3183f832a470026d93db5c565ead1bd3
+  data.tar.gz: 22c8cc673793bc474e5c4cd385752ecdaed134d5787af1182dbad420844fa9bf
 SHA512:
-  metadata.gz: f9ff8c13f40ba7ab458d94eedd0cc990a2ca4b495f7de915b77ad5d923b52d1861f7b67bf2db2d47e4a7e77391cdd6da0043b69d9ef7032a4985a1655cae5969
-  data.tar.gz: 23743abf0f6ad74a8b1eabb2805cd8bd73dde83b755901c3541be970640395fc4b67f83420935f2e0615c0f3b7deb50aeb169a61135a8352c3a430996d2e8ac0
+  metadata.gz: e5dd3830b105ed11a22a7cc5337839b8f0d0e5fe6041b9e981344ed86a3fb821a8e8a79f13dfb220b3497468f36b1698ca59d2236f01571cdc19994a6225be6c
+  data.tar.gz: 97e1f41887e1a85b8ca4a592821a40c73b4c15d9706ed5458013ca5097de61f1f66c79a9a0a125570cedbf9f42f151b79e50bff92c10fb8b8d30d7b0c585cc57

data/exe/brut

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+
+require "fileutils"
+require "brut"
+require "brut/cli/apps/build_assets"
+require "brut/cli/apps/db"
+require "brut/cli/apps/scaffold"
+require "brut/cli/apps/test"
+require "brut/cli/apps/deploy"
+require "brut/cli/apps/new"
+
+class Brut::CLI::Apps::Brut < Brut::CLI::Commands::BaseCommand
+  def description = "Brut CLI - interact with Brut and your app"
+
+  def commands
+    [
+      Brut::CLI::Apps::BuildAssets.new,
+      Brut::CLI::Apps::DB.new,
+      Brut::CLI::Apps::Scaffold.new,
+      Brut::CLI::Apps::Test.new,
+      Brut::CLI::Apps::Deploy.new,
+      Brut::CLI::Apps::New::App.new,
+    ]
+  end
+end
+
+runner = Brut::CLI::Runner.new(
+  Brut::CLI::Apps::Brut.new,
+  stdout: $stdout,
+  stderr: $stderr,
+  stdin: $stdin,
+  project_root: Pathname(FileUtils.pwd),
+)
+exit runner.run!(ARGV,ENV)

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

@@ -3,117 +3,147 @@ require "fileutils"
 
 require "brut/cli"
 
-class Brut::CLI::Apps::BuildAssets < Brut::CLI::App
-  description "Build and manage code and assets destined for the browser, such as CSS, JS, or images"
-  requires_project_env
-  default_command :all
-  configure_only!
-  opts.on("--[no-]clean", "If set, any old files from previous runs are deleted. If omitted, is false in production and true otherwise")
-
-  class All < Brut::CLI::Command
-    description "Build all assets"
-
-    def execute
-      if global_options.clean?(default: global_options.env != "production")
+class Brut::CLI::Apps::BuildAssets < Brut::CLI::Commands::BaseCommand
+  def description = "Build and manage code and assets destined for the browser, such as CSS, JS, or images"
+
+  def opts = [
+    [
+      "--[no-]clean",
+      "If set, any old files from previous runs are deleted. If omitted, is false in production and true otherwise",
+    ],
+  ]
+
+  def name = "build-assets" 
+
+  def default_command_class = All
+  def bootstrap? = default_command.bootstrap?
+
+  class All < Brut::CLI::Commands::CompoundCommand
+    def default_rack_env = "development"
+    def description = "Build all assets"
+    def bootstrap? = false
+
+    def initialize
+      super([
+        Images.new,
+        Css.new,
+        Js.new,
+      ])
+    end
+
+    def execute(execution_context)
+      if execution_context.options.clean?(default: execution_context.options.env != "production")
         asset_metadata_file = Brut.container.asset_metadata_file
-        out.puts "Removing #{asset_metadata_file}"
+        execution_context.stdout.puts "Removing #{asset_metadata_file}"
         FileUtils.rm_f(asset_metadata_file)
       end
-      delegate_to_commands(Images, Js, Css)
+      super
     end
   end
 
-  class Images < Brut::CLI::Command
-    description "Copy images to the public folder"
-    detailed_description %{
+  class Images < Brut::CLI::Commands::BaseCommand
+    def default_rack_env = "development"
+    def description = "Copy images to the public folder"
+    def detailed_description = %{
 This is to ensure that any images your code references will end up in the public directory, so they are served properly. This is not for managing images that may be referenced in CSS files. See the `css` command for information on that.
     }
+    def bootstrap? = false
 
-    def execute
+    def run
       src_dir  = Brut.container.images_src_dir
       dest_dir = Brut.container.images_root_dir
 
-      command = "rsync --archive --delete --verbose #{src_dir}/ #{dest_dir}"
-      system! command
+      system! "rsync --archive --delete --verbose \"#{src_dir}/\" \"#{dest_dir}\""
     end
   end
 
-  class Css < Brut::CLI::Command
-    description "Builds a single CSS file suitable for sending to the browser"
+  class Css < Brut::CLI::Commands::BaseCommand
+    def default_rack_env = "development"
+    def description = "Builds a single CSS file suitable for sending to the browser"
 
-    detailed_description %{
+    def detailed_description = %{
       This produces a hashed file in every environment, in order to keep environments consistent and reduce differences.  If your CSS file references images, fonts, or other assets via url() or other CSS functions, those files will be hashed and copied into the output directory where CSS is served.
 
       To ensure this happens correctly, your url() or other function must reference the file as a relative file from where your actual source CSS file is located. For example, a font named some-font.ttf would be in app/src/front_end/fonts and to reference this from app/src/front_end/css/index.css you'd use the url "../fonts/some-font.ttf"
     }
+    def bootstrap? = false
 
-    def execute
+    def run
       css_bundle          = Brut.container.css_bundle_output_dir / "styles.css"
       css_bundle_source   = Brut.container.front_end_src_dir / "css" / "index.css"
       esbuild_metafile    = Brut.container.tmp_dir / "build-css-meta.json"
       asset_metadata_file = Brut.container.asset_metadata_file
 
-      if global_options.clean?(default: global_options.env != "production")
-        out.puts "Cleaning old CSS files from #{Brut.container.css_bundle_output_dir}"
+      if options.clean?(default: options.env != "production")
+        puts "Cleaning old CSS files from #{Brut.container.css_bundle_output_dir}"
         Dir[Brut.container.css_bundle_output_dir / "*.*"].each do |file|
           if File.file?(file)
-            out.puts "Deleting #{file}"
+            puts "Deleting #{file}"
             FileUtils.rm(file)
           end
         end
       end
 
       command = "npx esbuild --loader:.ttf=copy --loader:.otf=copy --metafile=#{esbuild_metafile} --entry-names=[name]-[hash] --sourcemap --bundle #{css_bundle_source} --outfile=#{css_bundle}"
-      out.puts "Building CSS bundle '#{css_bundle}' with '#{command}'"
+      puts "Building CSS bundle '#{css_bundle}' with '#{command}'"
       system!(command)
 
       if !File.exist?(esbuild_metafile)
-        err.puts "'#{esbuild_metafile}' was not generated - cannot continue"
-        exit 1
+        stderr.puts "'#{esbuild_metafile}' was not generated - cannot continue"
+        return 1
       end
 
-      asset_metadata = Brut::FrontEnd::AssetMetadata.new(asset_metadata_file:,out:)
+      asset_metadata = Brut::FrontEnd::AssetMetadata.new(asset_metadata_file:,out: stdout)
       asset_metadata.merge!(extension: ".css", esbuild_metafile:)
       asset_metadata.save!
+      0
     end
   end
-  class Js < Brut::CLI::Command
-    description "Builds and bundles JavaScript destined for the browser"
-    opts.on("--output-file=FILE","Bundle to create that will be sent to the browser, relative to the JS public folder. Default is app.js")
-    opts.on("--source-file=FILE","Entry point used to create the bundle, relative to the source JS folder. Default is index.js")
-
-    def execute
+  class Js < Brut::CLI::Commands::BaseCommand
+    def default_rack_env = "development"
+    def description = "Builds and bundles JavaScript destined for the browser"
+    def opts = [
+      [
+        "--output-file=FILE",
+        "Bundle to create that will be sent to the browser, relative to the JS public folder. Default is app.js",
+      ],
+      [
+        "--source-file=FILE",
+        "Entry point used to create the bundle, relative to the source JS folder. Default is index.js",
+      ]
+    ]
+    def bootstrap? = false
+
+    def run
       js_bundle           = Brut.container.js_bundle_output_dir / options.output_file(default: "app.js")
       js_bundle_source    = Brut.container.front_end_src_dir /  "js" / options.source_file(default: "index.js")
       esbuild_metafile    = Brut.container.tmp_dir / "build-js-meta.json"
       asset_metadata_file = Brut.container.asset_metadata_file
 
       name_with_hash_regexp = /app\/public\/(?<path>.+)\/(?<name>.+)\-(?<hash>.+)\.js/
-      if global_options.clean?(default: global_options.env != "production")
-        out.puts "Cleaning old JS files from #{Brut.container.js_bundle_output_dir}"
+      if options.clean?(default: options.env != "production")
+        puts "Cleaning old JS files from #{Brut.container.js_bundle_output_dir}"
         Dir[Brut.container.js_bundle_output_dir / "*.*"].each do |file|
           if File.file?(file)
-            out.puts "Deleting #{file}"
+            puts "Deleting #{file}"
             FileUtils.rm(file)
           end
         end
       end
 
       command = "npx esbuild --metafile=#{esbuild_metafile} --entry-names=[name]-[hash] --sourcemap --bundle #{js_bundle_source} --outfile=#{js_bundle}"
-      env_for_command = {
-        "NODE_PATH" => (Brut.container.project_root / "lib").to_s, # Not needed once Brut is properly bundled
-      }
-      out.puts "Building JS bundle '#{js_bundle}' with '#{command}'"
-      system!(env_for_command,command)
+      puts "Building JS bundle '#{js_bundle}' with '#{command}'"
+      system!(command)
 
       if !File.exist?(esbuild_metafile)
-        err.puts "'#{esbuild_metafile}' was not generated - cannot continue"
-        exit 1
+        stderr.puts "'#{esbuild_metafile}' was not generated - cannot continue"
+        return 1
       end
 
-      asset_metadata = Brut::FrontEnd::AssetMetadata.new(asset_metadata_file:,out:)
+      asset_metadata = Brut::FrontEnd::AssetMetadata.new(asset_metadata_file:,out: stdout)
       asset_metadata.merge!(extension: ".js", esbuild_metafile:)
       asset_metadata.save!
+      0
     end
 
   end