procodile 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52606401641f665e09ce9beae6a752e70e3a680a
-  data.tar.gz: 052b223485baa0c66d5f67a3ff52afb9ed5a4ed4
+  metadata.gz: b2df02f31fea5565a5b982cd4d1ae98b53e6256d
+  data.tar.gz: a758543c9bb33dbe1f5520c0d38ad9c128cb1255
 SHA512:
-  metadata.gz: 9c97e8abbcade5ed3e51553ff97a0b658f69a326e4afc84029070e288b5882ea8b4b2d5c6e22bcfae15afd31c2305ac30a353a5c20e39849be41ddeafbf40fbb
-  data.tar.gz: eae3e1a71001a027ab132e5797a59c1b78e383bd6aac1f68dfe8ccba7b33afe81db7efc5ed8bf09212a7606d82fade99da6afb54f5e062eb480d75aad9cb8762
+  metadata.gz: f2ef597c33f6475992e64d577b543d50b4b70da16e634afd61a3a74339cdca4b1cdb20f7ba2bf8ca79939a1b5e0d1d132d0f61ccd4b08f4ae41c528377f7dc81
+  data.tar.gz: f6bdaa3e8caccccb8a6761536f5f8e77ad7911fd4f0b63f5bb0f318228c29ceec671011622816a4573be0c67411585167dbacfe541d2721a41bad75b95f3bd39

data/bin/procodile

@@ -29,10 +29,6 @@ begin
       options[:root] = root
     end
 
-    opts.on("-e", "--environment NAME", "The config environment to use") do |name|
-      options[:environment] = name
-    end
-
     opts.on("--procfile PATH", "The path to the Procfile (defaults to: Procfile)") do |path|
       options[:procfile] = path
     end
@@ -57,7 +53,7 @@ end
 
 # Create a determination to work out where we want to load our app from
 require 'procodile/app_determination'
-ap = Procodile::AppDetermination.new(FileUtils.pwd, options[:root], options[:procfile], options[:environment], global_config)
+ap = Procodile::AppDetermination.new(FileUtils.pwd, options[:root], options[:procfile], global_config)
 if ap.ambiguous?
   if ENV['PROCODILE_APP_ID']
     ap.set_app(ENV['PROCODILE_APP_ID'].to_i)
@@ -85,20 +81,15 @@ if ap.ambiguous?
   end
 end
 
-if ap.user && ENV['USER'] != ap.user
-  if global_config['user_reexec']
-    $stderr.puts "\e[31mProcodile must be run as #{ap.user}. Re-executing as #{ap.user}...\e[0m"
-    exec("sudo -E -u #{ap.user} -- #{$0} #{ORIGINAL_ARGV}")
-  else
-    $stderr.puts "\e[31mError: Procodile must be run as #{ap.user}\e[0m"
-    exit 1
-  end
-end
-
 begin
   if command != 'help'
-    cli.config = Procodile::Config.new(ap.root, ap.environment, ap.procfile)
+    cli.config = Procodile::Config.new(ap.root, ap.procfile)
+    if cli.config.user && ENV['USER'] != cli.config.user
+      $stderr.puts "\e[31mProcodile must be run as #{cli.config.user}. Re-executing as #{cli.config.user}...\e[0m"
+      exec("sudo -H -u #{cli.config.user} -- #{$0} #{ORIGINAL_ARGV}")
+    end
   end
+
   cli.dispatch(command)
 rescue Procodile::Error => e
   $stderr.puts "Error: #{e.message}".color(31)

data/lib/procodile/app_determination.rb

@@ -1,26 +1,20 @@
 module Procodile
   #
-  # This class is responsible for determining which application should be
+  # This class is responsible for determining which application should be
   # sued
   #
   class AppDetermination
 
     # Start by creating an determination ased on the root and procfile that has been provided
     # to us by the user (from --root and/or --procfile)
-    def initialize(pwd, given_root, given_procfile, given_environment, global_options = {})
+    def initialize(pwd, given_root, given_procfile, global_options = {})
       @pwd = pwd
-      @given_root = given_root
+      @given_root = given_root ? File.expand_path(given_root, pwd) : nil
       @given_procfile = given_procfile
-      @given_environment = given_environment
       @global_options = global_options
       calculate
     end
 
-    # Return the environment
-    def environment
-      @given_environment || @environment || 'production'
-    end
-
     # Return the root directory
     def root
       @root
@@ -31,16 +25,6 @@ module Procodile
       @procfile
     end
 
-    # Return the user that we must be executing as if not current user
-    def user
-      @user
-    end
-
-    # Should this be reexeced
-    def reexec?
-      @reexec == true
-    end
-
     # Are we in an app's directory?
     def in_app_directory?
       @in_app_directory == true
@@ -65,7 +49,9 @@ module Procodile
     def app_options
       if ambiguous?
         hash = {}
-        @global_options.each_with_index { |option, i| hash[i] = option['name'] || option['root'] }
+        @global_options.each_with_index do |option, i|
+          hash[i] = option['name'] || option['root']
+        end
         hash
       else
         {}
@@ -80,11 +66,6 @@ module Procodile
       if ambiguous?
         # Otherwise, try and use the global config we have been given
         find_root_and_procfile_from_options(@global_options)
-      else
-        # Try to load additional global details on to the existing app
-        if @root && options = global_options_for_path(@root)
-          add_global_options(options)
-        end
       end
     end
 
@@ -119,7 +100,6 @@ module Procodile
       if options.is_a?(Hash)
         # Use the current hash
         find_root_and_procfile(@pwd, options['root'], options['procfile'])
-        add_global_options(options)
       elsif options.is_a?(Array)
         # Global options is provides a list of apps. We need to know which one of
         # these we should be looking at.
@@ -129,23 +109,6 @@ module Procodile
       end
     end
 
-    def global_options_for_path(root)
-      root = expand_path(root)
-      if @global_options.is_a?(Hash) && @global_options['root'] && expand_path(@global_options['root']) == root
-        @global_options
-      elsif @global_options.is_a?(Array) && option = @global_options.select { |o| o['root'] && expand_path(o['root']) == root }.first
-        option
-      else
-        nil
-      end
-    end
-
-    def add_global_options(options)
-      @user = options['user'] if options['user']
-      @reexec = options['user_reexec'] if options['user_reexec']
-      @environment = options['environment'] if options['environment']
-    end
-
     def expand_path(path, root = nil)
       # Remove trailing slashes for normalization
       path = path.gsub(/\/\z/, '')

data/lib/procodile/config.rb

@@ -8,12 +8,8 @@ module Procodile
 
     COLORS = [35, 31, 36, 32, 33, 34]
 
-    attr_reader :root
-    attr_reader :environment
-
-    def initialize(root, environment = nil, procfile = nil)
+    def initialize(root, procfile = nil)
       @root = root
-      @environment = environment || 'production'
       @procfile_path = procfile
       unless File.file?(procfile_path)
         raise Error, "Procfile not found at #{procfile_path}"
@@ -59,12 +55,20 @@ module Procodile
       end
     end
 
+    def root
+      local_options['root'] || options['root'] || @root
+    end
+
+    def user
+      local_options['user'] || options['user']
+    end
+
     def app_name
-      @app_name ||= fetch(local_options['app_name']) || fetch(options['app_name']) || 'Procodile'
+      @app_name ||= local_options['app_name'] || options['app_name'] || 'Procodile'
     end
 
     def console_command
-      fetch(local_options['console_command']) || fetch(options['console_command'])
+      local_options['console_command'] || options['console_command']
     end
 
     def processes
@@ -96,11 +100,11 @@ module Procodile
     end
 
     def environment_variables
-      fetch_hash_values(options['env'] || {}).merge(fetch_hash_values(local_options['env'] || {}))
+      (options['env'] || {}).merge(local_options['env'] || {})
     end
 
     def pid_root
-      @pid_root ||= File.expand_path(fetch(local_options['pid_root']) || fetch(options['pid_root']) || 'pids', @root)
+      @pid_root ||= File.expand_path(local_options['pid_root'] || options['pid_root'] || 'pids', self.root)
     end
 
     def supervisor_pid_path
@@ -108,19 +112,19 @@ module Procodile
     end
 
     def log_path
-      log_path = fetch(local_options['log_path']) || fetch(options['log_path'])
+      log_path = local_options['log_path'] || options['log_path']
       if log_path
-        File.expand_path(log_path, @root)
+        File.expand_path(log_path, self.root)
       elsif log_path.nil? && self.log_root
         File.join(self.log_root, 'procodile.log')
       else
-        File.expand_path("procodile.log", @root)
+        File.expand_path("procodile.log", self.root)
       end
     end
 
     def log_root
-      if log_root = (fetch(local_options['log_root']) || fetch(options['log_root']))
-        File.expand_path(log_root, @root)
+      if log_root = (local_options['log_root'] || options['log_root'])
+        File.expand_path(log_root, self.root)
       else
         nil
       end
@@ -150,26 +154,6 @@ module Procodile
       process
     end
 
-    def fetch(value, default = nil)
-      if value.is_a?(Hash)
-        if value.has_key?(@environment)
-          value[@environment]
-        else
-          default
-        end
-      else
-        value.nil? ? default : value
-      end
-    end
-
-    def fetch_hash_values(hash)
-      hash.each_with_object({}) do |(key, value), h|
-        if value = fetch(value)
-          h[key] = value
-        end
-      end
-    end
-
     def load_process_list_from_file
       YAML.load_file(procfile_path)
     end

data/lib/procodile/control_session.rb

@@ -72,7 +72,6 @@ module Procodile
         :version => Procodile::VERSION,
         :messages => @supervisor.messages,
         :root => @supervisor.config.root,
-        :environment => @supervisor.config.environment,
         :app_name => @supervisor.config.app_name,
         :supervisor => @supervisor.to_hash,
         :instances => instances,

data/lib/procodile/status_cli_output.rb

@@ -15,7 +15,6 @@ module Procodile
     def print_header
       puts "Procodile Version   " + @status['version'].to_s.color(34)
       puts "Application Root    " + "#{@status['root']}".color(34)
-      puts "Environment         " + "#{@status['environment']}".color(34)
       puts "Supervisor PID      " + "#{@status['supervisor']['pid']}".color(34)
       if time = @status['supervisor']['started_at']
         time = Time.at(time)

data/lib/procodile/supervisor.rb

@@ -30,7 +30,7 @@ module Procodile
 
     def start(&after_start)
       Procodile.log nil, "system", "Procodile supervisor started with PID #{::Process.pid}"
-      Procodile.log nil, "system", "Environment is #{@config.environment}"
+      Procodile.log nil, "system", "Application root is #{@config.root}"
       if @run_options[:respawn] == false
         Procodile.log nil, "system", "Automatic respawning is disabled"
       end

data/lib/procodile/version.rb

@@ -1,3 +1,3 @@
 module Procodile
-  VERSION = '1.0.14'
+  VERSION = '1.0.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procodile
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2017-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -70,9 +70,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: This gem will help you run Ruby processes from a Procfile on Linux servers
   in the background.
 test_files: []
+has_rdoc: