pleaserun 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9ed4accac8b94375fd217a37c253a3e2b71dc9d6
+  data.tar.gz: 1ded3b7e8379b7c58cf3c26e237122c7e6b8853e
+SHA512:
+  metadata.gz: ecab9e1a4f3b9c1822c51fb22ec65c23bd829094d92db453fb12fa9c578a96a25952a1d483a1ec101566e0d4013de7a0a9687cff521e1857750d03bafee2bc5d
+  data.tar.gz: 7937ec96541fb798bf3f887ce543df6f2d99b0f06ea395a3b84566644a668706f9ceaf70d5cd04eadc16c2d6ab7e310d083fd362435a69f77f6bb2f80044a710

data/.rubocop.yml

@@ -0,0 +1,49 @@
+# Let's not argue over this...
+StringLiterals:
+  Enabled: false
+
+# I can't find a reason for raise vs fail.
+SignalException:
+  Enabled: false
+
+# I can't find a reason to prefer 'map' when 'collect' is what I mean.
+# I'm collecting things from a list. Maybe someone can help me understand the
+# semantics here.
+CollectionMethods:
+  Enabled: false
+
+# Why do you even *SEE* trailing whitespace? Because your editor was
+# misconfigured to highlight trailing whitespace, right? Maybe turn that off?
+# ;)
+TrailingWhitespace:
+  Enabled: false
+
+# Line length is another weird problem that somehow in the past 40 years of
+# computing we don't seem to have solved. It's a display problem :(
+LineLength:
+  Max: 9000
+
+# %w() vs [ "x", "y", ... ]
+# The complaint is on lib/pleaserun/detector.rb's map of OS=>Runner,
+# i'll ignore it.
+WordArray:
+  MinSize: 5
+
+# A 20-line method isn't too bad.
+MethodLength:
+  Max: 20
+
+# Hash rockets (=>) forever. Why? Not all of my hash keys are static symbols.
+HashSyntax:
+  EnforcedStyle: hash_rockets
+
+# I prefer explicit return. It makes it clear in the code that the
+# code author intended to return a value from a method.
+RedundantReturn:
+  Enabled: false
+
+# My view on a readable case statement seems to disagree with 
+# what rubocop wants and it doesn't let me configure it other than
+# enable/disable.
+CaseIndentation:
+  Enabled: false

data/CHANGELOG.asciidoc

@@ -0,0 +1,8 @@
+= Pleaserun Changes and Releases
+
+== 0.0.4 (March 5, 2014)
+  * cli: Autodetect OSX and use launchd 
+
+== Prior versions?
+
+prior versions and changes not tracked. Sorry!

data/LICENSE

@@ -0,0 +1,13 @@
+Copyright 2014 Jordan Sissel contributors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/lib/pleaserun/cli.rb

@@ -1,3 +1,4 @@
+require "English" # for $CHILD_STATUS
 require "pleaserun/namespace"
 require "clamp"
 require "cabin"
@@ -5,7 +6,10 @@ require "stud/temporary"
 
 require "pleaserun/platform/base"
 
-class PleaseRun::CLI < Clamp::Command
+# The CLI interface to pleaserun.
+#
+# This is invoked by `bin/pleaserun`.
+class PleaseRun::CLI < Clamp::Command # rubocop:disable ClassLength
   class Error < StandardError; end
   class ConfigurationError < Error; end
   class PlatformLoadError < Error; end
@@ -13,7 +17,7 @@ class PleaseRun::CLI < Clamp::Command
 
   option ["-p", "--platform"], "PLATFORM", "The name of the platform to target, such as sysv, upstart, etc"
   option ["-v", "--version"], "VERSION", "The version of the platform to target, such as 'lsb-3.1' for sysv or '1.5' for upstart",
-    :default => "default", :attribute_name => :target_version
+         :default => "default", :attribute_name => :target_version
 
   option "--log", "LOGFILE", "The path to use for writing pleaserun logs."
   option "--json", :flag, "Output a result in JSON. Intended to be consumed by other programs. This will emit the file contents and install actions as a JSON object."
@@ -24,20 +28,25 @@ class PleaseRun::CLI < Clamp::Command
   option "--debug", :flag, "Debug-level logging"
   option "--quiet", :flag, "Only errors or worse will be logged"
 
-  PleaseRun::Platform::Base.attributes.each do |facet|
+  # TODO(sissel): Make options based on other platforms
+
+  # Make program and args attributes into parameters
+  base = PleaseRun::Platform::Base
+
+  # Get the Base platform's attributes and make them available as flags
+  # through clamp.
+  #
+  # This has the effect of any 'attribute :foo, ...' becoming 'option "--foo",
+  # ...' in the CLI.
+  base.attributes.each do |facet|
     # Skip program and args which we don't want to make into flags.
     next if [:program, :args, :target_version].include?(facet.name)
 
     # Turn the attribute name into a flag.
     option "--#{facet.name}", facet.name.to_s.upcase, facet.description,
-      :attribute_name => facet.name
+           :attribute_name => facet.name
   end
   
-  # TODO(sissel): Make options based on other platforms
-
-  # Make program and args attributes into parameters
-  base = PleaseRun::Platform::Base
-
   # Load the 'program' attribute from the Base class and use it as the first
   # cli parameter.
   program = base.attributes.find { |f| f.name == :program }
@@ -51,7 +60,7 @@ class PleaseRun::CLI < Clamp::Command
 
   parameter "[ARGS] ...", args.description, :attribute_name => args.name
 
-  def help
+  def help # rubocop:disable MethodLength
     return <<-HELP
 Welcome to pleaserun!
 
@@ -90,6 +99,7 @@ are made. If it fails, nagios will not start. Yay!
 
 #{super}
     HELP
+    # rubocop:enable MethodLength
   end
 
   def execute
@@ -104,7 +114,7 @@ are made. If it fails, nagios will not start. Yay!
 
     if name.nil?
       self.name = File.basename(program)
-      @logger.warn("No name given, setting reasonable default", :name => self.name)
+      @logger.warn("No name given, setting reasonable default", :name => name)
     end
 
     # Load the platform implementation
@@ -158,15 +168,14 @@ are made. If it fails, nagios will not start. Yay!
     errors = []
 
     runner.files.each do |path, content, perms|
-      #perms ||= (0666 ^ File.umask)
+      # TODO(sissel): Force-set default file permissions if not provided?
+      # perms ||= (0666 ^ File.umask)
       fullpath = install? ? path : File.join(tmp, path)
       success = write(fullpath, content, perms)
       errors << fullpath unless success
     end
 
-    if errors.any?
-      raise FileWritingFailure, "Errors occurred while writing files"
-    end
+    raise FileWritingFailure, "Errors occurred while writing files" if errors.any?
 
     # TODO(sissel): Refactor this to be less lines of code or put into methods.
     if runner.install_actions.any?
@@ -174,9 +183,7 @@ are made. If it fails, nagios will not start. Yay!
         runner.install_actions.each do |action|
           @logger.info("Running install action", :action => action)
           system(action)
-          if !$?.success?
-            @logger.warn("Install action failed", :action => action, :code => $?.exitstatus)
-          end
+          @logger.warn("Install action failed", :action => action, :code => $CHILD_STATUS.exitstatus) unless $CHILD_STATUS.success?
         end # each install action
       else
         path = File.join(tmp, "install_actions.sh")
@@ -188,6 +195,7 @@ are made. If it fails, nagios will not start. Yay!
         end
       end
     end # if runner.install_actions.any?
+    return 0
   end # def run_human
 
   def write(fullpath, content, perms)
@@ -229,9 +237,7 @@ are made. If it fails, nagios will not start. Yay!
     require(platform_lib)
 
     const = PleaseRun::Platform.constants.find { |c| c.to_s.downcase == v.downcase }
-    if const.nil?
-      raise PlatformLoadError, "Could not find platform named '#{v}' after loading library '#{platform_lib}'. This is probably a bug."
-    end
+    raise PlatformLoadError, "Could not find platform named '#{v}' after loading library '#{platform_lib}'. This is probably a bug." if const.nil?
 
     return PleaseRun::Platform.const_get(const)
   rescue LoadError => e

data/lib/pleaserun/configurable.rb

@@ -45,9 +45,17 @@ module PleaseRun::Configurable
     end
   end # def configurable_setup
 
+  # A mixin to extend a class with whenever a class includes
+  # PleaseRun::Configurable.
+  #
+  # This class provides class-level 'attribute' method intended for use in
+  # defining attributes as well as a class-level 'attributes' method for
+  # listing attributes defined in this class. Finally, a helper
+  # 'all_attributes' method is provided to get all attributes defined by this
+  # class and any ancestors.
   module ClassMixin
     # Define an attribute on this class.
-    def attribute(name, description, options={}, &validator)
+    def attribute(name, description, options = {}, &validator)
       facet = Facet.new(name, description, options, &validator)
       attributes << facet
 
@@ -72,11 +80,35 @@ module PleaseRun::Configurable
     end
 
     def all_attributes
-      return ancestors.select { |a| a.respond_to?(:attributes) }.collect{ |a| a.attributes }.flatten
+      return ancestors.select { |a| a.respond_to?(:attributes) }.collect { |a| a.attributes }.flatten
     end # def attributes
   end # def ClassMixin
 
-  class FacetBuilder
+  # A DSL for describing a facet.
+  # 
+  # For example:
+  #
+  #     Facet.new(:temperature, "The temperature value") do
+  #       validate do |v|
+  #         fail "Temperature must be a number" unless v.is_a?(Numeric)
+  #       end
+  #       munge do |v|
+  #         Float(v)
+  #       end
+  #     end
+  #
+  # Both validation and munge blocks are optional.
+  #
+  # The 'validate' block is expcted to fail if the value given to the
+  # facet is not valid.
+  #
+  # The 'munge' block is intended to help you coerce a value.  For example, if
+  # you take "1234" from the user input (for example, as a command line flag
+  # value), you could use 'munge' to convert it to a number, as above.
+  #
+  # Munge is invoked *before* validation. Munge can fail if an invalid
+  # value is given.
+  class FacetDSL
     def initialize(facet, &block)
       @facet = facet
       instance_eval(&block)
@@ -85,16 +117,25 @@ module PleaseRun::Configurable
     def validate(&block)
       @facet.validator = block
     end
+
     def munge(&block)
       @facet.munger = block
     end
   end
 
+  # A generalized facet/property/container for a single value.
+  #
+  # Supports naming and text descriptions of this thing.
+  #
+  # Also supports value validation and munging on assignment to help
+  # you more easily accept user input from a variety of sources and
+  # keep the validation and value munging concerns near the value itself.
   class Facet
     attr_reader :name
     attr_reader :description
+    attr_writer :validator, :munger
 
-    def initialize(name, description, options={}, &validator)
+    def initialize(name, description, options = {}, &facet_dsl)
       insist { name }.is_a?(Symbol)
       insist { description }.is_a?(String)
       insist { options }.is_a?(Hash)
@@ -103,21 +144,11 @@ module PleaseRun::Configurable
       @description = description
       @options = options
 
-      FacetBuilder.new(self, &validator) if block_given?
+      FacetDSL.new(self, &facet_dsl) if block_given?
 
-      if @options[:default]
-        validate(@options[:default])
-      end
+      validate(@options[:default]) if @options[:default]
     end # def initialize
 
-    def validator=(callback)
-      @validator = callback
-    end # def validator=
-
-    def munger=(callback)
-      @munger = callback
-    end # def munger=
-
     def value=(v)
       v = @munger.call(v) if @munger
       validate(v)

data/lib/pleaserun/detector.rb

@@ -1,17 +1,23 @@
 require "cabin"
+
+# 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
   class UnknownSystem < StandardError; end
 
+  # A mapping of of [os, version] => [runner, version]
   MAPPING = {
     ["ubuntu", "12.04"] => ["upstart", "1.5"],
     ["ubuntu", "12.10"] => ["upstart", "1.5"],
     ["ubuntu", "13.04"] => ["upstart", "1.5"],
     ["ubuntu", "13.10"] => ["upstart", "1.5"],
-    ["debian", "7"] => [ "sysv", "lsb-3.1"],
-    ["debian", "6"] => [ "sysv", "lsb-3.1"],
-    ["fedora", "18"] => [ "systemd", "default"],
-    ["fedora", "19"] => [ "systemd", "default"],
-    ["fedora", "20"] => [ "systemd", "default"]
+    ["debian", "7"] => ["sysv", "lsb-3.1"],
+    ["debian", "6"] => ["sysv", "lsb-3.1"],
+    ["fedora", "18"] => ["systemd", "default"],
+    ["fedora", "19"] => ["systemd", "default"],
+    ["fedora", "20"] => ["systemd", "default"],
+    ["mac_os_x", "10.9"] => [ "launchd", "10.9"]
   }
 
   def self.detect
@@ -23,14 +29,18 @@ class PleaseRun::Detector
       begin
         platform, version = detect_facter
       rescue LoadError
+        raise UnknownSystem
       end
     end
 
-    raise UnknownSystem if platform.nil? || version.nil?
-    system = MAPPING[ [platform, version] ]
+    system = lookup([platform, version])
     raise UnknownSystem if system.nil?
     return system
-  end # def detect
+  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"
@@ -40,19 +50,25 @@ class PleaseRun::Detector
     ohai.all_plugins
 
     platform = ohai["platform"]
-    platform_version = ohai["platform_version"]
-    version = case platform
-      # Take '6.0.8' and make it just '6' since debian never makes major
-      # changes in a minor release
-      when "debian" ; platform_version[/^[0-9]+/]
-      else ; platform_version
-    end # case platform
+    version = ohai["platform_version"]
 
-    return platform, version
+    return platform, normalize_version(platform, version)
   end # def detect_ohai
 
+  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" 
+        return version[/^[0-9]+/]
+      when "mac_os_x"
+        return version[/^[0-9]+\.[0-9]+/]
+      # TODO(sissel): Any other edge cases?
+    end
+    return version
+  end
+
   def self.detect_facter
     require "facter"
   end
-
 end

data/lib/pleaserun/mustache_methods.rb

@@ -2,6 +2,7 @@ require "pleaserun/namespace"
 require "shellwords" # stdlib
 require "mustache" # gem 'mustache'
 
+# Methods for use within mustache render() calls.
 module PleaseRun::MustacheMethods
   def escaped_args
     return if args.nil?

data/lib/pleaserun/namespace.rb

@@ -1,3 +1,5 @@
+# :nodoc:
 module PleaseRun
+  # :nodoc:
   module Platform; end
 end

data/lib/pleaserun/platform/base.rb

@@ -4,6 +4,14 @@ require "pleaserun/mustache_methods"
 
 require "insist" # gem 'insist'
 
+# Base class for all platforms.
+#
+# This class provides all the general attributes common
+# among all process runners.
+#
+# For example, pretty much every runner (upstart, runit, sysv, etc) has
+# concepts for the 'name' of a thing, what program it runs, what user
+# to run as, etc.
 class PleaseRun::Platform::Base
   include PleaseRun::Configurable
   include PleaseRun::MustacheMethods
@@ -112,7 +120,7 @@ class PleaseRun::Platform::Base
     ]
 
     possibilities.each do |path|
-      next if !(File.readable?(path) && File.file?(path))
+      next unless File.readable?(path) && File.file?(path)
       return render(File.read(path))
     end
 
@@ -128,7 +136,7 @@ class PleaseRun::Platform::Base
   #
   # This renders `str` through Mustache and replaces spaces with underscores.
   def safe_filename(str)
-    return render(str).gsub(" ","_")
+    return render(str).gsub(" ", "_")
   end # def safe_filename
 
   # The default install_actions is none.

data/lib/pleaserun/platform/launchd.rb

@@ -1,7 +1,10 @@
 require "pleaserun/platform/base"
 require "pleaserun/namespace"
 
-class PleaseRun::Platform::LaunchD < PleaseRun::Platform::Base
+# The platform implementation for Apple's launchd.
+#
+# OS X users, this is for you!
+class PleaseRun::Platform::Launchd < PleaseRun::Platform::Base
   # Returns the file path to write this launchd config
   def daemons_path
     # Quoting launchctl(1):      
@@ -11,12 +14,12 @@ class PleaseRun::Platform::LaunchD < PleaseRun::Platform::Base
 
   def files
     return Enumerator::Generator.new do |out|
-      out.yield [ daemons_path, render_template("program.plist") ]
+      out.yield(daemons_path, render_template("program.plist"))
     end
   end # def files
 
   def install_actions
-    return [ "launchctl load #{daemons_path}", ]
+    return ["launchctl load #{daemons_path}"]
   end # def install_actions
 
   def xml_args
@@ -24,4 +27,3 @@ class PleaseRun::Platform::LaunchD < PleaseRun::Platform::Base
     return args.collect { |a| "<string>#{a}</string>" }.join("\n        ")
   end # def xml_args
 end
-

data/lib/pleaserun/platform/runit.rb

@@ -1,6 +1,9 @@
 require 'pleaserun/namespace'
 require "pleaserun/platform/base"
 
+# The platform implementation for runit
+#
+# Learn what runit is here: http://smarden.org/runit/
 class PleaseRun::Platform::Runit < PleaseRun::Platform::Base
   attribute :service_path, "The path runit service directory",
             :default => "/service" do |path|
@@ -11,8 +14,8 @@ class PleaseRun::Platform::Runit < PleaseRun::Platform::Base
 
   def files
     return Enumerator::Generator.new do |enum|
-      enum.yield [ safe_filename("{{ service_path }}/{{ name }}/run"), render_template('run') ]
-      enum.yield [ safe_filename("{{ service_path }}/{{ name}}/log/run"), render_template('log') ]
+      enum.yield(safe_filename("{{ service_path }}/{{ name }}/run"), render_template('run'))
+      enum.yield(safe_filename("{{ service_path }}/{{ name}}/log/run"), render_template('log'))
     end
   end
 end

data/lib/pleaserun/platform/systemd.rb

@@ -1,6 +1,9 @@
 require 'pleaserun/namespace'
 require "pleaserun/platform/base"
 
+# The platform implementation for systemd.
+#
+# If you use Fedora 18+ or CentOS/RHEL 7+, this is for you.
 class PleaseRun::Platform::Systemd < PleaseRun::Platform::Base
   def files
     begin
@@ -11,14 +14,12 @@ 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") ]
-      if prestart
-        enum.yield [ safe_filename("/lib/systemd/system/{{{ name }}}-prestart.sh"), render_template("prestart.sh"), 0755 ]
-      end
+      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
     end
   end # def files
 
   def install_actions
-    return [ "systemctl --system daemon-reload" ]
+    return ["systemctl --system daemon-reload"]
   end
 end # class PleaseRun::Platform::Systemd

data/lib/pleaserun/platform/sysv.rb

@@ -1,12 +1,14 @@
 require "pleaserun/platform/base"
 require "pleaserun/namespace"
 
+# The System V-style init system implementation.
+#
+# This will generate the familiar /etc/init.d/ scripts.
 class PleaseRun::Platform::SYSV < PleaseRun::Platform::Base
   def files
     return Enumerator::Generator.new do |out|
-      out.yield [ safe_filename("/etc/init.d/{{ name }}"), render_template("init.d"), 0755 ]
-      out.yield [ safe_filename("/etc/default/{{ name }}"), render_template("default") ]
+      out.yield(safe_filename("/etc/init.d/{{ name }}"), render_template("init.d"), 0755)
+      out.yield(safe_filename("/etc/default/{{ name }}"), render_template("default"))
     end
   end
 end
-

data/lib/pleaserun/platform/upstart.rb

@@ -1,11 +1,13 @@
 require "pleaserun/platform/base"
 
+# The Upstart platform implementation.
+#
+# If you use Ubuntu (8.10 to present) or CentOS 6 this is for you.
 class PleaseRun::Platform::Upstart < PleaseRun::Platform::Base
   def files
     return Enumerator::Generator.new do |out|
-      out.yield [ safe_filename("/etc/init/{{ name }}.conf"), render_template("init.conf") ]
-      out.yield [ safe_filename("/etc/init.d/{{ name }}"), render_template("init.d.sh"), 0755 ]
+      out.yield(safe_filename("/etc/init/{{ name }}.conf"), render_template("init.conf"))
+      out.yield(safe_filename("/etc/init.d/{{ name }}"), render_template("init.d.sh"), 0755)
     end
   end
 end
-

data/pleaserun.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |spec|
   files = %x{git ls-files}.split("\n")
 
   spec.name = "pleaserun"
-  spec.version = "0.0.3"
+  spec.version = "0.0.4"
   spec.summary = "pleaserun"
   spec.description = "pleaserun"
   spec.license = "Apache 2.0"

data/spec/pleaserun/configurable_spec.rb

@@ -1,6 +1,10 @@
 require "testenv"
 require "pleaserun/configurable"
 
+# rubocop complains that 'insist { ... } == ...' is Void. It's wrong, in this
+# case, so let's disable that check.
+# rubocop:disable Void
+
 describe PleaseRun::Configurable::Facet do
   subject { PleaseRun::Configurable::Facet  }
 
@@ -86,8 +90,8 @@ describe PleaseRun::Configurable::Facet do
       end
 
       facet.value = "hello"
-      insist { facet.value } == [ "hello" ]
-      insist { order } == [ :munge, :validate ]
+      insist { facet.value } == ["hello"]
+      insist { order } == [:munge, :validate]
     end
   end
   
@@ -119,7 +123,7 @@ describe PleaseRun::Configurable::Facet do
 
     it "fails if default is invalid" do
       insist do
-        facet = subject.new(:name, "description", :default => 4) do
+        subject.new(:name, "description", :default => 4) do
           validate do |v|
             insist { v } != 4
           end
@@ -128,7 +132,7 @@ describe PleaseRun::Configurable::Facet do
     end
     
     it "succeeds if default is valid" do
-      facet = subject.new(:name, "description", :default => 4) do
+      subject.new(:name, "description", :default => 4) do
         validate do |v|
           insist { v } == 4
         end

data/spec/pleaserun/mustache_methods_spec.rb

@@ -1,6 +1,7 @@
 require "testenv"
 require "pleaserun/mustache_methods"
 
+# Fixture for use in testing PleaseRun::MustacheMethods
 class MustacheMethodTester
   include PleaseRun::MustacheMethods
 
@@ -9,7 +10,7 @@ class MustacheMethodTester
   end
 
   def args
-    [ "hello world", "fancy pants"]
+    ["hello world", "fancy pants"]
   end
 
   def render(s)

data/spec/pleaserun/platform/launchd_spec.rb

@@ -1,14 +1,15 @@
+require "English" # for $CHILD_STATUS
 require "testenv"
 require "pleaserun/platform/launchd"
 
-describe PleaseRun::Platform::LaunchD do
+describe PleaseRun::Platform::Launchd do
   it "inherits correctly" do
-    insist { PleaseRun::Platform::LaunchD.ancestors }.include?(PleaseRun::Platform::Base)
+    insist { PleaseRun::Platform::Launchd.ancestors }.include?(PleaseRun::Platform::Base)
   end
 
   context "#files" do
     subject do
-      runner = PleaseRun::Platform::LaunchD.new("10.9")
+      runner = PleaseRun::Platform::Launchd.new("10.9")
       runner.name = "fancypants"
       next runner
     end
@@ -22,7 +23,7 @@ describe PleaseRun::Platform::LaunchD do
 
   context "#install_actions" do
     subject do
-      runner = PleaseRun::Platform::LaunchD.new("10.9")
+      runner = PleaseRun::Platform::Launchd.new("10.9")
       runner.name = "fancypants"
       next runner
     end
@@ -40,20 +41,20 @@ describe PleaseRun::Platform::LaunchD do
     end
 
     context "as the super user", :if => partytime do
-      subject { PleaseRun::Platform::LaunchD.new("10.9") }
+      subject { PleaseRun::Platform::Launchd.new("10.9") }
 
       before do
         subject.name = "example"
         subject.user = "root"
         subject.program = "/bin/sh"
-        subject.args = [ "-c", "echo hello world; sleep 5" ]
+        subject.args = ["-c", "echo hello world; sleep 5"]
 
         subject.files.each do |path, content|
           File.write(path, content)
         end
         subject.install_actions.each do |command|
           system(command)
-          raise "Command failed: #{command}" unless $?.success?
+          raise "Command failed: #{command}" unless $CHILD_STATUS.success?
         end
       end
 
@@ -65,28 +66,28 @@ describe PleaseRun::Platform::LaunchD do
         end
 
         # Remove the logs, too.
-        [ "/var/log/#{subject.name}.out", "/var/log/#{subject.name}.err" ].each do |log|
+        ["/var/log/#{subject.name}.out", "/var/log/#{subject.name}.err"].each do |log|
           File.unlink(log) if File.exist?(log)
         end
       end
 
       it "should install" do
         system_quiet("launchctl list #{subject.name}")
-        insist { $? }.success?
+        insist { $CHILD_STATUS }.success?
       end
 
       it "should start" do
         system_quiet("launchctl start #{subject.name}")
-        insist { $? }.success?
+        insist { $CHILD_STATUS }.success?
         system_quiet("launchctl list #{subject.name}")
-        insist { $? }.success?
+        insist { $CHILD_STATUS }.success?
       end
 
       it "should stop" do
         system_quiet("launchctl start #{subject.name}")
-        insist { $? }.success?
+        insist { $CHILD_STATUS }.success?
         system_quiet("launchctl stop #{subject.name}")
-        insist { $? }.success?
+        insist { $CHILD_STATUS }.success?
       end
     end
   end # real tests

data/spec/pleaserun/platform/systemd_spec.rb

@@ -54,7 +54,7 @@ describe PleaseRun::Platform::Systemd do
         subject.name = "hurray"
         subject.user = "root"
         subject.program = "/bin/sh"
-        subject.args = [ "-c", "echo hello world; sleep 5" ]
+        subject.args = ["-c", "echo hello world; sleep 5"]
         activate(subject)
         
         # monkeypatch StartLimitInterval=0 into the .service file to avoid
@@ -71,11 +71,6 @@ describe PleaseRun::Platform::Systemd do
         end
       end
 
-      #it "should install" do
-        #system("systemctl status #{subject.name}")
-        #status_stopped
-      #end
-
       it "should start" do
         starts
         status_running

data/spec/pleaserun/platform/sysv_spec.rb

@@ -42,7 +42,7 @@ describe PleaseRun::Platform::SYSV do
         subject.name = "example"
         subject.user = "root"
         subject.program = "/bin/ping"
-        subject.args = [ "127.0.0.1" ]
+        subject.args = ["127.0.0.1"]
 
         activate(subject)
       end
@@ -54,8 +54,6 @@ describe PleaseRun::Platform::SYSV do
         end
 
         # TODO(sissel): Remove the logs, too.
-        #log = "/var/log/example.log"
-        #File.unlink(log) if File.exist?(log)
       end
 
       it "should install" do

data/spec/pleaserun/platform/upstart_spec.rb

@@ -57,7 +57,7 @@ describe PleaseRun::Platform::Upstart do
         subject.name = "example"
         subject.user = "root"
         subject.program = "/bin/sh"
-        subject.args = [ "-c", "echo hello world; sleep 5" ]
+        subject.args = ["-c", "echo hello world; sleep 5"]
         activate(subject)
       end
 
@@ -72,11 +72,6 @@ describe PleaseRun::Platform::Upstart do
         File.unlink(log) if File.exist?(log)
       end
 
-      #it "should install" do
-        #system("initctl status #{subject.name}")
-        #status_stopped
-      #end
-
       it "should start" do
         starts
 

data/spec/testenv.rb

@@ -1,3 +1,4 @@
+require "English" # for $CHILD_STATUS
 require "pleaserun/namespace"
 require "insist"
 
@@ -15,7 +16,7 @@ end
 
 def sh(command)
   system_quiet(command)
-  return $?
+  return $CHILD_STATUS
 end
 
 def program?(name)
@@ -27,39 +28,44 @@ def program?(name)
 end
 
 def activate(pleaserun)
-  pleaserun.files.each do |path, content, mode=nil|
+  pleaserun.files.each do |path, content, mode = nil|
     File.write(path, content)
     File.chmod(mode, path) if mode
   end
   pleaserun.install_actions.each do |command|
     system(command)
-    raise "Command failed: #{command}" unless $?.success?
+    raise "Command failed: #{command}" unless $CHILD_STATUS.success?
   end
 end
 
+# Helper methods to provide during rspec tests.
 module Helpers
   def starts
-    system_quiet(start); insist { $? }.success?
+    system_quiet(start)
+    insist { $CHILD_STATUS }.success?
     status_running
   end
 
   def stops
-    system_quiet(stop); insist { $? }.success?
+    system_quiet(stop)
+    insist { $CHILD_STATUS }.success?
     status_stopped
   end
 
   def status_running
-    system_quiet(status); insist { $? }.success?
+    system_quiet(status)
+    insist { $CHILD_STATUS }.success?
   end
 
   def status_stopped
-    system_quiet(status); reject { $? }.success?
+    system_quiet(status)
+    reject { $CHILD_STATUS }.success?
   end
 
   def restarts
     starts
     system_quiet(restart)
-    insist { $? }.success?
+    insist { $CHILD_STATUS }.success?
     status_running
   end
 end

data/test/test.rb

@@ -35,9 +35,17 @@ end
 results = ARGV.collect { tag, success, out, err = queue.pop }
 successes = results.count { |tag, success, out, err| success }
 failures = results.count { |tag, success, out, err| !success }
-total_tests = 0
 tests = results.collect { |tag, success, out, err| 
-  JSON.parse(File.read(out).split("\n").last[/{.*$/])["examples"].each { |r| r["tag"] = tag }
+  #require "pry"
+  #binding.pry
+  begin
+    JSON.parse(File.read(out).split("\n").last[/{.*$/])["examples"].each { |r| r["tag"] = tag }
+  rescue TypeError
+    puts "Failed to parse json"
+    puts :out => File.read(out)
+    puts :err => File.read(err)
+    raise
+  end
 }.flatten
 
 duration = Time.now - start
@@ -45,14 +53,25 @@ duration = Time.now - start
 test_successes = tests.count { |t| t["status"] == "passed" }
 test_failures = tests.count { |t| t["status"] == "failed" }
 
+#require "pry"
+#tests.pry
+tests.each do |result|
+  next if result["status"] == "passed"
+
+  case result["status"]
+    when "failed"
+      puts "#{result["tag"]}: #{result["full_description"]}"
+      exception = result["exception"]
+      puts "  #{exception["class"]}: #{exception["message"]}"
+    when "pending"
+      puts "#{result["tag"]}: PENDING: #{result["full_description"]}"
+  end
+  puts "  #{result["file_path"]}:#{result["line_number"]}"
+end
+
 puts "Tests: #{test_successes} ok, #{test_failures} failures; Platforms: #{successes} ok, #{failures} failures;, Duration: #{sprintf("%0.3f", duration)} seconds"
 
 results.each do |tag, success, out, err|
-  # print only on failure *or* if only one container is run
-  if !success || results.size == 1
-    puts File.read(err).gsub(/^/, "#{tag}/stderr: ")
-    puts File.read(out).gsub(/^/, "#{tag}/stdout: ")
-  end
   File.delete(err)
   File.delete(out)
 end

metadata

@@ -1,116 +1,102 @@
 --- !ruby/object:Gem::Specification
 name: pleaserun
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cabin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: stud
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: insist
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -132,9 +117,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rubocop.yml
+- CHANGELOG.asciidoc
 - Gemfile
 - Gemfile.lock
 - Guardfile
+- LICENSE
 - Makefile
 - README.md
 - bin/pleaserun
@@ -177,27 +165,26 @@ files:
 homepage: 
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: pleaserun
 test_files: []