invoker 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Y2NjYjQ0N2Q3ODViNThlNTM0ODMxMzAxY2YyZGYyODllZDVmYjg5YQ==
-  data.tar.gz: !binary |-
-    NzQ4MTA2MWY1ZDdjM2ExMTY4ODQ1MGI5NjJhMTU4ZmJkODQ0NWI2ZA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MjllZmVkMTIxNmIxYTZlMjFjNjQ4NjIxNGQwNTFkMzcxZWFiYTg3YjdjNjk3
-    ZTI2YzM5ODk5Mjc5NTRmNWUyYjA4MjExZjQ3MTg2OTg2NTM2MGMxNGI0ODcz
-    ZTFiZDk1NTU0ZTc2YTIwOGE5OGUxY2E0NjlkNDIzNGJkYTI0ZjU=
-  data.tar.gz: !binary |-
-    ZjhhNDM5YjJhNjgzMjcxODJhMGI3ZmI1YmM2ZDY0OTI1NTQzN2NlMjBjNGRj
-    YmIwMTljMDMwNjlkMjI2OGY2YWI0ZmNiOTgyYWQyOTRjMWRiN2JjNTBlNjcy
-    ODQ2YWU3ZWQ5M2IxZTZiNGVhMzczN2NlNWEyNmZhMWJiMzljZGQ=
+SHA1:
+  metadata.gz: 8949242941b92eea8a78f0a528b62c59dc831b2e
+  data.tar.gz: bd867429fa2a66e625549de2a8d2ab532ffe2c6c
+SHA512:
+  metadata.gz: b6732d806f3ecfcc9a9d2275baa9068eff0207e789d63fe3b92d19bdcb5474513565b5f7a0d5a3438c4efcb41649c4249304cbf6a16459ddf111707b0cf1c183
+  data.tar.gz: 67c02e15182e736bdefb13b2f09e7eda386a9ecf7fd23f7dc44a1c6943ef73965ad5c039bc31cb952688dd46d9114004dcf1ea5d0f932517db2ec6326983eaad

data/.gitignore

@@ -6,3 +6,5 @@ pkg/
 local.ini
 multi.ini
 tags
+.rvmrc
+vendor/

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/Rakefile

@@ -1,5 +1,7 @@
-desc "Run the tests"
-task :spec do
-  spec_files = Dir["spec/**/*.rb"]
-  sh("bacon -I spec #{spec_files.join(" ")}")
-end
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new
+
+task :default => :spec
+task :test => :spec

data/invoker.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.homepage = %q{http://github.com/code-mancers/invoker}
+  s.homepage = %q{http://invoker.codemancers.com}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.summary = %q{Something small for Process management}
@@ -35,8 +35,8 @@ Gem::Specification.new do |s|
   s.add_dependency("uuid", "~> 2.3.7")
   s.add_dependency("highline", "~> 1.6.19")
   s.add_dependency("http-parser-lite", "~> 0.6.0")
-  s.add_development_dependency("bacon")
+  s.add_dependency("dotenv", "~> 0.9.0")
+  s.add_development_dependency("rspec")
   s.add_development_dependency("mocha")
-  s.add_development_dependency("mocha-on-bacon")
   s.add_development_dependency("rake")
 end

data/lib/invoker.rb

@@ -1,5 +1,6 @@
 $: << File.dirname(__FILE__) unless $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+require "fileutils"
 require "formatador"
 require 'rubydns'
 require 'em-proxy'
@@ -14,6 +15,7 @@ require "invoker/command_listener/server"
 require "invoker/command_listener/client"
 require "invoker/power"
 require "invoker/errors"
+require "invoker/parsers/procfile"
 require "invoker/parsers/config"
 require "invoker/parsers/option_parser"
 require "invoker/commander"

data/lib/invoker/commander.rb

@@ -161,15 +161,16 @@ 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))
       remove_worker(command_label, false)
       false
     end
 
     def process_kill(pid, signal_to_use)
       if signal_to_use.to_i == 0
-        Process.kill(signal_to_use, pid)
+        Process.kill(signal_to_use, -Process.getpgid(pid))
       else
-        Process.kill(signal_to_use.to_i, pid)
+        Process.kill(signal_to_use.to_i, -Process.getpgid(pid))
       end
     end
 
@@ -203,16 +204,17 @@ module Invoker
 
       event_manager.schedule_event(command_label, :exit) { remove_worker(command_label) }
 
+      spawn_options = {
+        :chdir => process_info.dir || ENV['PWD'], :out => write_pipe, :err => write_pipe,
+        :pgroup => true, :close_others => true, :in => :close
+      }
+
       if defined?(Bundler)
         Bundler.with_clean_env do
-          spawn(process_info.cmd, 
-            :chdir => process_info.dir || "/", :out => write_pipe, :err => write_pipe
-          )
+          spawn(process_info.cmd, spawn_options)
         end
       else
-        spawn(process_info.cmd, 
-          :chdir => process_info.dir || "/", :out => write_pipe, :err => write_pipe
-        )
+        spawn(process_info.cmd, spawn_options)
       end
     end
 
@@ -258,8 +260,9 @@ module Invoker
     def kill_workers
       @workers.each {|key,worker|
         begin
-          Process.kill("INT", worker.pid) 
+          Process.kill("INT", -Process.getpgid(worker.pid))
         rescue Errno::ESRCH
+          puts "Error killing #{key}"
         end
       }
       @workers = {}

data/lib/invoker/errors.rb

@@ -11,5 +11,6 @@ module Invoker
 
     class NoValidPortFound < StandardError; end
     class InvalidConfig < StandardError; end
+    class InvalidFile < StandardError; end
   end
 end

data/lib/invoker/parsers/config.rb

@@ -1,4 +1,5 @@
 require 'iniparse'
+require 'dotenv'
 
 module Invoker
   module Parsers
@@ -7,9 +8,9 @@ module Invoker
       attr_accessor :processes, :power_config
 
       def initialize(filename, port)
-        @ini_content = File.read(filename)
+        @filename = filename
         @port = port
-        @processes = process_ini(@ini_content)
+        @processes = load_config
         if Invoker.can_run_balancer?
           @power_config = Invoker::Power::Config.load_config()
         end
@@ -24,25 +25,52 @@ module Invoker
       end
 
       def process(label)
-        processes.detect {|pconfig|
-          pconfig.label == label
-        }
+        processes.detect { |pconfig| pconfig.label == label }
       end
 
       private
-      def process_ini(ini_content)
+      def load_config
+        if is_ini?
+          process_ini
+        elsif is_procfile?
+          process_procfile
+        else
+          Invoker::Logger.puts("\n Invalid config file. Invoker requires an ini or a Procfile.".color(:red))
+          abort
+        end
+      end
+
+      def process_ini
+        ini_content = File.read(@filename)
         document = IniParse.parse(ini_content)
         document.map do |section|
           check_directory(section["directory"])
-          if supports_subdomain?(section)
-            port = pick_port(section)
-            make_option_for_subdomain(section, port)
-          else
-            make_option(section)
-          end
+          process_command_from_section(section)
+        end
+      end
+
+      def process_procfile
+        load_env
+        procfile = Invoker::Parsers::Procfile.new(@filename)
+        procfile.entries.map do |name, command|
+          section = { "label" => name, "command" => command }
+          process_command_from_section(section)
+        end
+      end
+
+      def process_command_from_section(section)
+        if supports_subdomain?(section)
+          port = pick_port(section)
+          make_option_for_subdomain(section, port)
+        else
+          make_option(section)
         end
       end
 
+      def load_env
+        Dotenv.load
+      end
+
       def pick_port(section)
         if section['command'] =~ PORT_REGEX
           @port += 1
@@ -56,7 +84,7 @@ module Invoker
       def make_option_for_subdomain(section, port)
         OpenStruct.new(
           port: port,
-          label: section.key,
+          label: section["label"] || section.key,
           dir: section["directory"],
           cmd: replace_port_in_command(section["command"], port)
         )
@@ -64,7 +92,7 @@ module Invoker
 
       def make_option(section)
         OpenStruct.new(
-          label: section.key,
+          label: section["label"] || section.key,
           dir: section["directory"],
           cmd: section["command"]
         )
@@ -88,6 +116,13 @@ module Invoker
         end
       end
 
+      def is_ini?
+        File.extname(@filename) == '.ini'
+      end
+
+      def is_procfile?
+        @filename =~ /Procfile/
+      end
     end
   end
 end

data/lib/invoker/parsers/option_parser.rb

@@ -8,7 +8,7 @@ module Invoker
         selected_command = nil
         opts = Slop.parse(args, help: true) do
           on :v, "Print the version" do
-            Invoker::Logger.puts Invoker::VERSION
+            selected_command = OpenStruct.new(:command => 'version')
           end
           on :p, :port=, "Port series to be used for starting rack servers", as: Integer
 

data/lib/invoker/parsers/procfile.rb

@@ -0,0 +1,86 @@
+module Invoker
+  module Parsers
+    # rip off from foreman
+    class Procfile
+      # Initialize a Procfile
+      #
+      # @param [String] filename (nil)  An optional filename to read from
+      #
+      def initialize(filename=nil)
+        @entries = []
+        load(filename) if filename
+      end
+
+      # Yield each +Procfile+ entry in order
+      #
+      def entries
+        return @entries unless block_given?
+        @entries.each do |(name, command)|
+          yield name, command
+        end
+      end
+
+      # Retrieve a +Procfile+ command by name
+      #
+      # @param [String] name  The name of the Procfile entry to retrieve
+      #
+      def [](name)
+        @entries.detect { |n,c| name == n }.last
+      end
+
+      # Create a +Procfile+ entry
+      #
+      # @param [String] name     The name of the +Procfile+ entry to create
+      # @param [String] command  The command of the +Procfile+ entry to create
+      #
+      def []=(name, command)
+        delete name
+        @entries << [name, command]
+      end
+
+      # Remove a +Procfile+ entry
+      #
+      # @param [String] name  The name of the +Procfile+ entry to remove
+      #
+      def delete(name)
+        @entries.reject! { |n,c| name == n }
+      end
+
+      # Load a Procfile from a file
+      #
+      # @param [String] filename  The filename of the +Procfile+ to load
+      #
+      def load(filename)
+        @entries.replace parse(filename)
+      end
+
+      # Save a Procfile to a file
+      #
+      # @param [String] filename  Save the +Procfile+ to this file
+      #
+      def save(filename)
+        File.open(filename, 'w') do |file|
+          file.puts self.to_s
+        end
+      end
+
+      # Get the +Procfile+ as a +String+
+      #
+      def to_s
+        @entries.map do |name, command|
+          [ name, command ].join(": ")
+        end.join("\n")
+      end
+
+      private
+
+      def parse(filename)
+        File.read(filename).gsub("\r\n","\n").split("\n").map do |line|
+          if line =~ /^([A-Za-z0-9_-]+):\s*(.+)$/
+            [$1, $2]
+          end
+        end.compact
+      end
+    end
+  end
+end

data/lib/invoker/power.rb

@@ -1,6 +1,7 @@
 require "invoker/power/config"
 require "invoker/power/port_finder"
 require "invoker/power/setup"
+require "invoker/power/http_response"
 require "invoker/power/dns"
 require "invoker/power/balancer"
 require "invoker/power/powerup"

data/lib/invoker/power/balancer.rb

@@ -73,7 +73,8 @@ module Invoker
           connection.relay_to_servers(@buffer.join)
           @buffer = []
         else
-          connection.unbind
+          return_error_page(404)
+          connection.close_connection_after_writing
         end
       end
 
@@ -95,11 +96,17 @@ module Invoker
       end
 
       def backend_data(backend, data)
+        @backend_data = true
         data
       end
 
       def frontend_disconnect(backend, name)
         http_parser.reset()
+        unless @backend_data
+          Invoker::Logger.puts("\nApplication not running. Returning error page.".color(:red))
+          return_error_page(503)
+        end
+        @backend_data = false
         connection.close_connection_after_writing() if backend == session
       end
 
@@ -113,6 +120,14 @@ module Invoker
           nil
         end
       end
+
+      def return_error_page(status)
+        http_response = Invoker::Power::HttpResponse.new()
+        http_response.status = status
+        http_response['Content-Type'] = "text/html; charset=utf-8"
+        http_response.use_file_as_body(File.join(File.dirname(__FILE__), "templates/#{status}.html"))
+        connection.send_data(http_response.http_string)
+      end
     end
   end
 end

data/lib/invoker/power/http_response.rb

@@ -0,0 +1,81 @@
+require 'time'
+
+module Invoker
+  module Power
+    class HttpResponse
+      STATUS_MAPS = {
+        200 => "OK",
+        201 => "Created",
+        202 => "Accepted",
+        204 => "No Content",
+        205 => "Reset Content",
+        206 => "Partial Content",
+        301 => "Moved Permanently",
+        302 => "Found",
+        304 => "Not Modified",
+        400 => "Bad Request",
+        401 => "Unauthorized",
+        402 => "Payment Required",
+        403 => "Forbidden",
+        404 => "Not Found",
+        411 => "Length Required",
+        500 => "Internal Server Error",
+        501 => "Not Implemented",
+        502 => "Bad Gateway",
+        503 => "Service Unavailable",
+        504 => "Gateway Timeout"
+      }
+
+      HTTP_HEADER_FIELDS = [
+        'Cache-Control', 'Connection', 'Date',
+        'Pragma', 'Trailer', 'Transfer-Encoding',
+        'Accept-Ranges', 'Age', 'Etag',
+        'Server', 'Location', 'Allow',
+        'Content-Encoding', 'Content-Language', 'Content-Location',
+        'Content-MD5', 'Content-Range',
+        'Content-Type', 'Expires',
+        'Last-Modified', 'extension-header'
+      ]
+
+      attr_accessor :header, :body, :status
+
+      def initialize
+        @header = {}
+        header['Server'] = "Invoker 1.1"
+        header['Date'] = Time.now.httpdate
+        @status = 200
+        @body = ""
+      end
+
+      def []=(key, value)
+        header[key] = value
+      end
+
+      def use_file_as_body(file_name)
+        if file_name && File.exists?(file_name)
+          file_content = File.read(file_name)
+          self.body = file_content
+        else
+          raise Invoker::Errors:InvalidFile, "Invalid file as body"
+        end
+      end
+
+      def http_string
+        final_string = []
+        final_string << "HTTP/1.1 #{status} #{STATUS_MAPS[status]}"
+
+        if header['Transfer-Encoding'].nil? && body.empty?
+          header['Content-Length'] = body.length
+        end
+
+        HTTP_HEADER_FIELDS.each do |key|
+          if value = header[key]
+            final_string << "#{key}: #{value}"
+          end
+        end
+
+        final_string.join("\r\n") + "\r\n\r\n" + body
+      end
+    end
+  end
+end