brut 0.16.0 → 0.18.0

data/{mkbrut/lib/mkbrut → lib/brut/cli/apps/new}/internet_identifier.rb

@@ -1,4 +1,4 @@
-module MKBrut
+module Brut::CLI::Apps::New
   class InternetIdentifier
     def initialize(name, value)
       @name = name
@@ -13,19 +13,19 @@ module MKBrut
 
     def validate_identifier
       if @identifier.empty?
-        raise MKBrut::InvalidIdentifier, "#{@name} cannot be empty"
+        raise Brut::CLI::Apps::New::InvalidIdentifier, "#{@name} cannot be empty"
       end
 
       if @identifier.length > 63
-        raise MKBrut::InvalidIdentifier, "#{@name} cannot be longer than 63 characters"
+        raise Brut::CLI::Apps::New::InvalidIdentifier, "#{@name} cannot be longer than 63 characters"
       end
 
       if @identifier.start_with?("-") || @identifier.end_with?("-")
-        raise MKBrut::InvalidIdentifier, "#{@name} cannot start or end with a hyphen"
+        raise Brut::CLI::Apps::New::InvalidIdentifier, "#{@name} cannot start or end with a hyphen"
       end
 
       if @identifier.match?(/[^a-zA-Z0-9-]/)
-        raise MKBrut::InvalidIdentifier, "#{@name} can only contain letters, numbers, and hyphens"
+        raise Brut::CLI::Apps::New::InvalidIdentifier, "#{@name} can only contain letters, numbers, and hyphens"
       end
     end
   end 

data/{mkbrut/lib/mkbrut → lib/brut/cli/apps/new}/invalid_identifier.rb

@@ -1,4 +1,4 @@
-module MKBrut
+module Brut::CLI::Apps::New
   class InvalidIdentifier < ArgumentError
   end
 end

data/{mkbrut/lib/mkbrut/app.rb → lib/brut/cli/apps/new/old_app.rb}

@@ -1,8 +1,5 @@
-require "fileutils"
-require "erb"
-require "ostruct"
 
-module MKBrut
+class Brut::CLI::Apps::New
   class App
     def initialize(current_dir:, app_options:, out:, err:)
       @out = out
@@ -17,27 +14,27 @@ module MKBrut
 
       if app_options.dry_run?
         @out.puts "Dry Run"
-        MKBrut::Ops::BaseOp.dry_run = true
+        Brut::CLI::Apps::New::Ops::BaseOp.dry_run = true
       end
 
       templates_dir = Pathname(
-        Gem::Specification.find_by_name("mkbrut").gem_dir
+        Gem::Specification.find_by_name("brut").gem_dir
       ) / "templates"
 
-      @base = MKBrut::Base.new(
+      @base = Brut::CLI::Apps::New::Base.new(
         app_options:,
         current_dir:,
         templates_dir:
       )
       @segments = [
-        MKBrut::Segments::BareBones.new(
+        Brut::CLI::Apps::New::Segments::BareBones.new(
           app_options:,
           current_dir:,
           templates_dir:,
         ),
       ]
       if app_options.demo?
-        @segments << MKBrut::Segments::Demo.new(
+        @segments << Brut::CLI::Apps::New::Segments::Demo.new(
           app_options:,
           current_dir:,
           templates_dir:
@@ -46,12 +43,12 @@ module MKBrut
       app_options.segments.each do |segment|
         case segment
         when "heroku"
-          @segments << MKBrut::Segments::Heroku.new(
+          @segments << Brut::CLI::Apps::New::Segments::Heroku.new(
             project_root: @base.project_root,
             templates_dir:
           )
         when "sidekiq"
-          @segments << MKBrut::Segments::Sidekiq.new(
+          @segments << Brut::CLI::Apps::New::Segments::Sidekiq.new(
             project_root: @base.project_root,
             templates_dir:
           )

data/{mkbrut/lib/mkbrut → lib/brut/cli/apps/new}/ops/add_css_import.rb

@@ -1,4 +1,4 @@
-class MKBrut::Ops::AddCSSImport < MKBrut::Ops::BaseOp
+class Brut::CLI::Apps::New::Ops::AddCSSImport < Brut::CLI::Apps::New::Ops::BaseOp
   def initialize(project_root:, import:)
     @file   = project_root / "app" / "src" / "front_end" / "css" / "index.css"
     @import = import

data/{mkbrut/lib/mkbrut → lib/brut/cli/apps/new}/ops/add_i18n_message.rb

@@ -1,4 +1,4 @@
-class MKBrut::Ops::AddI18nMessage < MKBrut::Ops::PrismParsingOp
+class Brut::CLI::Apps::New::Ops::AddI18nMessage < Brut::CLI::Apps::New::Ops::PrismParsingOp
   def initialize(project_root:, hash:)
     @file = project_root / "app" / "config" / "i18n" / "en" / "2_app.rb"
     @hash = hash

data/{mkbrut/lib/mkbrut → lib/brut/cli/apps/new}/ops/add_method.rb

@@ -1,4 +1,4 @@
-class MKBrut::Ops::AddMethod < MKBrut::Ops::PrismParsingOp
+class Brut::CLI::Apps::New::Ops::AddMethod < Brut::CLI::Apps::New::Ops::PrismParsingOp
   def initialize(file:, class_name:, code:)
     @file        = file
     @class_name  = class_name

data/{mkbrut/lib/mkbrut → lib/brut/cli/apps/new}/ops/append_to_file.rb

@@ -1,4 +1,4 @@
-class MKBrut::Ops::AppendToFile < MKBrut::Ops::BaseOp
+class Brut::CLI::Apps::New::Ops::AppendToFile < Brut::CLI::Apps::New::Ops::BaseOp
   def initialize(file:, content:)
     @file    = file
     @content = content

data/{mkbrut/lib/mkbrut → lib/brut/cli/apps/new}/ops/base_op.rb

@@ -1,11 +1,11 @@
-class MKBrut::Ops::BaseOp
+class Brut::CLI::Apps::New::Ops::BaseOp
   @dry_run = false
 
   def self.dry_run=(value)
-    MKBrut::Ops::BaseOp.instance_variable_set(:@dry_run, value)
+    Brut::CLI::Apps::New::Ops::BaseOp.instance_variable_set(:@dry_run, value)
   end
 
-  def self.dry_run? = !!MKBrut::Ops::BaseOp.instance_variable_get(:@dry_run)
+  def self.dry_run? = !!Brut::CLI::Apps::New::Ops::BaseOp.instance_variable_get(:@dry_run)
   def dry_run? = self.class.dry_run?
 
   def call = raise "Subclass must implement"

data/{mkbrut/lib/mkbrut → lib/brut/cli/apps/new}/ops/copy_file.rb

@@ -1,6 +1,6 @@
 require "fileutils"
 
-class MKBrut::Ops::CopyFile < MKBrut::Ops::BaseOp
+class Brut::CLI::Apps::New::Ops::CopyFile < Brut::CLI::Apps::New::Ops::BaseOp
   def initialize(source, destination_root:)
     @source           = source
     @destination_root = destination_root

data/{mkbrut/lib/mkbrut → lib/brut/cli/apps/new}/ops/insert_code_in_method.rb

@@ -1,4 +1,4 @@
-class MKBrut::Ops::InsertCodeInMethod < MKBrut::Ops::PrismParsingOp
+class Brut::CLI::Apps::New::Ops::InsertCodeInMethod < Brut::CLI::Apps::New::Ops::PrismParsingOp
   def initialize(file:,
                  class_name:,
                  method_name:,

data/{mkbrut/lib/mkbrut → lib/brut/cli/apps/new}/ops/insert_into_file.rb

@@ -1,4 +1,4 @@
-class MKBrut::Ops::InsertIntoFile < MKBrut::Ops::BaseOp
+class Brut::CLI::Apps::New::Ops::InsertIntoFile < Brut::CLI::Apps::New::Ops::BaseOp
   def initialize(file:, content:, before_line:)
     @file        = file
     @content     = content

data/{mkbrut/lib/mkbrut → lib/brut/cli/apps/new}/ops/insert_route.rb

@@ -1,4 +1,4 @@
-class MKBrut::Ops::InsertRoute < MKBrut::Ops::PrismParsingOp
+class Brut::CLI::Apps::New::Ops::InsertRoute < Brut::CLI::Apps::New::Ops::PrismParsingOp
   def initialize(project_root:, code:)
     @file = project_root / "app" / "src" / "app.rb"
     @code = code

data/{mkbrut/lib/mkbrut → lib/brut/cli/apps/new}/ops/mkdir.rb

@@ -1,6 +1,6 @@
 require "fileutils"
 
-class MKBrut::Ops::Mkdir < MKBrut::Ops::BaseOp
+class Brut::CLI::Apps::New::Ops::Mkdir < Brut::CLI::Apps::New::Ops::BaseOp
   def initialize(path)
     @path = path
   end

data/{mkbrut/lib/mkbrut → lib/brut/cli/apps/new}/ops/prism_parsing_op.rb

@@ -1,5 +1,5 @@
 require "prism"
-class MKBrut::Ops::PrismParsingOp < MKBrut::Ops::BaseOp
+class Brut::CLI::Apps::New::Ops::PrismParsingOp < Brut::CLI::Apps::New::Ops::BaseOp
   def initialize(file:)
     @file = file
   end

data/{mkbrut/lib/mkbrut → lib/brut/cli/apps/new}/ops/render_template.rb

@@ -1,5 +1,5 @@
 require "erb"
-class MKBrut::Ops::RenderTemplate < MKBrut::Ops::BaseOp
+class Brut::CLI::Apps::New::Ops::RenderTemplate < Brut::CLI::Apps::New::Ops::BaseOp
 
   def initialize(source, destination_root:, erb_binding:)
     @erb              = source

data/{mkbrut/lib/mkbrut → lib/brut/cli/apps/new}/ops/skip_file.rb

@@ -1,4 +1,4 @@
-class MKBrut::Ops::SkipFile
+class Brut::CLI::Apps::New::Ops::SkipFile
   def initialize(source)
     @source = source
   end

data/lib/brut/cli/apps/new/ops.rb

@@ -0,0 +1,17 @@
+module Brut::CLI::Apps::New
+  module Ops
+    autoload :BaseOp, "brut/cli/apps/new/ops/base_op"
+    autoload :Mkdir, "brut/cli/apps/new/ops/mkdir"
+    autoload :CopyFile, "brut/cli/apps/new/ops/copy_file"
+    autoload :RenderTemplate, "brut/cli/apps/new/ops/render_template"
+    autoload :SkipFile, "brut/cli/apps/new/ops/skip_file"
+    autoload :InsertRoute, "brut/cli/apps/new/ops/insert_route"
+    autoload :InsertCodeInMethod, "brut/cli/apps/new/ops/insert_code_in_method"
+    autoload :AppendToFile, "brut/cli/apps/new/ops/append_to_file"
+    autoload :InsertIntoFile, "brut/cli/apps/new/ops/insert_into_file"
+    autoload :PrismParsingOp, "brut/cli/apps/new/ops/prism_parsing_op"
+    autoload :AddI18nMessage, "brut/cli/apps/new/ops/add_i18n_message"
+    autoload :AddCSSImport, "brut/cli/apps/new/ops/add_css_import"
+    autoload :AddMethod, "brut/cli/apps/new/ops/add_method"
+  end
+end

data/lib/brut/cli/apps/new/organization.rb

@@ -0,0 +1,5 @@
+class Brut::CLI::Apps::New::Organization < Brut::CLI::Apps::New::InternetIdentifier
+  def initialize(value)
+    super(:organization, value)
+  end
+end

data/{mkbrut/lib/mkbrut → lib/brut/cli/apps/new}/prefix.rb

@@ -1,4 +1,4 @@
-module MKBrut
+module Brut::CLI::Apps::New
   class Prefix
     def self.from_app_id(app_id)
       app_id = app_id.to_s

data/{mkbrut/lib/mkbrut → lib/brut/cli/apps/new}/segments/bare_bones.rb

@@ -1,12 +1,13 @@
 # The bare bones configuration on top of a blank Brut app.
-class MKBrut::Segments::BareBones < MKBrut::Base
+class Brut::CLI::Apps::New::Segments::BareBones < Brut::CLI::Apps::New::Base
 
   def self.friendly_name = "Bare bones framing"
+  def self.segment_name = "bare_bones_app"
 
-  def initialize(app_options:, current_dir:, templates_dir:)
-    @project_root  = current_dir / app_options.app_name
+  def initialize(app_name:, options:, versions:, current_dir:, templates_dir:)
+    @project_root  = current_dir / app_name
     @templates_dir = templates_dir / "segments" / "BareBones"
-    @erb_binding   = ErbBindingDelegate.new(app_options)
+    @erb_binding   = ErbBindingDelegate.new(options:, app_name:, versions:)
   end
 
   def <=>(other)
@@ -30,11 +31,11 @@ class MKBrut::Segments::BareBones < MKBrut::Base
 
   def other_operations(project_root)
     [
-      MKBrut::Ops::InsertRoute.new(
+      Brut::CLI::Apps::New::Ops::InsertRoute.new(
         project_root: @project_root,
         code: %{path "/trigger_exception", method: :get}
       ),
-      MKBrut::Ops::InsertCodeInMethod.new(
+      Brut::CLI::Apps::New::Ops::InsertCodeInMethod.new(
         file: @project_root / "app" / "src" / "app.rb",
         class_name: "App",
         method_name: "initialize",
@@ -51,7 +52,7 @@ end},
         project_root: @project_root,
         element_class_name: "Example",
       ),
-      MKBrut::Ops::InsertCodeInMethod.new(
+      Brut::CLI::Apps::New::Ops::InsertCodeInMethod.new(
         file: @project_root / "app" / "src" / "front_end" / "pages" / "home_page.rb",
         class_name: "HomePage",
         method_name: "page_template",
@@ -86,7 +87,7 @@ end
     # upper-case text.
     expect(example).to have_text("WE LIKE THE WEB") }
       ),
-      MKBrut::Ops::AppendToFile.new(
+      Brut::CLI::Apps::New::Ops::AppendToFile.new(
         file: @project_root / ".env.development",
         content: %{
 # Key used to allow triggering an exception. This is required to prevent
@@ -94,14 +95,14 @@ end
 TRIGGER_EXCEPTION_KEY=dev-trigger-exception
 }
       ),
-      MKBrut::Ops::AppendToFile.new(
+      Brut::CLI::Apps::New::Ops::AppendToFile.new(
         file: @project_root / ".env.test",
         content: "TRIGGER_EXCEPTION_KEY=test-trigger-exception"
       ),
 
     ]
   end
-  class InsertCustomElement < MKBrut::Ops::BaseOp
+  class InsertCustomElement < Brut::CLI::Apps::New::Ops::BaseOp
     def initialize(project_root:, element_class_name:)
       @file               = project_root / "app" / "src" / "front_end" / "js" / "index.js"
       @element_class_name = element_class_name
@@ -133,7 +134,7 @@ TRIGGER_EXCEPTION_KEY=dev-trigger-exception
     end
   end
 
-  class InsertEndToEndTestCode < MKBrut::Ops::PrismParsingOp
+  class InsertEndToEndTestCode < Brut::CLI::Apps::New::Ops::PrismParsingOp
     def initialize(file:, code:)
       @file = file
       @code = code

data/{mkbrut/lib/mkbrut → lib/brut/cli/apps/new}/segments/demo.rb

@@ -1,13 +1,14 @@
 # Additional classes and configuration for a new Brut
 # app that provides a more demonstration of the features.
-class MKBrut::Segments::Demo < MKBrut::Base
+class Brut::CLI::Apps::New::Segments::Demo < Brut::CLI::Apps::New::Base
 
   def self.friendly_name = "Demo features and files"
+  def self.segment_name = "demo_features"
 
-  def initialize(app_options:, current_dir:, templates_dir:)
-    @project_root  = current_dir / app_options.app_name
+  def initialize(app_name:, options:, versions:, current_dir:, templates_dir:)
+    @project_root  = current_dir / app_name
     @templates_dir = templates_dir / "segments" / "Demo"
-    @erb_binding   = ErbBindingDelegate.new(app_options)
+    @erb_binding   = ErbBindingDelegate.new(options:, app_name:, versions:)
   end
 
   def <=>(other)
@@ -31,7 +32,7 @@ private
 
   def other_operations(project_root)
     [
-      MKBrut::Ops::AddI18nMessage.new(
+      Brut::CLI::Apps::New::Ops::AddI18nMessage.new(
         project_root: project_root,
         hash: {
           en: {
@@ -54,19 +55,19 @@ private
           },
         }
       ),
-      MKBrut::Ops::InsertRoute.new(
+      Brut::CLI::Apps::New::Ops::InsertRoute.new(
         project_root: project_root,
         code: %{page "/guestbook"},
       ),
-      MKBrut::Ops::InsertRoute.new(
+      Brut::CLI::Apps::New::Ops::InsertRoute.new(
         project_root: project_root,
         code: %{form "/guestbook_message"},
       ),
-      MKBrut::Ops::InsertRoute.new(
+      Brut::CLI::Apps::New::Ops::InsertRoute.new(
         project_root: project_root,
         code: %{page "/new_guestbook_message"},
       ),
-      MKBrut::Ops::InsertCodeInMethod.new(
+      Brut::CLI::Apps::New::Ops::InsertCodeInMethod.new(
         file: project_root / "app" / "src" / "back_end" / "data_models" / "seed" / "seed_data.rb",
         class_name: "SeedData",
         method_name: "seed!",
@@ -76,15 +77,15 @@ private
 end
 }
       ),
-      MKBrut::Ops::AddCSSImport.new(
+      Brut::CLI::Apps::New::Ops::AddCSSImport.new(
         project_root: project_root,
         import: "constraint-violations.css"
       ),
-      MKBrut::Ops::AddCSSImport.new(
+      Brut::CLI::Apps::New::Ops::AddCSSImport.new(
         project_root: project_root,
         import: "fonts.css"
       ),
-      MKBrut::Ops::InsertCodeInMethod.new(
+      Brut::CLI::Apps::New::Ops::InsertCodeInMethod.new(
         file: project_root / "app" / "src" / "front_end" / "pages"/ "home_page.rb",
         class_name: "HomePage",
         method_name: "page_template",
@@ -99,12 +100,12 @@ div(class: "w-50 mh-auto mt-4") do
 end
 }
       ),
-      MKBrut::Ops::AddMethod.new(
+      Brut::CLI::Apps::New::Ops::AddMethod.new(
         file: project_root / "app" / "src" / "front_end" / "support" / "app_session.rb",
         class_name: "AppSession",
         code: %{def signed_guestbook? = !!self.guestbook_message},
       ),
-      MKBrut::Ops::AddMethod.new(
+      Brut::CLI::Apps::New::Ops::AddMethod.new(
         file: project_root / "app" / "src" / "front_end" / "support" / "app_session.rb",
         class_name: "AppSession",
         code: %{
@@ -115,7 +116,7 @@ def guestbook_message
 end
 }
       ),
-      MKBrut::Ops::AddMethod.new(
+      Brut::CLI::Apps::New::Ops::AddMethod.new(
         file: project_root / "app" / "src" / "front_end" / "support" / "app_session.rb",
         class_name: "AppSession",
         code: %{

data/{mkbrut/lib/mkbrut → lib/brut/cli/apps/new}/segments/heroku.rb

@@ -1,5 +1,6 @@
-class MKBrut::Segments::Heroku < MKBrut::Base
+class Brut::CLI::Apps::New::Segments::Heroku < Brut::CLI::Apps::New::Base
   def self.friendly_name = "Heroku-based Deployment"
+  def self.segment_name = "heroku"
 
   def initialize(project_root:, templates_dir:)
     @project_root  = project_root
@@ -15,10 +16,13 @@ class MKBrut::Segments::Heroku < MKBrut::Base
     end
   end
 
+  def output_post_add_messaging(stdout:)
+  end
+
   def <=>(other)
     if self.class == other.class
       0
-    elsif other.class == MKBrut::Segments::Sidekiq
+    elsif other.class == Brut::CLI::Apps::New::Segments::Sidekiq
       # If both herkou and sidekiq segments are activated, we want to do heroku first,
       # since Sidekiq will need to modify it.
       -1
@@ -29,16 +33,16 @@ class MKBrut::Segments::Heroku < MKBrut::Base
 
   def other_operations
     [
-      MKBrut::Ops::InsertIntoFile.new(
+      Brut::CLI::Apps::New::Ops::InsertIntoFile.new(
         file: @project_root / "Dockerfile.dx",
-        contents: %{
+        content: %{
 # Installs the Heroku CLI, per Heroku docs at 
 # https://devcenter.heroku.com/articles/heroku-cli#install-with-ubuntu-debian-apt-get
 RUN curl https://cli-assets.heroku.com/install-ubuntu.sh | sh
 },
         before_line: "# Up to now, RUN directives ran as the root user.  When using this container"
       ),
-      MKBrut::Ops::AppendToFile.new(
+      Brut::CLI::Apps::New::Ops::AppendToFile.new(
         file: @project_root / ".gitignore",
         content: %{
 # These are generated by bin/deploy

data/{mkbrut/lib/mkbrut → lib/brut/cli/apps/new}/segments/sidekiq.rb

@@ -1,11 +1,36 @@
 # Adds Sidekiq to a Brut app
-class MKBrut::Segments::Sidekiq < MKBrut::Base
-  def self.friendly_name = "Use Sidekiq to Run Background Jobs"
+class Brut::CLI::Apps::New::Segments::Sidekiq < Brut::CLI::Apps::New::Base
+
+  def self.friendly_name = "Sidekiq for Background Jobs"
+  def self.segment_name = "sidekiq"
+
   def initialize(project_root:, templates_dir:)
     @project_root  = project_root
     @templates_dir = templates_dir / "segments" / "Sidekiq"
   end
 
+  def output_post_add_messaging(stdout:)
+    stdout.puts ""
+    stdout.puts "Sidekiq has now been set up for your app. The configuration used is"
+    stdout.puts "a basic one, suitable for getting started, however you know own this"
+    stdout.puts "configuration.  Most of it is in these files:"
+    stdout.puts ""
+    stdout.puts "    app/config/sidekiq.yml"
+    stdout.puts "    app/src/back_end/segments/sidekiq_segment.rb"
+    stdout.puts ""
+    stdout.puts "You are encouraged to verify everything is set up as follows:"
+    stdout.puts ""
+    stdout.puts "1. Quit dx/start, and start it back up - this will downloaded and set up ValKey/Redis"
+    stdout.puts "2. Re-run bin/setup. This will install needed gems and create binstubs"
+    stdout.puts "3. Run the example integration test:"
+    stdout.puts ""
+    stdout.puts "   bin/test e2e specs/integration/sidekiq_works.spec.rb"
+    stdout.puts ""
+    stdout.puts "   This will use the actual Sidekiq server, so if it passes, you should"
+    stdout.puts "   all set and can start creating jobs"
+    stdout.puts ""
+  end
+
   def add!
     operations = copy_files(@templates_dir, @project_root) + 
                  other_operations
@@ -18,7 +43,7 @@ class MKBrut::Segments::Sidekiq < MKBrut::Base
   def <=>(other)
     if self.class == other.class
       0
-    elsif other.class == MKBrut::Segments::Heroku
+    elsif other.class == Brut::CLI::Apps::New::Segments::Heroku
       # If both herkou and sidekiq segments are activated, we want to do heroku first,
       # since Sidekiq will need to modify it.
       1
@@ -29,7 +54,7 @@ class MKBrut::Segments::Sidekiq < MKBrut::Base
 
   def other_operations
     [
-      MKBrut::Ops::AppendToFile.new(
+      Brut::CLI::Apps::New::Ops::AppendToFile.new(
         file: @project_root / "docker-compose.dx.yml",
         content: %{
   redis:
@@ -38,19 +63,19 @@ class MKBrut::Segments::Sidekiq < MKBrut::Base
     image: valkey/valkey:8.1
 },
       ),
-      MKBrut::Ops::AppendToFile.new(
+      Brut::CLI::Apps::New::Ops::AppendToFile.new(
         file: @project_root / "Procfile.development",
         content: "sidekiq: bin/run sidekiq\n"
       ),
-      MKBrut::Ops::AppendToFile.new(
+      Brut::CLI::Apps::New::Ops::AppendToFile.new(
         file: @project_root / "Procfile.test",
         content: "sidekiq: bin/run sidekiq\n"
       ),
-      MKBrut::Ops::AppendToFile.new(
+      Brut::CLI::Apps::New::Ops::AppendToFile.new(
         file: @project_root / "Gemfile",
         content: "# Sidekiq is used for background jobs\ngem \"sidekiq\"\n"
       ),
-      MKBrut::Ops::AppendToFile.new(
+      Brut::CLI::Apps::New::Ops::AppendToFile.new(
         file: @project_root / ".env.development",
         content: %{
 # URL of the Redis/ValKey to use for Sidekiq
@@ -63,7 +88,7 @@ SIDEKIQ_BASIC_AUTH_USER=sidekiq
 SIDEKIQ_BASIC_AUTH_PASSWORD=password
 }
       ),
-      MKBrut::Ops::AppendToFile.new(
+      Brut::CLI::Apps::New::Ops::AppendToFile.new(
         file: @project_root / ".env.test",
         content: %{
 SIDEKIQ_REDIS_URL=redis://redis:6379/2
@@ -72,29 +97,27 @@ SIDEKIQ_BASIC_AUTH_USER=sidekiq-test
 SIDEKIQ_BASIC_AUTH_PASSWORD=password
 }
       ),
-      MKBrut::Ops::InsertIntoFile.new(
+      Brut::CLI::Apps::New::Ops::InsertIntoFile.new(
         file: @project_root / "bin" / "test-server",
         before_line: "wait",
         content: "bin/run sidekiq &\n",
       ),
-      MKBrut::Ops::InsertIntoFile.new(
+      Brut::CLI::Apps::New::Ops::InsertIntoFile.new(
         file: @project_root / "bin" / "setup",
-        before_line: "  log \"Installing rspec binstubs\"",
-        content: %{log "Installing sidekiq binstubs"
-  system! "bundle binstub sidekiq"
-}
+        before_line: "      step \"Installing rspec binstubs\",   exec: \"bundle binstub rspec-core\"",
+        content:     "      step \"Installing sidekiq binstubs\", exec: \"bundle binstub sidekiq\""   
       ),
-      MKBrut::Ops::InsertIntoFile.new(
+      Brut::CLI::Apps::New::Ops::InsertIntoFile.new(
         file: @project_root / "specs" / "spec_helper.rb",
         before_line: "require \"brut/spec_support\"",
         content: "require \"sidekiq/testing\""
       ),
-      MKBrut::Ops::InsertIntoFile.new(
+      Brut::CLI::Apps::New::Ops::InsertIntoFile.new(
         file: @project_root / "config.ru",
         before_line: "bootstrap = Bootstrap.new.bootstrap!",
         content: "require \"sidekiq/web\"\n"
       ),
-      MKBrut::Ops::InsertIntoFile.new(
+      Brut::CLI::Apps::New::Ops::InsertIntoFile.new(
         file: @project_root / "config.ru",
         before_line: "  run bootstrap.rack_app",
         content: %{
@@ -106,19 +129,19 @@ SIDEKIQ_BASIC_AUTH_PASSWORD=password
   end
 }
       ),
-      MKBrut::Ops::InsertCodeInMethod.new(
+      Brut::CLI::Apps::New::Ops::InsertCodeInMethod.new(
         file: @project_root / "app" / "src" / "app.rb",
         class_name: "App",
         method_name: "initialize",
         code: "@sidekiq_segment = SidekiqSegment.new",
       ),
-      MKBrut::Ops::InsertCodeInMethod.new(
+      Brut::CLI::Apps::New::Ops::InsertCodeInMethod.new(
         file: @project_root / "app" / "src" / "app.rb",
         class_name: "App",
         method_name: "boot!",
         code: "@sidekiq_segment.boot!"
       ),
-      MKBrut::Ops::InsertCodeInMethod.new(
+      Brut::CLI::Apps::New::Ops::InsertCodeInMethod.new(
         file: project_root / "deploy" / "heroku_config.rb",
         class_name: "HerokuConfig",
         method_name: "additional_images",

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

@@ -0,0 +1,8 @@
+module Brut::CLI::Apps::New
+  module Segments
+    autoload :BareBones, "brut/cli/apps/new/segments/bare_bones"
+    autoload :Demo, "brut/cli/apps/new/segments/demo"
+    autoload :Sidekiq, "brut/cli/apps/new/segments/sidekiq"
+    autoload :Heroku, "brut/cli/apps/new/segments/heroku"
+  end
+end

data/lib/brut/cli/apps/new/version.rb

@@ -0,0 +1,3 @@
+module Brut::CLI::Apps::New
+  VERSION = "0.17.0"
+end

data/{mkbrut/lib/mkbrut → lib/brut/cli/apps/new}/versions.rb

@@ -2,9 +2,9 @@ require "pathname"
 require "json"
 require_relative "version"
 
-class MKBrut::Versions
+class Brut::CLI::Apps::New::Versions
   def initialize
-    @brut_version = MKBrut::VERSION
+    @brut_version = Brut::VERSION
   end
 
   def brut_version_specifier     = "~> #{@brut_version}"

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

@@ -0,0 +1,26 @@
+require "json"
+require "fileutils"
+
+require "brut/cli"
+
+module Brut::CLI::Apps::New
+
+  autoload :AddSegmentOptions  , "brut/cli/apps/new/add_segment_options"
+  autoload :AddSegment         , "brut/cli/apps/new/add_segment"
+  autoload :App                , "brut/cli/apps/new/app"
+  autoload :AppId              , "brut/cli/apps/new/app_id"
+  autoload :AppName            , "brut/cli/apps/new/app_name"
+  autoload :AppOptions         , "brut/cli/apps/new/app_options"
+  autoload :Base               , "brut/cli/apps/new/base"
+  autoload :Cli                , "brut/cli/apps/new/cli"
+  autoload :ErbBindingDelegate , "brut/cli/apps/new/erb_binding_delegate"
+  autoload :InternetIdentifier , "brut/cli/apps/new/internet_identifier"
+  autoload :InvalidIdentifier  , "brut/cli/apps/new/invalid_identifier"
+  autoload :Ops                , "brut/cli/apps/new/ops"
+  autoload :Organization       , "brut/cli/apps/new/organization"
+  autoload :Prefix             , "brut/cli/apps/new/prefix"
+  autoload :PrefixedIO         , "brut/cli/apps/new/prefixed_io"
+  autoload :Segments           , "brut/cli/apps/new/segments"
+  autoload :Versions           , "brut/cli/apps/new/versions"
+
+end