ringleader 1.0.0 → 1.0.1

data/CHANGES.md

@@ -0,0 +1,9 @@
+1.0.1
+---
+* Warn but proxy anyway to processes running outside ringleader's control
+* Add support for environment variable overrides in app config file
+* Support `rbenv` key in config for rbenv-managed projects
+
+1.0.0
+---
+* Initial release

data/README.md

@@ -92,12 +92,18 @@ main_app:
   idle_timeout: 6000       # Idle timeout in seconds
   startup_timeout: 180     # Application startup timeout
   disabled: true           # Set the app to be disabled when ringleader starts
+  env:                     # Override or set environment variables inherited
+    FOO: hello             # from the current environment. Use nil to unset a
+    BAR: nil               # var.
 
   # If you have an application managed by rvm, this setting automatically adds
   # the rvm-specific shell setup before executing the given command. This
   # supersedes the `command` setting.
   rvm: "foreman start"
 
+  # Likewise for rbenv:
+  rbenv: "foreman start"
+
 other_app:
   [...]
 ```

data/lib/ringleader/cli.rb

@@ -98,12 +98,18 @@ something like this:
       idle_timeout: 6000       # Idle timeout in seconds
       startup_timeout: 180     # Application startup timeout
       disabled: true           # Set the app to be disabled when ringleader starts
+      env:                     # Override or set environment variables inherited
+        FOO: hello             # from the current environment. Use nil to unset a
+        BAR: nil               # var.
 
       # If you have an application managed by rvm, this setting automatically
       # adds the rvm-specific shell setup before executing the given command.
       # This supersedes the `command` setting.
       rvm: "foreman start"
 
+      # Likewise for rbenv:
+      rbenv: "foreman start"
+
 OPTIONS
         banner
 

data/lib/ringleader/config.rb

@@ -37,9 +37,13 @@ module Ringleader
         options["host"] ||= DEFAULT_HOST
         options["idle_timeout"] ||= DEFAULT_IDLE_TIMEOUT
         options["startup_timeout"] ||= DEFAULT_STARTUP_TIMEOUT
+        options["env"] ||= {}
 
         if command = options.delete("rvm")
           options["command"] = "source ~/.rvm/scripts/rvm && rvm --with-rubies rvmrc exec -- #{command}"
+        elsif command = options.delete("rbenv")
+          options["command"] = "rbenv exec #{command}"
+          options["env"]["RBENV_VERSION"] = nil
         end
 
         validate name, options

data/lib/ringleader/process.rb

@@ -90,17 +90,25 @@ module Ringleader
     #
     # Returns true if the app started, false if not.
     def start_app
+      if already_running?
+        warn "#{config.name} already running on port #{config.app_port}"
+        return true
+      end
+
       @starting = true
       info "starting process `#{config.command}`"
 
       # give the child process a terminal so output isn't buffered
       @master, slave = PTY.open
-      @pid = ::Process.spawn %Q(bash -c "#{config.command}"),
+      @pid = ::Process.spawn(
+        config.env,
+        %Q(bash -c "#{config.command}"),
         :in => slave,
         :out => slave,
         :err => slave,
         :chdir => config.dir,
         :pgroup => true
+      )
       slave.close
       proxy_output @master
       debug "started with pid #{@pid}"
@@ -129,6 +137,15 @@ module Ringleader
       end
     end
 
+    # Private: check if the app is already running outside ringleader
+    def already_running?
+      socket = TCPSocket.new config.host, config.app_port
+      socket.close
+      true
+    rescue Errno::ECONNREFUSED
+      false
+    end
+
     # Private: proxy output streams to the logger.
     #
     # Fire and forget, runs in its own thread.

data/lib/ringleader/version.rb

@@ -1,3 +1,3 @@
 module Ringleader
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/fixtures/config.yml

@@ -11,6 +11,8 @@ admin:
   command: "bundle exec foreman start"
   server_port: 3001
   app_port: 4001
+  env:
+    OVERRIDE: true
 authentication:
   dir: "~/apps/auth"
   command: "bundle exec foreman start"

data/spec/fixtures/rbenv.yml

@@ -0,0 +1,7 @@
+---
+rbenv_app:
+  dir: "~/apps/main"
+  rbenv: "bundle exec foreman start"
+  server_port: 3000
+  app_port: 4000
+

data/spec/ringleader/config_spec.rb

@@ -12,7 +12,7 @@ describe Ringleader::Config do
 
       it "returns a hash of configurations" do
         config = subject.apps["main_site"]
-        expect(config.dir).to eq("~/apps/main")
+        expect(config.dir).to eq(File.expand_path("~/apps/main"))
       end
 
       it "includes a default host" do
@@ -30,6 +30,11 @@ describe Ringleader::Config do
       it "sets the config name to match the key in the config file" do
         expect(subject.apps["admin"].name).to eq("admin")
       end
+
+      it "sets the env hash to an empty hash if not specified" do
+        expect(subject.apps["main_site"].env).to eq({})
+        expect(subject.apps["admin"].env).to have_key("OVERRIDE")
+      end
     end
   end
 
@@ -64,4 +69,13 @@ describe Ringleader::Config do
     end
   end
 
+  context "with a config with a 'rbenv' key instead of 'command'" do
+    it "replaces the 'rbenv' command with an rbenv command and environment" do
+      config = Ringleader::Config.new "spec/fixtures/rbenv.yml"
+      expect(config.apps["rbenv_app"].command).to eq("rbenv exec bundle exec foreman start")
+      expect(config.apps["rbenv_app"].env).to have_key("RBENV_VERSION")
+      expect(config.apps["rbenv_app"].env["RBENV_VERSION"]).to eq(nil)
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ringleader
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -150,6 +150,7 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- CHANGES.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -201,6 +202,7 @@ files:
 - spec/fixtures/invalid.yml
 - spec/fixtures/no_app_port.yml
 - spec/fixtures/no_server_port.yml
+- spec/fixtures/rbenv.yml
 - spec/fixtures/rvm.yml
 - spec/ringleader/config_spec.rb
 - spec/spec_helper.rb
@@ -233,6 +235,7 @@ test_files:
 - spec/fixtures/invalid.yml
 - spec/fixtures/no_app_port.yml
 - spec/fixtures/no_server_port.yml
+- spec/fixtures/rbenv.yml
 - spec/fixtures/rvm.yml
 - spec/ringleader/config_spec.rb
 - spec/spec_helper.rb