procman 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 886e48b01bf0891b7c2e8f831e121b87cbf1ad8a
-  data.tar.gz: 34bf429ede05eda145aa92801ec871197ba8eef3
+  metadata.gz: 6a12f290cb60dba235f7e2e415a99a215b5d6249
+  data.tar.gz: b0dc610e93bd0994e360d0877df5bd87e6cf92eb
 SHA512:
-  metadata.gz: 459b783ef37008913693d201d8683c4003e4a45e63d222376be05a543d9191d305a531ffe50aa23c6cfb1b5508d0bdfdd71844a4828495e99b249627ce22a298
-  data.tar.gz: 1e9e39995417f1cf56025a80a817a51844b91b00a27967b1db7841e5153f9fc56b896665b3ecc3b585eb77cdc0364ce97e187b729f6b3a5f07a3a54ecacd3803
+  metadata.gz: 969dabeaa186a1db76054907e357d88ff5a9e4a54bcbb9a1beed63d14c3bcd9933bde6d725e2cf8553260043299faa537338d4e892b3b98c75a524e69e3c0799
+  data.tar.gz: 3bd880a25a15c4edc33923c2c53549b50df5cd05d4f7521282e56ca889506ebedd5e793fc7b974014138f9e0552a90dfcd2a86f38602f40eb390575ac3722f6b

data/Procfile.template

@@ -5,20 +5,20 @@ process :example_worker do
 
   # Only action this process in development
   # constraint :environment => 'development'
-  
+
   # Define the action to be carried out when this process should start
   start do
-    
+
   end
-  
+
   # Define the action to be carried out when this process should stop
   stop do
-    
+
   end
-  
+
   # Define the action to be carried out when this process should restart
   restart do
-    
+
   end
-  
+
 end

data/README.md

@@ -13,12 +13,14 @@ your processes.
 ## Setting up
 
 If you're using Bundler (you should be) and wish to use procman, just include it within
-your Gemfile and run `bundle` to install it. 
+your Gemfile and run `bundle` to install it.
 
 ```ruby
 gem 'procman'
 ```
 
+[![Gem Version](https://badge.fury.io/rb/procman.svg)](http://badge.fury.io/rb/procman)
+
 Once installed, you can execute commands as shown below but you should prefix `bundle exec`
 to the start of the command.
 
@@ -46,11 +48,11 @@ process :unicorn do
   start do
     system("umask 002 && bundle exec unicorn_rails -E #{environment} -c #{root}/config/unicorn.rb -D")
   end
-  
+
   stop do
     system("kill `cat #{root}/tmp/pids/unicorn.#{environment}.pid`")
   end
-  
+
   restart { stop and start }
 
 end
@@ -59,11 +61,11 @@ process :worker do
 
   constraint :environment => 'production', :host => /\.production\.myapp\z/
   constraint :environment => 'development', :host => /\.local\z/
-  
+
   start do
     system("bundle exec rbg start -c #{root}/config/processes/worker.rb -E #{environment}")
   end
-  
+
   stop do
     system("bundle exec rbg stop -c #{root}/config/processes/worker.rb -E #{environment}")
   end
@@ -71,7 +73,7 @@ process :worker do
   restart do
     system("bundle exec rbg reload -c #{root}/config/processes/worker.rb -E #{environment}")
   end
-  
+
 end
 ```
 
@@ -85,7 +87,7 @@ for a specific process, it will always be included when your action is executed.
 added, the process's action will only be invoked when at least one of the constraints is matched otherwise
 it will be skipped.
 
-Constraints are configured by adding `constraint` "rules" to your process definitions. 
+Constraints are configured by adding `constraint` "rules" to your process definitions.
 
 ```ruby
 # execute always in production

data/bin/procman

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+$:.unshift(File.expand_path(File.join('../../lib'), __FILE__))
 require 'proc_man'
 begin
-  
+
   # Convert command line arguments into the appropriate ruby objects
   args = ARGV.dup
   final_args = []
@@ -14,7 +15,7 @@ begin
       final_args << arg
     end
   end
-  
+
   command = final_args.first
   case command
   when 'init'
@@ -23,7 +24,7 @@ begin
     # Execute the command
     ProcMan.run(final_args.first, options)
   end
-  
+
 rescue ProcMan::Error => e
   puts "\e[31m" + e.message + "\e[0m"
   Process.exit(1)

data/lib/proc_man.rb

@@ -3,13 +3,13 @@ require 'proc_man/procfile'
 require 'proc_man/constraint'
 
 module ProcMan
-  
-  VERSION = '1.9.1'
-  
+
+  VERSION = '1.9.2'
+
   class Error < StandardError; end
-  
+
   class << self
-    
+
     def load_procfile(path)
       if File.file?(path)
         ProcMan::Procfile.class_eval(File.read(path))
@@ -18,13 +18,13 @@ module ProcMan
         raise Error, "Procfile not found at #{path}"
       end
     end
-    
+
     def processes
       @processes ||= Array.new
     end
-    
+
     def run(method, options = {})
-      load_procfile(options[:procfile] || File.expand_path('./Procfile'))
+      load_procfile(options[:procfile] || options[:f] || File.expand_path('./Procfile'))
       if method.nil?
         raise Error, "Command to execute was not specified. For example, pass 'start' to start processes."
       else
@@ -42,7 +42,7 @@ module ProcMan
         end
       end
     end
-    
+
     # Create a new Procfile template in the current directory root
     def init
       path = File.expand_path('./Procfile')
@@ -54,6 +54,6 @@ module ProcMan
         puts "\e[32mProcfile created at #{path}"
       end
     end
-    
+
   end
 end

data/lib/proc_man/capistrano.rb

@@ -18,7 +18,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     after 'deploy:start', "procman:start"
     after 'deploy:stop', "procman:stop"
     after 'deploy:restart', "procman:restart"
-    
+
     def procman_command(command)
 
       procfile_path = fetch(:procfile_path, "#{current_path}/Procfile")
@@ -33,11 +33,11 @@ Capistrano::Configuration.instance(:must_exist).load do
       command = "sh -c \"cd #{current_path} && bundle exec procman #{command} --root #{current_path} --environment #{fetch(:rails_env, 'production')} #{procfile} #{process_opts} \""
 
       if user = fetch(:procman_user, nil)
-        command = "sudo -u #{user} #{command}" 
-      end 
-      
+        command = "sudo -u #{user} #{command}"
+      end
+
       command
     end
-    
+
   end
 end

data/lib/proc_man/capistrano3.rb

@@ -29,7 +29,7 @@ namespace :procman do
   end
 
   after 'deploy:restart', "procman:restart"
-  
+
   def procman_command(command)
 
     procfile_path = fetch(:procfile_path, "#{current_path}/Procfile")
@@ -45,16 +45,16 @@ namespace :procman do
     command = "#{command} --root #{current_path} --environment #{fetch(:rails_env, 'production')} #{procfile} #{process_opts}"
 
     if user = fetch(:procman_user, nil)
-      command = "sudo -u #{user} #{command}" 
-    end 
-    
+      command = "sudo -u #{user} #{command}"
+    end
+
     command
   end
-  
+
 end
 
 namespace :load do
   task :defaults do
     set :procman_roles, fetch(:procman_roles, [:app])
   end
-end
+end

data/lib/proc_man/constraint.rb

@@ -1,11 +1,11 @@
 module ProcMan
   class Constraint
-    
+
     def initialize(process, conditions)
       @process      = process
       @conditions   = conditions
     end
-    
+
     def matches?
       matches = 0
       for key, value in @conditions
@@ -13,9 +13,9 @@ module ProcMan
       end
       @conditions.size > 0 && matches == @conditions.size
     end
-    
+
     private
-    
+
     def compare(condition, value)
       value = value.to_s.downcase
       case condition
@@ -31,6 +31,6 @@ module ProcMan
         false
       end
     end
-    
+
   end
 end

data/lib/proc_man/process.rb

@@ -1,34 +1,34 @@
 module ProcMan
   class Process
-    
+
     attr_writer :options
-    
+
     # Initializes the new process by receiving it's name
     def initialize(name)
       @name = name
       @constraints = []
     end
-    
+
     # Returns the name of the process
     def name
       @name
     end
-    
+
     # Returns a hash of options which the user has specified
     def options
       @options ||= {}
     end
-    
+
     # Returns the current environment
     def environment
       self.options[:environment] || self.options[:e] || self.options[:env] || 'development'
     end
-    
+
     # Returns the current root directory path
     def root
       @root ||= self.options[:root] || self.options[:r] || File.expand_path('./')
     end
-    
+
     ## Returns the current hostname of the machine executing this action
     def host
       @host ||= `hostname -f`.strip
@@ -39,25 +39,30 @@ module ProcMan
       return @manual unless @manual.nil?
       @manual = self.options[:processes] && self.options[:processes].split(',').include?(self.name.to_s)
     end
-    
+
     ## Sets a constraint for this process
     def constraint(hash = {})
       @constraints << Constraint.new(self, hash)
     end
-    
+
+    ## Return all processes which should execute
+    def processes_to_execute
+      (self.options[:processes] || self.options[:p])
+    end
+
     # Specifies whether or not actions for this process should be executed
     # in the current context.
     def execute?
       (@constraints.empty? || @constraints.any?(&:matches?)) &&
-      (self.options[:processes].nil? || self.options[:processes].split(',').include?(self.name.to_s))
+      (self.processes_to_execute.nil? || self.processes_to_execute.split(',').include?(self.name.to_s))
     end
-    
+
     # Specifies whether or not the provided method has been defined in the Procfile
     # for this process.
     def defined_method?(name)
       instance_variable_get("@#{name}").is_a?(Proc)
     end
-        
+
     # Stores and calls different process actions for this process. If there is no
     # block provided and we don't have a method it will return false otherwise it
     # will store or call the action as appropriate.
@@ -70,12 +75,12 @@ module ProcMan
         return false
       end
     end
-    
+
     def run(command)
       puts "      \e[36m#{command}\e[0m"
       system(command)
     end
-    
+
     # A shortcut method for defining a set of RBG processes
     def rbg(options = {})
       options[:config_file] ||= "Rbgfile"
@@ -83,7 +88,7 @@ module ProcMan
       stop      { run("rbg stop -c #{root}/#{options[:config_file]} -E #{environment}") }
       restart   { run("rbg restart -c #{root}/#{options[:config_file]} -E #{environment}") }
     end
-    
+
     # A shortcut method for defining a unicorn-like process
     def unicorn(options = {})
       options[:name]            ||= 'unicorn'
@@ -93,6 +98,6 @@ module ProcMan
       stop      { run("kill `cat #{root}/#{options[:pid_path]}`") if File.exist?(options[:pid_path]) }
       restart   { run("kill -USR2 `cat #{root}/#{options[:pid_path]}`") if File.exist?(options[:pid_path]) }
     end
-    
+
   end
 end

data/lib/proc_man/procfile.rb

@@ -1,13 +1,13 @@
 module ProcMan
   class Procfile
     class << self
-      
+
       def process(name, &block)
         process = ProcMan::Process.new(name)
         process.instance_eval(&block) if block_given?
         ProcMan.processes << process
       end
-      
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procman
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies: []
 description: A very very simple library for starting/stopping/restarting processes
   for a Ruby application
@@ -29,6 +29,7 @@ files:
 - lib/proc_man/process.rb
 - lib/proc_man/procfile.rb
 - lib/procman/capistrano.rb
+- procman-1.9.1.gem
 - procman.gemspec
 homepage: http://atechmedia.com
 licenses: []