invoker 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8949242941b92eea8a78f0a528b62c59dc831b2e
-  data.tar.gz: bd867429fa2a66e625549de2a8d2ab532ffe2c6c
+  metadata.gz: 36f535d2a652c9164fbe92e7df1e9aff140223d2
+  data.tar.gz: f84168b2628f0f40024de2b46c1de5017a9069d1
 SHA512:
-  metadata.gz: b6732d806f3ecfcc9a9d2275baa9068eff0207e789d63fe3b92d19bdcb5474513565b5f7a0d5a3438c4efcb41649c4249304cbf6a16459ddf111707b0cf1c183
-  data.tar.gz: 67c02e15182e736bdefb13b2f09e7eda386a9ecf7fd23f7dc44a1c6943ef73965ad5c039bc31cb952688dd46d9114004dcf1ea5d0f932517db2ec6326983eaad
+  metadata.gz: b0fb344263af24e67273104073e872b070bfeb73f2a9e782953f29d355216ab5d2c18c254b5d175619ba0e6bd7bd4461e2956e01b5d022574005f54d38640854
+  data.tar.gz: 1e758cf427cd35b11773c06896d3b3fc2ebd9fab50ac8c60ff06379cab2369fc41eb5353f9a53e6e34c5a5b5e04664bb9570ffa001ed6dc7b9fd867aa305fa6b

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/Gemfile

@@ -3,3 +3,5 @@ source "https://rubygems.org"
 gemspec
 
 gem 'pry'
+
+gem 'coveralls', require: false

data/invoker.gemspec

@@ -12,8 +12,7 @@ Gem::Specification.new do |s|
   s.version = Invoker::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Hemant Kumar"]
-  s.date = %q{2013-05-04}
+  s.authors = ["Hemant Kumar", "Amitava Basak"]
   s.description = %q{Something small for process management}
   s.email = %q{hemant@codemancers.com}
 
@@ -27,6 +26,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.summary = %q{Something small for Process management}
   s.add_dependency("slop", "~> 3.4.6")
+  s.add_dependency("rainbow", "~> 1.1.4")
   s.add_dependency("iniparse", "~> 1.1.6")
   s.add_dependency("formatador", "~> 0.2.4")
   s.add_dependency("eventmachine", "~> 1.0.3")

data/lib/invoker/commander.rb

@@ -1,6 +1,7 @@
 require "io/console"
 require 'pty'
 require "json"
+require "dotenv"
 
 module Invoker
   class Commander
@@ -67,6 +68,11 @@ module Invoker
     #
     # @param command_label [String] Command label of process specified in config file.
     def add_command_by_label(command_label)
+      if process_running?(command_label)
+        Invoker::Logger.puts "\nProcess '#{command_label}' is already running".color(:red)
+        return false
+      end
+
       process_info = Invoker::CONFIG.process(command_label)
       if process_info
         add_command(process_info)
@@ -142,6 +148,16 @@ module Invoker
       }
     end
 
+    def load_env(directory = nil)
+      directory ||= ENV['PWD']
+      default_env = File.join(directory, '.env')
+      if File.exist?(default_env)
+        Dotenv::Environment.new(default_env)
+      else
+        {}
+      end
+    end
+
     private
     def start_event_loop
       loop do
@@ -204,6 +220,8 @@ module Invoker
 
       event_manager.schedule_event(command_label, :exit) { remove_worker(command_label) }
 
+      env_options = load_env(process_info.dir)
+
       spawn_options = {
         :chdir => process_info.dir || ENV['PWD'], :out => write_pipe, :err => write_pipe,
         :pgroup => true, :close_others => true, :in => :close
@@ -211,10 +229,10 @@ module Invoker
 
       if defined?(Bundler)
         Bundler.with_clean_env do
-          spawn(process_info.cmd, spawn_options)
+          spawn(env_options, process_info.cmd, spawn_options)
         end
       else
-        spawn(process_info.cmd, spawn_options)
+        spawn(env_options, process_info.cmd, spawn_options)
       end
     end
 
@@ -267,5 +285,9 @@ module Invoker
       }
       @workers = {}
     end
+
+    def process_running?(command_label)
+      !!workers[command_label]
+    end
   end
 end

data/lib/invoker/parsers/config.rb

@@ -1,5 +1,4 @@
 require 'iniparse'
-require 'dotenv'
 
 module Invoker
   module Parsers
@@ -50,7 +49,6 @@ module Invoker
       end
 
       def process_procfile
-        load_env
         procfile = Invoker::Parsers::Procfile.new(@filename)
         procfile.entries.map do |name, command|
           section = { "label" => name, "command" => command }
@@ -67,10 +65,6 @@ module Invoker
         end
       end
 
-      def load_env
-        Dotenv.load
-      end
-
       def pick_port(section)
         if section['command'] =~ PORT_REGEX
           @port += 1

data/lib/invoker/power/balancer.rb

@@ -42,6 +42,7 @@ module Invoker
 
     class Balancer
       attr_accessor :connection, :http_parser, :session
+      DEV_MATCH_REGEX = /([\w-]+)\.dev(\:\d+)?$/
 
       def self.run(options = {})
         EventMachine.start_server('0.0.0.0', Invoker::CONFIG.http_port,
@@ -110,9 +111,13 @@ module Invoker
         connection.close_connection_after_writing() if backend == session
       end
 
+      def extract_host_from_domain(host)
+        host.match(DEV_MATCH_REGEX)
+      end
+
       private
       def select_backend_config(host)
-        matching_string = host.match(/(\w+)\.dev(\:\d+)?$/)
+        matching_string = extract_host_from_domain(host)
         return nil unless matching_string
         if selected_app = matching_string[1]
           Invoker::CONFIG.process(selected_app)

data/lib/invoker/version.rb

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

data/readme.md

@@ -2,6 +2,8 @@ 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/repos/51d3bfb9c7f3a3777b060155/badges/7e150ca223f6bc8935f7/gpa.png)](https://codeclimate.com/repos/51d3bfb9c7f3a3777b060155/feed)
+[![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)
 
 ## Usage ##
 

data/spec/invoker/commander_spec.rb

@@ -1,12 +1,12 @@
 require "spec_helper"
 
 describe "Invoker::Commander" do
-  
+
   describe "With no processes configured" do
     before do
       @commander = Invoker::Commander.new()
     end
-    
+
     it "should throw error" do
       invoker_config.stubs(:processes).returns([])
 
@@ -25,9 +25,14 @@ describe "Invoker::Commander" do
       invoker_config.stubs(:processes).returns([OpenStruct.new(:label => "resque", :cmd => "foo", :dir => "bar")])
       invoker_config.expects(:process).returns(OpenStruct.new(:label => "resque", :cmd => "foo", :dir => "bar"))
       @commander.expects(:add_command).returns(true)
-      
+
       @commander.add_command_by_label("resque")
     end
+
+    it "should not start already running process" do
+      @commander.workers.expects(:[]).returns(OpenStruct.new(:pid => "bogus"))
+      expect(@commander.add_command_by_label("resque")).to be_false
+    end
   end
 
   describe "#remove_command" do
@@ -58,7 +63,7 @@ describe "Invoker::Commander" do
       #   end
 
       #   it "should return false" do
-          
+
       #   end
       # end
     end
@@ -90,6 +95,7 @@ describe "Invoker::Commander" do
 
     it "should populate workers and open_pipes" do
       @commander.expects(:start_event_loop)
+      @commander.expects(:load_env).returns({})
       @commander.start_manager()
       expect(@commander.open_pipes).not_to be_empty
       expect(@commander.workers).not_to be_empty
@@ -131,4 +137,49 @@ describe "Invoker::Commander" do
     end
   end
 
+  describe "#load_env" do
+    before do
+      @commander = Invoker::Commander.new()
+    end
+
+    it "should load .env file from the specified directory" do
+      dir = "/tmp"
+      begin
+        env_file = File.new("#{dir}/.env", "w")
+        env_data =<<-EOD
+FOO=foo
+BAR=bar
+        EOD
+        env_file.write(env_data)
+        env_file.close
+        env_options = @commander.load_env(dir)
+        expect(env_options).to include("FOO" => "foo", "BAR" => "bar")
+      ensure
+        File.delete(env_file.path)
+      end
+    end
+
+    it "should default to current directory if no directory is specified" do
+      dir = ENV["HOME"]
+      ENV.stubs(:[]).with("PWD").returns(dir)
+      begin
+        env_file = File.new("#{dir}/.env", "w")
+        env_data =<<-EOD
+FOO=bar
+BAR=foo
+        EOD
+        env_file.write(env_data)
+        env_file.close
+        env_options = @commander.load_env
+        expect(env_options).to include("FOO" => "bar", "BAR" => "foo")
+      ensure
+        File.delete(env_file.path)
+      end
+    end
+
+    it "should return empty hash if there is no .env file" do
+      dir = "/tmp"
+      expect(@commander.load_env(dir)).to eq({})
+    end
+  end
 end

data/spec/invoker/config_spec.rb

@@ -145,25 +145,5 @@ web: bundle exec rails s -p $PORT
         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/power/balancer_spec.rb

@@ -0,0 +1,41 @@
+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"))
+    end
+
+    it "should do foo.dev match" do
+      match = @balancer.extract_host_from_domain("foo.dev")
+      expect(match).to_not be_nil
+
+      matching_string = match[1]
+      expect(matching_string).to eq("foo")
+    end
+
+    it "should match foo.dev:1080" do
+      match = @balancer.extract_host_from_domain("foo.dev:1080")
+      expect(match).to_not be_nil
+
+      matching_string = match[1]
+      expect(matching_string).to eq("foo")
+    end
+
+    it "should match emacs.bar.dev" do
+      match = @balancer.extract_host_from_domain("emacs.bar.dev")
+      expect(match).to_not be_nil
+
+      matching_string = match[1]
+      expect(matching_string).to eq("bar")
+    end
+
+    it "should match hello-world.dev" do
+      match = @balancer.extract_host_from_domain("hello-world.dev")
+      expect(match).to_not be_nil
+
+      matching_string = match[1]
+      expect(matching_string).to eq("hello-world")
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,7 @@
 require "pry"
+require 'coveralls'
+Coveralls.wear!
+
 require "invoker"
 
 # This file was generated by the `rspec --init` command. Conventionally, all

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: invoker
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Hemant Kumar
+- Amitava Basak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -24,6 +25,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.4.6
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: iniparse
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +214,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
 - .rspec
 - .travis.yml
@@ -240,6 +256,7 @@ files:
 - spec/invoker/config_spec.rb
 - spec/invoker/event/manager_spec.rb
 - spec/invoker/invoker_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
@@ -276,6 +293,7 @@ test_files:
 - spec/invoker/config_spec.rb
 - spec/invoker/event/manager_spec.rb
 - spec/invoker/invoker_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