foreman 0.84.0 → 0.85.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 07592e3ada2314429eef1c9e1c0ba6bece95ab7e
-  data.tar.gz: 445fb48e93a2447988598b2db0f60a78c1991b14
+SHA256:
+  metadata.gz: 0e43a0881882bfbd5a312184407cf297c245774fd31dd194bc7921f88de02187
+  data.tar.gz: e836814f151cd348c8744a158c2c5e0aaa35edc567d5482fef75b0b7943c8063
 SHA512:
-  metadata.gz: 546d1fb8701f569b96ba69885e6d390385abe15a309ffbe5a03a68a4cd074a878a0ba06d7dbe7f15bf0399e72c6c72097c8bfa10f94a8552b875787a9e88f1dd
-  data.tar.gz: d3a0b59f02ef1203f8cb4e8b354a789182cb7eaa9afd053a17bba0450f9f34ff03b287b410be514f8a759d9a7295ee080e14d75f073be65abc8281f5cd90c1f6
+  metadata.gz: 9ddc414ab8833e61463cc686cbffe9cb0cb3f6c745963854d57a048f044308d84f6a026378f1b1c90ae1e78a3988f327b86187ffd3871065582bef1623e0c6d6
+  data.tar.gz: 25ea476d1f02817f63040855c45c07f9e2e05753c18b190a715be3f0ff0f61b7dcca82ef2c8a3dc05522a7089a89c8e614e923b2019d0c891104bbab61318b3c

data/data/export/daemon/process.conf.erb

@@ -3,6 +3,6 @@ stop on stopping <%= app %>-<%= name.gsub('_', '-') %>
 respawn
 
 env PORT=<%= port %><% engine.env.each_pair do |var, env| %>
-env <%= var.upcase %>=<%= env %><% end %>
+env <%= var %>=<%= env %><% end %>
 
 exec start-stop-daemon --start --chuid <%= user %> --chdir <%= engine.root %> --make-pidfile --pidfile <%= run %>/<%= app %>-<%= name %>-<%= num %>.pid --exec <%= executable %><%= arguments %> >> <%= log %>/<%= app %>-<%= name %>-<%= num %>.log 2>&1

data/data/export/launchd/launchd.plist.erb

@@ -7,7 +7,7 @@
     <key>EnvironmentVariables</key>
     <dict>
     <%- engine.env.merge("PORT" => port).each_pair do |var,env| -%>
-        <key><%= var.upcase %></key>
+        <key><%= var %></key>
         <string><%= env %></string>
     <%- end -%>
     </dict>

data/data/export/systemd/process.service.erb

@@ -6,7 +6,7 @@ User=<%= user %>
 WorkingDirectory=<%= engine.root %>
 Environment=PORT=%i
 <% engine.env.each_pair do |var,env| -%>
-Environment="<%= var.upcase %>=<%= env %>"
+Environment="<%= var %>=<%= env %>"
 <% end -%>
 ExecStart=/bin/bash -lc 'exec <%= process.command %>'
 Restart=always

data/data/export/upstart/process.conf.erb

@@ -5,7 +5,7 @@ respawn
 env PORT=<%= port %>
 <% engine.env.each do |name,value| -%>
 <% next if name.upcase == "PORT" -%>
-env <%= name.upcase %>='<%= value.gsub(/'/, "'\"'\"'") %>'
+env <%= name %>='<%= value.gsub(/'/, "'\"'\"'") %>'
 <% end -%>
 
 setuid <%= user %>

data/lib/foreman/engine.rb

@@ -197,7 +197,8 @@ class Foreman::Engine
       end
     else
       begin
-        Process.kill signal, *@running.keys unless @running.empty?
+        pids = @running.keys.compact
+        Process.kill signal, *pids unless pids.empty?
       rescue Errno::ESRCH, Errno::EPERM
       end
     end

data/lib/foreman/export/base.rb

@@ -135,7 +135,11 @@ private ######################################################################
   end
 
   def write_template(name, target, binding)
-    compiled = ERB.new(export_template(name), nil, '-').result(binding)
+    compiled = if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
+                 ERB.new(export_template(name), trim_mode: '-').result(binding)
+               else
+                 ERB.new(export_template(name), nil, '-').result(binding)
+               end
     write_file target, compiled
   end
 

data/lib/foreman/procfile.rb

@@ -21,7 +21,7 @@ class Foreman::Procfile
 
   # Yield each +Procfile+ entry in order
   #
-  def entries(&blk)
+  def entries
     @entries.each do |(name, command)|
       yield name, command
     end

data/lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.84.0"
+  VERSION = "0.85.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 2017" "Foreman 0.84.0" "Foreman Manual"
+.TH "FOREMAN" "1" "March 2017" "Foreman 0.85.0" "Foreman Manual"
 .
 .SH "NAME"
 \fBforeman\fR \- manage Procfile\-based applications

data/spec/foreman/procfile_spec.rb

@@ -22,6 +22,13 @@ describe Foreman::Procfile, :fakefs do
     expect(procfile["foo_bar"]).to eq("./foo_bar")
   end
 
+  it 'only creates Procfile entries for lines matching regex' do
+    write_procfile
+    procfile = Foreman::Procfile.new("Procfile")
+    keys = procfile.instance_variable_get(:@entries).map(&:first)
+    expect(keys).to match_array(%w[alpha bravo foo-bar foo_bar])
+  end
+
   it "returns nil when attempting to retrieve an non-existing entry" do
     write_procfile
     procfile = Foreman::Procfile.new("Procfile")

data/spec/spec_helper.rb

@@ -1,5 +1,12 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+# it throws following message:
+# W, [2018-02-06T18:16:06.360071 #72025]  WARN -- :       This usage of the Code Climate Test Reporter is now deprecated. Since version
+#       1.0, we now require you to run `SimpleCov` in your test/spec helper, and then
+#       run the provided `codeclimate-test-reporter` binary separately to report your
+#       results to Code Climate.
+#
+#       More information here: https://github.com/codeclimate/ruby-test-reporter/blob/master/README.md
+# require "codeclimate-test-reporter"
+# CodeClimate::TestReporter.start
 
 require "simplecov"
 SimpleCov.start do
@@ -90,6 +97,7 @@ def write_procfile(procfile="Procfile", alpha_env="")
     file.puts "bravo:\t./bravo"
     file.puts "foo_bar:\t./foo_bar"
     file.puts "foo-bar:\t./foo-bar"
+    file.puts "# baz:\t./baz"
   end
   File.expand_path(procfile)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman
 version: !ruby/object:Gem::Version
-  version: 0.84.0
+  version: 0.85.0
 platform: ruby
 authors:
 - David Dollar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -153,9 +153,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Process manager for applications with multiple components
 test_files: []
-has_rdoc: