Compare commits

...
8 Commits
Author SHA1 Message Date
David Dollar cd384e0d59 0.54.0 2012-08-14 17:00:19 -04:00
David Dollar 8921cac35b use Foreman::Process to extract command running 2012-08-14 17:00:01 -04:00
David Dollar 6042783e82 Merge pull request #245 from brntbeer/env_bash_fix
changed to check env for bash
2012-08-08 14:09:19 -07:00
brntbeer b7b3a9f898 changed to check env for bash 2012-08-08 13:53:36 -07:00
David Dollar 15643dcb3f changelog 2012-07-24 11:18:42 -04:00
David Dollar 5f0f2f5378 0.53.0 2012-07-24 11:18:20 -04:00
David Dollar c1b57b59cf put app root in $HOME 2012-07-24 11:18:05 -04:00
David Dollar 21d53818f2 add changelog 2012-07-24 11:11:04 -04:00
7 changed files with 23 additions and 7 deletions
+10
View File
@@ -1,3 +1,13 @@
## 0.53.0 (2012-07-24)
* put app root in $HOME [David Dollar]
## 0.52.0 (2012-07-24)
* wrap command in a runner that sources .profile.d scripts [David Dollar]
* fix upstart export specs [David Dollar]
* Make upstart export start/stop with network [Daniel Farrell]
## 0.51.0 (2012-07-11) ## 0.51.0 (2012-07-11)
* dont try to colorize windows [David Dollar] * dont try to colorize windows [David Dollar]
+1 -1
View File
@@ -1,7 +1,7 @@
PATH PATH
remote: . remote: .
specs: specs:
foreman (0.52.0) foreman (0.54.0)
thor (>= 0.13.6) thor (>= 0.13.6)
GEM GEM
+1 -1
View File
@@ -1,4 +1,4 @@
#!/bin/bash #!/usr/bin/env bash
# #
#/ Usage: foreman-runner [-d <dir>] [-p] <command> [<args>...] #/ Usage: foreman-runner [-d <dir>] [-p] <command> [<args>...]
#/ #/
+2 -1
View File
@@ -76,7 +76,8 @@ class Foreman::CLI < Thor
def run(*args) def run(*args)
load_environment! load_environment!
begin begin
exec engine.env, args.shelljoin process = Foreman::Process.new(args.shelljoin, :env => engine.env)
process.run
rescue Errno::EACCES rescue Errno::EACCES
error "not executable: #{args.first}" error "not executable: #{args.first}"
rescue Errno::ENOENT rescue Errno::ENOENT
+4 -1
View File
@@ -256,7 +256,10 @@ private
1.upto(formation[@names[process]]) do |n| 1.upto(formation[@names[process]]) do |n|
reader, writer = create_pipe reader, writer = create_pipe
begin begin
pid = process.run(:output => writer, :env => { "PORT" => port_for(process, n).to_s }) pid = process.run(:output => writer, :env => {
"HOME" => process.cwd,
"PORT" => port_for(process, n).to_s
})
writer.puts "started with pid #{pid}" writer.puts "started with pid #{pid}"
rescue Errno::ENOENT rescue Errno::ENOENT
writer.puts "unknown command: #{process.command}" writer.puts "unknown command: #{process.command}"
+4 -2
View File
@@ -90,8 +90,10 @@ class Foreman::Process
!alive? !alive?
end end
private # Returns the working directory for this +Process+
#
# @returns [String]
#
def cwd def cwd
File.expand_path(@options[:cwd] || ".") File.expand_path(@options[:cwd] || ".")
end end
+1 -1
View File
@@ -1,5 +1,5 @@
module Foreman module Foreman
VERSION = "0.52.0" VERSION = "0.54.0"
end end