foreman 0.77.0 → 0.78.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ace00c61e2302bb26cb004552b600bf0c791f3b
-  data.tar.gz: d9d96a049154dcac4402f72a4251bcd5ac21daf5
+  metadata.gz: 61aa36818c7a0458ef2d9c2036bd212a82e2d7d1
+  data.tar.gz: 99520a0b2ddbeb2d1fb598889d6e872eb92d1e09
 SHA512:
-  metadata.gz: 1d6f953545ff47dc24a7dd19739fd4cf5b5a898830180bed8f953b9d5fa2e953339163a86040ce1a7589b9dd9b66f5e065bfbc6a2555462fccca6645073d59a2
-  data.tar.gz: 2ffde5cf550f9ae2f2c14e7b6f5ed06bdccbbad46b65b8bb7d6d37e41c7328e193391a0df5156fcb6575164ad708ffeec87cba89684a1c60951925f6e8adddce
+  metadata.gz: f6087790b0cd0f11bdde14756b74caba08458bd199e59674a1a2e850dc81a6042c17758b6fc5c6e914c7d1144f7a34eab2cd7229b5d7496eb8904625bb0f014e
+  data.tar.gz: 6233777b4f9f42fd29bbbe63967e790095faa9c797b69a16c478d3ce22a5f784ecf6f4afdbb4596fba7bb840dbae4b45f2e20f95a4d9ac1db196fd4fb1e922f0

data/lib/foreman/cli.rb

@@ -74,6 +74,7 @@ class Foreman::CLI < Thor
   desc "run COMMAND [ARGS...]", "Run a command using your application's environment"
 
   method_option :env, :type => :string, :aliases => "-e", :desc => "Specify an environment file to load, defaults to .env"
+  stop_on_unknown_option! :run
 
   def run(*args)
     load_environment!

data/lib/foreman/engine.rb

@@ -1,7 +1,7 @@
 require "foreman"
+require "foreman/env"
 require "foreman/process"
 require "foreman/procfile"
-require "dotenv"
 require "tempfile"
 require "timeout"
 require "fileutils"
@@ -169,7 +169,9 @@ class Foreman::Engine
   # @param [String] filename  A .env file to load into the environment
   #
   def load_env(filename)
-    @env.update Dotenv::Environment.new(filename)
+    Foreman::Env.new(filename).entries do |name, value|
+      @env[name] = value
+    end
   end
 
   # Send a signal to all processes started by this +Engine+

data/lib/foreman/env.rb

@@ -0,0 +1,29 @@
+require "foreman"
+
+class Foreman::Env
+
+  attr_reader :entries
+
+  def initialize(filename)
+    @entries = File.read(filename).gsub("\r\n","\n").split("\n").inject({}) do |ax, line|
+      if line =~ /\A([A-Za-z_0-9]+)=(.*)\z/
+        key = $1
+        case val = $2
+          # Remove single quotes
+          when /\A'(.*)'\z/ then ax[key] = $1
+          # Remove double quotes and unescape string preserving newline characters
+          when /\A"(.*)"\z/ then ax[key] = $1.gsub('\n', "\n").gsub(/\\(.)/, '\1')
+         else ax[key] = val
+        end
+      end
+      ax
+    end
+  end
+
+  def entries
+    @entries.each do |key, value|
+      yield key, value
+    end
+  end
+
+end

data/lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.77.0"
+  VERSION = "0.78.0"
 
 end

data/man/foreman.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FOREMAN" "1" "January 2015" "Foreman 0.77.0" "Foreman Manual"
+.TH "FOREMAN" "1" "January 2015" "Foreman 0.78.0" "Foreman Manual"
 .
 .SH "NAME"
 \fBforeman\fR \- manage Procfile\-based applications
@@ -46,6 +46,10 @@ Specify an alternate Procfile to load, implies \fB\-d\fR at the Procfile root\.
 \fB\-p\fR, \fB\-\-port\fR
 Specify which port to use as the base for this application\. Should be a multiple of 1000\.
 .
+.TP
+\fB\-t\fR, \fB\-\-timeout\fR
+Specify the amount of time (in seconds) processes have to shutdown gracefully before receiving a SIGKILL, defaults to 5\.
+.
 .P
 \fBforeman run\fR is used to run one\-off commands using the same environment as your defined processes\.
 .

data/spec/foreman/cli_spec.rb

@@ -76,8 +76,12 @@ describe "Foreman::CLI", :fakefs do
       expect(forked_foreman("run echo 1")).to eq("1\n")
     end
 
+    it "doesn't parse options for the command" do
+      expect(forked_foreman("run grep -e FOO #{resource_path(".env")}")).to eq("FOO=bar\n")
+    end
+
     it "includes the environment" do
-      expect(forked_foreman("run #{resource_path("bin/env FOO")} -e #{resource_path(".env")}")).to eq("bar\n")
+      expect(forked_foreman("run -e #{resource_path(".env")} #{resource_path("bin/env FOO")}")).to eq("bar\n")
     end
 
     it "can run a command from the Procfile" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman
 version: !ruby/object:Gem::Version
-  version: 0.77.0
+  version: 0.78.0
 platform: ruby
 authors:
 - David Dollar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.1
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.2
 description: Process manager for applications with multiple components
 email: ddollar@gmail.com
 executables:
@@ -75,6 +61,7 @@ files:
 - lib/foreman/distribution.rb
 - lib/foreman/engine.rb
 - lib/foreman/engine/cli.rb
+- lib/foreman/env.rb
 - lib/foreman/export.rb
 - lib/foreman/export/base.rb
 - lib/foreman/export/bluepill.rb