Skip to content

Commit

Permalink
Replace Foreman::Env with dotenv
Browse files Browse the repository at this point in the history
  • Loading branch information
bkeepers committed Mar 22, 2013
1 parent 7be4375 commit 3abe10e
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 33 deletions.
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ source "http://rubygems.org"

gemspec

gem 'dotenv', :github => 'bkeepers/dotenv', :branch => '0.7'

platform :mingw do
gem "win32console", "~> 1.3.0"
end
Expand Down
9 changes: 9 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
GIT
remote: git://github.com/bkeepers/dotenv.git
revision: bd139d3c2e627c4f5958542de50a1ae7038f0f8d
branch: 0.7
specs:
dotenv (0.7.0)

PATH
remote: .
specs:
foreman (0.62.0)
dotenv (>= 0.7)
thor (>= 0.13.6)

GEM
Expand Down Expand Up @@ -52,6 +60,7 @@ PLATFORMS

DEPENDENCIES
aws-s3
dotenv!
fakefs (~> 0.3.2)
foreman!
posix-spawn (~> 0.3.6)
Expand Down
1 change: 1 addition & 0 deletions foreman.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Gem::Specification.new do |gem|
gem.files << "man/foreman.1"

gem.add_dependency 'thor', '>= 0.13.6'
gem.add_dependency 'dotenv', '>= 0.7'

if ENV["PLATFORM"] == "java"
gem.add_dependency "posix-spawn", "~> 0.3.6"
Expand Down
6 changes: 2 additions & 4 deletions lib/foreman/engine.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require "foreman"
require "foreman/env"
require "foreman/process"
require "foreman/procfile"
require "dotenv"
require "tempfile"
require "timeout"
require "fileutils"
Expand Down Expand Up @@ -172,9 +172,7 @@ def load_procfile(filename)
# @param [String] filename A .env file to load into the environment
#
def load_env(filename)
Foreman::Env.new(filename).entries do |name, value|
@env[name] = value
end
@env.update Dotenv::Environment.new(filename)
end

# Send a signal to all processes started by this +Engine+
Expand Down
29 changes: 0 additions & 29 deletions lib/foreman/env.rb

This file was deleted.

0 comments on commit 3abe10e

Please sign in to comment.