foreman_god 0.0.2 → 0.0.3

data/lib/foreman_god/god_config.rb

@@ -5,6 +5,7 @@ require 'foreman/engine'
 require 'thor/core_ext/hash_with_indifferent_access'
 require 'god'
 require 'foreman_god'
+require 'etc'
 
 module God
   module Conditions
@@ -47,7 +48,10 @@ module ForemanGod
   class GodConfig
     attr_reader :dir_name, :options, :engine
 
-    def initialize dir
+    # Defaults to the owner of Procfile, but may be overridden with the user option in .foreman
+    attr_reader :user_name
+
+    def initialize dir, override_options={}
       @dir_name = File.basename(File.absolute_path(dir))
       if @dir_name == 'current'
         @dir_name = File.basename(File.dirname(File.absolute_path(dir)))
@@ -57,6 +61,7 @@ module ForemanGod
       temp_options = {}
       temp_options = (::YAML::load_file(options_file) || {}) if File.exists? options_file
       @options = Thor::CoreExt::HashWithIndifferentAccess.new(temp_options)
+      @options.merge! override_options
 
 
       @engine = Foreman::Engine.new(@options)
@@ -71,16 +76,15 @@ module ForemanGod
       end
 
       @engine.load_procfile(File.join(dir, "Procfile"))
+
+      procfile_owner = Etc.getpwuid(File.stat(File.join(dir, "Procfile")).uid).name
+      @user_name = @options[:user] || procfile_owner
     end
 
     def app_name
       @options[:app] || @dir_name
     end
 
-    def user_name
-      @options[:user]
-    end
-
     def log_path
       @options[:log] || 'log'
     end
@@ -133,7 +137,10 @@ module ForemanGod
 
         w.start = wrap_command(process.expanded_command(env))
 
-        w.uid = user_name if user_name
+        if user_name && (Etc.getlogin != user_name)
+          # Only set the uid if the user is different from the current user
+          w.uid = user_name
+        end
 
         # w.gid = ?
 

data/lib/foreman_god/version.rb

@@ -1,3 +1,3 @@
 module ForemanGod
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/god_config_spec.rb

@@ -10,7 +10,6 @@ describe GodConfig do
     it "should load basic properties" do
       config.dir_name.should == 'simple'
       config.app_name.should == 'simple'
-      config.user_name.should == nil
       config.options.should == {}
     end
 
@@ -27,7 +26,8 @@ describe GodConfig do
       watch.env.should == {'PORT' => '5000'}
       watch.start.should == 'ruby ../simple_loop.rb -p 5000'
       watch.log.should == '/dev/null'
-      watch.uid.should == nil
+
+      watch.uid.should == nil # The user name is the same as the current user
 
     end
 
@@ -42,11 +42,16 @@ describe GodConfig do
       end
     end
 
+    it "should default to using the owner of Procfile as the user" do
+      user_name = Etc.getpwuid(File.stat('samples/simple/Procfile').uid).name
+      config.user_name.should == user_name
+    end
+
   end
 
   context "configuration" do
-    let(:config) { GodConfig.new(sample('configuration')) }
     let(:user) { Etc.getlogin }
+    let(:config) { GodConfig.new(sample('configuration')) }
 
     it "should load basic properties" do
       config.dir_name.should == 'configuration'
@@ -56,7 +61,7 @@ describe GodConfig do
     end
 
     it "should watch" do
-      config.options["user"] = user # We need to override the user to the current user, otherwise god will fail
+      config = GodConfig.new(sample('configuration'), user: user) # we need to override the user here
 
       config.watch
       God.watches.values.count.should == 3
@@ -70,7 +75,10 @@ describe GodConfig do
       watch.env.should == {'PORT' => '5000', 'MY_VAR' => '12345', 'ANOTHER_VAR' => 'yes'}
       watch.start.should == 'ruby ../simple_loop.rb -p 5000'
       watch.log.should == File.absolute_path('samples/configuration/configured-app-loop-1.log')
-      watch.uid.should == user
+
+      # We cannot easily test watch.uid in a single-user setup
+      pending "Test watch.uid"
+      #watch.uid.should == user
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_god
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman