Update composer.json

recca0120 · Feb 4, 2016 · 04e6930 · 04e6930
1 parent a3a36cd
commit 04e6930
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 22 deletions.
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/resources/assets/coffee/app.coffee b/resources/assets/coffee/app.coffee
@@ -122,15 +122,6 @@ do ($ = jQuery, window, document) ->
         colors: $.terminal.ansi_colors
         term: null,
         defaultPrompt: "$ "
-        needConfirm:
-            "artisan": [
-                "migrate"
-                "migrate:install"
-                "migrate:refresh"
-                "migrate:reset"
-                "migrate:rollback"
-                "db:seed"
-            ]
         color: (color, background, type = "bold") =>
             if @colors[type] and @colors[type][color]
                 return @colors[type][color]
@@ -184,7 +175,7 @@ do ($ = jQuery, window, document) ->
                     @execute term, "#{commandPrefix.replace(/\s+/g, '-')} #{command}"
                 return false
             ,
-                prompt: "#{prompt} >"
+                prompt: "#{prompt}> "
             return false
 
         capitalize = (str) =>
@@ -205,9 +196,9 @@ do ($ = jQuery, window, document) ->
                         term.echo " "
 
         commandArtisan: (term, cmd) =>
-            cmd2 = $.terminal.parseCommand cmd.rest.trim()
-            if @options.environment is "production" and $.inArray("--force", cmd2.args) is -1
-                if $.inArray(cmd2.name, @options.confirmToProceed[cmd.name]) isnt -1
+            restParsed = $.terminal.parseCommand cmd.rest.trim()
+            if @options.environment is "production" and $.inArray("--force", restParsed.args) is -1
+                if $.inArray(restParsed.name, @options.confirmToProceed[cmd.name]) isnt -1
                     @confirmToProceed term, cmd
                     return
             @rpcRequest term, cmd
@@ -231,11 +222,6 @@ do ($ = jQuery, window, document) ->
                 Loading.hide term
                 @serverInfo(term)
 
-        interpreters:
-            "mysql": "mysql"
-            "artisan tinker": "tinker"
-            "tinker": "tinker"
-
         execute: (term, command) =>
             command = command.trim()
             switch command
@@ -245,7 +231,7 @@ do ($ = jQuery, window, document) ->
                 when ""
                     return
                 else
-                    for interpreter, prompt of @interpreters
+                    for interpreter, prompt of @options.interpreters
                         if command is interpreter
                             @interpreter prompt, term
                             return
@@ -272,6 +258,8 @@ do ($ = jQuery, window, document) ->
             ].join "\n"
 
         serverInfo: (term) =>
+            if term.level() > 1
+                return
             host = @info "#{@options.username}@#{@options.hostname}"
             os = @question "#{@options.os}"
             path = @comment "#{@options.basePath}"
@@ -285,5 +273,7 @@ do ($ = jQuery, window, document) ->
                     @execute term, 'list'
                 onBlur: =>
                     false
+                onClear: (term) =>
+                    @serverInfo(term)
                 greetings: @greetings()
                 prompt: @defaultPrompt
diff --git a/ruleset.xml b/ruleset.xml
@@ -16,7 +16,7 @@
   <rule ref="rulesets/naming.xml/ShortVariable">
     <priority>1</priority>
     <properties>
-      <property name="minimum" value="2" />
+      <property name="minimum" value="1" />
     </properties>
   </rule>
   <rule ref="rulesets/naming.xml/ShortMethodName">

diff --git a/src/Application.php b/src/Application.php
@@ -118,4 +118,18 @@ private function isFromArtisanStartingEvent()
 
         return false;
     }
+
+    /**
+     * Renders a caught exception.
+     *
+     * @param \Exception      $e      An exception instance
+     * @param OutputInterface $output An OutputInterface instance
+     */
+    public function renderException(Exception $e, OutputInterface $output)
+    {
+        while ($prevException = $e->getPrevious()) {
+            $e = $prevException;
+        }
+        parent::renderException($e, $output);
+    }
 }
diff --git a/src/Console/Commands/Artisan.php b/src/Console/Commands/Artisan.php
@@ -22,7 +22,7 @@ class Artisan extends Command
      *
      * @var string
      */
-    protected $description = 'artisan';
+    protected $description = 'laravel artisan';
 
     /**
      * no support array.

diff --git a/src/Http/Controllers/TerminalController.php b/src/Http/Controllers/TerminalController.php
@@ -29,6 +29,11 @@ public function index(ApplicationContract $app, ConsoleKernel $consoleKernel)
             'version'          => $app->version(),
             'endPoint'         => action('\\'.static::class.'@rpcResponse'),
             'helpInfo'         => $consoleKernel->output(),
+            'interpreters'     => [
+                'mysql'          => 'mysql',
+                'artisan tinker' => 'tinker',
+                'tinker'         => 'tinker',
+            ],
             'confirmToProceed' => [
                 'artisan' => [
                     'migrate',