invoker 1.5.6 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b041781f5abb31802fa52316895c2c1ad4142c78
-  data.tar.gz: 63d084268289f696b8b689f564b007b833f323b6
+SHA256:
+  metadata.gz: 55217109e2c3f44ebbbfd25c36f3b4d8d3dedff2c8380cc262cb12653cc1a1b1
+  data.tar.gz: 7f9e9a0d4a100d44549400473a81686d09773ee0d9d5ec8f193ccbee999bebe9
 SHA512:
-  metadata.gz: 7356d438f44f82bc34d4dfa262bfda0a07b9048024ac905b56b72139a5dac08c7b007cc87e03f58c14c1862ebaf99878f2738316483183768f428aa6c20326b0
-  data.tar.gz: cb55d77bee7313ff21eff64247c89452f7488fdbb6198f7944ba42e27aea638d6ca2c40867af1878e17e647ecc95cb0bf5c499ca912d0a101ee33b518580a3bb
+  metadata.gz: 4221997cbbcf54911d116f2dde24cc30ba91e36013f72b3ed1e392fcb96c0be43186f2837be0735da43932e09ddd1725452784ee2a3e7fd0b12928daebd7f337
+  data.tar.gz: f4c3a7697a1ce22121cce85e58770ad0a3fd8f816d731b82115c5b0dcba5cda404822d3a56b1710766171bf776c2cccb44223e8759974f9e231956e2125e2ef6

data/lib/invoker.rb

@@ -21,7 +21,6 @@ require "invoker/power/setup"
 require "invoker/power/setup/linux_setup"
 require "invoker/power/setup/osx_setup"
 require "invoker/power/powerup"
-require "invoker/power/pf_migrate"
 require "invoker/errors"
 require "invoker/parsers/procfile"
 require "invoker/parsers/config"

data/lib/invoker/cli.rb

@@ -19,6 +19,7 @@ module Invoker
     def setup
       Invoker::Power::Setup.install(get_tld(options))
     end
+    map install: :setup
 
     desc "version", "Print Invoker version"
     def version
@@ -56,7 +57,6 @@ module Invoker
       Invoker.private_key = options[:private_key]
       Invoker.load_invoker_config(file, port)
       warn_about_notification
-      warn_about_old_configuration
       pinger = Invoker::CLI::Pinger.new(unix_socket)
       abort("Invoker is already running".colorize(:red)) if pinger.invoker_running?
       Invoker.commander.start_manager
@@ -91,6 +91,7 @@ module Invoker
       signal = options[:signal] || 'INT'
       unix_socket.send_command('reload', process_name: name, signal: signal)
     end
+    map restart: :reload
 
     desc "list", "List all running processes"
     option :raw,
@@ -131,7 +132,7 @@ module Invoker
     end
 
     def self.valid_tasks
-      tasks.keys + ["help"]
+      tasks.keys + %w(help install restart)
     end
 
     # TODO(kgrz): the default TLD option is duplicated in both this file and
@@ -172,12 +173,6 @@ module Invoker
         end
       end
     end
-
-    def warn_about_old_configuration
-      Invoker::Power::PfMigrate.new.tap do |pf_migrator|
-        pf_migrator.migrate
-      end
-    end
   end
 end
 

data/lib/invoker/parsers/config.rb

@@ -133,10 +133,10 @@ module Invoker
         end
 
         sleep_duration = section['sleep'].to_i
-        if sleep_duration > 0
+        if sleep_duration >= 0
           pconfig['sleep_duration'] = sleep_duration
         else
-          pconfig['sleep_duration'] = 1
+          pconfig['sleep_duration'] = 0
         end
 
         OpenStruct.new(pconfig)

data/lib/invoker/power/balancer.rb

@@ -100,7 +100,7 @@ module Invoker
         @backend_data = true
 
         # check backend data for websockets connection. check for upgrade headers
-        # - Upgarde: websocket\r\n
+        # - Upgrade: websocket\r\n
         if data =~ /Upgrade: websocket/
           @upgraded_to = "websocket"
         end

data/lib/invoker/power/setup.rb

@@ -11,9 +11,11 @@ module Invoker
       end
 
       def self.uninstall
-        power_config = Invoker::Power::Config.load_config
-        selected_installer_klass = installer_klass
-        selected_installer_klass.new(power_config.tld).uninstall_invoker
+        if Invoker::Power::Config.has_config?
+          power_config = Invoker::Power::Config.load_config
+          selected_installer_klass = installer_klass
+          selected_installer_klass.new(power_config.tld).uninstall_invoker
+        end
       end
 
       def self.installer_klass
@@ -74,6 +76,7 @@ module Invoker
       end
 
       def remove_resolver_file
+        return if resolver_file.nil?
         begin
           safe_remove_file(resolver_file)
         rescue Errno::EACCES

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

@@ -12,23 +12,19 @@ module Invoker
         end
 
         def self.distro_installer(tld)
-          case Facter[:operatingsystem].value
-          when "Ubuntu"
-            require "invoker/power/setup/distro/ubuntu"
-            Ubuntu.new(tld)
-          when "Fedora"
-            require "invoker/power/setup/distro/redhat"
-            Redhat.new(tld)
-          when "Archlinux"
+          if distro.start_with? "Arch Linux", "Manjaro Linux"
             require "invoker/power/setup/distro/arch"
             Arch.new(tld)
-          when "Debian"
+          elsif distro.start_with? "Debian"
             require "invoker/power/setup/distro/debian"
             Debian.new(tld)
-          when "LinuxMint"
-            require "invoker/power/setup/distro/mint"
-            Mint.new(tld)
-          when "OpenSuSE"
+          elsif distro.start_with? "Fedora"
+            require "invoker/power/setup/distro/redhat"
+            Redhat.new(tld)
+          elsif distro.start_with? "Linux Mint", "Ubuntu"
+            require "invoker/power/setup/distro/ubuntu"
+            Ubuntu.new(tld)
+          elsif distro.start_with? "openSUSE"
             require "invoker/power/setup/distro/opensuse"
             Opensuse.new(tld)
           else
@@ -36,6 +32,17 @@ module Invoker
           end
         end
 
+        def self.distro
+          @distro ||= if File.exist?('/etc/os-release')
+            File.read('/etc/os-release').each_line do |line|
+              parsed_line = line.chomp.tr('"', '').split('=')
+              break parsed_line[1] if parsed_line[0] == 'NAME'
+            end
+          else
+            raise "File /etc/os-release doesn't exist or not Linux"
+          end
+        end
+
         def initialize(tld)
           self.tld = tld
         end
@@ -51,6 +58,22 @@ module Invoker
           system("systemctl start socat_invoker.service")
           system("systemctl restart dnsmasq")
         end
+
+        def install_packages
+          "dnsmasq and socat"
+        end
+
+        def install_other
+          " a local resolver for .#{tld} domain and"
+        end
+
+        def get_user_confirmation?
+          Invoker::Logger.puts("Invoker is going to install #{install_packages} on this machine."\
+            " It is also going to install#{install_other} 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) : ")
+        end
       end
     end
   end

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

@@ -4,6 +4,42 @@ module Invoker
   module Power
     module Distro
       class Ubuntu < Debian
+        def using_systemd_resolved?
+          return @_using_systemd_resolved if defined?(@_using_systemd_resolved)
+          @_using_systemd_resolved = system("systemctl is-active --quiet systemd-resolved")
+        end
+
+        def install_required_software
+          if using_systemd_resolved?
+            # Don't install dnsmasq if Ubuntu version uses systemd-resolved for DNS because they conflict
+            system("apt-get --assume-yes install socat")
+          else
+            super
+          end
+        end
+
+        def install_packages
+          using_systemd_resolved? ? "socat" : super
+        end
+
+        def install_other
+          using_systemd_resolved? ? nil : super
+        end
+
+        def resolver_file
+          using_systemd_resolved? ? nil : super
+        end
+
+        def tld
+          using_systemd_resolved? ? 'localhost' : @tld
+        end
+
+        def get_user_confirmation?
+          if using_systemd_resolved? && tld != 'localhost'
+            Invoker::Logger.puts("Ubuntu installations using systemd-resolved (typically Ubuntu 17+) only support the .localhost domain, so your tld setting (or the default) will be ignored.".colorize(:yellow))
+          end
+          super
+        end
       end
     end
   end

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

@@ -1,5 +1,4 @@
 require "invoker/power/setup/distro/base"
-require "facter"
 require 'erb'
 require 'fileutils'
 
@@ -9,8 +8,8 @@ module Invoker
       attr_accessor :distro_installer
 
       def setup_invoker
-        if get_user_confirmation?
-          initialize_distro_installer
+        initialize_distro_installer
+        if distro_installer.get_user_confirmation?
           find_open_ports
           distro_installer.install_required_software
           install_resolver
@@ -35,6 +34,12 @@ module Invoker
         Invoker::Power::Config.delete
       end
 
+      def build_power_config
+        config = super
+        config[:tld] = distro_installer.tld
+        config
+      end
+
       def resolver_file
         distro_installer.resolver_file
       end
@@ -50,16 +55,11 @@ module Invoker
       private
 
       def initialize_distro_installer
-        # Create a new facter check for systemctl (in systemd)
-        Facter.add(:systemctl) do
-          setcode do
-            Facter::Util::Resolution.exec("[ -e /usr/bin/systemctl ] && echo 'true' || echo 'false'")
-          end
-        end
-        @distro_installer = Invoker::Power::Distro::Base.distro_installer(tld)
+        @distro_installer ||= Invoker::Power::Distro::Base.distro_installer(tld)
       end
 
       def install_resolver
+        return if resolver_file.nil?
         File.open(resolver_file, "w") do |fl|
           fl.write(resolver_file_content)
         end
@@ -92,14 +92,6 @@ address=/#{tld}/127.0.0.1
         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 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) : ")
-      end
     end
   end
 end

data/lib/invoker/process_manager.rb

@@ -168,6 +168,9 @@ module Invoker
       if worker
         @open_pipes.delete(worker.pipe_end.fileno)
         @workers.delete(command_label)
+        # Move label color to front of array so it's reused first
+        LABEL_COLORS.delete(worker.color)
+        LABEL_COLORS.unshift(worker.color)
       end
       if trigger_event
         Invoker.commander.trigger(command_label, :worker_removed)

data/lib/invoker/version.rb

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

data/spec/invoker/config_spec.rb

@@ -155,7 +155,7 @@ command = ls
 
   describe "Procfile" do
     it "should load Procfiles and create config object" do
-      File.open("/tmp/Procfile", "w") {|fl| 
+      File.open("/tmp/Procfile", "w") {|fl|
         fl.write <<-EOD
 web: bundle exec rails s -p $PORT
           EOD
@@ -170,7 +170,7 @@ web: bundle exec rails s -p $PORT
 
   describe "Copy of DNS information" do
     it "should allow copy of DNS information" do
-      File.open("/tmp/Procfile", "w") {|fl| 
+      File.open("/tmp/Procfile", "w") {|fl|
         fl.write <<-EOD
 web: bundle exec rails s -p $PORT
           EOD
@@ -251,7 +251,7 @@ index = 1
         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[0].sleep_duration).to eq(0)
         expect(processes[1].sleep_duration).to eq(5)
       ensure
         file.unlink()
@@ -342,7 +342,7 @@ some_other_process: some_other_command
             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.sleep_duration).to eq(0)
             expect(process_1.index).to eq(0)
           ensure
             File.delete(invoker_ini)

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

@@ -16,43 +16,55 @@ def mock_socat_scripts
     fl.write(socat_content)
   end
   FileUtils.mkdir_p("/usr/bin")
+  FileUtils.mkdir_p("/etc/systemd/system")
 end
 
 describe Invoker::Power::LinuxSetup, fakefs: true do
   before do
     FileUtils.mkdir_p(inv_conf_dir)
     FileUtils.mkdir_p(Invoker::Power::Distro::Base::RESOLVER_DIR)
+    Invoker.config = mock
   end
 
   let(:invoker_setup) { Invoker::Power::LinuxSetup.new('test') }
   let(:distro_installer) { Invoker::Power::Distro::Ubuntu.new('test') }
 
-  describe "should only proceed after user confirmation" do
-    before { invoker_setup.distro_installer = distro_installer }
+  before do
+    invoker_setup.distro_installer = distro_installer
+  end
 
-    it "should create config file with port" do
-      invoker_setup.expects(:initialize_distro_installer).returns(true)
-      invoker_setup.expects(:get_user_confirmation?).returns(true)
-      invoker_setup.expects(:install_resolver).returns(true)
-      invoker_setup.expects(:install_port_forwarder).returns(true)
-      invoker_setup.expects(:drop_to_normal_user).returns(true)
+  it "should only proceed after user confirmation" do
+    distro_installer.expects(:get_user_confirmation?).returns(false)
 
-      distro_installer.expects(:install_required_software)
-      distro_installer.expects(:restart_services)
+    invoker_setup.setup_invoker
 
-      invoker_setup.setup_invoker
+    expect { Invoker::Power::Config.load_config }.to raise_error(Errno::ENOENT)
+  end
 
-      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
+  it "should create config file with http(s) ports" do
+    invoker_setup.expects(:initialize_distro_installer).returns(true)
+    invoker_setup.expects(:install_resolver).returns(true)
+    invoker_setup.expects(:install_port_forwarder).returns(true)
+    invoker_setup.expects(:drop_to_normal_user).returns(true)
+
+    distro_installer.expects(:get_user_confirmation?).returns(true)
+    distro_installer.expects(:install_required_software)
+    distro_installer.expects(:restart_services)
+
+    invoker_setup.setup_invoker
+
+    config = Invoker::Power::Config.load_config
+    expect(config.tld).to eq('test')
+    expect(config.http_port).not_to be_nil
+    expect(config.dns_port).to be_nil
+    expect(config.https_port).not_to be_nil
   end
 
-  describe "configuring dnsmasq and socat" do
+  describe "configuring services" do
+    let(:config) { Invoker::Power::Config.load_config }
+
     before(:all) do
       @original_invoker_config = Invoker.config
-      Invoker.config = mock
     end
 
     after(:all) do
@@ -60,26 +72,21 @@ describe Invoker::Power::LinuxSetup, fakefs: true do
     end
 
     before(:each) do
-      invoker_setup.distro_installer = distro_installer
       mock_socat_scripts
     end
 
-    it "should create proper config file" do
+    def run_setup
       invoker_setup.expects(:initialize_distro_installer).returns(true)
-      invoker_setup.expects(:get_user_confirmation?).returns(true)
       invoker_setup.expects(:drop_to_normal_user).returns(true)
 
+      distro_installer.expects(:get_user_confirmation?).returns(true)
       distro_installer.expects(:install_required_software)
       distro_installer.expects(:restart_services)
 
       invoker_setup.setup_invoker
+    end
 
-      config = Invoker::Power::Config.load_config
-
-      dnsmasq_content = File.read(distro_installer.resolver_file)
-      expect(dnsmasq_content.strip).to_not be_empty
-      expect(dnsmasq_content).to match(/test/)
-
+    def test_socat_config
       socat_content = File.read(Invoker::Power::Distro::Base::SOCAT_SHELLSCRIPT)
       expect(socat_content.strip).to_not be_empty
       expect(socat_content.strip).to match(/#{config.https_port}/)
@@ -88,15 +95,71 @@ describe Invoker::Power::LinuxSetup, fakefs: true do
       service_file = File.read(Invoker::Power::Distro::Base::SOCAT_SYSTEMD)
       expect(service_file.strip).to_not be_empty
     end
+
+    context 'on ubuntu with systemd-resolved' do
+      it "should create socat config & set tld to localhost" do
+        distro_installer.expects(:using_systemd_resolved?).at_least_once.returns(true)
+        run_setup
+        expect(distro_installer.resolver_file).to be_nil
+        test_socat_config
+        expect(config.tld).to eq('localhost')
+      end
+    end
+
+    context 'on non-systemd-resolved distro' do
+      it "should create dnsmasq & socat configs" do
+        run_setup
+        dnsmasq_content = File.read(distro_installer.resolver_file)
+        expect(dnsmasq_content.strip).to_not be_empty
+        expect(dnsmasq_content).to match(/test/)
+
+        test_socat_config
+      end
+    end
   end
 
   describe 'resolver file' do
     context 'user sets up a custom top level domain' do
-      it 'should create the correct resolver file' do
-        linux_setup = Invoker::Power::LinuxSetup.new('local')
-        suse_installer = Invoker::Power::Distro::Opensuse.new('local')
-        linux_setup.distro_installer = suse_installer
-        expect(linux_setup.resolver_file).to eq('/etc/dnsmasq.d/local-tld')
+      let(:tld) { 'local' }
+      let(:linux_setup) { Invoker::Power::LinuxSetup.new(tld) }
+
+      context 'on ubuntu with systemd-resolved' do
+        it 'should not create a resolver file' do
+          ubuntu_installer = Invoker::Power::Distro::Ubuntu.new(tld)
+          linux_setup.distro_installer = ubuntu_installer
+          ubuntu_installer.expects(:using_systemd_resolved?).at_least_once.returns(true)
+          expect(linux_setup.resolver_file).to eq(nil)
+        end
+      end
+
+      context 'on non-systemd-resolved distro' do
+        it 'should create the correct resolver file' do
+          suse_installer = Invoker::Power::Distro::Opensuse.new(tld)
+          linux_setup.distro_installer = suse_installer
+          expect(linux_setup.resolver_file).to eq("/etc/dnsmasq.d/#{tld}-tld")
+        end
+      end
+    end
+  end
+end
+
+describe Invoker::Power::Distro::Base, docker: true do
+  describe '.distro_installer' do
+    it 'correctly recognizes the current distro' do
+      case ENV['DISTRO']
+      when 'archlinux/base', 'manjarolinux/base'
+        expect(described_class.distro_installer('')).to be_a Invoker::Power::Distro::Arch
+      when 'debian'
+        expect(described_class.distro_installer('')).to be_a Invoker::Power::Distro::Debian
+      when 'fedora'
+        expect(described_class.distro_installer('')).to be_a Invoker::Power::Distro::Redhat
+      when 'linuxmintd/mint20-amd64', 'ubuntu'
+        expect(described_class.distro_installer('')).to be_a Invoker::Power::Distro::Ubuntu
+      when 'opensuse/leap', 'opensuse/tumbleweed'
+        expect(described_class.distro_installer('')).to be_a Invoker::Power::Distro::Opensuse
+      when nil
+      else
+        raise 'Unrecognized Linux distro. Please add the appropriate docker image to the travis build matrix, update the described method, and add a case here.'
       end
     end
   end