lunar_shell 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a73b7e46f828543f4db5cf0e02dbda8d89e31b64
-  data.tar.gz: 39bffe232f768b73b812a94494ca4e5cc01f257a
+  metadata.gz: cefb1c858a8b4dca7f75fc5b058924f1e4e067ea
+  data.tar.gz: 8166dc6a4bf78373c2c817480fe70e20d32f2da1
 SHA512:
-  metadata.gz: 420fafe926a111d3983ad8c7a6a2aaff65db3c8f51bb88cc6ce51a3cf39892cfdfb34f9b34b2d5785464032ad9d282c397299284b1459bb1dedcc8e0d169872b
-  data.tar.gz: e2f34f1a349eb2c1f6946a1088fb2beb4bd825bbaae0d8671f5360789d9da69b6f12c7def27e0775c19bba15598a7bf9f696478f6cc842e86f88d932d4ecb05e
+  metadata.gz: 714ae445a5805758b6c819013a9571ff83279436f7a3c6a6a19d91a2d6ed66574ad0833a611c41898396d0a5a3e3253192704d295021ff9417d46fdad2425441
+  data.tar.gz: 6150bc84fb0a45d494570567dad1fc16150b7fee1babde11a6ab7bf936fff001764660b4ea41d4744ec9766658023ec4fee554cef94a62effdd984777d642e1c

data/app/controllers/lunar_shell/satellites_controller.rb

@@ -5,12 +5,7 @@ module LunarShell
     before_action :log_command!
 
     def run
-      render 'no_command'
-    end
-
-    def error
       render 'no_command' and return unless command
-      render 'clear' and return if command == 'clear'
       render 'command_not_found'
     end
 
@@ -30,6 +25,11 @@ module LunarShell
     end
     helper_method :parameters
 
+    def parameters?
+      parameters.present?
+    end
+    helper_method :parameters?
+
     def log_command!
       return if !command || command == 'history'
       session[:history] << "#{command} #{parameters.try :join, ' '}".strip

data/config/routes.rb

@@ -10,8 +10,11 @@ LunarShell::Engine.routes.draw do
     end
     resource :quit, only: []
     resource :su, only: [:create]
+
+    # catch all
+    post '*error', action: 'run'
+    post :run
   end
-  post 'satellites/*error', to: 'satellites#error'
 
   root 'shells#show'
 end

data/lib/generators/lunar_shell/satellite/USAGE

@@ -0,0 +1,14 @@
+Description:
+    Creates a new Lunar shell satellite
+
+Example:
+    rails generate lunar_shell:satellite thing
+
+    This will create:
+        app/controllers/lunar_shell/satellites/thing_controller.rb
+        app/views/lunar_shell/satellites/thing/run.js.erb
+    
+    And add this route:
+        namespace :satellites do
+          resource :thing, only: []
+        end

data/lib/generators/lunar_shell/satellite/satellite_generator.rb

@@ -0,0 +1,72 @@
+module LunarShell
+  class SatelliteGenerator < Rails::Generators::NamedBase
+    source_root File.expand_path('../templates', __FILE__)
+
+    class_option :include_test, aliases: '-t', desc: 'Include test file'
+
+    def copy_satellite_files
+      template 'controller.rb', controller_path
+      template 'view.rb', view_path
+      template 'test.rb', test_path if options[:include_test]
+    end
+
+    def add_route
+      satellite_route singular_name
+    end
+
+    private
+
+    def base_path(type)
+      "app/#{type}/lunar_shell/satellites/#{singular_name}"
+    end
+
+    def controller_path
+      "#{base_path :controllers}_controller.rb"
+    end
+
+    def test_path
+      "test/integration/#{singular_name}_test.rb"
+    end
+
+    def view_path
+      "#{base_path :views}/run.js.erb"
+    end
+
+    def satellite_route(name)
+      route = "resource :#{name}, only: []\n"
+      log :route, route.strip
+
+      scopes = [{sentinel: /\.routes\.draw do\s*\n/m}]
+
+      mp = LunarShell::Engine.mount_path.gsub(/^\//, '')
+      scopes << satellite_scope("scope :#{mp}", scopes.count) if mp.present?
+
+      ["scope module: :lunar_shell", 'namespace :satellites'].each do |name|
+        scopes << satellite_scope(name, scopes.count)
+      end
+
+      scopes << { name: "#{'  ' * scopes.count}#{route}" }
+
+      in_root do
+        scopes.drop(1).each_with_index do |scope, i|
+          content = File.binread("#{destination_root}/config/routes.rb")
+          next if content =~ scope[:sentinel]
+          inject_into_file 'config/routes.rb',
+            scope[:name],
+            after: scopes[i][:sentinel],
+            verbose: false
+        end
+      end
+    end
+
+    def satellite_scope(name, level = 0)
+      spaces = '  ' * level
+      scope_start = "#{spaces}#{name} do\n"
+      scope_end = "#{spaces}end\n"
+      {
+        name: "#{scope_start}#{scope_end}",
+        sentinel: /^#{scope_start}/m
+      }
+    end
+  end
+end

data/lib/generators/lunar_shell/satellite/templates/controller.rb

@@ -0,0 +1,8 @@
+module LunarShell
+  module Satellites
+    class <%= class_name %>Controller < LunarShell::SatellitesController
+      def run
+      end
+    end
+  end
+end

data/lib/generators/lunar_shell/satellite/templates/test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class <%= class_name %>Test < SatelliteIntegrationTest
+  test "<%= singular_name %>" do
+    run_command '<%= singular_name %>'
+    page.has_content? 'Just ran "<%= singular_name %>"!'
+  end
+end

data/lib/generators/lunar_shell/satellite/templates/view.rb

@@ -0,0 +1,2 @@
+$('#shell-history').append('<div class="output">Just ran "<%= singular_name %>"!</div>');
+$('#shell-cli').html('<%%= j render('lunar_shell/shells/cli') %>');

data/lib/lunar_shell/engine.rb

@@ -5,5 +5,23 @@ module LunarShell
     initializer 'lunar_shell.add_middleware' do |app|
       app.middleware.insert_after Rack::ETag, LunarShell::Middleware::Interpreter
     end
+
+    initializer "lunar_shell.assets.precompile" do |app|
+      app.config.assets.precompile += %w(lunar_shell.coffee lunar_shell.sass)
+    end
+
+    config.app_generators.satellite :satellite
+
+    def mount_path
+      @mount_path ||= routes.url_helpers.root_path[0..-2]
+    end
+
+    def run_command_path(command)
+      run_path.gsub('run', "#{command}/run")
+    end
+
+    def run_path
+      @run_path ||= routes.url_helpers.satellites_run_path
+    end
   end
 end

data/lib/lunar_shell/middleware/interpreter.rb

@@ -16,7 +16,7 @@ module LunarShell
             request.update_param('parameters', params) if params.any?
             request.update_param('command', command)
 
-            env['PATH_INFO'] = "/satellites/#{command}/run"
+            env['PATH_INFO'] = LunarShell::Engine.run_command_path(command)
           end
         end
 

data/lib/lunar_shell/version.rb

@@ -1,3 +1,3 @@
 module LunarShell
-  VERSION = "0.3.0"
+  VERSION = "0.4.1"
 end

data/test/dummy/log/development.log

@@ -131599,3 +131599,14 @@ Started GET "/assets/lunar_shell/satellites/su.self-626d3eb61573185dcf5a0a5e7c8a
 
 
 Started GET "/assets/lunar_shell/application.self-377610cd7c1509e934744c810e3b4cf672dfbcacac3274e7d039827e2ae0fcc7.js?body=1" for ::1 at 2016-06-25 01:50:55 -0700
+
+
+Started POST "/satellites/run" for ::1 at 2016-06-25 02:07:33 -0700
+Processing by LunarShell::SatellitesController#error as JS
+  Parameters: {"utf8"=>"✓", "command"=>"backspin", "error"=>"backspin/run"}
+  Rendered /Users/dave/Playground/lunar_shell/app/views/lunar_shell/satellites/_command_not_found.html.erb (0.1ms)
+  LunarShell::User Load (0.3ms)  SELECT  "lunar_shell_users".* FROM "lunar_shell_users" WHERE (id = NULL OR username = NULL)  ORDER BY "lunar_shell_users"."id" ASC LIMIT 1
+  Rendered /Users/dave/Playground/lunar_shell/app/views/lunar_shell/shells/_prompt.html.erb (1.1ms)
+  Rendered /Users/dave/Playground/lunar_shell/app/views/lunar_shell/shells/_cli.html.erb (14.5ms)
+  Rendered /Users/dave/Playground/lunar_shell/app/views/lunar_shell/satellites/command_not_found.js.erb (39.3ms)
+Completed 200 OK in 57ms (Views: 56.0ms | ActiveRecord: 0.3ms)