Merge branch 'development'

Author: rastating

.rubocop.yml

@@ -58,3 +58,8 @@ Metrics/BlockLength:
   Description: 'Some unit tests are going to be naturally long; no need to flag this up.'
   Exclude:
     - spec/**/*
+
+Layout/EmptyLinesAroundArguments:
+  Description: 'Produces false positives when using multi-line strings with spaces.'
+  Exclude:
+    - 'modules/**/*'

.ruby-version

@@ -1 +1 @@
-2.4.3
+2.5.1

.travis.yml

@@ -1,10 +1,11 @@
 language: ruby
 rvm:
-  - 2.3.5
-  - 2.4.2
-  - 2.4.3
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
 before_install:
   - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
+  - "gem install bundler"
 script: bundle exec rspec
 branches:
   except:

VERSION

@@ -1 +1 @@
-1.9.1
+1.9.2

lib/cli/console.rb

@@ -23,12 +23,14 @@ class Console
     include Cli::Output
 
     def commands_without_output
-      %w(back)
+      %w[back]
     end
 
     def permitted_commands
-      %w(use back set show quit run unset check info gset gunset search clear
-         reload help)
+      %w[
+        use back set show quit run unset check info
+        gset setg gunset unsetg search clear reload help
+      ]
     end
 
     def initialize
@@ -112,8 +114,20 @@ def on_event_emitted(event)
       end
     end
 
+    def normalise_alised_commands(command)
+      if command == 'exit'
+        'quit'
+      elsif command == 'setg'
+        'gset'
+      elsif command == 'unsetg'
+        'gunset'
+      else
+        command
+      end
+    end
+
     def execute_user_command(command, args)
-      command = 'quit' if command == 'exit'
+      command = normalise_alised_commands(command)
       if can_handle? command
         puts unless commands_without_output.include? command
         send(command, *args) if correct_number_of_args?(command, args)

lib/cli/loaded_module.rb

@@ -44,6 +44,7 @@ def run
       end
 
       context.module.cleanup
+      self.indent_level = 1
     end
 
     def check

lib/cli/output.rb

@@ -89,5 +89,7 @@ def print_table_row(data, widths)
       end
       puts ''
     end
+
+    attr_accessor :indent_level
   end
 end

lib/wpxf/net/http_server.rb

@@ -84,11 +84,15 @@ def start_http_server(non_block = false)
 
   # Stop the HTTP server after it has finished processing the current request.
   def stop_http_server
+    return false if @is_stopping
+    @is_stopping = true
+
     emit_info 'Stopping HTTP server...', true
     @http_server_kill_switch = true
-    @http_server_thread.exit if @http_server_thread
+    @http_server_thread&.exit
     @tcp_server.close if !@tcp_server.nil? && !@tcp_server.closed?
     emit_info 'HTTP server stopped'
+    @is_stopping = false
   end
 
   # @return [Thread] thread that the server runs on when in non-blocking mode.
@@ -147,11 +151,10 @@ def http_server_loop
     rescue SignalException
       emit_warning 'Caught kill signal', true
     rescue StandardError => e
-      emit_warning "Socket error: #{e}", true
+      emit_error "Socket error: #{e}"
     end
 
-    @tcp_server.close if !@tcp_server.nil? && !@tcp_server.closed?
-    @http_server_kill_switch = false
+    stop_http_server
   end
 
   def handle_incoming_http_request(socket)

lib/wpxf/wordpress/comments.rb

@@ -4,6 +4,7 @@
 module Wpxf::WordPress::Comments
   include Wpxf
 
+  # Initialises a new instance of {Comments}
   def initialize
     super
   end

lib/wpxf/wordpress/hash_dump.rb

@@ -4,6 +4,7 @@
 module Wpxf::WordPress::HashDump
   include Wpxf
 
+  # Initialises a new instance of {HashDump}
   def initialize
     super