invoker 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35e208abbd4ff8979f1d1ecc0c5896ef3b460799
-  data.tar.gz: 6e2e65d581a9705f5358bf8076654a9b34185683
+  metadata.gz: e1da2ee349b145013878352cca28cc1de9ed13c5
+  data.tar.gz: 066597992a678fa848f9d6d9e36798272141ff7b
 SHA512:
-  metadata.gz: 44eecb467482053d584410fbc279c192e1dc25b7c97f245bf058f20e7bac0a12d9c0c73487d0ab0652d632030ef3f39741449dd5d30391104ef4ec9cc165091f
-  data.tar.gz: a4108aab6742c8b02886423a341c2d59c47deba5645d73b671686aff4cac4f7af668677645bb5444b8d37fe260afa8e05631ca249ba9d41f6bc9396426534a30
+  metadata.gz: 51bd2c4294e3d7b97dfe909f1289b4d62b170db3171c4cee96c1d0848df98d0ab286835f7d8de9a321c2da3e4695aea3e1010a25b308228071f981c2f4dc51ad
+  data.tar.gz: e265b1e4452c688517aa5a648a5fd81fc34c3a6a395061e7c486723318d6031018778fe3adcf76219dc8771c0b4f73168491ef86b4229d63b3fd8d26d3058f82

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.0")
+  s.add_dependency("rainbow", "~> 2.1.0")
   s.add_dependency("iniparse", "~> 1.1")
   s.add_dependency("formatador", "~> 0.2")
   s.add_dependency("eventmachine", "~> 1.0.4")

data/lib/invoker/cli.rb

@@ -65,6 +65,11 @@ module Invoker
       tailer.run
     end
 
+    desc "log process1", "Get log of particular process"
+    def log(process_name)
+      system("egrep -a '^#{process_name}' #{Invoker.daemon.log_file}")
+    end
+
     desc "reload process", "Reload a process managed by Invoker"
     option :signal,
       banner: "Signal to send for killing the process, default is SIGINT",

data/lib/invoker/command_worker.rb

@@ -26,13 +26,13 @@ module Invoker
     def receive_line(line)
       tail_watchers = Invoker.tail_watchers[@command_label]
       color_line = "#{@command_label.color(color)} : #{line}"
+      plain_line = "#{@command_label} : #{line}"
+      Invoker::Logger.puts plain_line
       if tail_watchers && !tail_watchers.empty?
         json_encoded_tail_response = tail_response(color_line)
         if json_encoded_tail_response
           tail_watchers.each { |tail_socket| send_data(tail_socket, json_encoded_tail_response) }
         end
-      else
-        Invoker::Logger.puts color_line
       end
     end
 

data/lib/invoker/commander.rb

@@ -37,7 +37,11 @@ module Invoker
       unix_server_thread = Thread.new { Invoker::IPC::Server.new }
       @thread_group.add(unix_server_thread)
       process_manager.run_power_server
-      Invoker.config.autorunnable_processes.each { |process_info| process_manager.start_process(process_info) }
+      Invoker.config.autorunnable_processes.each do |process_info|
+        process_manager.start_process(process_info)
+        Logger.puts("Starting process - #{process_info.label} waiting for #{process_info.sleep_duration} seconds...")
+        sleep(process_info.sleep_duration)
+      end
       at_exit { process_manager.kill_workers }
       start_event_loop
     end

data/lib/invoker/parsers/config.rb

@@ -42,7 +42,8 @@ module Invoker
       end
 
       def autorunnable_processes
-        processes.reject(&:disable_autorun)
+        process_to_run = processes.reject(&:disable_autorun)
+        process_to_run.sort_by { |process| process.index }
       end
 
       def process(label)
@@ -52,7 +53,7 @@ module Invoker
       private
 
       def autodetect_config_file
-        Dir.glob("{invoker.ini,Procfile}").first
+        Dir.glob("{invoker.ini,Procfile.dev,Procfile}").first
       end
 
       def invalid_config_file?
@@ -123,6 +124,20 @@ module Invoker
         }
         pconfig['port'] = section['port'] if section['port']
         pconfig['disable_autorun'] = section['disable_autorun'] if section['disable_autorun']
+        pconfig['index'] = section['index'].to_i if section['index']
+        section_index = pconfig['index'].to_i
+        if section_index
+          pconfig['index'] = section_index
+        else
+          pconfig['index'] = 0
+        end
+
+        sleep_duration = section['sleep'].to_i
+        if sleep_duration > 0
+          pconfig['sleep_duration'] = sleep_duration
+        else
+          pconfig['sleep_duration'] = 1
+        end
 
         OpenStruct.new(pconfig)
       end

data/lib/invoker/power/http_response.rb

@@ -41,7 +41,7 @@ module Invoker
 
       def initialize
         @header = {}
-        header['Server'] = "Invoker 1.1"
+        header['Server'] = "Invoker #{Invoker::VERSION}"
         header['Date'] = Time.now.httpdate
         @status = 200
         @body = ""

data/lib/invoker/process_manager.rb

@@ -88,6 +88,11 @@ module Invoker
 
     def load_env(directory = nil)
       directory ||= ENV['PWD']
+
+      if !directory || directory.empty? || !Dir.exist?(directory)
+        return {}
+      end
+
       default_env = File.join(directory, '.env')
       local_env = File.join(directory, '.env.local')
       env = {}

data/lib/invoker/version.rb

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

data/spec/invoker/commander_spec.rb

@@ -27,7 +27,7 @@ describe "Invoker::Commander" do
   describe "#start_process" do
     describe "when not daemonized" do
       before do
-        processes = [OpenStruct.new(:label => "foobar", :cmd => "foobar_command", :dir => ENV['HOME'])]
+        processes = [OpenStruct.new(:label => "foobar", :cmd => "foobar_command", :dir => ENV['HOME'], :sleep_duration => 2)]
         Invoker.config.stubs(:processes).returns(processes)
         Invoker.config.stubs(:autorunnable_processes).returns(processes)
         Invoker.stubs(:can_run_balancer?).returns(false)
@@ -61,7 +61,7 @@ describe "Invoker::Commander" do
 
     describe "when daemonized" do
       before do
-        processes = [OpenStruct.new(:label => "foobar", :cmd => "foobar_command", :dir => ENV['HOME'])]
+        processes = [OpenStruct.new(:label => "foobar", :cmd => "foobar_command", :dir => ENV['HOME'], :sleep_duration => 2)]
         Invoker.config.stubs(:processes).returns(processes)
         Invoker.config.stubs(:autorunnable_processes).returns(processes)
         Invoker.stubs(:can_run_balancer?).returns(false)
@@ -102,8 +102,8 @@ describe "Invoker::Commander" do
     context 'autorun is disabled for a process' do
       before do
         @processes = [
-          OpenStruct.new(:label => "foobar", :cmd => "foobar_command", :dir => ENV['HOME']),
-          OpenStruct.new(:label => "panda", :cmd => "panda_command", :dir => ENV['HOME'], :disable_autorun => true)
+          OpenStruct.new(:label => "foobar", :cmd => "foobar_command", :dir => ENV['HOME'], :sleep_duration => 2),
+          OpenStruct.new(:label => "panda", :cmd => "panda_command", :dir => ENV['HOME'], :disable_autorun => true, :sleep_duration => 2)
         ]
         Invoker.config.stubs(:processes).returns(@processes)
         Invoker.config.stubs(:autorunnable_processes).returns([@processes.first])

data/spec/invoker/config_spec.rb

@@ -216,6 +216,47 @@ command = bundle exec rails s -p $PORT
         file.unlink()
       end
     end
+
+    it "returns a list of processes that can by index" do
+      begin
+        file = Tempfile.new(["config", ".ini"])
+        config_data =<<-EOD
+[postgres]
+command = postgres -D /usr/local/var/postgres
+index = 2
+sleep = 5
+
+[redis]
+command = redis-server /usr/local/etc/redis.conf
+disable_autorun = true
+index = 3
+
+[memcached]
+command = /usr/local/opt/memcached/bin/memcached
+disable_autorun = false
+index = 5
+
+[panda-api]
+command = bundle exec rails s
+disable_autorun = true
+index = 4
+
+[panda-auth]
+command = bundle exec rails s -p $PORT
+index = 1
+      EOD
+        file.write(config_data)
+        file.close
+
+        config = Invoker::Parsers::Config.new(file.path, 9000)
+        processes = config.autorunnable_processes
+        expect(processes.map(&:label)).to eq(['panda-auth', 'postgres', 'memcached'])
+        expect(processes[0].sleep_duration).to eq(1)
+        expect(processes[1].sleep_duration).to eq(5)
+      ensure
+        file.unlink()
+      end
+    end
   end
 
   describe "global config file" do
@@ -299,6 +340,10 @@ some_other_process: some_other_command
 
             config = Invoker::Parsers::Config.new(nil, 9000)
             expect(config.process("some_process").cmd).to eq("some_command")
+            processes = config.autorunnable_processes
+            process_1 = processes[0]
+            expect(process_1.sleep_duration).to eq(1)
+            expect(process_1.index).to eq(0)
           ensure
             File.delete(invoker_ini)
             File.delete(procfile)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: invoker
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.3
 platform: ruby
 authors:
 - Hemant Kumar
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-07 00:00:00.000000000 Z
+date: 2017-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: iniparse
   requirement: !ruby/object:Gem::Requirement
@@ -358,4 +358,32 @@ rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Something small for Process management
-test_files: []
+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