pleaserun 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 285e8687da96da9e598aee6d7e1172a4a06a4612
-  data.tar.gz: 5574056db684c58c8dff19eecc62c4612ff08084
+  metadata.gz: 6c371eb9b2f8b78cf1ad9a8ae5129a9742386e91
+  data.tar.gz: d16ad0c63c9dc26192ae18bc72ca01a33d8a28b6
 SHA512:
-  metadata.gz: 3c29e32c070ba54e5c02f9fc4c1f1cd809a6a02dada6081b60114ee9298d9ae8d72af12fc71fe2a74b99252dafe0c575c319d87ef0d5183e61fcaba569250bc6
-  data.tar.gz: 35d61cafe539a1df9fe767946c6b115d85289b99643f8686f7f5b424003c81075a6592f30953dc74cc42bbfca82437bc53d52061f6ce54d289e36fb086370045
+  metadata.gz: d3147ecf4ccd30e852bfde20d9c5d67a3f8eedc5a610fde7ac047e32a345acc9ad13f55d8ce1c27d49b8330a32352d49fef8692435379d07bab598b166d35d83
+  data.tar.gz: b15a188ce0ae49b661bbca638a9ba20e720ee8b5a89a4e9150e279cc04685b192d664a4503c2166c4a8f51bc6773593193c87f0c06ef93141e194cc6cc9378b2

data/CHANGELOG.asciidoc

@@ -1,5 +1,8 @@
 = Pleaserun Changes and Releases
 
+== 0.0.17 (May 4, 2016)
+  * Added detection for Fedora 22 and 23, OS X 10.11, and Ubuntu 14.10, 15.04, 15.50, and 16.04. (#98, Aaron Mildenstein)
+
 == 0.0.13  (April 30, 2015)
   * Now supports MRI 1.9.3 (Vincent Janelle)
   * cli: New flag --install-prefix. This lets you tell pleaserun what directory to write things.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pleaserun (0.0.12)
+    pleaserun (0.0.16)
       cabin (> 0)
       clamp
       insist
@@ -11,10 +11,10 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    cabin (0.7.1)
+    cabin (0.8.1)
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    clamp (0.6.4)
+    clamp (1.0.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)
     ffi (1.9.6)
@@ -104,7 +104,7 @@ GEM
     slop (3.6.0)
     spoon (0.0.4)
       ffi
-    stud (0.0.19)
+    stud (0.0.22)
     systemu (2.6.5)
     thor (0.19.1)
     timers (4.0.1)
@@ -124,3 +124,6 @@ DEPENDENCIES
   peach
   pleaserun!
   rspec (~> 3.0.0)
+
+BUNDLED WITH
+   1.11.2

data/lib/pleaserun/detector.rb

@@ -19,6 +19,10 @@ class PleaseRun::Detector
     ["fedora", "18"] => ["systemd", "default"],
     ["fedora", "19"] => ["systemd", "default"],
     ["fedora", "20"] => ["systemd", "default"],
+    ["fedora", "21"] => ["systemd", "default"],
+    ["fedora", "22"] => ["systemd", "default"],
+    ["fedora", "23"] => ["systemd", "default"],
+    ["mac_os_x", "10.11"] => ["launchd", "10.9"],
     ["mac_os_x", "10.10"] => ["launchd", "10.9"],
     ["mac_os_x", "10.8"] => ["launchd", "10.9"],
     ["mac_os_x", "10.9"] => ["launchd", "10.9"],
@@ -28,7 +32,11 @@ class PleaseRun::Detector
     ["ubuntu", "12.10"] => ["upstart", "1.5"],
     ["ubuntu", "13.04"] => ["upstart", "1.5"],
     ["ubuntu", "13.10"] => ["upstart", "1.5"],
-    ["ubuntu", "14.04"] => ["upstart", "1.5"]
+    ["ubuntu", "14.04"] => ["upstart", "1.5"],
+    ["ubuntu", "14.10"] => ["upstart", "1.5"],
+    ["ubuntu", "15.04"] => ["systemd", "default"],
+    ["ubuntu", "15.10"] => ["systemd", "default"],
+    ["ubuntu", "16.04"] => ["systemd", "default"]
   }
 
   def self.detect

data/pleaserun.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |spec|
   files = File.read(__FILE__)[/^__END__$.*/m].split("\n")[1..-1]
 
   spec.name = "pleaserun"
-  spec.version = "0.0.16"
+  spec.version = "0.0.17"
   spec.summary = "pleaserun"
   spec.description = "pleaserun"
   spec.license = "Apache 2.0"

data/templates/systemd/default/program.service

@@ -7,11 +7,14 @@ Description={{{ description }}}
 Type=simple
 User={{{ user }}}
 Group={{{ group }}}
+EnvironmentFile=/etc/default/{{{name}}}
+EnvironmentFile=/etc/sysconfig/{{{name}}}
 ExecStart={{{program}}} {{{shell_args}}}
 {{#prestart}}
 ExecStartPre=/lib/systemd/system/{{{name}}}-prestart.sh
 {{/prestart}}
 Restart=always
+WorkingDirectory={{{chdir}}}
 
 [Install]
 WantedBy=multi-user.target

data/templates/sysv/lsb-3.1/default

@@ -12,3 +12,8 @@ nice="{{{nice}}}"
 {{/limit_open_files}}{{#limit_user_processes}}limit_user_processes="{{{limit_user_processes}}}"
 {{/limit_user_processes}}{{#limit_physical_memory}}limit_physical_memory="{{{limit_physical_memory}}}"
 {{/limit_physical_memory}}{{#limit_stack_size}}limit_stack_size="{{{limit_stack_size}}}"{{/limit_stack_size}}
+
+# If this is set to 1, then when `stop` is called, if the process has
+# not exited within a reasonable time, SIGKILL will be sent next.
+# The default behavior is to simply log a message "program stop failed; still running"
+KILL_ON_STOP_TIMEOUT=0

data/templates/sysv/lsb-3.1/init.sh

@@ -88,7 +88,13 @@ stop() {
       sleep 1
     done
     if status ; then
-      emit "$name stop failed; still running."
+      if [ "$KILL_ON_STOP_TIMEOUT" -eq 1 ] ; then
+        trace "Timeout reached. Killing $name (pid $pid) with SIGKILL.  This may result in data loss."
+        kill -KILL $pid
+        emit "$name killed with SIGKILL."
+      else
+        emit "$name stop failed; still running."
+      fi
     else
       emit "$name stopped."
     fi
@@ -157,7 +163,7 @@ case "$1" in
     ;;
   stop) stop ;;
   force-stop) force_stop ;;
-  status) 
+  status)
     status
     code=$?
     if [ $code -eq 0 ] ; then
@@ -167,11 +173,11 @@ case "$1" in
     fi
     exit $code
     ;;
-  restart) 
+  restart)
     {{#prestart}}if [ "$PRESTART" != "no" ] ; then
       prestart || exit $?
     fi{{/prestart}}
-    stop && start 
+    stop && start
     ;;
   *)
     echo "Usage: $SCRIPTNAME {start|force-start|stop|force-start|force-stop|status|restart}" >&2

data/templates/upstart/1.5/init.conf

@@ -4,22 +4,44 @@ stop on runlevel [!2345]
 
 respawn
 umask {{{umask}}}
-#nice {{{nice}}}
-#chroot {{{chroot}}}
+{{#nice}}
+nice {{{nice}}}
+{{/nice}}
+{{#chroot}}
+chroot {{{chroot}}}
+{{/chroot}}
 chdir {{{chdir}}}
-#limit core <softlimit> <hardlimit>
-#limit cpu <softlimit> <hardlimit>
-#limit data <softlimit> <hardlimit>
-#limit fsize <softlimit> <hardlimit>
-#limit memlock <softlimit> <hardlimit>
+{{#limit_coredump}}
+limit core {{{limit_coredump}}} {{{limit_coredump}}}
+{{/limit_coredump}}
+{{#limit_cputime}}
+limit cpu {{{limit_cputime}}} {{{limit_cputime}}}
+{{/limit_cputime}}
+{{#limit_data}}
+limit data {{{limit_data}}} {{{limit_data}}}
+{{/limit_data}}
+{{#limit_file_size}}
+limit fsize {{{limit_file_size}}} {{{limit_file_size}}}
+{{/limit_file_size}}
+{{#limit_locked_memory}}
+limit memlock {{{limit_locked_memory}}} {{{limit_locked_memory}}}
+{{/limit_locked_memory}}
 #limit msgqueue <softlimit> <hardlimit>
 #limit nice <softlimit> <hardlimit>
-#limit nofile <softlimit> <hardlimit>
-#limit nproc <softlimit> <hardlimit>
-#limit rss <softlimit> <hardlimit>
+{{#limit_open_files}}
+limit nofile {{{limit_open_files}}} {{{limit_open_files}}}
+{{/limit_open_files}}
+{{#limit_user_processes}}
+limit nproc {{{limit_user_processes}}} {{{limit_user_processes}}}
+{{/limit_user_processes}}
+{{#limit_physical_memory}}
+limit rss {{{limit_physical_memory}}} {{{limit_physical_memory}}}
+{{/limit_physical_memory}}
 #limit rtprio <softlimit> <hardlimit>
 #limit sigpending <softlimit> <hardlimit>
-#limit stack <softlimit> <hardlimit>
+{{#limit_stack_size}}
+limit stack {{{limit_stack_size}}} {{{limit_stack_size}}}
+{{/limit_stack_size}}
 setuid {{{user}}}
 setgid {{{group}}}
 console log # log stdout/stderr to /var/log/upstart/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pleaserun
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: pleaserun