pleaserun 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1607c72a99aa0a0bb5f3513e132c32c4ed64b340
-  data.tar.gz: 5aa785212a00ed91a9dfe31a09a63da531c4d1a8
+  metadata.gz: f7e0519711adf2648e38698c8e3aca1b736f4c4e
+  data.tar.gz: 8ea0617089d0b51121baffb1afe909f223b56ce3
 SHA512:
-  metadata.gz: 5d3279e7c1bf924033659d3a11ab28fca8688208df956199a641f5e234fbf11d36d818375a091eeafadc353d397e2a0b1ad0b65f58ee592e9908b8cec630c086
-  data.tar.gz: 105778d5a15040001808f335a4737b98e9ff70860e06b323b113a19119f6ff98eb3b4912cf0ff387e4817480c969708f4fdb05dc786015ca292cbc60dbf17447
+  metadata.gz: 4161d65cabbb8f8668e2a3a088b76c25533bb5efe98350b81b5582d22f6fbd42adb83d38ff60aa59baca06f58f2a71604f542cc8a284241cd0af5de525dc2c3b
+  data.tar.gz: 63faf6d869a494389564d6ec18680224b44e434a279b395bf90e1ca62081d82a69124794de590aa3d9ae58d35026c4a6fe7797568ad13db3e3b591aa3311c96b

data/CHANGELOG.asciidoc

@@ -1,5 +1,12 @@
 = Pleaserun Changes and Releases
 
+== 0.0.22 (May 18, 2016)
+  * systemd platform now defaults to targeting /etc/systemd/system for writing
+    unit files. This was chosen based on research across across 7 different
+    Linux distributions.
+  * fix a bug where attempting to detect systemd would crash becuase
+    `systemctl` was not available.
+
 == 0.0.21 (May 16, 2016)
   * Platform detection mechanism now looks for evidence that a given platform
     is available (files, executables, etc).  The previous mechanism used facter

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pleaserun (0.0.20)
+    pleaserun (0.0.21)
       cabin (> 0)
       clamp
       insist

data/lib/pleaserun/detector.rb

@@ -1,5 +1,6 @@
 require "cabin"
 require "open3"
+require "pleaserun/namespace"
 
 # Detect the service platform that's most likely to be successful on the
 # running machine.
@@ -24,12 +25,9 @@ module PleaseRun::Detector
   end
 
   def detect_systemd
-    # Expect a certain directory
-    return false unless File.directory?("/lib/systemd/system")
-
     # Check the version. If `systemctl` fails, systemd isn't available.
-    out, status = execute([ "systemctl", "--version" ])
-    return false unless status.success?
+    out, success = execute([ "systemctl", "--version" ])
+    return false unless success
 
     # version is the last word on the first line of the --version output
     version = out.split("\n").first.split(/\s+/).last 
@@ -41,8 +39,8 @@ module PleaseRun::Detector
     return false unless File.directory?("/etc/init")
 
     # Check the version. If `initctl` fails, upstart isn't available.
-    out, status = execute(["initctl", "--version"])
-    return false unless status.success?
+    out, success = execute(["initctl", "--version"])
+    return false unless success
 
     version = out.split("\n").first.tr("()", "").split(/\s+/).last
     ["upstart", version]
@@ -58,8 +56,8 @@ module PleaseRun::Detector
   def detect_launchd
     return false unless File.directory?("/Library/LaunchDaemons")
 
-    out, status = execute(["launchctl", "version"])
-    return false unless status.success?
+    out, success = execute(["launchctl", "version"])
+    return false unless success
 
     # TODO(sissel): Version?
     version = out.split("\n").first.split(":").first.split(/\s+/).last
@@ -78,7 +76,11 @@ module PleaseRun::Detector
       out = stdout.read
       stderr.close
       exit_status = wait_thr.value
-      return out, exit_status
+      return out, exit_status.success?
     end
+  rescue Errno::ENOENT, Errno::EACCES => e
+    # If the path doesn't exist or we cannot execute it, return the exception
+    # message as the output and indicate a failure to run.
+    return e.message, false
   end
 end

data/lib/pleaserun/platform/systemd.rb

@@ -5,6 +5,13 @@ require "pleaserun/platform/base"
 #
 # If you use Fedora 18+ or CentOS/RHEL 7+, this is for you.
 class PleaseRun::Platform::Systemd < PleaseRun::Platform::Base
+  attribute :unit_path, "The path to put systemd unit files",
+            :default => "/etc/systemd/system" do
+    validate do |path|
+      insist { path }.is_a?(String)
+    end
+  end
+
   def files
     begin
       # TODO(sissel): Make it easy for subclasses to extend validation on attributes.
@@ -14,8 +21,10 @@ class PleaseRun::Platform::Systemd < PleaseRun::Platform::Base
     end
 
     return Enumerator::Generator.new do |enum|
-      enum.yield(safe_filename("/lib/systemd/system/{{{ name }}}.service"), render_template("program.service"))
-      enum.yield(safe_filename("/lib/systemd/system/{{{ name }}}-prestart.sh"), render_template("prestart.sh"), 0755) if prestart
+      enum.yield(safe_filename("{{{ unit_path }}}/{{{ name }}}.service"), render_template("program.service"))
+
+      # TODO(sissel): This is probably not the best place to put this. Ahh well :)
+      enum.yield(safe_filename("{{{ unit_path }}}/{{{ name }}}-prestart.sh"), render_template("prestart.sh"), 0755) if prestart
     end
   end # def files
 

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.21"
+  spec.version = "0.0.22"
   spec.summary = "pleaserun"
   spec.description = "pleaserun"
   spec.license = "Apache 2.0"

data/spec/pleaserun/platform/systemd_spec.rb

@@ -24,8 +24,10 @@ describe PleaseRun::Platform::Systemd do
 
     let(:files) { subject.files.collect { |path, _| path } }
 
-    it "emits a file in /lib/systemd/system" do
-      insist { files }.include?("/lib/systemd/system/fancypants.service")
+    context "by default" do
+      it "emits a file in /etc/systemd/system" do
+        insist { files }.include?("/etc/systemd/system/fancypants.service")
+      end
     end
   end
 

data/templates/systemd/default/program.service

@@ -14,7 +14,7 @@ EnvironmentFile=-/etc/default/{{{name}}}
 EnvironmentFile=-/etc/sysconfig/{{{name}}}
 ExecStart={{{program}}} {{{shell_args}}}
 {{#prestart}}
-ExecStartPre=/lib/systemd/system/{{{name}}}-prestart.sh
+ExecStartPre={{{unit_path}}}/{{{name}}}-prestart.sh
 {{/prestart}}
 Restart=always
 WorkingDirectory={{{chdir}}}

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

@@ -26,6 +26,8 @@ pidfile="/var/run/$name.pid"
 [ -r /etc/default/$name ] && . /etc/default/$name
 [ -r /etc/sysconfig/$name ] && . /etc/sysconfig/$name
 
+[ -z "$nice" ] && nice=0
+
 trace() {
   logger -t "/etc/init.d/{{{name}}}" "$@"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pleaserun
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-15 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin