invoker 1.5.3 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e1da2ee349b145013878352cca28cc1de9ed13c5
-  data.tar.gz: 066597992a678fa848f9d6d9e36798272141ff7b
+SHA256:
+  metadata.gz: b853190df0eac206efeac859446934d0e1b6df0fa93ad88d1ef950c2b9e30143
+  data.tar.gz: 127d6df5d280e555ed05b8b3449bfcc100ae6d9efb5bb447e01eaeedef16bef9
 SHA512:
-  metadata.gz: 51bd2c4294e3d7b97dfe909f1289b4d62b170db3171c4cee96c1d0848df98d0ab286835f7d8de9a321c2da3e4695aea3e1010a25b308228071f981c2f4dc51ad
-  data.tar.gz: e265b1e4452c688517aa5a648a5fd81fc34c3a6a395061e7c486723318d6031018778fe3adcf76219dc8771c0b4f73168491ef86b4229d63b3fd8d26d3058f82
+  metadata.gz: 75ce1dd71098a4f5306797a8bc7ef82b7dafdbf21160a8633526fa697a4925b420d6f7ba8a3fcb230009fafa3d95e269bc384bffaa3dc7313996b689f2d00383
+  data.tar.gz: 3328f736e84fd2e681c59338c416b111c77199f0cdc01d06e2297ec5b82b3b9cc7b63d94bcaf77f6b68dd7c1be315936786e66014f135ad1be77fa68ef8631dd

data/lib/invoker.rb

@@ -6,8 +6,7 @@ require "formatador"
 require "ostruct"
 require "uuid"
 require "json"
-require "rainbow"
-require "rainbow/ext/string"
+require "colorize"
 require "etc"
 
 require "invoker/version"
@@ -22,7 +21,6 @@ require "invoker/power/setup"
 require "invoker/power/setup/linux_setup"
 require "invoker/power/setup/osx_setup"
 require "invoker/power/powerup"
-require "invoker/power/pf_migrate"
 require "invoker/errors"
 require "invoker/parsers/procfile"
 require "invoker/parsers/config"
@@ -36,9 +34,10 @@ require "invoker/process_printer"
 module Invoker
   class << self
     attr_accessor :config, :tail_watchers, :commander
-    attr_accessor :dns_cache, :daemonize
+    attr_accessor :dns_cache, :daemonize, :nocolors, :certificate, :private_key
 
     alias_method :daemonize?, :daemonize
+    alias_method :nocolors?, :nocolors
 
     def darwin?
       ruby_platform.downcase.include?("darwin")
@@ -73,7 +72,7 @@ module Invoker
       return true if File.exist?(Invoker::Power::Config.config_file)
 
       if throw_warning
-        Invoker::Logger.puts("Invoker has detected setup has not been run. Domain feature will not work without running setup command.".color(:red))
+        Invoker::Logger.puts("Invoker has detected setup has not been run. Domain feature will not work without running setup command.".colorize(:red))
       end
       false
     end
@@ -146,7 +145,7 @@ module Invoker
     end
 
     def default_tld
-      'dev'
+      'test'
     end
   end
 end

data/lib/invoker/cli.rb

@@ -19,6 +19,7 @@ module Invoker
     def setup
       Invoker::Power::Setup.install(get_tld(options))
     end
+    map install: :setup
 
     desc "version", "Print Invoker version"
     def version
@@ -37,15 +38,27 @@ module Invoker
       type: :boolean,
       banner: "Daemonize the server into the background",
       aliases: [:d]
+    option :nocolors,
+      type: :boolean,
+      banner: "Disable color in output",
+      aliases: [:nc]
+    option :certificate,
+      type: :string,
+      banner: "Path to certificate"
+    option :private_key,
+      type: :string,
+      banner: "Path to private key"
     def start(file = nil)
       Invoker.setup_config_location
       port = options[:port] || 9000
       Invoker.daemonize = options[:daemon]
+      Invoker.nocolors = options[:nocolors]
+      Invoker.certificate = options[:certificate]
+      Invoker.private_key = options[:private_key]
       Invoker.load_invoker_config(file, port)
       warn_about_notification
-      warn_about_old_configuration
       pinger = Invoker::CLI::Pinger.new(unix_socket)
-      abort("Invoker is already running".color(:red)) if pinger.invoker_running?
+      abort("Invoker is already running".colorize(:red)) if pinger.invoker_running?
       Invoker.commander.start_manager
     end
 
@@ -78,11 +91,35 @@ module Invoker
       signal = options[:signal] || 'INT'
       unix_socket.send_command('reload', process_name: name, signal: signal)
     end
+    map restart: :reload
 
     desc "list", "List all running processes"
+    option :raw,
+      type: :boolean,
+      banner: "Print process list in raw text format",
+      aliases: [:r]
+    option :wait,
+      type: :boolean,
+      banner: "wait for update",
+      aliases: [:w]
     def list
-      unix_socket.send_command('list') do |response_object|
-        Invoker::ProcessPrinter.new(response_object).tap { |printer| printer.print_table }
+      if options[:wait]
+        Signal.trap("INT") { exit(0) }
+        loop do
+          puts "\e[H\e[2J"
+          unix_socket.send_command('list') do |response_object|
+            Invoker::ProcessPrinter.new(response_object).tap { |printer| printer.print_table }
+          end
+          sleep(5)
+        end
+      else
+        unix_socket.send_command('list') do |response_object|
+          if options[:raw]
+            Invoker::ProcessPrinter.new(response_object).tap { |printer| printer.print_raw_text }
+          else
+            Invoker::ProcessPrinter.new(response_object).tap { |printer| printer.print_table }
+          end
+        end
       end
     end
 
@@ -110,14 +147,16 @@ module Invoker
     end
 
     def self.valid_tasks
-      tasks.keys + ["help"]
+      tasks.keys + %w(help install restart)
     end
 
+    # TODO(kgrz): the default TLD option is duplicated in both this file and
+    # lib/invoker.rb May be assign this to a constant?
     def get_tld(options)
       if options[:tld] && !options[:tld].empty?
         options[:tld]
       else
-        'dev'
+        'test'
       end
     end
 
@@ -137,7 +176,7 @@ module Invoker
       require "libnotify"
     rescue LoadError
       Invoker::Logger.puts "You can install libnotify gem for Invoker notifications "\
-        "via system tray".color(:red)
+        "via system tray".colorize(:red)
     end
 
     def warn_about_terminal_notifier
@@ -145,16 +184,10 @@ module Invoker
         command_path = `which terminal-notifier`
         if !command_path || command_path.empty?
           Invoker::Logger.puts "You can enable OSX notification for processes "\
-            "by installing terminal-notifier gem".color(:red)
+            "by installing terminal-notifier gem".colorize(:red)
         end
       end
     end
-
-    def warn_about_old_configuration
-      Invoker::Power::PfMigrate.new.tap do |pf_migrator|
-        pf_migrator.migrate
-      end
-    end
   end
 end
 

data/lib/invoker/command_worker.rb

@@ -25,9 +25,13 @@ module Invoker
     # Print the lines received over the network
     def receive_line(line)
       tail_watchers = Invoker.tail_watchers[@command_label]
-      color_line = "#{@command_label.color(color)} : #{line}"
+      color_line = "#{@command_label.colorize(color)} : #{line}"
       plain_line = "#{@command_label} : #{line}"
-      Invoker::Logger.puts plain_line
+      if Invoker.nocolors?
+        Invoker::Logger.puts plain_line
+      else
+        Invoker::Logger.puts color_line
+      end
       if tail_watchers && !tail_watchers.empty?
         json_encoded_tail_response = tail_response(color_line)
         if json_encoded_tail_response

data/lib/invoker/commander.rb

@@ -82,10 +82,16 @@ module Invoker
     end
 
     def install_interrupt_handler
-      Signal.trap("INT") do
+      Signal.trap("INT") {
+        Invoker::Logger.puts("Stopping invoker")
         process_manager.kill_workers
         exit(0)
-      end
+      }
+      Signal.trap("TERM") {
+        Invoker::Logger.puts("Stopping invoker")
+        process_manager.kill_workers
+        exit(0)
+      }
     end
 
     def daemonize_app

data/lib/invoker/ipc/unix_client.rb

@@ -28,7 +28,7 @@ module Invoker
         begin
           socket = Socket.unix(Invoker::IPC::Server::SOCKET_PATH)
         rescue
-          abort("Invoker does not seem to be running".color(:red))
+          abort("Invoker does not seem to be running".colorize(:red))
         end
         message_object = get_message_object(command, message)
         send_json_message(socket, message_object)
@@ -49,7 +49,7 @@ module Invoker
       def open_client_socket(abort_if_not_running = true)
         Socket.unix(Invoker::IPC::Server::SOCKET_PATH) { |socket| yield socket }
       rescue
-        abort_if_not_running && abort("Invoker does not seem to be running".color(:red))
+        abort_if_not_running && abort("Invoker does not seem to be running".colorize(:red))
       end
 
       def send_json_message(socket, message_object)

data/lib/invoker/parsers/config.rb

@@ -90,7 +90,7 @@ module Invoker
       end
 
       def print_message_and_abort
-        Invoker::Logger.puts("\n Invalid config file. Invoker requires an ini or a Procfile.".color(:red))
+        Invoker::Logger.puts("\n Invalid config file. Invoker requires an ini or a Procfile.".colorize(:red))
         abort
       end
 
@@ -133,10 +133,10 @@ module Invoker
         end
 
         sleep_duration = section['sleep'].to_i
-        if sleep_duration > 0
+        if sleep_duration >= 0
           pconfig['sleep_duration'] = sleep_duration
         else
-          pconfig['sleep_duration'] = 1
+          pconfig['sleep_duration'] = 0
         end
 
         OpenStruct.new(pconfig)

data/lib/invoker/power/balancer.rb

@@ -17,7 +17,7 @@ module Invoker
     class InvokerHttpsProxy < InvokerHttpProxy
       def post_init
         super
-        start_tls
+        start_tls(private_key_file: Invoker.private_key, cert_chain_file: Invoker.certificate)
       end
     end
 
@@ -65,12 +65,14 @@ module Invoker
           return
         end
         @session = UUID.generate()
-        if !headers['Host'] || headers['Host'].empty?
+        headers = headers.transform_keys(&:downcase)
+
+        if !headers['host'] || headers['host'].empty?
           return_error_page(400)
           return
         end
 
-        dns_check_response = UrlRewriter.new.select_backend_config(headers['Host'])
+        dns_check_response = UrlRewriter.new.select_backend_config(headers['host'])
         if dns_check_response && dns_check_response.port
           connection.server(session, host: dns_check_response.ip, port: dns_check_response.port)
         else
@@ -100,7 +102,7 @@ module Invoker
         @backend_data = true
 
         # check backend data for websockets connection. check for upgrade headers
-        # - Upgarde: websocket\r\n
+        # - Upgrade: websocket\r\n
         if data =~ /Upgrade: websocket/
           @upgraded_to = "websocket"
         end

data/lib/invoker/power/setup.rb

@@ -11,9 +11,11 @@ module Invoker
       end
 
       def self.uninstall
-        power_config = Invoker::Power::Config.load_config
-        selected_installer_klass = installer_klass
-        selected_installer_klass.new(power_config.tld).uninstall_invoker
+        if Invoker::Power::Config.has_config?
+          power_config = Invoker::Power::Config.load_config
+          selected_installer_klass = installer_klass
+          selected_installer_klass.new(power_config.tld).uninstall_invoker
+        end
       end
 
       def self.installer_klass
@@ -26,7 +28,7 @@ module Invoker
 
       def initialize(tld)
         if tld !~ /^[a-z]+$/
-          Invoker::Logger.puts("Please specify valid tld".color(:red))
+          Invoker::Logger.puts("Please specify valid tld".colorize(:red))
           exit(1)
         end
         self.tld = tld
@@ -36,7 +38,7 @@ module Invoker
         if check_if_setup_can_run?
           setup_invoker
         else
-          Invoker::Logger.puts("The setup has been already run.".color(:red))
+          Invoker::Logger.puts("The setup has been already run.".colorize(:red))
         end
         self
       end
@@ -74,10 +76,11 @@ module Invoker
       end
 
       def remove_resolver_file
+        return if resolver_file.nil?
         begin
           safe_remove_file(resolver_file)
         rescue Errno::EACCES
-          Invoker::Logger.puts("Running uninstall requires root access, please rerun it with sudo".color(:red))
+          Invoker::Logger.puts("Running uninstall requires root access, please rerun it with sudo".colorize(:red))
           raise
         end
       end

data/lib/invoker/power/setup/distro/base.rb

@@ -12,23 +12,19 @@ module Invoker
         end
 
         def self.distro_installer(tld)
-          case Facter[:operatingsystem].value
-          when "Ubuntu"
-            require "invoker/power/setup/distro/ubuntu"
-            Ubuntu.new(tld)
-          when "Fedora"
-            require "invoker/power/setup/distro/redhat"
-            Redhat.new(tld)
-          when "Archlinux"
+          if distro.start_with? "Arch Linux", "Manjaro Linux"
             require "invoker/power/setup/distro/arch"
             Arch.new(tld)
-          when "Debian"
+          elsif distro.start_with? "Debian"
             require "invoker/power/setup/distro/debian"
             Debian.new(tld)
-          when "LinuxMint"
-            require "invoker/power/setup/distro/mint"
-            Mint.new(tld)
-          when "OpenSuSE"
+          elsif distro.start_with? "Fedora"
+            require "invoker/power/setup/distro/redhat"
+            Redhat.new(tld)
+          elsif distro.start_with? "Linux Mint", "Ubuntu"
+            require "invoker/power/setup/distro/ubuntu"
+            Ubuntu.new(tld)
+          elsif distro.start_with? "openSUSE"
             require "invoker/power/setup/distro/opensuse"
             Opensuse.new(tld)
           else
@@ -36,6 +32,17 @@ module Invoker
           end
         end
 
+        def self.distro
+          @distro ||= if File.exist?('/etc/os-release')
+            File.read('/etc/os-release').each_line do |line|
+              parsed_line = line.chomp.tr('"', '').split('=')
+              break parsed_line[1] if parsed_line[0] == 'NAME'
+            end
+          else
+            raise "File /etc/os-release doesn't exist or not Linux"
+          end
+        end
+
         def initialize(tld)
           self.tld = tld
         end
@@ -51,6 +58,22 @@ module Invoker
           system("systemctl start socat_invoker.service")
           system("systemctl restart dnsmasq")
         end
+
+        def install_packages
+          "dnsmasq and socat"
+        end
+
+        def install_other
+          " a local resolver for .#{tld} domain and"
+        end
+
+        def get_user_confirmation?
+          Invoker::Logger.puts("Invoker is going to install #{install_packages} on this machine."\
+            " It is also going to install#{install_other} a socat service"\
+            " which will forward all local requests on port 80 and 443 to another port")
+          Invoker::Logger.puts("If you still want to proceed with installation, press y.")
+          Invoker::CLI::Question.agree("Proceed with installation (y/n) : ")
+        end
       end
     end
   end

data/lib/invoker/power/setup/distro/ubuntu.rb

@@ -4,6 +4,42 @@ module Invoker
   module Power
     module Distro
       class Ubuntu < Debian
+        def using_systemd_resolved?
+          return @_using_systemd_resolved if defined?(@_using_systemd_resolved)
+          @_using_systemd_resolved = system("systemctl is-active --quiet systemd-resolved")
+        end
+
+        def install_required_software
+          if using_systemd_resolved?
+            # Don't install dnsmasq if Ubuntu version uses systemd-resolved for DNS because they conflict
+            system("apt-get --assume-yes install socat")
+          else
+            super
+          end
+        end
+
+        def install_packages
+          using_systemd_resolved? ? "socat" : super
+        end
+
+        def install_other
+          using_systemd_resolved? ? nil : super
+        end
+
+        def resolver_file
+          using_systemd_resolved? ? nil : super
+        end
+
+        def tld
+          using_systemd_resolved? ? 'localhost' : @tld
+        end
+
+        def get_user_confirmation?
+          if using_systemd_resolved? && tld != 'localhost'
+            Invoker::Logger.puts("Ubuntu installations using systemd-resolved (typically Ubuntu 17+) only support the .localhost domain, so your tld setting (or the default) will be ignored.".colorize(:yellow))
+          end
+          super
+        end
       end
     end
   end