invoker 1.1.0 → 1.2.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17e01fb0ade988c21a62f385d51e3b07e58f9016
-  data.tar.gz: 2e4e0c36f2df111493b7c05dea7e0ae99244de2c
+  metadata.gz: 82fe57088b14eea68ff54c85fd7cb0d95ab005d2
+  data.tar.gz: 37b082192e6af1f57544055d9a3c65761b53dbfc
 SHA512:
-  metadata.gz: a7601b89cd0db7b1cc0e780885d14f27ec652739702b5c2a59cf961b677db347bfd9e764ada4a53057de80a418ca3d486949c1a6909ee414505a8b5323593708
-  data.tar.gz: 552b15ffb14c384d02f3ec972ccd8f3a2191afedab5bfa899f19c9fb1ecf0e4df86c65cdbfa475df8babfc746401bc6d914bcb26f0abda2f6fd04283dab092c3
+  metadata.gz: 9840525fee76d6639a1a138d3fa4a0b40f4a9f197acf73a47a79c02cc01a67c523bb21559457bd0ab32cbf9f604fb557a69e95c610d3c60b90d2bac09d8114ea
+  data.tar.gz: 75622356bdde370032362506609019947b439d0cfcb16ba70de758b4ada5797668f8abf1552afa9f37ecf6dec465e281d2b0fe54dc6f52d65f3c595db96b969c

data/.gitignore

@@ -3,8 +3,7 @@ config/
 *.gem
 Gemfile.lock
 pkg/
-local.ini
-multi.ini
+*.ini
 tags
 .rvmrc
 vendor/
@@ -13,3 +12,4 @@ _site
 coverage
 invoker_profile/
 *.pid
+.ruby-version

data/lib/invoker.rb

@@ -18,6 +18,8 @@ require "invoker/ipc"
 require "invoker/power/config"
 require "invoker/power/port_finder"
 require "invoker/power/setup"
+require "invoker/power/setup/linux_setup"
+require "invoker/power/setup/osx_setup"
 require "invoker/power/powerup"
 require "invoker/errors"
 require "invoker/parsers/procfile"
@@ -62,7 +64,6 @@ module Invoker
     end
 
     def can_run_balancer?(throw_warning = true)
-      return false unless darwin?
       return true if File.exist?(Invoker::Power::Config::CONFIG_LOCATION)
 
       if throw_warning

data/lib/invoker/parsers/config.rb

@@ -23,6 +23,10 @@ module Invoker
         power_config && power_config.dns_port
       end
 
+      def https_port
+        power_config && power_config.https_port
+      end
+
       def process(label)
         processes.detect { |pconfig| pconfig.label == label }
       end

data/lib/invoker/power/balancer.rb

@@ -3,7 +3,7 @@ require 'http-parser'
 
 module Invoker
   module Power
-    class BalancerConnection < EventMachine::ProxyServer::Connection
+    class InvokerHttpProxy < EventMachine::ProxyServer::Connection
       attr_accessor :host, :ip, :port
       def set_host(host, selected_backend)
         self.host = host
@@ -12,6 +12,13 @@ module Invoker
       end
     end
 
+    class InvokerHttpsProxy < InvokerHttpProxy
+      def post_init
+        super
+        start_tls
+      end
+    end
+
     class BalancerParser
       attr_accessor :host, :parser
       def initialize
@@ -44,27 +51,44 @@ module Invoker
     end
 
     class Balancer
-      attr_accessor :connection, :http_parser, :session
+      attr_accessor :connection, :http_parser, :session, :protocol
       DEV_MATCH_REGEX = /([\w-]+)\.dev(\:\d+)?$/
 
       def self.run(options = {})
-        EventMachine.start_server('0.0.0.0', Invoker.config.http_port,
-                                  BalancerConnection, options) do |connection|
-          balancer = Balancer.new(connection)
+        start_http_proxy(InvokerHttpProxy, 'http', options)
+        start_http_proxy(InvokerHttpsProxy, 'https', options)
+      end
+
+      def self.start_http_proxy(proxy_class, protocol, options)
+        port = protocol == 'http' ? Invoker.config.http_port : Invoker.config.https_port
+        EventMachine.start_server('0.0.0.0', port,
+                                  proxy_class, options) do |connection|
+          balancer = Balancer.new(connection, protocol)
           balancer.install_callbacks
         end
       end
 
-      def initialize(connection)
+      def initialize(connection, protocol)
         @connection = connection
+        @protocol = protocol
         @http_parser = BalancerParser.new()
         @session = nil
         @buffer = []
       end
 
+      # insert X_FORWARDED_PROTO_ so as rails can identify the request as coming from
+      # https
+      def insert_forwarded_proto_header(data)
+        if data =~ /\r\n\r\n/ && data !~ /X_FORWARDED_PROTO/i && protocol == 'https'
+          data.gsub(/\r\n\r\n/, "\r\nX_FORWARDED_PROTO: #{protocol}\r\n\r\n")
+        else
+          data
+        end
+      end
+
       def install_callbacks
         http_parser.on_headers_complete { |header| headers_received(header) }
-        connection.on_data {|data| upstream_data(data) }
+        connection.on_data { |data| upstream_data(data) }
         connection.on_response { |backend, data| backend_data(backend, data) }
         connection.on_finish { |backend, name| frontend_disconnect(backend, name) }
       end
@@ -74,7 +98,7 @@ module Invoker
         dns_check_response = select_backend_config(header['Host'])
         if dns_check_response && dns_check_response.port
           connection.server(session, host: '0.0.0.0', port: dns_check_response.port)
-          connection.relay_to_servers(@buffer.join)
+          connection.relay_to_servers(insert_forwarded_proto_header(@buffer.join))
           @buffer = []
         else
           return_error_page(404)
@@ -88,7 +112,7 @@ module Invoker
           append_for_http_parsing(data)
           nil
         else
-          data
+          insert_forwarded_proto_header(data)
         end
       end
 
@@ -107,7 +131,7 @@ module Invoker
       def frontend_disconnect(backend, name)
         http_parser.reset
         unless @backend_data
-          Invoker::Logger.puts("\nApplication not running. Returning error page.".color(:red))
+          Invoker::Logger.puts("\nApplication #{name} not running. Returning error page.".color(:red))
           return_error_page(503)
         end
         @backend_data = false

data/lib/invoker/power/config.rb

@@ -43,6 +43,10 @@ module Invoker
         @config[:http_port] = http_port
       end
 
+      def https_port=(https_port)
+        @config[:https_port] = https_port
+      end
+
       def ipfw_rule_number=(ipfw_rule_number)
         @config[:ipfw_rule_number] = ipfw_rule_number
       end
@@ -51,6 +55,10 @@ module Invoker
       def http_port; @config[:http_port]; end
       def ipfw_rule_number; @config[:ipfw_rule_number]; end
 
+      def https_port
+        @config[:https_port]
+      end
+
       def save
         File.open(CONFIG_LOCATION, "w") do |fl|
           YAML.dump(@config, fl)

data/lib/invoker/power/port_finder.rb

@@ -2,7 +2,7 @@ module Invoker
   module Power
     class PortFinder
       STARTING_PORT = 23400
-      attr_accessor :dns_port, :http_port, :starting_port
+      attr_accessor :dns_port, :http_port, :starting_port, :https_port
       def initialize
         @starting_port = STARTING_PORT
         @ports = []
@@ -12,7 +12,7 @@ module Invoker
 
       def find_ports
         STARTING_PORT.upto(STARTING_PORT + 100) do |port|
-          break if @ports.size > 2
+          break if @ports.size > 3
           if check_if_port_is_open(port)
             @ports << port
           else
@@ -21,9 +21,11 @@ module Invoker
         end
         @dns_port = @ports[0]
         @http_port = @ports[1]
+        @https_port = @ports[2]
       end
 
       private
+
       def check_if_port_is_open(port)
         socket_flag = true
         sockets = nil
@@ -42,8 +44,6 @@ module Invoker
       rescue
         nil
       end
-
-
     end
   end
 end

data/lib/invoker/power/powerup.rb

@@ -13,7 +13,9 @@ module Invoker
         EM.run {
           trap("TERM") { stop }
           trap("INT") { stop }
-          DNS.new.run(listen: DNS.server_ports)
+          if Invoker.darwin?
+            DNS.new.run(listen: DNS.server_ports)
+          end
           Balancer.run
         }
       end

data/lib/invoker/power/setup.rb

@@ -3,72 +3,38 @@ require "eventmachine"
 module Invoker
   module Power
     class Setup
-      RESOLVER_FILE = "/etc/resolver/dev"
-      RESOLVER_DIR = "/etc/resolver"
-
-      FIREWALL_PLIST_FILE = "/Library/LaunchDaemons/com.codemancers.invoker.firewall.plist"
+      attr_accessor :port_finder
       def self.install
-        installer = new
-        if Invoker.darwin?
-          if installer.check_if_setup_can_run?
-            installer.setup_invoker
-          else
-            Invoker::Logger.puts("The setup has been already run.".color(:red))
-          end
-        else
-          Invoker::Logger.puts("Domain feature is currently not supported on systems other than OSX".color(:red))
-        end
-        installer
+        selected_installer_klass = installer_klass
+        selected_installer_klass.new.install
       end
 
       def self.uninstall
-        installer = new
-        installer.uninstall_invoker
+        selected_installer_klass = installer_klass
+        selected_installer_klass.new.uninstall_invoker
       end
 
-      def setup_invoker
-        if setup_resolver_file
-          find_open_ports
-          install_resolver(port_finder.dns_port)
-          install_firewall(port_finder.http_port)
-          flush_dns_rules()
-          # Before writing the config file, drop down to a normal user
-          drop_to_normal_user()
-          create_config_file()
+      def self.installer_klass
+        if Invoker.darwin?
+          Invoker::Power::OsxSetup
         else
-          Invoker::Logger.puts("Invoker is not configured to serve from subdomains".color(:red))
+          Invoker::Power::LinuxSetup
         end
-        self
       end
 
-      def uninstall_invoker
-        uninstall_invoker_flag = Invoker::CLI::Question.agree("Are you sure you want to uninstall firewall rules created by setup (y/n) : ")
-
-        if uninstall_invoker_flag
-          remove_resolver_file
-          unload_firewall_rule(true)
-          flush_dns_rules
-          Invoker::Power::Config.delete
-          Invoker::Logger.puts("Firewall rules were removed")
+      def install
+        if check_if_setup_can_run?
+          setup_invoker
+        else
+          Invoker::Logger.puts("The setup has been already run.".color(:red))
         end
+        self
       end
 
       def drop_to_normal_user
         EventMachine.set_effective_user(ENV["SUDO_USER"])
       end
 
-      def flush_dns_rules
-        system("dscacheutil -flushcache")
-      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
-        )
-      end
-
       def find_open_ports
         port_finder.find_ports()
       end
@@ -77,112 +43,9 @@ module Invoker
         @port_finder ||= Invoker::Power::PortFinder.new()
       end
 
-      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))
-        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 check_if_setup_can_run?
         !File.exists?(Invoker::Power::Config::CONFIG_LOCATION)
       end
-
-      def install_firewall(balancer_port)
-        File.open(FIREWALL_PLIST_FILE, "w") { |fl|
-          fl.write(plist_string(balancer_port))
-        }
-        unload_firewall_rule
-        load_firewall_rule
-      end
-
-      def load_firewall_rule
-        system("launchctl load -Fw #{FIREWALL_PLIST_FILE} 2>/dev/null")
-      end
-
-      def unload_firewall_rule(remove = false)
-        system("launchctl unload -w #{FIREWALL_PLIST_FILE} 2>/dev/null")
-        system("rm -rf #{FIREWALL_PLIST_FILE}") if remove
-      end
-
-      # Ripped from POW code
-      def plist_string(balancer_port)
-        plist =<<-EOD
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-<key>Label</key>
-<string>com.codemancers.invoker</string>
-<key>ProgramArguments</key>
-<array>
-<string>sh</string>
-<string>-c</string>
-<string>#{firewall_command(balancer_port)}</string>
-</array>
-<key>RunAtLoad</key>
-<true/>
-<key>UserName</key>
-<string>root</string>
-</dict>
-</plist>
-        EOD
-        plist
-      end
-
-      def resolve_string(dns_port)
-        string =<<-EOD
-nameserver 127.0.0.1
-port #{dns_port}
-        EOD
-        string
-      end
-
-      # Ripped from Pow code
-      def firewall_command(balancer_port)
-        "ipfw add fwd 127.0.0.1,#{balancer_port} tcp from any to me dst-port 80 in"\
-          "&amp;&amp; sysctl -w net.inet.ip.forwarding=1"
-      end
-
-      def setup_resolver_file
-        return true unless File.exists?(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)
-        end
-        replace_resolver_flag
-      end
-
-      private
-
-      def open_resolver_for_write
-        FileUtils.mkdir(RESOLVER_DIR) unless Dir.exists?(RESOLVER_DIR)
-        fl = File.open(RESOLVER_FILE, "w")
-        yield fl
-      ensure
-        fl && fl.close
-      end
-
     end
   end
 end

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

@@ -0,0 +1,84 @@
+module Invoker
+  module Power
+    class LinuxSetup < Setup
+      RESOLVER_FILE = "/etc/dnsmasq.d/dev-tld"
+      RINETD_FILE = "/etc/rinetd.conf"
+
+      def setup_invoker
+        if get_user_confirmation?
+          find_open_ports
+          install_required_software
+          install_resolver
+          install_port_forwarder
+          restart_services
+          drop_to_normal_user
+          create_config_file
+        else
+          Invoker::Logger.puts("Invoker is not configured to serve from subdomains".color(:red))
+        end
+        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
+        )
+      end
+
+      def uninstall_invoker
+        Invoker::Logger.puts("Uninstall is not yet supported on Linux."\
+          " You can remove invoker changes by uninstalling dnsmasq and rinetd")
+      end
+
+      private
+
+      def restart_services
+        system("/etc/init.d/rinetd restart")
+        system("/etc/init.d/dnsmasq restart")
+      end
+
+      def install_required_software
+        system("apt-get --assume-yes install dnsmasq rinetd")
+      end
+
+      def install_resolver
+        File.open(RESOLVER_FILE, "w") do |fl|
+          fl.write(tld_setup)
+        end
+      end
+
+      def install_port_forwarder
+        File.open(RINETD_FILE, "a") do |fl|
+          fl << "\n"
+          fl << rinetd_setup(port_finder.http_port, port_finder.https_port)
+        end
+      end
+
+      def tld_setup
+        tld_string =<<-EOD
+local=/dev/
+address=/dev/127.0.0.1
+        EOD
+        tld_string
+      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
+      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"\
+          " 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/osx_setup.rb

@@ -0,0 +1,152 @@
+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"
+
+      def setup_invoker
+        if setup_resolver_file
+          find_open_ports
+          install_resolver(port_finder.dns_port)
+          install_firewall(port_finder.http_port, port_finder.https_port)
+          flush_dns_rules
+          # Before writing the config file, drop down to a normal user
+          drop_to_normal_user
+          create_config_file
+        else
+          Invoker::Logger.puts("Invoker is not configured to serve from subdomains".color(:red))
+        end
+        self
+      end
+
+      def uninstall_invoker
+        uninstall_invoker_flag = Invoker::CLI::Question.agree("Are you sure you want to uninstall firewall rules created by setup (y/n) : ")
+
+        if uninstall_invoker_flag
+          remove_resolver_file
+          unload_firewall_rule(true)
+          flush_dns_rules
+          Invoker::Power::Config.delete
+          Invoker::Logger.puts("Firewall rules were removed")
+        end
+      end
+
+      def flush_dns_rules
+        system("dscacheutil -flushcache")
+      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
+        )
+      end
+
+      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))
+        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))
+        }
+        unload_firewall_rule
+        load_firewall_rule
+      end
+
+      def load_firewall_rule
+        system("launchctl load -Fw #{FIREWALL_PLIST_FILE} 2>/dev/null")
+      end
+
+      def unload_firewall_rule(remove = false)
+        system("launchctl unload -w #{FIREWALL_PLIST_FILE} 2>/dev/null")
+        system("rm -rf #{FIREWALL_PLIST_FILE}") if remove
+      end
+
+      # Ripped from POW code
+      def plist_string(http_port, https_port)
+        plist =<<-EOD
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+<key>Label</key>
+<string>com.codemancers.invoker</string>
+<key>ProgramArguments</key>
+<array>
+<string>sh</string>
+<string>-c</string>
+<string>#{firewall_command(http_port, https_port)}</string>
+</array>
+<key>RunAtLoad</key>
+<true/>
+<key>UserName</key>
+<string>root</string>
+</dict>
+</plist>
+        EOD
+        plist
+      end
+
+      def resolve_string(dns_port)
+        string =<<-EOD
+nameserver 127.0.0.1
+port #{dns_port}
+        EOD
+        string
+      end
+
+      # Ripped from Pow code
+      def firewall_command(http_port, https_port)
+        "ipfw add fwd 127.0.0.1,#{http_port} tcp from any to me dst-port 80 in"\
+          "&amp;&amp; ipfw add fwd 127.0.0.1,#{https_port} tcp from any to me dst-port 443 in"\
+          "&amp;&amp; sysctl -w net.inet.ip.forwarding=1"
+      end
+
+      def setup_resolver_file
+        return true unless File.exists?(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)
+        end
+        replace_resolver_flag
+      end
+
+      private
+
+      def open_resolver_for_write
+        FileUtils.mkdir(RESOLVER_DIR) unless Dir.exists?(RESOLVER_DIR)
+        fl = File.open(RESOLVER_FILE, "w")
+        yield fl
+      ensure
+        fl && fl.close
+      end
+    end
+  end
+end

data/lib/invoker/version.rb

@@ -1,3 +1,3 @@
 module Invoker
-  VERSION = "1.1.0"
+  VERSION = "1.2.0.pre"
 end

data/spec/invoker/config_spec.rb

@@ -108,20 +108,12 @@ command = ls
       @file = Tempfile.new(["config", ".ini"])
     end
 
-    it "does not load config if platform is not darwin" do
-      Invoker.expects(:darwin?).returns(false)
-      Invoker::Power::Config.expects(:load_config).never
-      Invoker::Parsers::Config.new(@file.path, 9000)
-    end
-
     it "does not load config if platform is darwin but there is no power config file" do
-      Invoker.expects(:darwin?).returns(true)
       Invoker::Power::Config.expects(:load_config).never
       Invoker::Parsers::Config.new(@file.path, 9000)
     end
 
     it "loads config if platform is darwin and power config file exists" do
-      Invoker.expects(:darwin?).returns(true)
       File.open(Invoker::Power::Config::CONFIG_LOCATION, "w") { |fl| fl.puts "sample" }
       Invoker::Power::Config.expects(:load_config).once
       Invoker::Parsers::Config.new(@file.path, 9000)

data/spec/invoker/invoker_spec.rb

@@ -14,37 +14,18 @@ describe "Invoker" do
   end
 
   describe "#can_run_balancer?" do
-    before {
-      File.exists?(Invoker::Power::Config::CONFIG_LOCATION) &&
-      File.delete(Invoker::Power::Config::CONFIG_LOCATION)
-    }
-
-    after {
-      File.exists?(Invoker::Power::Config::CONFIG_LOCATION) &&
-      File.delete(Invoker::Power::Config::CONFIG_LOCATION)
-    }
-
-    it "should return false if setup command was not run on osx" do
-      Invoker.expects(:ruby_platform).returns("x86_64-darwin12.4.0")
-      expect(Invoker.can_run_balancer?).to be_false
-    end
-
-    it "should return false if platform is not osx" do
-      Invoker.expects(:ruby_platform).returns("i686-linux")
+    it "should return false if setup command was not run" do
       expect(Invoker.can_run_balancer?).to be_false
     end
 
     it "should return true if setup was run properly" do
-      Invoker.expects(:ruby_platform).returns("x86_64-darwin12.4.0")
       File.open(Invoker::Power::Config::CONFIG_LOCATION, "w") {|fl|
         fl.write("hello")
       }
-
       expect(Invoker.can_run_balancer?).to be_true
     end
 
     it "should not print warning if setup is not run when flag is false" do
-      Invoker.expects(:ruby_platform).returns("x86_64-darwin12.4.0")
       Invoker::Logger.expects(:puts).never()
       Invoker.can_run_balancer?(false)
     end
@@ -81,4 +62,3 @@ describe "Invoker" do
     end
   end
 end
-

data/spec/invoker/power/balancer_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Invoker::Power::Balancer do
   context "matching domain part of incoming request" do
     before do
-      @balancer = Invoker::Power::Balancer.new(mock("connection"))
+      @balancer = Invoker::Power::Balancer.new(mock("connection"), "http")
     end
 
     it "should do foo.dev match" do

data/spec/invoker/power/setup/linux_setup_spec.rb

@@ -0,0 +1,44 @@
+require "spec_helper"
+
+describe Invoker::Power::LinuxSetup do
+  let(:invoker_setup) { Invoker::Power::LinuxSetup.new }
+  describe "should only proceed after user confirmation" do
+    it "should create config file with port" do
+      invoker_setup.expects(:get_user_confirmation?).returns(true)
+      invoker_setup.expects(:install_required_software).returns(true)
+      invoker_setup.expects(:install_resolver).returns(true)
+      invoker_setup.expects(:install_port_forwarder).returns(true)
+      invoker_setup.expects(:restart_services).returns(true)
+      invoker_setup.expects(:drop_to_normal_user).returns(true)
+
+      invoker_setup.setup_invoker
+
+      config = Invoker::Power::Config.load_config
+      expect(config.http_port).not_to be_nil
+      expect(config.dns_port).to be_nil
+      expect(config.https_port).not_to be_nil
+    end
+  end
+
+  describe "configuring dnsmasq and rinetd" do
+    it "should create proper config file" do
+      invoker_setup.expects(:get_user_confirmation?).returns(true)
+      invoker_setup.expects(:install_required_software).returns(true)
+      invoker_setup.expects(:restart_services).returns(true)
+      invoker_setup.expects(:drop_to_normal_user).returns(true)
+
+      invoker_setup.setup_invoker
+
+      config = Invoker::Power::Config.load_config
+
+      dnsmasq_content = File.read(Invoker::Power::LinuxSetup::RESOLVER_FILE)
+      expect(dnsmasq_content.strip).to_not be_empty
+      expect(dnsmasq_content).to match(/dev/)
+
+      rinetd_content = File.read(Invoker::Power::LinuxSetup::RINETD_FILE)
+      expect(rinetd_content.strip).to_not be_empty
+      expect(rinetd_content.strip).to match(/#{config.https_port}/)
+      expect(rinetd_content.strip).to match(/#{config.http_port}/)
+    end
+  end
+end

data/spec/invoker/power/setup/osx_setup_spec.rb

@@ -0,0 +1,96 @@
+require "spec_helper"
+
+describe Invoker::Power::OsxSetup do
+  describe "When no setup exists" do
+    it "should create a config file with port etc" do
+      setup = Invoker::Power::OsxSetup.new
+      setup.expects(:install_resolver).returns(true)
+      setup.expects(:flush_dns_rules).returns(true)
+      setup.expects(:drop_to_normal_user).returns(true)
+      setup.expects(:install_firewall).once
+
+      setup.setup_invoker
+
+      config = Invoker::Power::Config.load_config
+      expect(config.http_port).not_to be_nil
+      expect(config.dns_port).not_to be_nil
+      expect(config.https_port).not_to be_nil
+    end
+  end
+
+  describe "when a setup file exists" do
+    it "should throw error about existing file" do
+      File.open(Invoker::Power::Config::CONFIG_LOCATION, "w") {|fl|
+        fl.write("foo test")
+      }
+      Invoker::Power::Setup.any_instance.expects(:setup_invoker).never
+      Invoker::Power::Setup.install()
+    end
+  end
+
+  describe "when pow like setup exists" do
+    before {
+      File.open(Invoker::Power::OsxSetup::RESOLVER_FILE, "w") {|fl|
+        fl.write("hello")
+      }
+      @setup = Invoker::Power::OsxSetup.new
+    }
+
+    describe "when user selects to overwrite it" do
+      it "should run setup normally" do
+        @setup.expects(:setup_resolver_file).returns(true)
+        @setup.expects(:drop_to_normal_user).returns(true)
+        @setup.expects(:install_resolver).returns(true)
+        @setup.expects(:flush_dns_rules).returns(true)
+        @setup.expects(:install_firewall).once()
+
+        @setup.setup_invoker
+      end
+    end
+
+    describe "when user chose not to overwrite it" do
+      it "should abort the setup process" do
+        @setup.expects(:setup_resolver_file).returns(false)
+
+        @setup.expects(:install_resolver).never
+        @setup.expects(:flush_dns_rules).never
+        @setup.expects(:install_firewall).never
+
+        @setup.setup_invoker
+      end
+    end
+  end
+
+  describe "uninstalling firewall rules" do
+    it "should uninstall firewall rules and remove all files created by setup" do
+      setup = Invoker::Power::OsxSetup.new
+
+      Invoker::CLI::Question.expects(:agree).returns(true)
+      setup.expects(:remove_resolver_file).once
+      setup.expects(:unload_firewall_rule).with(true).once
+      setup.expects(:flush_dns_rules).once
+      Invoker::Power::Config.expects(:delete).once
+
+      setup.uninstall_invoker
+    end
+  end
+
+  describe "setup on fresh osx install" do
+    context "when resolver directory does not exist" do
+      before do
+        @setup = Invoker::Power::OsxSetup.new
+        FileUtils.rm_rf(Invoker::Power::OsxSetup::RESOLVER_DIR)
+      end
+
+      it "should create the directory and install" do
+        @setup.expects(:setup_resolver_file).returns(true)
+        @setup.expects(:drop_to_normal_user).returns(true)
+        @setup.expects(:flush_dns_rules).returns(true)
+        @setup.expects(:install_firewall).once()
+
+        @setup.setup_invoker
+        expect(Dir.exist?(Invoker::Power::OsxSetup::RESOLVER_DIR)).to be_true
+      end
+    end
+  end
+end

data/spec/invoker/power/setup_spec.rb

@@ -1,104 +1,4 @@
 require "spec_helper"
 
 describe "Setup" do
-  describe "When no setup exists" do
-    it "should create a config file with port etc" do
-      setup = Invoker::Power::Setup.new()
-      setup.expects(:install_resolver).returns(true)
-      setup.expects(:flush_dns_rules).returns(true)
-      setup.expects(:drop_to_normal_user).returns(true)
-      setup.expects(:install_firewall).once()
-
-      setup.setup_invoker
-
-      config = Invoker::Power::Config.load_config()
-      expect(config.http_port).not_to be_nil
-      expect(config.dns_port).not_to be_nil
-    end
-  end
-
-  describe "setup on non osx systems" do
-    it "should not run setup" do
-      Invoker.expects(:ruby_platform).returns("i686-linux")
-      Invoker::Power::Setup.any_instance.expects(:check_if_setup_can_run?).never()
-      Invoker::Power::Setup.install
-    end
-  end
-
-  describe "when a setup file exists" do
-    it "should throw error about existing file" do
-      File.open(Invoker::Power::Config::CONFIG_LOCATION, "w") {|fl|
-        fl.write("foo test")
-      }
-      Invoker::Power::Setup.any_instance.expects(:setup_invoker).never
-      Invoker::Power::Setup.install()
-    end
-  end
-
-  describe "when pow like setup exists" do
-    before {
-      File.open(Invoker::Power::Setup::RESOLVER_FILE, "w") {|fl|
-        fl.write("hello")
-      }
-      @setup = Invoker::Power::Setup.new
-    }
-
-    describe "when user selects to overwrite it" do
-      it "should run setup normally" do
-        @setup.expects(:setup_resolver_file).returns(true)
-        @setup.expects(:drop_to_normal_user).returns(true)
-        @setup.expects(:install_resolver).returns(true)
-        @setup.expects(:flush_dns_rules).returns(true)
-        @setup.expects(:install_firewall).once()
-
-        @setup.setup_invoker
-      end
-    end
-
-    describe "when user chose not to overwrite it" do
-      it "should abort the setup process" do
-        @setup.expects(:setup_resolver_file).returns(false)
-
-        @setup.expects(:install_resolver).never
-        @setup.expects(:flush_dns_rules).never
-        @setup.expects(:install_firewall).never
-
-        @setup.setup_invoker
-      end
-    end
-  end
-
-  describe "uninstalling firewall rules" do
-    it "should uninstall firewall rules and remove all files created by setup" do
-      setup = Invoker::Power::Setup.new
-
-      Invoker::CLI::Question.expects(:agree).returns(true)
-      setup.expects(:remove_resolver_file).once
-      setup.expects(:unload_firewall_rule).with(true).once
-      setup.expects(:flush_dns_rules).once
-      Invoker::Power::Config.expects(:delete).once
-
-      setup.uninstall_invoker
-    end
-  end
-
-  describe "setup on fresh osx install" do
-    context "when resolver directory does not exist" do
-      before do
-        @setup = Invoker::Power::Setup.new()
-        FileUtils.rm_rf(Invoker::Power::Setup::RESOLVER_DIR)
-      end
-
-      it "should create the directory and install" do
-        @setup.expects(:setup_resolver_file).returns(true)
-        @setup.expects(:drop_to_normal_user).returns(true)
-        @setup.expects(:flush_dns_rules).returns(true)
-        @setup.expects(:install_firewall).once()
-
-        @setup.setup_invoker()
-
-        expect(Dir.exists?(Invoker::Power::Setup::RESOLVER_DIR)).to be_true
-      end
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -7,6 +7,8 @@ end
 
 require "invoker"
 require "invoker/power/power"
+$: << File.join(File.dirname(__FILE__), "support")
+require "mock_setup_file"
 MM = Invoker::IPC::Message
 
 RSpec.configure do |config|
@@ -14,44 +16,16 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.mock_framework = :mocha
+  config.include MockSetupFile
 
-  config.before(:each) do
-    @original_verbosity = $VERBOSE
+  config.around do |example|
+    original_verbosity = $VERBOSE
     $VERBOSE = nil
-    @old_config = Invoker::Power::Config::CONFIG_LOCATION
-    Invoker::Power::Config.const_set(:CONFIG_LOCATION, "/tmp/.invoker/config")
-    FileUtils.mkdir("/tmp/.invoker") unless Dir.exist?("/tmp/.invoker")
-
-    File.exists?(Invoker::Power::Config::CONFIG_LOCATION) &&
-      File.delete(Invoker::Power::Config::CONFIG_LOCATION)
-
-    @old_resolver = Invoker::Power::Setup::RESOLVER_FILE
-    Invoker::Power::Setup.const_set(:RESOLVER_FILE, "/tmp/resolver/invoker-dev")
-    Invoker::Power::Setup.const_set(:RESOLVER_DIR, "/tmp/resolver")
-
-    unless Dir.exists?(Invoker::Power::Setup::RESOLVER_DIR)
-      FileUtils.mkdir(Invoker::Power::Setup::RESOLVER_DIR)
-    end
-
-    File.exists?(Invoker::Power::Setup::RESOLVER_FILE) &&
-      File.delete(Invoker::Power::Setup::RESOLVER_FILE)
+    setup_mocked_config_files
+    example.run
+    remove_mocked_config_files
+    $VERBOSE = original_verbosity
   end
-
-  config.after(:each) do
-    File.exists?(Invoker::Power::Config::CONFIG_LOCATION) &&
-      File.delete(Invoker::Power::Config::CONFIG_LOCATION)
-
-    Invoker::Power::Config.const_set(:CONFIG_LOCATION, @old_config)
-
-    File.exists?(Invoker::Power::Setup::RESOLVER_FILE) &&
-      File.delete(Invoker::Power::Setup::RESOLVER_FILE)
-
-    FileUtils.rm_rf(Invoker::Power::Setup::RESOLVER_DIR)
-    Invoker::Power::Setup.const_set(:RESOLVER_FILE, @old_resolver)
-
-    $VERBOSE = @original_verbosity
-  end
-
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.

data/spec/support/mock_setup_file.rb

@@ -0,0 +1,68 @@
+module MockSetupFile
+  def setup_mocked_config_files
+    setup_invoker_config
+    setup_osx_resolver_path
+    setup_linux_resolver_path
+  end
+
+  def remove_mocked_config_files
+    restore_invoker_config
+    restore_osx_resolver_setup
+    restore_linux_resolver_path
+  end
+
+  def safe_remove_file(file_location)
+    File.exist?(file_location) &&
+      File.delete(file_location)
+  end
+
+  def safe_make_directory(directory)
+    FileUtils.mkdir(directory) unless Dir.exist?(directory)
+  end
+
+  private
+
+  def setup_invoker_config
+    @old_config = Invoker::Power::Config::CONFIG_LOCATION
+    Invoker::Power::Config.const_set(:CONFIG_LOCATION, "/tmp/.invoker/config")
+    safe_make_directory("/tmp/.invoker")
+    safe_remove_file(Invoker::Power::Config::CONFIG_LOCATION)
+  end
+
+  def restore_invoker_config
+    safe_remove_file(Invoker::Power::Config::CONFIG_LOCATION)
+    Invoker::Power::Config.const_set(:CONFIG_LOCATION, @old_config)
+    $VERBOSE = @original_verbosity
+  end
+
+  def restore_osx_resolver_setup
+    safe_remove_file(Invoker::Power::OsxSetup::RESOLVER_FILE)
+    FileUtils.rm_rf(Invoker::Power::OsxSetup::RESOLVER_DIR)
+    Invoker::Power::OsxSetup.const_set(:RESOLVER_FILE, @old_osx_resolver)
+  end
+
+  def setup_osx_resolver_path
+    @old_osx_resolver = Invoker::Power::OsxSetup::RESOLVER_FILE
+    Invoker::Power::OsxSetup.const_set(:RESOLVER_FILE, "/tmp/resolver/invoker-dev")
+    Invoker::Power::OsxSetup.const_set(:RESOLVER_DIR, "/tmp/resolver")
+
+    safe_make_directory(Invoker::Power::OsxSetup::RESOLVER_DIR)
+    safe_remove_file(Invoker::Power::OsxSetup::RESOLVER_FILE)
+  end
+
+  def setup_linux_resolver_path
+    @old_linux_resolver = Invoker::Power::LinuxSetup::RESOLVER_FILE
+    @old_rinetd_config = Invoker::Power::LinuxSetup::RINETD_FILE
+    Invoker::Power::LinuxSetup.const_set(:RESOLVER_FILE, "/tmp/dev-tld")
+    Invoker::Power::LinuxSetup.const_set(:RINETD_FILE, "/tmp/rinetd.conf")
+    safe_remove_file(Invoker::Power::LinuxSetup::RESOLVER_FILE)
+    safe_remove_file(Invoker::Power::LinuxSetup::RINETD_FILE)
+  end
+
+  def restore_linux_resolver_path
+    safe_remove_file(Invoker::Power::LinuxSetup::RESOLVER_FILE)
+    safe_remove_file(Invoker::Power::LinuxSetup::RINETD_FILE)
+    Invoker::Power::LinuxSetup.const_set(:RESOLVER_FILE, @old_linux_resolver)
+    Invoker::Power::LinuxSetup.const_set(:RINETD_FILE, @old_rinetd_config)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: invoker
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0.pre
 platform: ruby
 authors:
 - Hemant Kumar
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -219,7 +219,6 @@ files:
 - lib/invoker/cli/tail_watcher.rb
 - lib/invoker/command_worker.rb
 - lib/invoker/commander.rb
-- lib/invoker/config.rb
 - lib/invoker/daemon.rb
 - lib/invoker/dns_cache.rb
 - lib/invoker/errors.rb
@@ -251,6 +250,8 @@ files:
 - lib/invoker/power/power.rb
 - lib/invoker/power/powerup.rb
 - lib/invoker/power/setup.rb
+- lib/invoker/power/setup/linux_setup.rb
+- lib/invoker/power/setup/osx_setup.rb
 - lib/invoker/power/templates/404.html
 - lib/invoker/power/templates/503.html
 - lib/invoker/process_manager.rb
@@ -277,10 +278,13 @@ files:
 - spec/invoker/power/config_spec.rb
 - spec/invoker/power/http_response_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/process_manager_spec.rb
 - spec/invoker/reactor_spec.rb
 - spec/spec_helper.rb
+- spec/support/mock_setup_file.rb
 homepage: http://invoker.codemancers.com
 licenses:
 - MIT
@@ -305,27 +309,5 @@ rubygems_version: 2.2.2
 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_response_spec.rb
-- spec/invoker/power/port_finder_spec.rb
-- spec/invoker/power/setup_spec.rb
-- spec/invoker/process_manager_spec.rb
-- spec/invoker/reactor_spec.rb
-- spec/spec_helper.rb
+test_files: []
 has_rdoc: 

data/lib/invoker/config.rb

@@ -1,5 +0,0 @@
-module Invoker
-  module Config
-
-  end
-end