pleaserun 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84a11be503460d6af5609596f83c4995f278c920
-  data.tar.gz: 3ace8d7cac212d0406fd4fe4df71c1870d1509c7
+  metadata.gz: 1607c72a99aa0a0bb5f3513e132c32c4ed64b340
+  data.tar.gz: 5aa785212a00ed91a9dfe31a09a63da531c4d1a8
 SHA512:
-  metadata.gz: 32f25ee793d36fe24e4c117f17982ddf83003d7d407cababa6af80403b6f61438a6d828469d2eac32ac7e57ca702620c1c6cb5921f94e792a89d134f32fde0a7
-  data.tar.gz: 8d1014835d3efe304e9c6524c7d634e1e5cf4af3f4449150780954255674fde584c2e9f7ce54a57c89c50abcd7a151ae88ad1c053f7ffd81146fa0aba52243eb
+  metadata.gz: 5d3279e7c1bf924033659d3a11ab28fca8688208df956199a641f5e234fbf11d36d818375a091eeafadc353d397e2a0b1ad0b65f58ee592e9908b8cec630c086
+  data.tar.gz: 105778d5a15040001808f335a4737b98e9ff70860e06b323b113a19119f6ff98eb3b4912cf0ff387e4817480c969708f4fdb05dc786015ca292cbc60dbf17447

data/CHANGELOG.asciidoc

@@ -1,5 +1,11 @@
 = Pleaserun Changes and Releases
 
+== 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
+    or ohai to figure out the operating system version and had a mapping of OS to
+    platform.
+
 == 0.0.20 (May 13, 2016)
   * The --install-prefix flag now sets the write path for both --install and --no-install (default) modes
 

data/Gemfile.lock

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

data/lib/pleaserun/detector.rb

@@ -1,102 +1,84 @@
 require "cabin"
+require "open3"
 
-# Detect the operating system and version, and based on that information,
-# choose the most appropriate runner platform.
-# TODO(sissel): Make this a module, not a class.
-class PleaseRun::Detector
+# Detect the service platform that's most likely to be successful on the
+# running machine.
+#
+# See the `detect` method.
+module PleaseRun::Detector
   class UnknownSystem < StandardError; end
 
-  # A mapping of of [os, version] => [runner, version]
-  MAPPING = {
-    ["amazon", "2014.09"] => ["upstart", "0.6.5"],
-    ["arch", "rolling"] => ["systemd", "default"],
-    ["centos", "5"] => ["sysv", "lsb-3.1"],
-    ["centos", "6"] => ["upstart", "0.6.5"],
-    ["centos", "7"] => ["systemd", "default"],
-    ["debian", "6"] => ["sysv", "lsb-3.1"],
-    ["debian", "7"] => ["sysv", "lsb-3.1"],
-    ["debian", "8"] => ["systemd", "default"],
-    ["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"],
-    ["opensuse", "12"] => ["sysv", "lsb-3.1"],
-    ["opensuse", "13"] => ["systemd", "default"],
-    ["ubuntu", "12.04"] => ["upstart", "1.5"],
-    ["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.10"] => ["upstart", "1.5"],
-    ["ubuntu", "15.04"] => ["systemd", "default"],
-    ["ubuntu", "15.10"] => ["systemd", "default"],
-    ["ubuntu", "16.04"] => ["systemd", "default"]
-  }
-
-  def self.detect
+  module_function
+
+  def detect
     return @system unless @system.nil?
 
     @logger ||= Cabin::Channel.get
-    begin
-      platform, version = detect_ohai
-    rescue LoadError => e
-      @logger.debug("Failed to load ohai", :exception => e)
-      begin
-        platform, version = detect_facter
-      rescue LoadError
-        raise UnknownSystem, "Could not detect because neither ohai nor facter libraries are found"
-      end
-    end
-
-    @system = lookup([platform, version])
-    raise UnknownSystem, "#{platform} #{version}" if @system.nil?
+    @system = detect_platform
+    raise UnknownSystem, "Unable to detect which service platform to use" if @system.nil?
     return @system
   end # def self.detect
 
-  def self.lookup(platform_and_version)
-    return MAPPING[platform_and_version]
-  end # def self.lookup
-
-  def self.detect_ohai
-    require "ohai/system"
-    ohai = Ohai::System.new
-    # TODO(sissel): Loading all plugins takes a long time (seconds).
-    # TODO(sissel): Figure out how to load just the platform plugin correctly.
-    ohai.all_plugins
-
-    platform = ohai["platform"]
-    version = ohai["platform_version"]
-
-    return platform, normalize_version(platform, version)
-  end # def detect_ohai
-
-  def self.detect_facter
-    require "facter"
-
-    platform = Facter.value(:operatingsystem).downcase
-    version = Facter.value(:operatingsystemrelease)
-    return platform, normalize_version(platform, version)
-  end # def detect_facter
-
-  def self.normalize_version(platform, version)
-    case platform
-      # Take '6.0.8' and make it just '6' since debian never makes major
-      # changes in a minor release
-      when "debian", "centos"
-        return version[/^[0-9]+/] # First digit is the 'major' version
-      when "mac_os_x"
-        return version[/^[0-9]+\.[0-9]+/] # 10.x
-      when "arch"
-        return "rolling"
-      # TODO(sissel): Any other edge cases?
-    end
-    return version
+  def detect_platform
+    detect_systemd || detect_upstart || detect_launchd || detect_runit || detect_sysv
+  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?
+
+    # version is the last word on the first line of the --version output
+    version = out.split("\n").first.split(/\s+/).last 
+    ["systemd", version]
+  end
+
+  def detect_upstart
+    # Expect a certain directory
+    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?
+
+    version = out.split("\n").first.tr("()", "").split(/\s+/).last
+    ["upstart", version]
   end
 
+  def detect_sysv
+    return false unless File.directory?("/etc/init.d")
+    
+    # TODO(sissel): Do more specific testing.
+    ["sysv", "lsb-3.1"]
+  end
+
+  def detect_launchd
+    return false unless File.directory?("/Library/LaunchDaemons")
+
+    out, status = execute(["launchctl", "version"])
+    return false unless status.success?
+
+    # TODO(sissel): Version?
+    version = out.split("\n").first.split(":").first.split(/\s+/).last
+    ["launchd", version]
+  end
+
+  def detect_runit
+    return false unless File.directory?("/service")
+
+    # TODO(sissel): Do more tests for runit
+  end
+
+  def execute(command)
+    Open3.popen3(*command) do |stdin, stdout, stderr, wait_thr|
+      stdin.close
+      out = stdout.read
+      stderr.close
+      exit_status = wait_thr.value
+      return out, exit_status
+    end
+  end
 end

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

data/templates/systemd/default/program.service

@@ -7,8 +7,11 @@ Description={{{ description }}}
 Type=simple
 User={{{ user }}}
 Group={{{ group }}}
-EnvironmentFile=/etc/default/{{{name}}}
-EnvironmentFile=/etc/sysconfig/{{{name}}}
+# Load env vars from /etc/default/ and /etc/sysconfig/ if they exist.
+# Prefixing the path with '-' makes it try to load, but if the file doesn't
+# exist, it continues onward.
+EnvironmentFile=-/etc/default/{{{name}}}
+EnvironmentFile=-/etc/sysconfig/{{{name}}}
 ExecStart={{{program}}} {{{shell_args}}}
 {{#prestart}}
 ExecStartPre=/lib/systemd/system/{{{name}}}-prestart.sh

metadata

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