From a54eaeef363795f86fdb4cdb0f7f1fa648c0e02b Mon Sep 17 00:00:00 2001
From: Brandon Keepers <brandon@opensoul.org>
Date: Thu, 8 Feb 2024 14:21:39 -0500
Subject: [PATCH 1/6] Get basic CLI demo working

---
 Gemfile                                |  1 +
 Gemfile.lock                           |  2 ++
 app/controllers/cli_controller.rb      |  7 ++++
 app/models/web_cli.rb                  | 33 +++++++++++++++++++
 app/views/cli/execute.html.erb         |  2 ++
 app/views/cli/show.html.erb            | 45 ++++++++++++++++++++++++++
 app/views/layouts/application.html.erb | 10 +++---
 config/routes.rb                       |  2 ++
 8 files changed, 98 insertions(+), 4 deletions(-)
 create mode 100644 app/controllers/cli_controller.rb
 create mode 100644 app/models/web_cli.rb
 create mode 100644 app/views/cli/execute.html.erb
 create mode 100644 app/views/cli/show.html.erb

diff --git a/Gemfile b/Gemfile
index 40171e5..cfa4db6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,6 +10,7 @@ flipper_version = '~> 1.2.2'
 gem 'flipper-cloud', flipper_version
 gem 'flipper-ui', flipper_version
 gem 'flipper-active_record', flipper_version
+gem 'ansi-to-html'
 
 group :development, :test do
   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
diff --git a/Gemfile.lock b/Gemfile.lock
index c19e14f..a70c09c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -77,6 +77,7 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
+    ansi-to-html (0.0.3)
     base64 (0.2.0)
     bcrypt (3.1.20)
     bigdecimal (3.1.6)
@@ -264,6 +265,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  ansi-to-html
   bcrypt
   byebug
   capybara
diff --git a/app/controllers/cli_controller.rb b/app/controllers/cli_controller.rb
new file mode 100644
index 0000000..cef6a4e
--- /dev/null
+++ b/app/controllers/cli_controller.rb
@@ -0,0 +1,7 @@
+class CliController < ApplicationController
+  def execute
+    args = Shellwords.split(params[:prompt].to_s)
+    @status, @output = WebCli.run(args)
+    render layout: false ## FIXME: render full page if not xhr
+  end
+end
diff --git a/app/models/web_cli.rb b/app/models/web_cli.rb
new file mode 100644
index 0000000..2eebb6a
--- /dev/null
+++ b/app/models/web_cli.rb
@@ -0,0 +1,33 @@
+require 'flipper/cli'
+
+class WebCli < Flipper::CLI
+  def load_environment!
+    # already loaded, so no need
+  end
+
+  def run(...)
+    original_stdout = $stdout
+    original_stderr = $stderr
+
+    output = StringIO.new
+    # Prentend this a TTY so we get colorization
+    def output.tty?
+      true
+    end
+
+    $stdout = output
+    $stderr = output
+    status = 0
+
+    begin
+      super(...)
+    rescue SystemExit => e
+      status = e.status
+    end
+
+    [status, output.string]
+  ensure
+    $stdout = original_stdout
+    $stderr = original_stderr
+  end
+end
diff --git a/app/views/cli/execute.html.erb b/app/views/cli/execute.html.erb
new file mode 100644
index 0000000..621b811
--- /dev/null
+++ b/app/views/cli/execute.html.erb
@@ -0,0 +1,2 @@
+<span class="text-white-50">$</span> flipper <%= params[:prompt] %>
+<%=raw Ansi::To::Html.new(h(@output)).to_html(:xterm) %>
diff --git a/app/views/cli/show.html.erb b/app/views/cli/show.html.erb
new file mode 100644
index 0000000..8b8087f
--- /dev/null
+++ b/app/views/cli/show.html.erb
@@ -0,0 +1,45 @@
+<label for="prompt" class="d-block text-bg-secondary p-2 font-monospace overflow-auto" style="height: 75vh;">
+  <pre id="history"></pre>
+
+  <%= form_tag do %>
+    <div class="d-flex align-items-center">
+      <div>
+        <%= tag.span "$", class: @status && @status > 0 ? 'text-danger' : 'text-white-50' %>
+        flipper
+      </div>
+      <div class="ps-2">
+        <input type="text" name="prompt" id="prompt" value="--help" class="form-control-plaintext text-bg-secondary">
+      </div>
+    </div>
+  <% end %>
+</label>
+
+<script>
+const history = document.getElementById('history');
+const prompt = document.getElementById('prompt');
+const form = document.querySelector('form')
+
+form.addEventListener('submit', function(event) {
+  event.preventDefault();
+
+  const { action, method } = event.target;
+  const body = new FormData(event.target);
+
+  fetch(action, { method, body }).then(response => {
+    if(!response.ok) {
+      throw new Error(response);
+    }
+
+    response.text().then(html => {
+      history.innerHTML += html;
+      prompt.scrollIntoView();
+    });
+  });
+
+  // Reset prompt
+  prompt.value = '';
+});
+
+// Submit the default prompt on load
+// form.submit();
+</script>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index cbe939b..f85e5cc 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -42,13 +42,15 @@
 
 
       <div class="row mb-3">
-        <main class="col col-12 col-xl-6 ps-xl-4 pe-xl-5 mx-auto">
+        <main class="col col-12<% if content_for?(:aside) %>col-xl-6 ps-xl-4 pe-xl-5 mx-auto<% end %>">
           <%= yield %>
         </main>
 
-        <aside class="col col-12 col-xl-6 mx-auto">
-          <%= yield :aside %>
-        </aside>
+        <% if content_for?(:aside) %>
+          <aside class="col col-12 col-xl-6 mx-auto">
+            <%= yield :aside %>
+          </aside>
+        <% end %>
       </div>
     </div>
 
diff --git a/config/routes.rb b/config/routes.rb
index 22d979c..9ffae38 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -18,6 +18,8 @@
   get 'example/index', as: :examples
   get 'example/:slug', to: "example#show", as: :example
 
+  get "cli", to: "cli#show", as: :cli
+  post "cli", to: "cli#execute"
 
   get 'connect/:token', to: "cloud#connect", as: :cloud_connect
 

From be45568fcbccc26bdda3f3342b402d1370b72010 Mon Sep 17 00:00:00 2001
From: Brandon Keepers <brandon@opensoul.org>
Date: Thu, 8 Feb 2024 14:40:24 -0500
Subject: [PATCH 2/6] Tweak text styles

---
 app/views/cli/show.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/cli/show.html.erb b/app/views/cli/show.html.erb
index 8b8087f..aed4fed 100644
--- a/app/views/cli/show.html.erb
+++ b/app/views/cli/show.html.erb
@@ -1,5 +1,5 @@
-<label for="prompt" class="d-block text-bg-secondary p-2 font-monospace overflow-auto" style="height: 75vh;">
-  <pre id="history"></pre>
+<label for="prompt" class="d-block text-bg-dark p-4 font-monospace overflow-auto rounded-4" style="height: 75vh;">
+  <pre id="history" class="fs-6"></pre>
 
   <%= form_tag do %>
     <div class="d-flex align-items-center">
@@ -8,7 +8,7 @@
         flipper
       </div>
       <div class="ps-2">
-        <input type="text" name="prompt" id="prompt" value="--help" class="form-control-plaintext text-bg-secondary">
+        <input type="text" name="prompt" id="prompt" value="--help" class="form-control-plaintext text-bg-dark">
       </div>
     </div>
   <% end %>

From 5ce1987ed7c451cd014515018389179041f69e20 Mon Sep 17 00:00:00 2001
From: Brandon Keepers <brandon@opensoul.org>
Date: Mon, 12 Feb 2024 12:16:22 -0500
Subject: [PATCH 3/6] Avoid mutating $stout, $stderr

---
 Gemfile                           |  2 +-
 Gemfile.lock                      | 39 ++++++++++++++++++-------------
 app/controllers/cli_controller.rb |  3 +--
 app/models/web_cli.rb             | 25 ++++++++------------
 4 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/Gemfile b/Gemfile
index cfa4db6..b1e7752 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ gem 'puma'
 gem 'bcrypt'
 gem 'faker'
 
-flipper_version = '~> 1.2.2'
+flipper_version = { git: "https://github.com/flippercloud/flipper", ref: "ef9a631858c582b53b6d0ab7bcc557e0c477a685" }
 gem 'flipper-cloud', flipper_version
 gem 'flipper-ui', flipper_version
 gem 'flipper-active_record', flipper_version
diff --git a/Gemfile.lock b/Gemfile.lock
index a70c09c..d8eaa1c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,23 @@
+GIT
+  remote: https://github.com/flippercloud/flipper
+  revision: ef9a631858c582b53b6d0ab7bcc557e0c477a685
+  ref: ef9a631858c582b53b6d0ab7bcc557e0c477a685
+  specs:
+    flipper (1.2.2)
+      concurrent-ruby (< 2)
+    flipper-active_record (1.2.2)
+      activerecord (>= 4.2, < 8)
+      flipper (~> 1.2.2)
+    flipper-cloud (1.2.2)
+      flipper (~> 1.2.2)
+    flipper-ui (1.2.2)
+      erubi (>= 1.0.0, < 2.0.0)
+      flipper (~> 1.2.2)
+      rack (>= 1.4, < 4)
+      rack-protection (>= 1.5.3, < 5.0.0)
+      rack-session (>= 1.0.2, < 3.0.0)
+      sanitize (< 7)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -109,19 +129,6 @@ GEM
     faker (3.2.3)
       i18n (>= 1.8.11, < 2)
     ffi (1.16.3)
-    flipper (1.2.2)
-      concurrent-ruby (< 2)
-    flipper-active_record (1.2.2)
-      activerecord (>= 4.2, < 8)
-      flipper (~> 1.2.2)
-    flipper-cloud (1.2.2)
-      flipper (~> 1.2.2)
-    flipper-ui (1.2.2)
-      erubi (>= 1.0.0, < 2.0.0)
-      flipper (~> 1.2.2)
-      rack (>= 1.4, < 4)
-      rack-protection (>= 1.5.3, <= 4.0.0)
-      sanitize (< 7)
     globalid (1.2.1)
       activesupport (>= 6.1)
     hashdiff (1.1.0)
@@ -271,9 +278,9 @@ DEPENDENCIES
   capybara
   dotenv-rails
   faker
-  flipper-active_record (~> 1.2.2)
-  flipper-cloud (~> 1.2.2)
-  flipper-ui (~> 1.2.2)
+  flipper-active_record!
+  flipper-cloud!
+  flipper-ui!
   listen
   puma
   rails
diff --git a/app/controllers/cli_controller.rb b/app/controllers/cli_controller.rb
index cef6a4e..e8b0929 100644
--- a/app/controllers/cli_controller.rb
+++ b/app/controllers/cli_controller.rb
@@ -1,7 +1,6 @@
 class CliController < ApplicationController
   def execute
-    args = Shellwords.split(params[:prompt].to_s)
-    @status, @output = WebCli.run(args)
+    @status, @output = WebCli.run(params[:prompt])
     render layout: false ## FIXME: render full page if not xhr
   end
 end
diff --git a/app/models/web_cli.rb b/app/models/web_cli.rb
index 2eebb6a..02152c8 100644
--- a/app/models/web_cli.rb
+++ b/app/models/web_cli.rb
@@ -1,33 +1,28 @@
 require 'flipper/cli'
 
 class WebCli < Flipper::CLI
-  def load_environment!
-    # already loaded, so no need
-  end
-
-  def run(...)
-    original_stdout = $stdout
-    original_stderr = $stderr
-
+  def self.run(input)
+    args = Shellwords.split(input.to_s)
+    status = 0
     output = StringIO.new
+
     # Prentend this a TTY so we get colorization
     def output.tty?
       true
     end
 
-    $stdout = output
-    $stderr = output
-    status = 0
+    cli = new(stdout: output, stderr: output)
 
     begin
-      super(...)
+      cli.run(args)
     rescue SystemExit => e
       status = e.status
     end
 
     [status, output.string]
-  ensure
-    $stdout = original_stdout
-    $stderr = original_stderr
+  end
+
+  def load_environment!
+    # already loaded, so no need
   end
 end

From ecc78f075650f2a32c353d1f760535166e479459 Mon Sep 17 00:00:00 2001
From: Brandon Keepers <brandon@opensoul.org>
Date: Mon, 12 Feb 2024 12:37:19 -0500
Subject: [PATCH 4/6] Cleanup WebCli and controller

---
 app/controllers/cli_controller.rb |  2 +-
 app/models/web_cli.rb             | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controllers/cli_controller.rb b/app/controllers/cli_controller.rb
index e8b0929..9987680 100644
--- a/app/controllers/cli_controller.rb
+++ b/app/controllers/cli_controller.rb
@@ -1,6 +1,6 @@
 class CliController < ApplicationController
   def execute
     @status, @output = WebCli.run(params[:prompt])
-    render layout: false ## FIXME: render full page if not xhr
+    render layout: false
   end
 end
diff --git a/app/models/web_cli.rb b/app/models/web_cli.rb
index 02152c8..4b53203 100644
--- a/app/models/web_cli.rb
+++ b/app/models/web_cli.rb
@@ -2,8 +2,6 @@
 
 class WebCli < Flipper::CLI
   def self.run(input)
-    args = Shellwords.split(input.to_s)
-    status = 0
     output = StringIO.new
 
     # Prentend this a TTY so we get colorization
@@ -11,17 +9,19 @@ def output.tty?
       true
     end
 
-    cli = new(stdout: output, stderr: output)
-
-    begin
-      cli.run(args)
-    rescue SystemExit => e
-      status = e.status
-    end
+    status = new(stdout: output, stderr: output).run(Shellwords.split(input.to_s))
 
     [status, output.string]
   end
 
+  # Override to not exit and return default status of 0
+  def run(args)
+    super
+    0
+  rescue SystemExit => e
+    e.status
+  end
+
   def load_environment!
     # already loaded, so no need
   end

From 86b1b209579f66ae89da1a8141cc98300974a409 Mon Sep 17 00:00:00 2001
From: Brandon Keepers <brandon@opensoul.org>
Date: Mon, 12 Feb 2024 12:37:38 -0500
Subject: [PATCH 5/6] Show --help on load

---
 app/views/cli/show.html.erb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/cli/show.html.erb b/app/views/cli/show.html.erb
index aed4fed..015d3ac 100644
--- a/app/views/cli/show.html.erb
+++ b/app/views/cli/show.html.erb
@@ -1,4 +1,4 @@
-<label for="prompt" class="d-block text-bg-dark p-4 font-monospace overflow-auto rounded-4" style="height: 75vh;">
+<label for="prompt" class="d-block text-bg-dark p-4 font-monospace overflow-auto rounded-4" style="height: 60vh;">
   <pre id="history" class="fs-6"></pre>
 
   <%= form_tag do %>
@@ -41,5 +41,6 @@ form.addEventListener('submit', function(event) {
 });
 
 // Submit the default prompt on load
-// form.submit();
+form.requestSubmit();
+prompt.focus();
 </script>

From 83fdac98ade3a60db7e4b8bb9be95d097d787f1f Mon Sep 17 00:00:00 2001
From: Brandon Keepers <brandon@opensoul.org>
Date: Mon, 12 Feb 2024 12:39:22 -0500
Subject: [PATCH 6/6] Link CLI in footer

---
 app/views/cli/show.html.erb            | 4 ++++
 app/views/shared/_page_footer.html.erb | 9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/views/cli/show.html.erb b/app/views/cli/show.html.erb
index 015d3ac..8a4d362 100644
--- a/app/views/cli/show.html.erb
+++ b/app/views/cli/show.html.erb
@@ -14,6 +14,10 @@
   <% end %>
 </label>
 
+<% content_for :footer do %>
+  <%= page_footer(__FILE__) %>
+<% end %>
+
 <script>
 const history = document.getElementById('history');
 const prompt = document.getElementById('prompt');
diff --git a/app/views/shared/_page_footer.html.erb b/app/views/shared/_page_footer.html.erb
index 53abcd3..c5d81a8 100644
--- a/app/views/shared/_page_footer.html.erb
+++ b/app/views/shared/_page_footer.html.erb
@@ -1,10 +1,15 @@
 <footer class="d-flex justify-content-between border-top gap-3 my-5 py-4">
   <div class="d-flex justify-content-center gap-2">
-    <span class="fw-bold"></span>
     <a target="_blank" rel="noreferrer" class="link-offset-2 link-underline link-underline-opacity-25 icon-link" href="/flipper">
       <%= icon 'toggles' %>
       Flipper UI
     </a>
+
+    <a target="_blank" rel="noreferrer" class="ms-4 link-offset-2 link-underline link-underline-opacity-25 icon-link" href="/cli">
+      <%=icon 'terminal' %>
+      Command Line
+    </a>
+
   </div>
   <div class="d-flex justify-content-center gap-2">
     <span class="fw-bold">View Source</span>
@@ -15,4 +20,4 @@
       <code><%= locals[:file] %></code>
     </a>
   </div>
-</footer>
\ No newline at end of file
+</footer>