hookit 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5c3f231b006d73bcced104ed279d8badd17ae9d
-  data.tar.gz: 4f31cb12066a30328060d4d967c8d17ffafbb774
+  metadata.gz: be8d878c31cfb5843f20a99980f9f2fa7491c6b6
+  data.tar.gz: ce6373de03a2d8276e0b2409b080752d769dd08d
 SHA512:
-  metadata.gz: b57bc696382a86fd72e81acb87875787c0fbe9c80b0d8019b242544c31c9cdf16f7ced569532949e3ff018fe73e783b0d13f154c2d8b9a0c5a499240dfcb3060
-  data.tar.gz: d8fb49dc30e0f57b09d48117094979bd8caec876a7445ce82597480ae3c0c940f6185962358c015f5eb10f88a82da4e64411c9a580d327545f503efaa1d1241e
+  metadata.gz: 6bd3cd48a338e2c33b8dec7e3a8bc111ad48cc971bccef2b4e685391e1bbd9f53e6d7959dcc2951065a88e72f9fac1f551ae6d10aec1f65dc5884f974b6d190e
+  data.tar.gz: 9fdb4ddb415236a49171454b59eb9354bdf50579429c491112c3b3cebba0fc22614ab26285491926e179d72146f63ee85ffe69b8312807cf132db3b84647e156

data/lib/hookit/error.rb

@@ -1,5 +1,6 @@
 module Hookit
   module Error
+    class MissingConfiguration < StandardError; end
     class UnexpectedExit < StandardError; end
     class UnknownAction < StandardError; end
     class UnsupportedPlatform < StandardError; end

data/lib/hookit/platform/docker.rb

@@ -0,0 +1,19 @@
+module Hookit
+  module Platform
+    class Docker < Base
+      
+      def detect?
+        ! `cat /proc/self/cgroup 2>/dev/null | grep docker`.empty? 
+      end
+
+      def name
+        'docker'
+      end
+
+      def os
+        'linux'
+      end
+
+    end
+  end
+end

data/lib/hookit/platform.rb

@@ -1,4 +1,5 @@
 require 'hookit/platform/base'
+require 'hookit/plaftorm/docker'
 require 'hookit/platform/smartos'
 require 'hookit/platform/ubuntu'
 

data/lib/hookit/platforms.rb

@@ -1,2 +1,3 @@
+Hookit.platforms.register(:docker)   { Hookit::Platform::Docker }
 Hookit.platforms.register(:smartos)  { Hookit::Platform::Smartos }
 Hookit.platforms.register(:ubuntu)   { Hookit::Platform::Ubuntu }

data/lib/hookit/resource/base.rb

@@ -95,6 +95,12 @@ module Hookit
       def run_command!(cmd, expect_code=0)
         `#{cmd}`
         code = $?.exitstatus
+
+        # break early if the caller doesn't want to validate the exit code
+        if expect_code == false
+          return
+        end
+
         if code != expect_code
           raise Hookit::Error::UnexpectedExit, "#{cmd} failed with exit code '#{code}'"
         end

data/lib/hookit/resource/service.rb

@@ -19,6 +19,8 @@ module Hookit
             init(:smf)
           when 'ubuntu'
             init(:upstart)
+          when 'docker'
+            init(:runit)
           end
         end
       end
@@ -47,9 +49,40 @@ module Hookit
         when :smf
           run_command! "svcadm enable -s #{"-r" if recursive} #{service_name}"
         when :runit
-          run_command! "sv start #{service_name}"
+          # fail fast if we don't have an runit run configuration
+          if not File.exist?("/etc/service/#{service_name}/run")
+            raise Hookit::Error::MissingConfiguration "Expecting service configuration file at: /etc/service/#{service_name}/run"
+          end
+
+          # register and potentially start the service
+          run_command! "sv start #{service_name}", false
+
+          # runit can take up to 5 seconds to register the service before the
+          # service starts to run. We'll keep checking the status for up to 
+          # 6 seconds, after which time we'll raise an exception.
+          registered = false
+
+          6.times do
+            # check the status
+            `sv status #{service_name}`
+            if $?.exitstatus == 0
+              registered = true
+              break
+            end
+
+            sleep 1
+          end
+
+          if registered
+            # just in case the service is registered but not started, try
+            # to start the service one more time
+            run_command! "sv start #{service_name}"
+          else
+            raise Hookit::Error::UnexpectedExit "Service #{service_name} did not register within 6 seconds."
+          end
+
         else
-          Hookit::Error::UnsupportedOption "Unsupported init schema '#{init}'"
+          raise Hookit::Error::UnsupportedOption "Unsupported init schema '#{init}'"
         end
       end
 
@@ -60,7 +93,7 @@ module Hookit
         when :runit
           run_command! "sv stop #{service_name}"
         else
-          Hookit::Error::UnsupportedOption "Unsupported init schema '#{init}'"
+          raise Hookit::Error::UnsupportedOption "Unsupported init schema '#{init}'"
         end
       end
 
@@ -71,7 +104,7 @@ module Hookit
         when :runit
           disable!; enable!
         else
-          Hookit::Error::UnsupportedOption "Unsupported init schema '#{init}'"
+          raise Hookit::Error::UnsupportedOption "Unsupported init schema '#{init}'"
         end
       end
 
@@ -80,7 +113,7 @@ module Hookit
         when :smf
           run_command! "svcadm refresh #{service_name}"
         else
-          Hookit::Error::UnsupportedOption "Unsupported init schema '#{init}'"
+          raise Hookit::Error::UnsupportedOption "Unsupported init schema '#{init}'"
         end
       end
 

data/lib/hookit/resource/socket.rb

@@ -14,6 +14,15 @@ module Hookit
         service name unless service
         max_checks 3 unless max_checks
         super
+
+        case platform.os
+        when 'sun'
+          @active_com=`netstat -an | egrep '\*\.#{port}' | grep LISTEN`
+          @inactive_com=`netstat -an | grep 'ESTABLISHED' | awk '{ print $1 }' | grep "$(ifconfig #{interface} | grep inet | awk '{ print $2 }')\.#{port}"`
+        else
+          @active_com=`netstat -an | egrep ':#{port}' | grep LISTEN`
+          @inactive_com=`netstat -an | grep 'ESTABLISHED' | awk '{ print $4 }' | grep "$(ifconfig #{interface} | awk '/inet addr/ { print $2}' | cut -f2 -d':' | tr -d '\n'):#{port}"`
+        end
       end
 
       def run(action)
@@ -33,9 +42,10 @@ module Hookit
         # increment check
         registry("#{service}.listening", registry("#{service}.listening").to_i + 1)
 
-        if `netstat -an | grep '\*\.#{port}' | grep LISTEN`.empty?
+        if `#{@active_com}`.empty?
           count = registry("#{service}.listening").to_i
           if count <= max_checks
+            sleep 1
             exit(count + 10)
           else
             $stderr.puts "ERROR: timed out waiting for #{service} to listen"
@@ -49,8 +59,9 @@ module Hookit
         # increment check
         registry("#{service}.no_connections", registry("#{service}.no_connections").to_i + 1)
 
-        unless `netstat -an | grep 'ESTABLISHED' | awk '{ print $1 }' | grep "$(ifconfig #{interface} | grep inet | awk '{ print $2 }')\.#{port}"`.empty?
+        unless `#{@inactive_com}`.empty?
           count = registry("#{service}.no_connections").to_i
+          sleep 1
           if count <= max_checks
             exit(count + 10)
           end

data/lib/hookit/version.rb

@@ -1,3 +1,3 @@
 module Hookit
-  VERSION = "0.9.2"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hookit
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Tyler Flint
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -153,6 +153,7 @@ files:
 - lib/hookit/logvac.rb
 - lib/hookit/platform.rb
 - lib/hookit/platform/base.rb
+- lib/hookit/platform/docker.rb
 - lib/hookit/platform/smartos.rb
 - lib/hookit/platform/ubuntu.rb
 - lib/hookit/platforms.rb