invoker 1.4.1 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fe046d5488f7cd2fe7b7aa6b10df51a0e7b3801
-  data.tar.gz: d9e3cf26e7bab5677a9fa6d6739ada78a6d79304
+  metadata.gz: 35e208abbd4ff8979f1d1ecc0c5896ef3b460799
+  data.tar.gz: 6e2e65d581a9705f5358bf8076654a9b34185683
 SHA512:
-  metadata.gz: 6119c3f2f8c620956833ffa74af58161d8480dbe296c616cd2366242d3b145c62e8c7b88fb514440bd7772fc56b8c86e84888cc7455e3e1d068dc1bd4cd2e190
-  data.tar.gz: 65351289ad3f5f5fea61ed8600ffaa03a6306c3592fbe504eb76604d1d0939692c35fc7aea014f11a36dec120e976c90c0ad8de04257a45d8fd4796e6a35c3f6
+  metadata.gz: 44eecb467482053d584410fbc279c192e1dc25b7c97f245bf058f20e7bac0a12d9c0c73487d0ab0652d632030ef3f39741449dd5d30391104ef4ec9cc165091f
+  data.tar.gz: a4108aab6742c8b02886423a341c2d59c47deba5645d73b671686aff4cac4f7af668677645bb5444b8d37fe260afa8e05631ca249ba9d41f6bc9396426534a30

data/.gitignore

@@ -2,7 +2,6 @@ invoker.ini
 config/
 *.gem
 pkg/
-*.ini
 tags
 .rvmrc
 vendor/

data/.rubocop.yml

@@ -1,5 +1,4 @@
 AllCops:
-  RunRailsCops: false
   Excludes:
     - db/**
 

data/.travis.yml

@@ -1,8 +1,10 @@
 language: ruby
+cache: bundler
+sudo: false
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.0
+  - 2.3.0
 
 script: bundle exec rake spec
-

data/Dockerfile

@@ -0,0 +1,7 @@
+FROM ruby:2.3
+
+MAINTAINER hemant@codemancers.com
+
+RUN apt-get update && apt-get -y install dnsmasq socat
+
+CMD cd /invoker && bundle install --path vendor/ && bundle exec rake spec

data/Gemfile

@@ -2,6 +2,9 @@ source "https://rubygems.org"
 
 gemspec
 
+gem 'websocket-eventmachine-server', require: false
+gem 'websocket-eventmachine-client', require: false
+
 group :development do
   gem 'pry'
   gem 'tins', '~>1.4.0'

data/Rakefile

@@ -5,3 +5,11 @@ RSpec::Core::RakeTask.new
 
 task :default => :spec
 task :test => :spec
+
+current_directory = File.expand_path(File.dirname(__FILE__))
+
+desc "run specs inside docker"
+task :docker_spec do
+  system("docker build -t invoker-ruby . ")
+  system("docker run --name invoker-rspec --rm -v #{current_directory}:/invoker -t invoker-ruby")
+end

data/examples/hello_sinatra.rb

@@ -0,0 +1,26 @@
+# myapp.rb
+require 'sinatra'
+
+get '/' do
+  'Hello world!'
+end
+
+get "/emacs" do
+  redirect to("/vim")
+end
+
+get "/vim" do
+  "vim rules"
+end
+
+
+post '/foo' do
+  puts request.env
+  "done"
+end
+
+
+post "/api/v1/datapoints" do
+  puts request.env
+  "done"
+end

data/examples/sample.ini

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

data/invoker.gemspec

@@ -35,8 +35,9 @@ Gem::Specification.new do |s|
   s.add_dependency("uuid", "~> 2.3")
   s.add_dependency("facter", "~> 2.2")
   s.add_dependency("http-parser-lite", "~> 0.6")
-  s.add_dependency("dotenv", "~> 1.0.2")
+  s.add_dependency("dotenv", "~> 2.0")
   s.add_development_dependency("rspec", "~> 3.0")
   s.add_development_dependency("mocha")
   s.add_development_dependency("rake")
+  s.add_development_dependency('fakefs')
 end

data/lib/invoker.rb

@@ -44,6 +44,10 @@ module Invoker
       ruby_platform.downcase.include?("darwin")
     end
 
+    def linux?
+      ruby_platform.downcase.include?("linux")
+    end
+
     def ruby_platform
       RUBY_PLATFORM
     end
@@ -100,18 +104,27 @@ module Invoker
     end
 
     def notify_user(message)
-      run_without_bundler { check_and_notify_with_terminal_notifier(message) }
+      if Invoker.darwin?
+        run_without_bundler { check_and_notify_with_terminal_notifier(message) }
+      elsif Invoker.linux?
+        notify_with_libnotify(message)
+      end
     end
 
     def check_and_notify_with_terminal_notifier(message)
-      return unless Invoker.darwin?
-
       command_path = `which terminal-notifier`
       if command_path && !command_path.empty?
         system("terminal-notifier -message '#{message}' -title Invoker")
       end
     end
 
+    def notify_with_libnotify(message)
+      begin
+        require "libnotify"
+        Libnotify.show(body: message, summary: "Invoker", timeout: 2.5)
+      rescue LoadError; end
+    end
+
     def migrate_old_config(old_config, config_location)
       new_config = File.join(config_location, 'config')
       File.open(new_config, 'w') do |file|
@@ -131,5 +144,9 @@ module Invoker
         Etc.getpwuid(Process.uid).dir
       end
     end
+
+    def default_tld
+      'dev'
+    end
   end
 end

data/lib/invoker/cli.rb

@@ -13,8 +13,11 @@ module Invoker
     end
 
     desc "setup", "Run Invoker setup"
+    option :tld,
+      type: :string,
+      banner: 'Configure invoker to use a different top level domain'
     def setup
-      Invoker::Power::Setup.install
+      Invoker::Power::Setup.install(get_tld(options))
     end
 
     desc "version", "Print Invoker version"
@@ -39,7 +42,7 @@ module Invoker
       port = options[:port] || 9000
       Invoker.daemonize = options[:daemon]
       Invoker.load_invoker_config(file, port)
-      warn_about_terminal_notifier
+      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?
@@ -51,9 +54,9 @@ module Invoker
       unix_socket.send_command('add', process_name: name)
     end
 
-    desc "add_http process_name port", "Add an external http process to Invoker DNS server"
-    def add_http(name, port)
-      unix_socket.send_command('add_http', process_name: name, port: port)
+    desc "add_http process_name port [IP]", "Add an external http process to Invoker DNS server"
+    def add_http(name, port, ip = nil)
+      unix_socket.send_command('add_http', process_name: name, port: port, ip: ip)
     end
 
     desc "tail process1 process2", "Tail a particular process"
@@ -105,12 +108,35 @@ module Invoker
       tasks.keys + ["help"]
     end
 
+    def get_tld(options)
+      if options[:tld] && !options[:tld].empty?
+        options[:tld]
+      else
+        'dev'
+      end
+    end
+
     def unix_socket
       Invoker::IPC::UnixClient.new
     end
 
+    def warn_about_notification
+      if Invoker.darwin?
+        warn_about_terminal_notifier
+      else
+        warn_about_libnotify
+      end
+    end
+
+    def warn_about_libnotify
+      require "libnotify"
+    rescue LoadError
+      Invoker::Logger.puts "You can install libnotify gem for Invoker notifications "\
+        "via system tray".color(:red)
+    end
+
     def warn_about_terminal_notifier
-      if RUBY_PLATFORM.downcase.include?("darwin")
+      if Invoker.darwin?
         command_path = `which terminal-notifier`
         if !command_path || command_path.empty?
           Invoker::Logger.puts "You can enable OSX notification for processes "\

data/lib/invoker/dns_cache.rb

@@ -16,8 +16,8 @@ module Invoker
       @dns_mutex.synchronize { dns_data[process_name] }
     end
 
-    def add(name, port)
-      @dns_mutex.synchronize { dns_data[name] = { 'port' => port } }
+    def add(name, port, ip = nil)
+      @dns_mutex.synchronize { dns_data[name] = { 'port' => port, 'ip' => ip } }
     end
   end
 end

data/lib/invoker/ipc/add_http_command.rb

@@ -2,7 +2,7 @@ module Invoker
   module IPC
     class AddHttpCommand < BaseCommand
       def run_command(message_object)
-        Invoker.dns_cache.add(message_object.process_name, message_object.port)
+        Invoker.dns_cache.add(message_object.process_name, message_object.port, message_object.ip)
         true
       end
     end

data/lib/invoker/ipc/dns_check_command.rb

@@ -6,7 +6,8 @@ module Invoker
 
         dns_check_response = Invoker::IPC::Message::DnsCheckResponse.new(
           process_name: message_object.process_name,
-          port: process_detail ? process_detail['port'] : nil
+          port: process_detail ? process_detail['port'] : nil,
+          ip: process_detail && process_detail['ip'] ? process_detail['ip'] : '0.0.0.0'
         )
         send_data(dns_check_response)
         true

data/lib/invoker/ipc/message.rb

@@ -118,7 +118,7 @@ module Invoker
 
       class AddHttp < Base
         include Serialization
-        message_attributes :process_name, :port
+        message_attributes :process_name, :port, :ip
       end
 
       class Reload < Base
@@ -151,7 +151,7 @@ module Invoker
 
       class DnsCheckResponse < Base
         include Serialization
-        message_attributes :process_name, :port
+        message_attributes :process_name, :port, :ip
       end
 
       class Ping < Base

data/lib/invoker/parsers/config.rb

@@ -16,7 +16,6 @@ module Invoker
       # value by 1, that way generating different ports for different commands.
       def initialize(filename, port)
         @filename = filename || autodetect_config_file
-
         print_message_and_abort if invalid_config_file?
 
         @port = port - 1
@@ -38,6 +37,10 @@ module Invoker
         power_config && power_config.https_port
       end
 
+      def tld
+        power_config && power_config.tld
+      end
+
       def autorunnable_processes
         processes.reject(&:disable_autorun)
       end

data/lib/invoker/power/balancer.rb

@@ -22,7 +22,7 @@ module Invoker
     end
 
     class Balancer
-      attr_accessor :connection, :http_parser, :session, :protocol
+      attr_accessor :connection, :http_parser, :session, :protocol, :upgraded_to
 
       def self.run(options = {})
         start_http_proxy(InvokerHttpProxy, 'http', options)
@@ -43,6 +43,7 @@ module Invoker
         @protocol = protocol
         @http_parser = HttpParser.new(protocol)
         @session = nil
+        @upgraded_to = nil
         @buffer = []
       end
 
@@ -71,7 +72,7 @@ module Invoker
 
         dns_check_response = UrlRewriter.new.select_backend_config(headers['Host'])
         if dns_check_response && dns_check_response.port
-          connection.server(session, host: '0.0.0.0', port: dns_check_response.port)
+          connection.server(session, host: dns_check_response.ip, port: dns_check_response.port)
         else
           return_error_page(404)
           http_parser.reset
@@ -80,8 +81,12 @@ module Invoker
       end
 
       def upstream_data(data)
-        append_for_http_parsing(data)
-        nil
+        if upgraded_to == "websocket"
+          data
+        else
+          append_for_http_parsing(data)
+          nil
+        end
       end
 
       def append_for_http_parsing(data)
@@ -93,6 +98,13 @@ module Invoker
 
       def backend_data(backend, data)
         @backend_data = true
+
+        # check backend data for websockets connection. check for upgrade headers
+        # - Upgarde: websocket\r\n
+        if data =~ /Upgrade: websocket/
+          @upgraded_to = "websocket"
+        end
+
         data
       end
 

data/lib/invoker/power/config.rb

@@ -60,9 +60,10 @@ module Invoker
       def dns_port; @config[:dns_port]; end
       def http_port; @config[:http_port]; end
       def ipfw_rule_number; @config[:ipfw_rule_number]; end
+      def https_port; @config[:https_port]; end
 
-      def https_port
-        @config[:https_port]
+      def tld
+        @config[:tld] || Invoker.default_tld
       end
 
       def save

data/lib/invoker/power/dns.rb

@@ -31,7 +31,7 @@ module Invoker
       end
 
       def name_matches?(name)
-        name =~ /.*\.dev/
+        name =~ /.*\.#{Invoker.config.tld}/
       end
     end
   end

data/lib/invoker/power/pf_migrate.rb

@@ -13,7 +13,7 @@ module Invoker
       def migrate
         if firewall_config_requires_migration? && ask_user_for_migration
           sudome
-          osx_setup = Invoker::Power::OsxSetup.new()
+          osx_setup = Invoker::Power::OsxSetup.new(Invoker.config.tld)
           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."\

data/lib/invoker/power/setup.rb

@@ -3,15 +3,17 @@ require "eventmachine"
 module Invoker
   module Power
     class Setup
-      attr_accessor :port_finder
-      def self.install
+      attr_accessor :port_finder, :tld
+
+      def self.install(tld)
         selected_installer_klass = installer_klass
-        selected_installer_klass.new.install
+        selected_installer_klass.new(tld).install
       end
 
       def self.uninstall
+        power_config = Invoker::Power::Config.load_config
         selected_installer_klass = installer_klass
-        selected_installer_klass.new.uninstall_invoker
+        selected_installer_klass.new(power_config.tld).uninstall_invoker
       end
 
       def self.installer_klass
@@ -22,6 +24,14 @@ module Invoker
         end
       end
 
+      def initialize(tld)
+        if tld !~ /^[a-z]+$/
+          Invoker::Logger.puts("Please specify valid tld".color(:red))
+          exit(1)
+        end
+        self.tld = tld
+      end
+
       def install
         if check_if_setup_can_run?
           setup_invoker
@@ -46,6 +56,35 @@ module Invoker
       def check_if_setup_can_run?
         !File.exists?(Invoker::Power::Config.config_file)
       end
+
+      def create_config_file
+        Invoker.setup_config_location
+        config = build_power_config
+        Invoker::Power::Config.create(config)
+      end
+
+      # Builds and returns power config hash. Override this method in subclasses if necessary.
+      def build_power_config
+        config = {
+          http_port: port_finder.http_port,
+          https_port: port_finder.https_port,
+          tld: tld
+        }
+        config
+      end
+
+      def remove_resolver_file
+        begin
+          safe_remove_file(resolver_file)
+        rescue Errno::EACCES
+          Invoker::Logger.puts("Running uninstall requires root access, please rerun it with sudo".color(:red))
+          raise
+        end
+      end
+
+      def safe_remove_file(file)
+        File.delete(file) if File.exists?(file)
+      end
     end
   end
 end