RubyGems - invoker - Versions diffs - 1.0.2 → 1.0.3 - Mend

invoker 1.0.2 → 1.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (31) hide show

checksums.yaml +6 -14
data/.gitignore +2 -0
data/.rspec +2 -0
data/Rakefile +7 -5
data/invoker.gemspec +3 -3
data/lib/invoker.rb +2 -0
data/lib/invoker/commander.rb +12 -9
data/lib/invoker/errors.rb +1 -0
data/lib/invoker/parsers/config.rb +49 -14
data/lib/invoker/parsers/option_parser.rb +1 -1
data/lib/invoker/parsers/procfile.rb +86 -0
data/lib/invoker/power.rb +1 -0
data/lib/invoker/power/balancer.rb +16 -1
data/lib/invoker/power/http_response.rb +81 -0
data/lib/invoker/power/setup.rb +13 -1
data/lib/invoker/power/templates/404.html +40 -0
data/lib/invoker/power/templates/503.html +40 -0
data/lib/invoker/runner.rb +6 -0
data/lib/invoker/version.rb +1 -1
data/spec/invoker/command_listener/client_spec.rb +1 -1
data/spec/invoker/command_worker_spec.rb +1 -1
data/spec/invoker/commander_spec.rb +10 -10
data/spec/invoker/config_spec.rb +55 -17
data/spec/invoker/event/manager_spec.rb +13 -18
data/spec/invoker/invoker_spec.rb +5 -5
data/spec/invoker/power/config_spec.rb +4 -4
data/spec/invoker/power/http_response_spec.rb +34 -0
data/spec/invoker/power/port_finder_spec.rb +2 -2
data/spec/invoker/power/setup_spec.rb +22 -30
data/spec/spec_helper.rb +58 -8
metadata +26 -19

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

@@ -4,6 +4,8 @@ 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"
       def self.install
         installer = new
@@ -75,7 +77,7 @@ module Invoker
       end
       def install_resolver(dns_port)
-        File.open(RESOLVER_FILE, "w") { |fl|
+        open_resolver_for_write { |fl|
           fl.write(resolve_string(dns_port))
         }
       rescue Errno::EACCES
@@ -169,6 +171,16 @@ port #{dns_port}
         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/templates/404.html ADDED

@@ -0,0 +1,40 @@
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Invoker</title>
+  <style>
+    body {
+      margin: 0;
+      padding: 0;
+      background: #fff;
+      line-height: 18px;
+    }
+    div.page {
+      padding: 36px 90px;
+    }
+    h1, h2, p, li {
+      font-family: Helvetica, sans-serif;
+      font-size: 13px;
+    }
+    h1 {
+      line-height: 45px;
+      font-size: 36px;
+      margin: 0;
+    }
+    h2 {
+      line-height: 27px;
+      font-size: 18px;
+      font-weight: normal;
+      margin: 0;
+    }
+  </style>
+</head>
+<body class="">
+  <div class="page">
+    <h1>Application not found</h1>
+    <hr>
+    <h2>Invoker could not find the application. Please check the configuration file.<h2>
+  </div>
+</body>
+</html>

data/lib/invoker/power/templates/503.html ADDED

@@ -0,0 +1,40 @@
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Invoker</title>
+  <style>
+    body {
+      margin: 0;
+      padding: 0;
+      background: #fff;
+      line-height: 18px;
+    }
+    div.page {
+      padding: 36px 90px;
+    }
+    h1, h2, p, li {
+      font-family: Helvetica, sans-serif;
+      font-size: 13px;
+    }
+    h1 {
+      line-height: 45px;
+      font-size: 36px;
+      margin: 0;
+    }
+    h2 {
+      line-height: 27px;
+      font-size: 18px;
+      font-weight: normal;
+      margin: 0;
+    }
+  </style>
+</head>
+<body class="">
+  <div class="page">
+    <h1>Application not running</h1>
+    <hr>
+    <h2>Invoker did not get any response. Please check if the application is running.<h2>
+  </div>
+</body>
+</html>

data/lib/invoker/runner.rb CHANGED

@@ -14,6 +14,8 @@ module Invoker
     def self.run_command(selected_command)
       return unless selected_command
       case selected_command.command
+      when 'version'
+        emit_version
       when 'setup'
         setup_pow(selected_command)
       when 'uninstall'
@@ -33,6 +35,10 @@ module Invoker
       end
     end
+    def self.emit_version
+      Invoker::Logger.puts Invoker::VERSION
+    end
     def self.setup_pow(selected_command)
       Invoker::Power::Setup.install()
     end

data/lib/invoker/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Invoker
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/invoker/command_listener/client_spec.rb CHANGED

@@ -6,7 +6,7 @@ describe Invoker::CommandListener::Client do
       @client_socket = mock()
       @client = Invoker::CommandListener::Client.new(@client_socket)
     end
     it "should run if read from socket" do
       invoker_commander.expects(:on_next_tick).with("foo")
       @client_socket.expects(:gets).returns("add foo\n")

data/spec/invoker/command_worker_spec.rb CHANGED

@@ -9,7 +9,7 @@ describe "Command Worker" do
     end
     it "should print json" do
-      @workers.values.map {|worker| worker.to_h }.to_json.should.not.be.empty
+      expect(@workers.values.map {|worker| worker.to_h }.to_json).not_to be_empty
     end
   end
 end

data/spec/invoker/commander_spec.rb CHANGED

@@ -10,9 +10,9 @@ describe "Invoker::Commander" do
     it "should throw error" do
       invoker_config.stubs(:processes).returns([])
-      lambda {
+      expect {
         @commander.start_manager()
-      }.should.raise(Invoker::Errors::InvalidConfig)
+      }.to raise_error(Invoker::Errors::InvalidConfig)
     end
   end
@@ -40,14 +40,14 @@ describe "Invoker::Commander" do
       describe "if a signal is specified" do
         it "should use that signal to kill the worker" do
           @commander.expects(:process_kill).with("bogus", "HUP").returns(true)
-          @commander.remove_command("resque", "HUP").should.be.true
+          expect(@commander.remove_command("resque", "HUP")).to be_true
         end
       end
       describe "if no signal is specified" do
         it "should use INT signal" do
           @commander.expects(:process_kill).with("bogus", "INT").returns(true)
-          @commander.remove_command("resque", nil).should.be.true
+          expect(@commander.remove_command("resque", nil)).to be_true
         end
       end
@@ -91,17 +91,17 @@ describe "Invoker::Commander" do
     it "should populate workers and open_pipes" do
       @commander.expects(:start_event_loop)
       @commander.start_manager()
-      @commander.open_pipes.should.not.be.empty
-      @commander.workers.should.not.be.empty
+      expect(@commander.open_pipes).not_to be_empty
+      expect(@commander.workers).not_to be_empty
       worker = @commander.workers['sleep']
-      worker.should.not.equal nil
-      worker.command_label.should.equal "sleep"
-      worker.color.should.equal :green
+      expect(worker).not_to be_nil
+      expect(worker.command_label).to eq('sleep')
+      expect(worker.color).to eq(:green)
       pipe_end_worker = @commander.open_pipes[worker.pipe_end.fileno]
-      pipe_end_worker.should.not.equal nil
+      expect(pipe_end_worker).not_to be_nil
     end
   end

data/spec/invoker/config_spec.rb CHANGED

@@ -6,7 +6,7 @@ describe "Invoker::Config" do
   describe "with invalid directory" do
     it "should raise error during startup" do
       begin
-        file = Tempfile.new("invalid_config.ini")
+        file = Tempfile.new(["invalid_config", ".ini"])
         config_data =<<-EOD
 [try_sleep]
@@ -15,9 +15,9 @@ command = ruby try_sleep.rb
       EOD
         file.write(config_data)
         file.close
-        lambda {
+        expect {
           Invoker::Parsers::Config.new(file.path, 9000)
-        }.should.raise(Invoker::Errors::InvalidConfig)
+        }.to raise_error(Invoker::Errors::InvalidConfig)
       ensure
         file.unlink()
       end
@@ -27,7 +27,7 @@ command = ruby try_sleep.rb
   describe "for ports" do
     it "should replace port in commands" do
       begin
-        file = Tempfile.new("invalid_config.ini")
+        file = Tempfile.new(["invalid_config", ".ini"])
         config_data =<<-EOD
 [try_sleep]
@@ -48,17 +48,17 @@ command = ls
         config = Invoker::Parsers::Config.new(file.path, 9000)
         command1 = config.processes.first
-        command1.port.should == 9001
-        command1.cmd.should =~ /9001/
+        expect(command1.port).to eq(9001)
+        expect(command1.cmd).to match(/9001/)
         command2 = config.processes[1]
-        command2.port.should == 9002
-        command2.cmd.should =~ /9002/
+        expect(command2.port).to eq(9002)
+        expect(command2.cmd).to match(/9002/)
         command2 = config.processes[2]
-        command2.port.should == nil
+        expect(command2.port).to be_nil
       ensure
         file.unlink()
       end
@@ -66,7 +66,7 @@ command = ls
     it "should use port from separate option" do
       begin
-        file = Tempfile.new("invalid_config.ini")
+        file = Tempfile.new(["invalid_config", ".ini"])
         config_data =<<-EOD
 [try_sleep]
 directory = /tmp
@@ -87,16 +87,16 @@ command = ls
         config = Invoker::Parsers::Config.new(file.path, 9000)
         command1 = config.processes.first
-        command1.port.should == 9001
-        command1.cmd.should =~ /9001/
+        expect(command1.port).to eq(9001)
+        expect(command1.cmd).to match(/9001/)
         command2 = config.processes[1]
-        command2.port.should == 3000
+        expect(command2.port).to eq(3000)
         command2 = config.processes[2]
-        command2.port.should == nil
+        expect(command2.port).to be_nil
       ensure
         file.unlink()
       end
@@ -105,7 +105,7 @@ command = ls
   describe "loading power config" do
     before do
-      @file = Tempfile.new("config.ini")
+      @file = Tempfile.new(["config", ".ini"])
     end
     it "does not load config if platform is not darwin" do
@@ -116,16 +116,54 @@ command = ls
     it "does not load config if platform is darwin but there is no power config file" do
       Invoker.expects(:darwin?).returns(true)
-      File.expects(:exists?).with(Invoker::Power::Config::CONFIG_LOCATION).returns(false)
       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.expects(:exists?).with(Invoker::Power::Config::CONFIG_LOCATION).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)
     end
   end
+  describe "Procfile" do
+    it "should load Procfiles and create config object" do
+      begin
+        File.open("/tmp/Procfile", "w") {|fl|
+          fl.write <<-EOD
+web: bundle exec rails s -p $PORT
+          EOD
+        }
+        config = Invoker::Parsers::Config.new("/tmp/Procfile", 9000)
+        command1 = config.processes.first
+        expect(command1.port).to eq(9001)
+        expect(command1.cmd).to match(/bundle exec rails/)
+      ensure
+        File.delete("/tmp/Procfile")
+      end
+    end
+    it "should load environment variables from .env file" do
+      begin
+        env_file = File.new("#{ENV['PWD']}/.env", "w")
+        env_data =<<-EOD
+TEST="test env"
+        EOD
+        env_file.write(env_data)
+        env_file.close()
+        File.open("/tmp/Procfile", "w") {|fl|
+          fl.write <<-EOD
+web: bundle exec rails s -p $PORT
+          EOD
+        }
+        config = Invoker::Parsers::Config.new("/tmp/Procfile", 9000)
+        expect(ENV["TEST"]).to eq("test env")
+      ensure
+        File.delete("#{ENV['PWD']}/.env")
+      end
+    end
+  end
 end

data/spec/invoker/event/manager_spec.rb CHANGED

@@ -11,11 +11,11 @@ describe Invoker::Event::Manager do
       @event_manager.trigger("foo", :exit)
       @event_manager.run_scheduled_events do |event|
-        event.block.call.should.equal("exit foo")
+        expect(event.block.call).to eq("exit foo")
       end
-      @event_manager.scheduled_events.should.be.empty
-      @event_manager.triggered_events.should.be.empty
+      expect(@event_manager.scheduled_events).to be_empty
+      expect(@event_manager.triggered_events).to be_empty
     end
     it "should remove triggrered and scheduld events on run" do
@@ -25,22 +25,17 @@ describe Invoker::Event::Manager do
       @event_manager.trigger("baz", :exit)
       @event_manager.run_scheduled_events do |event|
-        event.block.call.should.equal("exit foo")
+        expect(event.block.call).to eq("exit foo")
       end
-      @event_manager.scheduled_events.should.not.be.empty
-      @event_manager.triggered_events.should.not.be.empty
+      expect(@event_manager.scheduled_events).not_to be_empty
+      expect(@event_manager.triggered_events).not_to be_empty
-      baz_containing_event = lambda do |events|
-        events.detect {|event| event.command_label == "baz" }
-      end
-      bar_containing_scheduled_event = lambda do |events|
-        events.keys.detect {|event_key| event_key == "bar" }
-      end
+      baz_containing_event = @event_manager.triggered_events.map(&:command_label)
+      expect(baz_containing_event).to include("baz")
-      @event_manager.triggered_events.should.be.a baz_containing_event
-      @event_manager.scheduled_events.should.be.a bar_containing_scheduled_event
+      bar_containing_scheduled_event = @event_manager.scheduled_events.keys
+      expect(bar_containing_scheduled_event).to include("bar")
     end
     it "should handle multiple events for same command" do
@@ -54,8 +49,8 @@ describe Invoker::Event::Manager do
       @event_manager.schedule_event("foo", :exit) { 'exit foo' }
       @event_manager.trigger("foo", :exit)
-      @event_manager.scheduled_events.should.not.be.empty
-      @event_manager.triggered_events.should.not.be.empty
+      expect(@event_manager.scheduled_events).not_to be_empty
+      expect(@event_manager.triggered_events).not_to be_empty
     end
     it "should not run unmatched events" do
@@ -66,7 +61,7 @@ describe Invoker::Event::Manager do
       @event_manager.run_scheduled_events do |event|
         events_ran = true
       end
-      events_ran.should.be.false
+      expect(events_ran).to be_false
     end
   end
 end

data/spec/invoker/invoker_spec.rb CHANGED

@@ -4,12 +4,12 @@ describe "Invoker" do
   describe "#darwin?" do
     it "should return true on osx" do
       Invoker.expects(:ruby_platform).returns("x86_64-darwin12.4.0")
-      Invoker.darwin?.should == true
+      expect(Invoker.darwin?).to be_true
     end
     it "should return false on linux" do
       Invoker.expects(:ruby_platform).returns("i686-linux")
-      Invoker.darwin?.should == false
+      expect(Invoker.darwin?).to be_false
     end
   end
@@ -26,12 +26,12 @@ describe "Invoker" do
     it "should return false if setup command was not run on osx" do
       Invoker.expects(:ruby_platform).returns("x86_64-darwin12.4.0")
-      Invoker.can_run_balancer?.should ==false
+      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")
-      Invoker.can_run_balancer?.should == false
+      expect(Invoker.can_run_balancer?).to be_false
     end
     it "should return true if setup was run properly" do
@@ -40,7 +40,7 @@ describe "Invoker" do
         fl.write("hello")
       }
-      Invoker.can_run_balancer?.should === true
+      expect(Invoker.can_run_balancer?).to be_true
     end
     it "should not print warning if setup is not run when flag is false" do