foreman 0.88.1 → 0.90.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dfe6fcff4e6a0293ccee732ad38fe72e7a05b2beb662ba2bdf8cc54437e7242
-  data.tar.gz: 2abc2ad27e0c30aebf936508467b7a74217d9c6f1fbabeaf80e1c771247f22cd
+  metadata.gz: e5361d21cc82555a253f0ddeb76d8ddc3a3c099fcbb3bc217491fdd5bc1cc3d5
+  data.tar.gz: a9eeb94380ccbf6b021bcd8be79e7a827f44767f8f563b5e00c2d429050cbeb4
 SHA512:
-  metadata.gz: d5f8cdb2f096a15c7f83e7ee3d8c870b37d2a3e1c7085af59e8c34810f88110a87d1db30e44e2f4bf5beb4abede9f0976456e675b174512cee5745d4c8223345
-  data.tar.gz: ed5640039e33ef6a492449ddeae69718f8a8a6a333ddce677f21860e707620f730fd124f19cac9687849783372115eba1e846c72d198325346234ed5c146ed4f
+  metadata.gz: 72f23c7afd63aa9bf625cfca6892e7bbed7792edb246a263fae16d4b3d574e527ed52ba0a356091c00ecc9252c1b553f88dbc7c788354f565890e3e2304c6687
+  data.tar.gz: 488872c4619b43bd911dd328462a204d1b431f246745d8d2c1539d441bd245e5228ca6a311597bd7c28865d6dc289c68c35f94f0dae34dc1d5d6e8888ef39e26

data/data/export/bluepill/master.pill.erb

@@ -11,7 +11,7 @@ Bluepill.application("<%= app %>", :foreground => false, :log_file => "/var/log/
 
     process.working_dir = "<%= engine.root %>"
     process.daemonize = true
-    process.environment = <%= engine.env.merge("PORT" => port.to_s).inspect %>
+    process.environment = {<%= engine.env.merge("PORT" => port.to_s).map { |k,v| "#{k.inspect}=>#{v.inspect}" }.join(",") %>}
     process.stop_signals = [:quit, 30.seconds, :term, 5.seconds, :kill]
     process.stop_grace_time = 45.seconds
 

data/lib/foreman/cli.rb

@@ -5,10 +5,10 @@ require "foreman/engine/cli"
 require "foreman/export"
 require "foreman/version"
 require "shellwords"
+require "thor"
 require "yaml"
-require "foreman/vendor/thor/lib/thor"
 
-class Foreman::CLI < Foreman::Thor
+class Foreman::CLI < Thor
 
   include Foreman::Helpers
 
@@ -27,6 +27,10 @@ class Foreman::CLI < Foreman::Thor
   method_option :timestamp, :type => :boolean, :default => true, :desc => "Include timestamp in output"
 
   class << self
+    def exit_on_failure?
+      true
+    end
+
     # Hackery. Take the run method away from Thor so that we can redefine it.
     def is_thor_reserved_word?(word, type)
       return false if word == "run"
@@ -126,6 +130,13 @@ class Foreman::CLI < Foreman::Thor
         engine
       end
     end
+
+    def options
+      original_options = super
+      return original_options unless File.file?(".foreman")
+      defaults = ::YAML::load_file(".foreman") || {}
+      Thor::CoreExt::HashWithIndifferentAccess.new(defaults.merge(original_options))
+    end
   end
 
 private ######################################################################
@@ -157,11 +168,4 @@ private ######################################################################
       else "Procfile"
     end
   end
-
-  def options
-    original_options = super
-    return original_options unless File.file?(".foreman")
-    defaults = ::YAML::load_file(".foreman") || {}
-    Foreman::Thor::CoreExt::HashWithIndifferentAccess.new(defaults.merge(original_options))
-  end
 end

data/lib/foreman/export/base.rb

@@ -1,5 +1,4 @@
 require "foreman/export"
-require "ostruct"
 require "pathname"
 require "shellwords"
 
@@ -18,29 +17,6 @@ class Foreman::Export::Base
     @engine    = engine
     @options   = options.dup
     @formation = engine.formation
-
-    # deprecated
-    def port
-      Foreman::Export::Base.warn_deprecation!
-      engine.base_port
-    end
-
-    # deprecated
-    def template
-      Foreman::Export::Base.warn_deprecation!
-      options[:template]
-    end
-
-    # deprecated
-    def @engine.procfile
-      Foreman::Export::Base.warn_deprecation!
-      @processes.map do |process|
-        OpenStruct.new(
-          :name => @names[process],
-          :process => process
-        )
-      end
-    end
   end
 
   def export
@@ -68,18 +44,6 @@ class Foreman::Export::Base
 
 private ######################################################################
 
-  def self.warn_deprecation!
-    @@deprecation_warned ||= false
-    return if @@deprecation_warned
-    puts "WARNING: Using deprecated exporter interface. Please update your exporter"
-    puts "the interface shown in the upstart exporter:"
-    puts
-    puts "https://github.com/ddollar/foreman/blob/main/lib/foreman/export/upstart.rb"
-    puts "https://github.com/ddollar/foreman/blob/main/data/export/upstart/process.conf.erb"
-    puts
-    @@deprecation_warned = true
-  end
-
   def chown user, dir
     FileUtils.chown user, nil, dir
   rescue

data/lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.88.1"
+  VERSION = "0.90.0"
 
 end

data/man/foreman.1

@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1
-.TH "FOREMAN" "1" "April 2024" "Foreman 0.88.1" "Foreman Manual"
+.TH "FOREMAN" "1" "July 2025" "Foreman 0.90.0" "Foreman Manual"
 .SH "NAME"
 \fBforeman\fR \- manage Procfile\-based applications
 .SH "SYNOPSIS"

data/spec/foreman/cli_spec.rb

@@ -77,15 +77,15 @@ describe "Foreman::CLI", :fakefs do
 
   describe "run" do
     it "can run a command" do
-      expect(forked_foreman("run echo 1")).to eq("1\n")
+      expect(forked_foreman("run -f #{resource_path("Procfile")} 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")
+      expect(forked_foreman("run -f #{resource_path("Procfile")} grep -e FOO #{resource_path(".env")}")).to eq("FOO=bar\n")
     end
 
     it "includes the environment" do
-      expect(forked_foreman("run -e #{resource_path(".env")} #{resource_path("bin/env FOO")}")).to eq("bar\n")
+      expect(forked_foreman("run -f #{resource_path("Procfile")} -e #{resource_path(".env")} #{resource_path("bin/env FOO")}")).to eq("bar\n")
     end
 
     it "can run a command from the Procfile" do
@@ -93,8 +93,8 @@ describe "Foreman::CLI", :fakefs do
     end
 
     it "exits with the same exit code as the command" do
-      expect(fork_and_get_exitstatus("run echo 1")).to eq(0)
-      expect(fork_and_get_exitstatus("run date 'invalid_date'")).to eq(1)
+      expect(fork_and_get_exitstatus("run -f #{resource_path("Procfile")} echo 1")).to eq(0)
+      expect(fork_and_get_exitstatus("run -f #{resource_path("Procfile")} date 'invalid_date'")).to eq(1)
     end
   end
 

data/spec/foreman/process_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 require 'foreman/process'
-require 'ostruct'
 require 'timeout'
 require 'tmpdir'
 

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: foreman
 version: !ruby/object:Gem::Version
-  version: 0.88.1
+  version: 0.90.0
 platform: ruby
 authors:
 - David Dollar
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-12 00:00:00.000000000 Z
-dependencies: []
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 description: Process manager for applications with multiple components
 email: ddollar@gmail.com
 executables:
@@ -60,38 +73,6 @@ files:
 - lib/foreman/helpers.rb
 - lib/foreman/process.rb
 - lib/foreman/procfile.rb
-- lib/foreman/vendor/thor/lib/thor.rb
-- lib/foreman/vendor/thor/lib/thor/actions.rb
-- lib/foreman/vendor/thor/lib/thor/actions/create_file.rb
-- lib/foreman/vendor/thor/lib/thor/actions/create_link.rb
-- lib/foreman/vendor/thor/lib/thor/actions/directory.rb
-- lib/foreman/vendor/thor/lib/thor/actions/empty_directory.rb
-- lib/foreman/vendor/thor/lib/thor/actions/file_manipulation.rb
-- lib/foreman/vendor/thor/lib/thor/actions/inject_into_file.rb
-- lib/foreman/vendor/thor/lib/thor/base.rb
-- lib/foreman/vendor/thor/lib/thor/command.rb
-- lib/foreman/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb
-- lib/foreman/vendor/thor/lib/thor/core_ext/io_binary_read.rb
-- lib/foreman/vendor/thor/lib/thor/core_ext/ordered_hash.rb
-- lib/foreman/vendor/thor/lib/thor/error.rb
-- lib/foreman/vendor/thor/lib/thor/group.rb
-- lib/foreman/vendor/thor/lib/thor/invocation.rb
-- lib/foreman/vendor/thor/lib/thor/line_editor.rb
-- lib/foreman/vendor/thor/lib/thor/line_editor/basic.rb
-- lib/foreman/vendor/thor/lib/thor/line_editor/readline.rb
-- lib/foreman/vendor/thor/lib/thor/parser.rb
-- lib/foreman/vendor/thor/lib/thor/parser/argument.rb
-- lib/foreman/vendor/thor/lib/thor/parser/arguments.rb
-- lib/foreman/vendor/thor/lib/thor/parser/option.rb
-- lib/foreman/vendor/thor/lib/thor/parser/options.rb
-- lib/foreman/vendor/thor/lib/thor/rake_compat.rb
-- lib/foreman/vendor/thor/lib/thor/runner.rb
-- lib/foreman/vendor/thor/lib/thor/shell.rb
-- lib/foreman/vendor/thor/lib/thor/shell/basic.rb
-- lib/foreman/vendor/thor/lib/thor/shell/color.rb
-- lib/foreman/vendor/thor/lib/thor/shell/html.rb
-- lib/foreman/vendor/thor/lib/thor/util.rb
-- lib/foreman/vendor/thor/lib/thor/version.rb
 - lib/foreman/version.rb
 - man/foreman.1
 - spec/foreman/cli_spec.rb
@@ -155,7 +136,6 @@ homepage: https://github.com/ddollar/foreman
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -170,8 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Process manager for applications with multiple components
 test_files: []

data/lib/foreman/vendor/thor/lib/thor/actions/create_file.rb

@@ -1,103 +0,0 @@
-require "foreman/vendor/thor/lib/thor/actions/empty_directory"
-
-class Foreman::Thor
-  module Actions
-    # Create a new file relative to the destination root with the given data,
-    # which is the return value of a block or a data string.
-    #
-    # ==== Parameters
-    # destination<String>:: the relative path to the destination root.
-    # data<String|NilClass>:: the data to append to the file.
-    # config<Hash>:: give :verbose => false to not log the status.
-    #
-    # ==== Examples
-    #
-    #   create_file "lib/fun_party.rb" do
-    #     hostname = ask("What is the virtual hostname I should use?")
-    #     "vhost.name = #{hostname}"
-    #   end
-    #
-    #   create_file "config/apache.conf", "your apache config"
-    #
-    def create_file(destination, *args, &block)
-      config = args.last.is_a?(Hash) ? args.pop : {}
-      data = args.first
-      action CreateFile.new(self, destination, block || data.to_s, config)
-    end
-    alias_method :add_file, :create_file
-
-    # CreateFile is a subset of Template, which instead of rendering a file with
-    # ERB, it gets the content from the user.
-    #
-    class CreateFile < EmptyDirectory #:nodoc:
-      attr_reader :data
-
-      def initialize(base, destination, data, config = {})
-        @data = data
-        super(base, destination, config)
-      end
-
-      # Checks if the content of the file at the destination is identical to the rendered result.
-      #
-      # ==== Returns
-      # Boolean:: true if it is identical, false otherwise.
-      #
-      def identical?
-        exists? && File.binread(destination) == render
-      end
-
-      # Holds the content to be added to the file.
-      #
-      def render
-        @render ||= if data.is_a?(Proc)
-          data.call
-        else
-          data
-        end
-      end
-
-      def invoke!
-        invoke_with_conflict_check do
-          FileUtils.mkdir_p(File.dirname(destination))
-          File.open(destination, "wb") { |f| f.write render }
-        end
-        given_destination
-      end
-
-    protected
-
-      # Now on conflict we check if the file is identical or not.
-      #
-      def on_conflict_behavior(&block)
-        if identical?
-          say_status :identical, :blue
-        else
-          options = base.options.merge(config)
-          force_or_skip_or_conflict(options[:force], options[:skip], &block)
-        end
-      end
-
-      # If force is true, run the action, otherwise check if it's not being
-      # skipped. If both are false, show the file_collision menu, if the menu
-      # returns true, force it, otherwise skip.
-      #
-      def force_or_skip_or_conflict(force, skip, &block)
-        if force
-          say_status :force, :yellow
-          yield unless pretend?
-        elsif skip
-          say_status :skip, :yellow
-        else
-          say_status :conflict, :red
-          force_or_skip_or_conflict(force_on_collision?, true, &block)
-        end
-      end
-
-      # Shows the file collision menu to the user and gets the result.
-      #
-      def force_on_collision?
-        base.shell.file_collision(destination) { render }
-      end
-    end
-  end
-end

data/lib/foreman/vendor/thor/lib/thor/actions/create_link.rb

@@ -1,59 +0,0 @@
-require "foreman/vendor/thor/lib/thor/actions/create_file"
-
-class Foreman::Thor
-  module Actions
-    # Create a new file relative to the destination root from the given source.
-    #
-    # ==== Parameters
-    # destination<String>:: the relative path to the destination root.
-    # source<String|NilClass>:: the relative path to the source root.
-    # config<Hash>:: give :verbose => false to not log the status.
-    #   :: give :symbolic => false for hard link.
-    #
-    # ==== Examples
-    #
-    #   create_link "config/apache.conf", "/etc/apache.conf"
-    #
-    def create_link(destination, *args)
-      config = args.last.is_a?(Hash) ? args.pop : {}
-      source = args.first
-      action CreateLink.new(self, destination, source, config)
-    end
-    alias_method :add_link, :create_link
-
-    # CreateLink is a subset of CreateFile, which instead of taking a block of
-    # data, just takes a source string from the user.
-    #
-    class CreateLink < CreateFile #:nodoc:
-      attr_reader :data
-
-      # Checks if the content of the file at the destination is identical to the rendered result.
-      #
-      # ==== Returns
-      # Boolean:: true if it is identical, false otherwise.
-      #
-      def identical?
-        exists? && File.identical?(render, destination)
-      end
-
-      def invoke!
-        invoke_with_conflict_check do
-          FileUtils.mkdir_p(File.dirname(destination))
-          # Create a symlink by default
-          config[:symbolic] = true if config[:symbolic].nil?
-          File.unlink(destination) if exists?
-          if config[:symbolic]
-            File.symlink(render, destination)
-          else
-            File.link(render, destination)
-          end
-        end
-        given_destination
-      end
-
-      def exists?
-        super || File.symlink?(destination)
-      end
-    end
-  end
-end

data/lib/foreman/vendor/thor/lib/thor/actions/directory.rb

@@ -1,118 +0,0 @@
-require "foreman/vendor/thor/lib/thor/actions/empty_directory"
-
-class Foreman::Thor
-  module Actions
-    # Copies recursively the files from source directory to root directory.
-    # If any of the files finishes with .tt, it's considered to be a template
-    # and is placed in the destination without the extension .tt. If any
-    # empty directory is found, it's copied and all .empty_directory files are
-    # ignored. If any file name is wrapped within % signs, the text within
-    # the % signs will be executed as a method and replaced with the returned
-    # value. Let's suppose a doc directory with the following files:
-    #
-    #   doc/
-    #     components/.empty_directory
-    #     README
-    #     rdoc.rb.tt
-    #     %app_name%.rb
-    #
-    # When invoked as:
-    #
-    #   directory "doc"
-    #
-    # It will create a doc directory in the destination with the following
-    # files (assuming that the `app_name` method returns the value "blog"):
-    #
-    #   doc/
-    #     components/
-    #     README
-    #     rdoc.rb
-    #     blog.rb
-    #
-    # <b>Encoded path note:</b> Since Foreman::Thor internals use Object#respond_to? to check if it can
-    # expand %something%, this `something` should be a public method in the class calling
-    # #directory. If a method is private, Foreman::Thor stack raises PrivateMethodEncodedError.
-    #
-    # ==== Parameters
-    # source<String>:: the relative path to the source root.
-    # destination<String>:: the relative path to the destination root.
-    # config<Hash>:: give :verbose => false to not log the status.
-    #                If :recursive => false, does not look for paths recursively.
-    #                If :mode => :preserve, preserve the file mode from the source.
-    #                If :exclude_pattern => /regexp/, prevents copying files that match that regexp.
-    #
-    # ==== Examples
-    #
-    #   directory "doc"
-    #   directory "doc", "docs", :recursive => false
-    #
-    def directory(source, *args, &block)
-      config = args.last.is_a?(Hash) ? args.pop : {}
-      destination = args.first || source
-      action Directory.new(self, source, destination || source, config, &block)
-    end
-
-    class Directory < EmptyDirectory #:nodoc:
-      attr_reader :source
-
-      def initialize(base, source, destination = nil, config = {}, &block)
-        @source = File.expand_path(base.find_in_source_paths(source.to_s))
-        @block  = block
-        super(base, destination, {:recursive => true}.merge(config))
-      end
-
-      def invoke!
-        base.empty_directory given_destination, config
-        execute!
-      end
-
-      def revoke!
-        execute!
-      end
-
-    protected
-
-      def execute!
-        lookup = Util.escape_globs(source)
-        lookup = config[:recursive] ? File.join(lookup, "**") : lookup
-        lookup = file_level_lookup(lookup)
-
-        files(lookup).sort.each do |file_source|
-          next if File.directory?(file_source)
-          next if config[:exclude_pattern] && file_source.match(config[:exclude_pattern])
-          file_destination = File.join(given_destination, file_source.gsub(source, "."))
-          file_destination.gsub!("/./", "/")
-
-          case file_source
-          when /\.empty_directory$/
-            dirname = File.dirname(file_destination).gsub(%r{/\.$}, "")
-            next if dirname == given_destination
-            base.empty_directory(dirname, config)
-          when /#{TEMPLATE_EXTNAME}$/
-            base.template(file_source, file_destination[0..-4], config, &@block)
-          else
-            base.copy_file(file_source, file_destination, config, &@block)
-          end
-        end
-      end
-
-      if RUBY_VERSION < "2.0"
-        def file_level_lookup(previous_lookup)
-          File.join(previous_lookup, "{*,.[a-z]*}")
-        end
-
-        def files(lookup)
-          Dir[lookup]
-        end
-      else
-        def file_level_lookup(previous_lookup)
-          File.join(previous_lookup, "*")
-        end
-
-        def files(lookup)
-          Dir.glob(lookup, File::FNM_DOTMATCH)
-        end
-      end
-    end
-  end
-end

data/lib/foreman/vendor/thor/lib/thor/actions/empty_directory.rb

@@ -1,135 +0,0 @@
-class Foreman::Thor
-  module Actions
-    # Creates an empty directory.
-    #
-    # ==== Parameters
-    # destination<String>:: the relative path to the destination root.
-    # config<Hash>:: give :verbose => false to not log the status.
-    #
-    # ==== Examples
-    #
-    #   empty_directory "doc"
-    #
-    def empty_directory(destination, config = {})
-      action EmptyDirectory.new(self, destination, config)
-    end
-
-    # Class which holds create directory logic. This is the base class for
-    # other actions like create_file and directory.
-    #
-    # This implementation is based in Templater actions, created by Jonas Nicklas
-    # and Michael S. Klishin under MIT LICENSE.
-    #
-    class EmptyDirectory #:nodoc:
-      attr_reader :base, :destination, :given_destination, :relative_destination, :config
-
-      # Initializes given the source and destination.
-      #
-      # ==== Parameters
-      # base<Foreman::Thor::Base>:: A Foreman::Thor::Base instance
-      # source<String>:: Relative path to the source of this file
-      # destination<String>:: Relative path to the destination of this file
-      # config<Hash>:: give :verbose => false to not log the status.
-      #
-      def initialize(base, destination, config = {})
-        @base = base
-        @config = {:verbose => true}.merge(config)
-        self.destination = destination
-      end
-
-      # Checks if the destination file already exists.
-      #
-      # ==== Returns
-      # Boolean:: true if the file exists, false otherwise.
-      #
-      def exists?
-        ::File.exist?(destination)
-      end
-
-      def invoke!
-        invoke_with_conflict_check do
-          ::FileUtils.mkdir_p(destination)
-        end
-      end
-
-      def revoke!
-        say_status :remove, :red
-        ::FileUtils.rm_rf(destination) if !pretend? && exists?
-        given_destination
-      end
-
-    protected
-
-      # Shortcut for pretend.
-      #
-      def pretend?
-        base.options[:pretend]
-      end
-
-      # Sets the absolute destination value from a relative destination value.
-      # It also stores the given and relative destination. Let's suppose our
-      # script is being executed on "dest", it sets the destination root to
-      # "dest". The destination, given_destination and relative_destination
-      # are related in the following way:
-      #
-      #   inside "bar" do
-      #     empty_directory "baz"
-      #   end
-      #
-      #   destination          #=> dest/bar/baz
-      #   relative_destination #=> bar/baz
-      #   given_destination    #=> baz
-      #
-      def destination=(destination)
-        return unless destination
-        @given_destination = convert_encoded_instructions(destination.to_s)
-        @destination = ::File.expand_path(@given_destination, base.destination_root)
-        @relative_destination = base.relative_to_original_destination_root(@destination)
-      end
-
-      # Filenames in the encoded form are converted. If you have a file:
-      #
-      #   %file_name%.rb
-      #
-      # It calls #file_name from the base and replaces %-string with the
-      # return value (should be String) of #file_name:
-      #
-      #   user.rb
-      #
-      # The method referenced can be either public or private.
-      #
-      def convert_encoded_instructions(filename)
-        filename.gsub(/%(.*?)%/) do |initial_string|
-          method = $1.strip
-          base.respond_to?(method, true) ? base.send(method) : initial_string
-        end
-      end
-
-      # Receives a hash of options and just execute the block if some
-      # conditions are met.
-      #
-      def invoke_with_conflict_check(&block)
-        if exists?
-          on_conflict_behavior(&block)
-        else
-          say_status :create, :green
-          yield unless pretend?
-        end
-
-        destination
-      end
-
-      # What to do when the destination file already exists.
-      #
-      def on_conflict_behavior
-        say_status :exist, :blue
-      end
-
-      # Shortcut to say_status shell method.
-      #
-      def say_status(status, color)
-        base.shell.say_status status, relative_destination, color if config[:verbose]
-      end
-    end
-  end
-end