hookit 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ef6a1d03fe66b7dc858921b2c6f9b38c46dab67
-  data.tar.gz: 11ab5f5d41b157edbd05903ee92714bee86fae0a
+  metadata.gz: 949ebb8c4d5b30e1e8e55f012c3050f32d005cdc
+  data.tar.gz: 777738e6010351d754de2c01af6790f193a7700b
 SHA512:
-  metadata.gz: 695084242a78005016c86fbf9e26903e631bb2c1f6fe2a1094eac62a75a1f26cc077fc2f3a667ba3a048bfccc97c0b806d541f4091608c644acbaba2260c11bc
-  data.tar.gz: 177d445bc16ad1ec7fef87be550b105259a47f5b890f9923fac8e409ec56fece6a14e42f29356161716dc54e6dbff756550023ebb66477bc17d0045b2f9d960e
+  metadata.gz: eae7b877f879646944b256248831db05571192571a2f760c30b68f933dbaa04a3743b91ddf1ed0ce994e4d9c8e95c898c334d7ee69ee64ad560bd4b2965802b7
+  data.tar.gz: d3cfdcd42a3df3ffcd093555af039779d9e63e19e2969a60973e1fe470d746870f00ce70ccdf04a3ac852da76536168d9e4bd74879822ce53bd25e9f8925530f

data/bin/hookit

@@ -1,41 +1,51 @@
 #!/usr/bin/env ruby
-
-MODULE_DIR = ENV['MODULE_DIR']  || "/opt/local/hookit/mod"
-LOG_LEVEL  = ENV['LOG_LEVEL']   || :error
-LOGFILE    = ENV['LOGFILE']     || '/var/log/hookit/hookit.log'
-
-hook = ARGV.shift
-
-if not hook
-  $stderr.puts "hook is required"
-  exit 1
-end
-
-# uncomment if dev only
-lib = File.expand_path('../../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require 'hookit'
-require 'json'
-
-include Hookit::Hook   # payload helpers / resource dsl
-
-set :log_level,   LOG_LEVEL
-set :logfile,     LOGFILE
-set :module_root, MODULE_DIR
-
-# require hook libs
-Dir.glob("#{MODULE_DIR}/lib/*.rb").each do |file|
-  require file
-end
-
-logger.info ""
-logger.info "hook: #{hook}"
-logger.info "payload: #{payload.to_json}"
-
 begin
-  load "#{MODULE_DIR}/hooks/#{hook}.rb"
-rescue LoadError
-  logger.error "hook: #{hook} does not exist"
-  $stderr.puts "hook: #{hook} does not exist"
+  MODULE_DIR = ENV['MODULE_DIR']  || "/opt/local/hookit/mod"
+  LOG_LEVEL  = ENV['LOG_LEVEL']   || :error
+  LOGFILE    = ENV['LOGFILE']     || '/var/log/hookit/hookit.log'
+
+  hook = ARGV.shift
+
+  if not hook
+    $stderr.puts "hook is required"
+    exit 1
+  end
+
+  # uncomment if dev only
+  lib = File.expand_path('../../lib', __FILE__)
+  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+  require 'hookit'
+  require 'json'
+
+  include Hookit::Hook   # payload helpers / resource dsl
+
+  set :log_level,   LOG_LEVEL
+  set :logfile,     LOGFILE
+  set :module_root, MODULE_DIR
+
+  # require hook libs
+  Dir.glob("#{MODULE_DIR}/lib/*.rb").each do |file|
+    require file
+  end
+
+  logger.info ""
+  logger.info "hook: #{hook}"
+  logger.info "payload: #{payload.to_json}"
+
+  begin
+    load "#{MODULE_DIR}/hooks/#{hook}.rb"
+  rescue LoadError
+    logger.error "hook: #{hook} does not exist"
+    $stderr.puts "hook: #{hook} does not exist"
+  end
+rescue Exception => e
+  $stderr.puts "There has been an error."
+  $stderr.puts "If you choose to submit a ticket,"
+  $stderr.puts "please include the following backtrace."
+  $stderr.puts "======================================="
+  $stderr.puts e.message
+  $stderr.puts e.backtrace
+  $stderr.puts "======================================="
+  exit 1
 end

data/lib/hookit/resource/mount.rb

@@ -41,10 +41,10 @@ module Hookit
 
       def mount!
         ::FileUtils.mkdir_p(mount_point)
-        case platform.name
-        when 'smartos'
+        case platform.os
+        when 'sun'
           run_command! "mount -O -F #{fstype} -o retry=5,timeo=300 #{options!(as_arg=true)} #{device} #{mount_point}"
-        when 'ubuntu'
+        when 'linux'
           run_command! "mount -t #{fstype} -o retry=5,timeo=300 #{options!(as_arg=true)} #{device} #{mount_point}"
         end
       end
@@ -55,19 +55,19 @@ module Hookit
 
       def enable!
         entry = "#{device}\t#{device =~ /^\/dev/ ? device : "-"}\t#{mount_point}\t#{fstype}\t#{pass}\tyes\t#{options!}"
-        case platform.name
-        when 'smartos'
+        case platform.os
+        when 'sun'
           `echo "#{entry}" >> /etc/vfstab`
-        when 'ubuntu'
+        when 'linux'
           `echo "#{entry}" >> /etc/fstab`
         end
       end
 
       def disable!
-        case platform.name
-        when 'smartos'
+        case platform.os
+        when 'sun'
           `egrep -v "#{device}.*#{mount_point}" /etc/vfstab > /tmp/vfstab.tmp; mv -f /tmp/vfstab.tmp /etc/vfstab`
-        when 'ubuntu'
+        when 'linux'
           `egrep -v "#{device}.*#{mount_point}" /etc/fstab > /tmp/vfstab.tmp; mv -f /tmp/vfstab.tmp /etc/vfstab`
         end
       end

data/lib/hookit/version.rb

@@ -1,3 +1,3 @@
 module Hookit
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hookit
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Tyler Flint
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Hookit is a framework to provide hookit scripts with re-usable components