ringleader 1.0.1 → 1.0.2

data/lib/ringleader/app.rb

@@ -107,7 +107,7 @@ module Ringleader
 
     def reset_activity_timer
       start_activity_timer
-      @activity_timer.reset
+      @activity_timer.reset if @activity_timer
     end
 
     def stop_activity_timer

data/lib/ringleader/process.rb

@@ -35,7 +35,12 @@ module Ringleader
       elsif @starting
         wait :running
       else
-        start_app
+        if already_running?
+          warn "#{config.name} already running on port #{config.app_port}"
+          return true
+        else
+          start_app
+        end
       end
     end
 
@@ -90,25 +95,22 @@ 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(
-        config.env,
-        %Q(bash -c "#{config.command}"),
-        :in => slave,
-        :out => slave,
-        :err => slave,
-        :chdir => config.dir,
-        :pgroup => true
-      )
+      in_clean_environment do
+        @pid = ::Process.spawn(
+          config.env,
+          %Q(bash -c "#{config.command}"),
+          :in => slave,
+          :out => slave,
+          :err => slave,
+          :chdir => config.dir,
+          :pgroup => true
+        )
+      end
       slave.close
       proxy_output @master
       debug "started with pid #{@pid}"
@@ -157,6 +159,15 @@ module Ringleader
       end
     end
 
+    # Private: execute a command in a clean environment (bundler)
+    def in_clean_environment(&block)
+      if Object.const_defined?(:Bundler)
+        ::Bundler.with_clean_env(&block)
+      else
+        yield
+      end
+    end
+
   end
 
 end

data/lib/ringleader/version.rb

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

data/ringleader.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "rainbow", "~> 1.1.4"
   gem.add_dependency "color", "~> 1.4.1"
 
+  gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec", "~> 2.11.0"
   gem.add_development_dependency "guard-rspec"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ringleader
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -107,6 +107,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -224,6 +240,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -834861029563874532
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24