invoker 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 174f97bf4ba760cca1391b8c904114e7949c9dbd
-  data.tar.gz: 3fc440a77808ed5fe86f4b344f015f6c866a52b2
+  metadata.gz: 94d07aee24e9bfaca5d95b721d38c8b6396b996f
+  data.tar.gz: 0623bb80d7a17b18e6e9f7371c62104a4d22323a
 SHA512:
-  metadata.gz: 58a73394506ed9427f8637c46794643a37c1de4517a48786310e36f5f89f2a9f71c8c8ce6d157cc2798af6a9e2d78262d1362cabaf5f6378e827cbaeae20910c
-  data.tar.gz: ce5a29570d59711eee4683533bfdc6668581ff23908abd53dc6e71279551b7679856838269bb02d4ce190f929ff02a08ce87fb17efd6aa6bb27a2b7cb0585307
+  metadata.gz: 6ecb8ff338d9d7824d151e20a30bd7874987a4f03d645cb6787aeb71ca298b673b1e51d62d120a7229fec1fd339f29c9e9a31fa5887745adc3846018cb638444
+  data.tar.gz: f8be5f264d28794ef11e1d023892afc4421e65cc0d840ddb7381eb57be981dffa18cff2f0ab0b50a037102579d52f3d771d00269ce169412db9942da3722d7c2

data/.travis.yml

@@ -7,4 +7,6 @@ rvm:
   - 2.2.0
   - 2.3.0
 
+before_install:
+  - gem update bundler --no-document
 script: bundle exec rake spec

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 ## Changelog since 1.5.4
 
 
+
+# v1.5.5
+* Fix high cpu usage when process managed by Invoker crashes and Invoker doesn't read from its socket.(https://github.com/code-mancers/invoker/pull/198)
+* Allow users to specify custom ssl certificate and key (https://github.com/code-mancers/invoker/pull/199)
+* Remove rainbow dependency and migrate to colorize
+
 # v1.5.4
 * Add support for running Invoker build in SELinux environments (https://github.com/code-mancers/invoker/pull/188)
 * Add an option to print process listing in raw format. This enables us to see complete process list (https://github.com/code-mancers/invoker/pull/193)

data/examples/crash.rb

@@ -0,0 +1,2 @@
+puts "Starting this process"
+exit(-1)

data/examples/sample.ini

@@ -1,3 +1,7 @@
 [rails]
 directory = ./examples
 command = ruby hello_sinatra.rb -p $PORT
+
+[crash]
+directory = ./examples
+command = ruby crash.rb

data/invoker.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.summary = %q{Something small for Process management}
   s.add_dependency("thor", "~> 0.19")
-  s.add_dependency("rainbow", "~> 2.1.0")
+  s.add_dependency("colorize", "~> 0.8.1")
   s.add_dependency("iniparse", "~> 1.1")
   s.add_dependency("formatador", "~> 0.2")
   s.add_dependency("eventmachine", "~> 1.0.4")

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"
@@ -36,7 +35,7 @@ require "invoker/process_printer"
 module Invoker
   class << self
     attr_accessor :config, :tail_watchers, :commander
-    attr_accessor :dns_cache, :daemonize, :nocolors
+    attr_accessor :dns_cache, :daemonize, :nocolors, :certificate, :private_key
 
     alias_method :daemonize?, :daemonize
     alias_method :nocolors?, :nocolors
@@ -74,7 +73,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

data/lib/invoker/cli.rb

@@ -41,16 +41,24 @@ module Invoker
       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
 
@@ -150,7 +158,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
@@ -158,7 +166,7 @@ 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

data/lib/invoker/command_worker.rb

@@ -25,7 +25,7 @@ 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}"
       if Invoker.nocolors?
         Invoker::Logger.puts plain_line

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
 

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
 

data/lib/invoker/power/pf_migrate.rb

@@ -17,7 +17,7 @@ module Invoker
           osx_setup.install_firewall(Invoker.config.http_port, Invoker.config.https_port)
           drop_to_normal_user
           Invoker::Logger.puts "Invoker has updated its configuration for yosemite."\
-            " Please restart OSX to complete the configuration process.".color(:red)
+            " Please restart OSX to complete the configuration process.".colorize(:red)
           exit(-1)
         end
       end
@@ -27,7 +27,7 @@ module Invoker
           Invoker::Logger.puts "Invoker has detected you are running OSX 10.10 "\
             " but your invoker configuration does not support it."
           Invoker::Logger.puts "Invoker can update its configuration automaticaly"\
-            " but it will require a system reboot.".color(:red)
+            " but it will require a system reboot.".colorize(:red)
           Invoker::CLI::Question.agree("Update Invoker configuration (y/n) :")
         else
           true

data/lib/invoker/power/setup.rb

@@ -26,7 +26,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 +36,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
@@ -77,7 +77,7 @@ module Invoker
         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/linux_setup.rb

@@ -19,7 +19,7 @@ module Invoker
           drop_to_normal_user
           create_config_file
         else
-          Invoker::Logger.puts("Invoker is not configured to serve from subdomains".color(:red))
+          Invoker::Logger.puts("Invoker is not configured to serve from subdomains".colorize(:red))
         end
         self
       end

data/lib/invoker/power/setup/osx_setup.rb

@@ -17,7 +17,7 @@ module Invoker
           drop_to_normal_user
           create_config_file
         else
-          Invoker::Logger.puts("Invoker is not configured to serve from subdomains".color(:red))
+          Invoker::Logger.puts("Invoker is not configured to serve from subdomains".colorize(:red))
         end
         self
       end
@@ -42,7 +42,7 @@ module Invoker
       def install_resolver(dns_port)
         open_resolver_for_write { |fl| fl.write(resolve_string(dns_port)) }
       rescue Errno::EACCES
-        Invoker::Logger.puts("Running setup requires root access, please rerun it with sudo".color(:red))
+        Invoker::Logger.puts("Running setup requires root access, please rerun it with sudo".colorize(:red))
         raise
       end
 
@@ -110,7 +110,7 @@ port #{dns_port}
         return true unless File.exist?(resolver_file)
 
         Invoker::Logger.puts "Invoker has detected an existing Pow installation. We recommend "\
-          "that you uninstall pow and rerun this setup.".color(:red)
+          "that you uninstall pow and rerun this setup.".colorize(:red)
         Invoker::Logger.puts "If you have already uninstalled Pow, proceed with installation"\
           " by pressing y/n."
         replace_resolver_flag = Invoker::CLI::Question.agree("Replace Pow configuration (y/n) : ")
@@ -118,7 +118,7 @@ port #{dns_port}
         if replace_resolver_flag
           Invoker::Logger.puts "Invoker has overwritten one or more files created by Pow. "\
           "If .#{tld} domains still don't resolve locally, try turning off the wi-fi"\
-          " and turning it on. It'll force OS X to reload network configuration".color(:green)
+          " and turning it on. It'll force OS X to reload network configuration".colorize(:green)
         end
         replace_resolver_flag
       end

data/lib/invoker/process_manager.rb

@@ -30,7 +30,7 @@ module Invoker
     # @param process_name [String] Command label of process specified in config file.
     def start_process_by_name(process_name)
       if process_running?(process_name)
-        Invoker::Logger.puts "\nProcess '#{process_name}' is already running".color(:red)
+        Invoker::Logger.puts "\nProcess '#{process_name}' is already running".colorize(:red)
         return false
       end
 
@@ -49,7 +49,7 @@ module Invoker
       return false unless worker
       signal_to_use = remove_message.signal || 'INT'
 
-      Invoker::Logger.puts("Removing #{command_label} with signal #{signal_to_use}".color(:red))
+      Invoker::Logger.puts("Removing #{command_label} with signal #{signal_to_use}".colorize(:red))
       kill_or_remove_process(worker.pid, signal_to_use, command_label)
     end
 
@@ -128,7 +128,7 @@ module Invoker
       thread = Thread.new do
         Process.wait(pid)
         message = "Process with command #{command_label} exited with status #{$?.exitstatus}"
-        Invoker::Logger.puts("\n#{message}".color(:red))
+        Invoker::Logger.puts("\n#{message}".colorize(:red))
         Invoker.notify_user(message)
         Invoker.commander.trigger(command_label, :exit)
       end
@@ -149,7 +149,7 @@ module Invoker
       process_kill(pid, signal_to_use)
       true
     rescue Errno::ESRCH
-      Invoker::Logger.puts("Killing process with #{pid} and name #{command_label} failed".color(:red))
+      Invoker::Logger.puts("Killing process with #{pid} and name #{command_label} failed".colorize(:red))
       remove_worker(command_label, false)
       false
     end

data/lib/invoker/reactor/reader.rb

@@ -19,18 +19,29 @@ module Invoker
 
     def process_read(ready_fd)
       command_worker = Invoker.commander.get_worker_from_fd(ready_fd)
-      return unless command_worker
       begin
         data = read_data(ready_fd)
-        command_worker.receive_data(data)
+        send_data_to_worker(data, command_worker)
       rescue Invoker::Errors::ProcessTerminated
-        remove_from_read_monitoring(command_worker.pipe_end, command_worker)
+        remove_from_read_monitoring(command_worker, ready_fd)
+      end
+    end
+
+    def send_data_to_worker(data, command_worker)
+      if command_worker
+        command_worker.receive_data(data)
+      else
+        Invoker::Logger.puts("No reader found for incoming data")
       end
     end
 
-    def remove_from_read_monitoring(fd, command_worker)
-      read_array.delete(fd)
-      command_worker.unbind
+    def remove_from_read_monitoring(command_worker, ready_fd)
+      if command_worker
+        read_array.delete(command_worker.pipe_end)
+        command_worker.unbind
+      else
+        read_array.delete(ready_fd)
+      end
     rescue StandardError => error
       Invoker::Logger.puts(error.message)
       Invoker::Logger.puts(error.backtrace)

data/lib/invoker/version.rb

@@ -43,5 +43,5 @@ module Invoker
       Version.new(next_splits.join('.'))
     end
   end
-  VERSION = "1.5.4"
+  VERSION = "1.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: invoker
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Hemant Kumar
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-22 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -26,19 +26,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.19'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: iniparse
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +242,7 @@ files:
 - bin/invoker
 - contrib/completion/invoker-completion.bash
 - contrib/completion/invoker-completion.zsh
+- examples/crash.rb
 - examples/hello_sinatra.rb
 - examples/sample.ini
 - invoker.gemspec
@@ -355,36 +356,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Something small for Process management
-test_files:
-- spec/invoker/cli/pinger_spec.rb
-- spec/invoker/cli/tail_watcher_spec.rb
-- spec/invoker/cli_spec.rb
-- spec/invoker/command_worker_spec.rb
-- spec/invoker/commander_spec.rb
-- spec/invoker/config_spec.rb
-- spec/invoker/daemon_spec.rb
-- spec/invoker/event/manager_spec.rb
-- spec/invoker/invoker_spec.rb
-- spec/invoker/ipc/client_handler_spec.rb
-- spec/invoker/ipc/dns_check_command_spec.rb
-- spec/invoker/ipc/message/list_response_spec.rb
-- spec/invoker/ipc/message_spec.rb
-- spec/invoker/ipc/unix_client_spec.rb
-- spec/invoker/power/balancer_spec.rb
-- spec/invoker/power/config_spec.rb
-- spec/invoker/power/http_parser_spec.rb
-- spec/invoker/power/http_response_spec.rb
-- spec/invoker/power/pf_migrate_spec.rb
-- spec/invoker/power/port_finder_spec.rb
-- spec/invoker/power/setup/linux_setup_spec.rb
-- spec/invoker/power/setup/osx_setup_spec.rb
-- spec/invoker/power/setup_spec.rb
-- spec/invoker/power/url_rewriter_spec.rb
-- spec/invoker/power/web_sockets_spec.rb
-- spec/invoker/process_manager_spec.rb
-- spec/invoker/reactor_spec.rb
-- spec/spec_helper.rb
+test_files: []