invoker 1.4.1 → 1.5.1

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

@@ -3,14 +3,11 @@ module Invoker
     module Distro
       class Arch < Base
         def install_required_software
-          system("pacman -S --needed --noconfirm dnsmasq")
+          system("pacman -S --needed --noconfirm dnsmasq socat")
           system("mkdir -p /etc/dnsmasq.d")
           unless File.open("/etc/dnsmasq.conf").each_line.any? { |line| line.chomp == "conf-dir=/etc/dnsmasq.d" }
             File.open("/etc/dnsmasq.conf", "a") {|f| f.write("conf-dir=/etc/dnsmasq.d") }
           end
-          unless system("ls /usr/bin/rinetd > /dev/null 2>&1")
-            fail "You'll need to install rinetd from the AUR in order to continue"
-          end
         end
       end
     end

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

@@ -2,37 +2,42 @@ module Invoker
   module Power
     module Distro
       class Base
-        RESOLVER_FILE = "/etc/dnsmasq.d/dev-tld"
-        RINETD_FILE = "/etc/rinetd.conf"
+        SOCAT_SHELLSCRIPT = "/usr/bin/invoker_forwarder.sh"
+        SOCAT_SYSTEMD = "/etc/systemd/system/socat_invoker.service"
+        RESOLVER_DIR = "/etc/dnsmasq.d"
+        attr_accessor :tld
 
-        def self.distro_installer
+        def resolver_file
+          File.join(RESOLVER_DIR, "#{tld}-tld")
+        end
+
+        def self.distro_installer(tld)
           case Facter[:operatingsystem].value
           when "Ubuntu"
             require "invoker/power/setup/distro/ubuntu"
-            Ubuntu.new
+            Ubuntu.new(tld)
           when "Fedora"
             require "invoker/power/setup/distro/redhat"
-            Redhat.new
+            Redhat.new(tld)
           when "Archlinux"
             require "invoker/power/setup/distro/arch"
-            Arch.new
+            Arch.new(tld)
           when "Debian"
             require "invoker/power/setup/distro/debian"
-            Debian.new
+            Debian.new(tld)
           when "LinuxMint"
             require "invoker/power/setup/distro/mint"
-            Mint.new
+            Mint.new(tld)
+          when "OpenSuSE"
+            require "invoker/power/setup/distro/opensuse"
+            Opensuse.new(tld)
           else
             raise "Your selected distro is not supported by Invoker"
           end
         end
 
-        def resolver_file
-          RESOLVER_FILE
-        end
-
-        def rinetd_file
-          RINETD_FILE
+        def initialize(tld)
+          self.tld = tld
         end
 
         # Install required software
@@ -41,13 +46,10 @@ module Invoker
         end
 
         def restart_services
-          if Facter[:systemctl] == "true"
-            system("systemctl restart rinetd")
-            system("systemctl restart dnsmasq")
-          else
-            system("service rinetd restart")
-            system("service dnsmasq restart")
-          end
+          system("systemctl enable socat_invoker.service")
+          system("systemctl enable dnsmasq")
+          system("systemctl start socat_invoker.service")
+          system("systemctl restart dnsmasq")
         end
       end
     end

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

@@ -3,7 +3,7 @@ module Invoker
     module Distro
       class Debian < Base
         def install_required_software
-          system("apt-get --assume-yes install dnsmasq rinetd")
+          system("apt-get --assume-yes install dnsmasq socat")
         end
       end
     end

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

@@ -0,0 +1,11 @@
+module Invoker
+  module Power
+    module Distro
+      class Opensuse < Base
+        def install_required_software
+          system("zypper install -l dnsmasq socat")
+        end
+      end
+    end
+  end
+end

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

@@ -3,13 +3,7 @@ module Invoker
     module Distro
       class Redhat < Base
         def install_required_software
-          system("yum --assumeyes install dnsmasq rinetd")
-        end
-
-        def restart_services
-          system("systemctl enable rinetd")
-          system("service rinetd restart")
-          system("service dnsmasq restart")
+          system("yum --assumeyes install dnsmasq socat")
         end
       end
     end

data/lib/invoker/power/setup/files/invoker_forwarder.sh.erb

@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+KillJobs() {
+    for job in $(jobs -p); do
+        kill -s SIGTERM $job > /dev/null 2>&1 || (sleep 10 && kill -9 $job > /dev/null 2>&1 &)
+    done
+}
+
+# Whatever you need to clean here
+trap KillJobs SIGINT SIGTERM EXIT
+
+/usr/bin/socat TCP-LISTEN:80,reuseaddr,fork TCP:0.0.0.0:<%= http_port %>&
+pid1=$!
+/usr/bin/socat TCP-LISTEN:443,reuseaddr,fork TCP:0.0.0.0:<%= https_port %>&
+pid2=$!
+wait $pid1 $pid2
+wait $pid1 $pid2

data/lib/invoker/power/setup/files/socat_invoker.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=Socat port forwarding service
+After=network.target
+Documentation=man:socat(1)
+
+[Service]
+ExecStart=/usr/bin/invoker_forwarder.sh
+Restart=on-success
+
+
+[Install]
+WantedBy=multi-user.target

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

@@ -1,5 +1,7 @@
 require "invoker/power/setup/distro/base"
 require "facter"
+require 'erb'
+require 'fileutils'
 
 module Invoker
   module Power
@@ -22,17 +24,27 @@ module Invoker
         self
       end
 
-      def create_config_file
-        Invoker.setup_config_location
-        Invoker::Power::Config.create(
-          http_port: port_finder.http_port,
-          https_port: port_finder.https_port
-        )
+      def uninstall_invoker
+        system("systemctl disable socat_invoker.service")
+        system("systemctl stop socat_invoker.service")
+        system("rm #{Invoker::Power::Distro::Base::SOCAT_SYSTEMD}")
+        system("rm #{Invoker::Power::Distro::Base::SOCAT_SHELLSCRIPT}")
+        initialize_distro_installer
+        remove_resolver_file
+        drop_to_normal_user
+        Invoker::Power::Config.delete
       end
 
-      def uninstall_invoker
-        Invoker::Logger.puts("Uninstall is not yet supported on Linux."\
-          " You can remove invoker changes by uninstalling dnsmasq and rinetd")
+      def resolver_file
+        distro_installer.resolver_file
+      end
+
+      def forwarder_script
+        File.join(File.dirname(__FILE__), "files/invoker_forwarder.sh.erb")
+      end
+
+      def socat_unit
+        File.join(File.dirname(__FILE__), "files/socat_invoker.service")
       end
 
       private
@@ -44,41 +56,46 @@ module Invoker
             Facter::Util::Resolution.exec("[ -e /usr/bin/systemctl ] && echo 'true' || echo 'false'")
           end
         end
-        @distro_installer =  Invoker::Power::Distro::Base.distro_installer
+        @distro_installer = Invoker::Power::Distro::Base.distro_installer(tld)
       end
 
       def install_resolver
-        File.open(distro_installer.resolver_file, "w") do |fl|
-          fl.write(tld_setup)
+        File.open(resolver_file, "w") do |fl|
+          fl.write(resolver_file_content)
         end
       end
 
       def install_port_forwarder
-        File.open(distro_installer.rinetd_file, "a") do |fl|
-          fl << "\n"
-          fl << rinetd_setup(port_finder.http_port, port_finder.https_port)
-        end
+        install_forwarder_script(port_finder.http_port, port_finder.https_port)
+        install_systemd_unit
       end
 
-      def tld_setup
-        tld_string =<<-EOD
-local=/dev/
-address=/dev/127.0.0.1
+      def resolver_file_content
+        content =<<-EOD
+local=/#{tld}/
+address=/#{tld}/127.0.0.1
         EOD
-        tld_string
+        content
       end
 
-      def rinetd_setup(http_port, https_port)
-        rinetd_string =<<-EOD
-0.0.0.0 80 0.0.0.0 #{http_port}
-0.0.0.0 443 0.0.0.0 #{https_port}
-        EOD
-        rinetd_string
+      def install_forwarder_script(http_port, https_port)
+        script_template = File.read(forwarder_script)
+        renderer = ERB.new(script_template)
+        script_output = renderer.result(binding)
+        File.open(Invoker::Power::Distro::Base::SOCAT_SHELLSCRIPT, "w") do |fl|
+          fl.write(script_output)
+        end
+        system("chmod +x #{Invoker::Power::Distro::Base::SOCAT_SHELLSCRIPT}")
+      end
+
+      def install_systemd_unit
+        FileUtils.cp(socat_unit, Invoker::Power::Distro::Base::SOCAT_SYSTEMD)
+        system("chmod 644 #{Invoker::Power::Distro::Base::SOCAT_SYSTEMD}")
       end
 
       def get_user_confirmation?
-        Invoker::Logger.puts("Invoker is going to install dnsmasq and rinetd on this machine."\
-          " It is also going to install a local resolver for .dev domain and a rinetd rule"\
+        Invoker::Logger.puts("Invoker is going to install dnsmasq and socat on this machine."\
+          " It is also going to install a local resolver for .#{tld} domain and 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) : ")

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

@@ -1,9 +1,12 @@
 module Invoker
   module Power
     class OsxSetup < Setup
-      RESOLVER_FILE = "/etc/resolver/dev"
-      RESOLVER_DIR = "/etc/resolver"
       FIREWALL_PLIST_FILE = "/Library/LaunchDaemons/com.codemancers.invoker.firewall.plist"
+      RESOLVER_DIR = "/etc/resolver"
+
+      def resolver_file
+        File.join(RESOLVER_DIR, tld)
+      end
 
       def setup_invoker
         if setup_resolver_file
@@ -30,33 +33,19 @@ module Invoker
         end
       end
 
-      def create_config_file
-        Invoker.setup_config_location
-        Invoker::Power::Config.create(
-          dns_port: port_finder.dns_port,
-          http_port: port_finder.http_port,
-          https_port: port_finder.https_port
-        )
+      def build_power_config
+        config = super
+        config[:dns_port] = port_finder.dns_port
+        config
       end
 
       def install_resolver(dns_port)
-        open_resolver_for_write { |fl|
-          fl.write(resolve_string(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))
         raise
       end
 
-      def remove_resolver_file
-        if File.exists?(RESOLVER_FILE)
-          File.delete(RESOLVER_FILE)
-        end
-      rescue Errno::EACCES
-        Invoker::Logger.puts("Running uninstall requires root access, please rerun it with sudo".color(:red))
-        raise
-      end
-
       def install_firewall(http_port, https_port)
         File.open(FIREWALL_PLIST_FILE, "w") { |fl|
           fl.write(plist_string(http_port, https_port))
@@ -118,19 +107,18 @@ port #{dns_port}
       end
 
       def setup_resolver_file
-        return true unless File.exists?(RESOLVER_FILE)
+        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)
-
         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) : ")
 
         if replace_resolver_flag
           Invoker::Logger.puts "Invoker has overwritten one or more files created by Pow. "\
-          "If .dev domains still don't resolve locally. Try turning off the wi-fi"\
-          " and turning it on. It will force OSX to reload network configuration".color(:green)
+          "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)
         end
         replace_resolver_flag
       end
@@ -138,8 +126,8 @@ port #{dns_port}
       private
 
       def open_resolver_for_write
-        FileUtils.mkdir(RESOLVER_DIR) unless Dir.exists?(RESOLVER_DIR)
-        fl = File.open(RESOLVER_FILE, "w")
+        FileUtils.mkdir(RESOLVER_DIR) unless Dir.exist?(RESOLVER_DIR)
+        fl = File.open(resolver_file, "w")
         yield fl
       ensure
         fl && fl.close

data/lib/invoker/power/url_rewriter.rb

@@ -1,8 +1,6 @@
 module Invoker
   module Power
     class UrlRewriter
-      DEV_MATCH_REGEX = [/([\w.-]+)\.dev(\:\d+)?$/, /([\w-]+)\.dev(\:\d+)?$/]
-
       def select_backend_config(complete_path)
         possible_matches = extract_host_from_domain(complete_path)
         exact_match = nil
@@ -17,7 +15,7 @@ module Invoker
 
       def extract_host_from_domain(complete_path)
         matching_strings = []
-        DEV_MATCH_REGEX.map do |regexp|
+        tld_match_regex.map do |regexp|
           if (match_result = complete_path.match(regexp))
             matching_strings << match_result[1]
           end
@@ -27,6 +25,11 @@ module Invoker
 
       private
 
+      def tld_match_regex
+        tld = Invoker.config.tld
+        [/([\w.-]+)\.#{tld}(\:\d+)?$/, /([\w-]+)\.#{tld}(\:\d+)?$/]
+      end
+
       def dns_check(dns_args)
         Invoker::IPC::UnixClient.send_command("dns_check", dns_args) do |dns_response|
           dns_response

data/lib/invoker/process_manager.rb

@@ -89,17 +89,23 @@ module Invoker
     def load_env(directory = nil)
       directory ||= ENV['PWD']
       default_env = File.join(directory, '.env')
-      return {} unless File.exist?(default_env)
-      Dotenv::Environment.new(default_env)
+      local_env = File.join(directory, '.env.local')
+      env = {}
+
+      if File.exist?(default_env)
+        env.merge!(Dotenv::Environment.new(default_env))
+      end
+
+      if File.exist?(local_env)
+        env.merge!(Dotenv::Environment.new(local_env))
+      end
+
+      env
     end
 
     def kill_workers
       @workers.each do |key, worker|
-        begin
-          Process.kill("INT", -Process.getpgid(worker.pid))
-        rescue Errno::ESRCH
-          Invoker::Logger.puts "Error killing #{key}"
-        end
+        kill_or_remove_process(worker.pid, "INT", worker.command_label)
       end
       @workers = {}
     end

data/lib/invoker/version.rb

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

data/readme.md

@@ -1,9 +1,9 @@
 Invoker is a gem for managing processes in development environment.
 
-[![Build Status](https://travis-ci.org/code-mancers/invoker.png)](https://travis-ci.org/code-mancers/invoker)
-[![Code Climate](https://codeclimate.com/github/code-mancers/invoker.png)](https://codeclimate.com/github/code-mancers/invoker)
-[![Coverage Status](https://coveralls.io/repos/code-mancers/invoker/badge.png)](https://coveralls.io/r/code-mancers/invoker)
-[![Dependency Status](https://gemnasium.com/code-mancers/invoker.png)](https://gemnasium.com/code-mancers/invoker)
+[![Build Status](https://travis-ci.org/code-mancers/invoker.svg)](https://travis-ci.org/code-mancers/invoker)
+[![Code Climate](https://codeclimate.com/github/code-mancers/invoker.svg)](https://codeclimate.com/github/code-mancers/invoker)
+[![Coverage Status](https://coveralls.io/repos/code-mancers/invoker/badge.svg)](https://coveralls.io/r/code-mancers/invoker)
+[![Dependency Status](https://gemnasium.com/code-mancers/invoker.svg)](https://gemnasium.com/code-mancers/invoker)
 
 ## Usage ##
 

data/spec/invoker/commander_spec.rb

@@ -1,13 +1,22 @@
 require "spec_helper"
 
 describe "Invoker::Commander" do
+  before(:each) do
+    @original_invoker_config = Invoker.config
+    Invoker.config = mock
+  end
+
+  after(:each) do
+    Invoker.config = @original_invoker_config
+  end
+
   describe "With no processes configured" do
-    before do
+    before(:each) do
       @commander = Invoker::Commander.new
     end
 
     it "should throw error" do
-      invoker_config.stubs(:processes).returns([])
+      Invoker.config.stubs(:processes).returns([])
 
       expect {
         @commander.start_manager
@@ -19,8 +28,9 @@ describe "Invoker::Commander" do
     describe "when not daemonized" do
       before do
         processes = [OpenStruct.new(:label => "foobar", :cmd => "foobar_command", :dir => ENV['HOME'])]
-        invoker_config.stubs(:processes).returns(processes)
-        invoker_config.stubs(:autorunnable_processes).returns(processes)
+        Invoker.config.stubs(:processes).returns(processes)
+        Invoker.config.stubs(:autorunnable_processes).returns(processes)
+        Invoker.stubs(:can_run_balancer?).returns(false)
         @commander = Invoker::Commander.new
         Invoker.commander = @commander
       end
@@ -52,8 +62,9 @@ describe "Invoker::Commander" do
     describe "when daemonized" do
       before do
         processes = [OpenStruct.new(:label => "foobar", :cmd => "foobar_command", :dir => ENV['HOME'])]
-        invoker_config.stubs(:processes).returns(processes)
-        invoker_config.stubs(:autorunnable_processes).returns(processes)
+        Invoker.config.stubs(:processes).returns(processes)
+        Invoker.config.stubs(:autorunnable_processes).returns(processes)
+        Invoker.stubs(:can_run_balancer?).returns(false)
         @commander = Invoker::Commander.new
         Invoker.commander = @commander
         Invoker.daemonize = true
@@ -94,8 +105,8 @@ describe "Invoker::Commander" do
           OpenStruct.new(:label => "foobar", :cmd => "foobar_command", :dir => ENV['HOME']),
           OpenStruct.new(:label => "panda", :cmd => "panda_command", :dir => ENV['HOME'], :disable_autorun => true)
         ]
-        invoker_config.stubs(:processes).returns(@processes)
-        invoker_config.stubs(:autorunnable_processes).returns([@processes.first])
+        Invoker.config.stubs(:processes).returns(@processes)
+        Invoker.config.stubs(:autorunnable_processes).returns([@processes.first])
 
         @commander = Invoker::Commander.new
       end