hive-runner 2.1.16 → 2.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f93f7c3be523ef297bac9808d5005863be39f8ef
-  data.tar.gz: 8f3fd2329e720825c3653f600060535309adb5f5
+  metadata.gz: d4704758c41182147429e0d686f6aac6f9fbfbde
+  data.tar.gz: 4b53978303fb1d7a890b26b642a090d30af50f6a
 SHA512:
-  metadata.gz: 68e9a34d1acd84fd7b7dc2b37f1318d7053373e4e2726b39b2e6671dfbc073d69b141c721f1aa8ec1b88e5e50611faaa37e0b5b53238682c5adf26ba38caf8c2
-  data.tar.gz: a5ea8cf63bfcc12f76f82c41a3831538223db8e2bda3a2a36c10576acfe7bc087bf73f95573514ef6fbe94672922d18f50edb35934e15a19439570b6903eb4f6
+  metadata.gz: f272540c420ddd01528d609cf746219032a5137ca4263f9a7dfa554e48f60130da34ad53784b8e6069985cee3eab99de963c7c72c98ac217726095acfed4ff0a
+  data.tar.gz: 5d33248ba5945404a8097e1e091cda6fa400d0dd1feedc9437bb2387943d6afa42a836a51d434b918009f98f6729c8af3540a0335c7bd041896605ce3e8b03e3

data/bin/hive_setup

@@ -98,7 +98,7 @@ def gather_options
   opt = ''
   mods = []
   ruby, nrubies = find_ruby true
-  daemons = ( os != 'Unknown' )
+  daemons = false
 
   while opt.upcase != 'X'
     table = Terminal::Table.new headings: ['Device', 'Module', 'Source']
@@ -123,7 +123,7 @@ def gather_options
     puts '1) Add module'
     puts '2) Change ruby version'
     if os != 'Unknown'
-      puts "3) #{ daemons ? 'Do not s' : 'S'}et up daemon script"
+      puts "3) #{ daemons ? 'Do not s' : 'S'}et up daemon script (experimental)"
     end
     puts 'X) Continue'
     puts ''
@@ -241,38 +241,38 @@ def setup_hive(options)
   end
   print "SUCCESS\n"
 
-  print "Creating daemon startup script..."
-  if os == 'Linux'
-    startup_script = "#{dir}/hived.init"
-    config_file = "#{dir}/hived.conf"
-    write_logs = '> $LOG_DIRECTORY/hived.out 2> $LOG_DIRECTORY/hived.err'
-    File.open("#{dir}/start_hive.sh", 'w', 0755) do |f|
-      f.write "#!/bin/bash -li\n"
-
-      f.write "if [ -f /etc/hived.conf ]\n"
-      f.write "then\n"
-      f.write "  . /etc/hived.conf\n"
-      f.write "else\n"
-      f.write "  . #{config_file}\n"
-      f.write "fi\n"
-
-      f.write "cd $HIVE_HOME #{write_logs}\n"
-      f.write "start_hive -p $PIDFILE #{write_logs} &\n" 
-      f.write "echo $!\n"
-    end
+  print "Creating daemon startup script ... "
+  if daemons
+    if os == 'Linux'
+      startup_script = "#{dir}/hived.init"
+      config_file = "#{dir}/hived.conf"
+      write_logs = '> $LOG_DIRECTORY/hived.out 2> $LOG_DIRECTORY/hived.err'
+      File.open("#{dir}/start_hive.sh", 'w', 0755) do |f|
+        f.write "#!/bin/bash -li\n"
+
+        f.write "if [ -f /etc/hived.conf ]\n"
+        f.write "then\n"
+        f.write "  . /etc/hived.conf\n"
+        f.write "else\n"
+        f.write "  . #{config_file}\n"
+        f.write "fi\n"
+
+        f.write "cd $HIVE_HOME #{write_logs}\n"
+        f.write "start_hive -p $PIDFILE #{write_logs} &\n"
+        f.write "echo $!\n"
+      end
 
-    FileUtils.cp(File.expand_path('../init.d.hived', __FILE__), startup_script)
+      FileUtils.cp(File.expand_path('../init.d.hived', __FILE__), startup_script)
 
-    File.open(config_file, 'w') do |conf|
-      conf.write "HIVE_HOME=#{dir}\n"
-      conf.write "USER=#{Etc.getlogin}\n"
-      conf.write "LOG_DIRECTORY=#{dir}/log\n"
-      conf.write "PIDFILE=#{dir}/hived.pid\n"
-    end
-    print "SUCCESS\n"
+      File.open(config_file, 'w') do |conf|
+        conf.write "HIVE_HOME=#{dir}\n"
+        conf.write "USER=#{Etc.getlogin}\n"
+        conf.write "LOG_DIRECTORY=#{dir}/log\n"
+        conf.write "PIDFILE=#{dir}/hived.pid\n"
+      end
+      print "SUCCESS\n"
 
-    print "Moving daemon startup script... "
-    if daemons
+      print "Moving daemon startup script ... "
       if system("sudo cp #{startup_script} /etc/init.d/hived") && system("sudo chmod 755 /etc/init.d/hived") && system("sudo cp #{config_file} /etc/hived.conf")
         print "SUCCESS\n"
       else
@@ -280,14 +280,15 @@ def setup_hive(options)
         print "FAILED\n"
       end
     else
-      print "SKIPPED\n"
+      #startup_script = '??'
+      print "SKIPPED (not available on #{os})\n"
+      startup_script = false
+      daemons = false
+      #print "FAILED\n"
+      #puts "  Cannot set up daemons for '#{os}'"
     end
   else
-    #startup_script = '??'
-    startup_script = false
-    daemons = false
-    #print "FAILED\n"
-    #puts "  Cannot set up daemons for '#{os}'"
+    print "SKIPPED\n"
   end
 
   print "Executing 'bundle install' ... "

data/bin/init.d.hived

@@ -0,0 +1,73 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          hived
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start the Hive Runner
+# Description:       The Hive Runner is part of the Hive CI test
+#                    automation framework. For more details see
+#                    https://bbc.github.io/hive-ci/
+### END INIT INFO
+
+# Author: Joe Haig <joe.haig@bbc.co.uk>
+
+. /etc/hived.conf
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin:$HIVE_HOME
+DAEMON=$HIVE_HOME/start_hive.sh
+NAME=hived
+DESC="Hive Runner"
+SCRIPTNAME=/etc/init.d/"$NAME"
+. /lib/lsb/init-functions
+
+LOG_DIRECTORY=/var/log/hived
+SCRIPT=$HIVE_HOME/start_hive.sh
+if [ ! -d $LOG_DIRECTORY ]
+then
+  mkdir -p $LOG_DIRECTORY
+  chown $USER $LOG_DIRECTORY
+fi
+
+case "$1" in
+  start)
+    log_daemon_msg "Starting Hive Runner" "hived" || true
+    /sbin/start-stop-daemon --background --start --nicelevel 10 --quiet --oknodo --chdir $HIVE_HOME --startas $DAEMON --pidfile $PIDFILE --chuid $USER -- $DAEMON -p $PIDFILE
+    log_end_msg $?
+    ;;
+  stop)
+    log_daemon_msg "Stopping Hive Runner" "hived" || true
+    /sbin/start-stop-daemon --stop --pidfile $PIDFILE
+    RETVAL=$?
+    [ $RETVAL -eq 0 ] && [ -e "$PIDFILE" ] && rm -f $PIDFILE
+    log_end_msg $RETVAL
+    ;;
+  #reload)
+  #  echo "TODO: reload"
+  #  ;;
+  restart)
+    log_daemon_msg "Stopping Hive Runner" "hived" || true
+    /sbin/start-stop-daemon --stop --pidfile $PIDFILE
+    log_daemon_msg "Starting Hive Runner" "hived" || true
+    /sbin/start-stop-daemon --background --start --nicelevel 10 --quiet --oknodo --chdir $HIVE_HOME --startas $DAEMON --pidfile $PIDFILE --chuid $USER -- $DAEMON -p $PIDFILE
+    ;;
+  status)
+    if sig "USR1"
+    then
+      telnet localhost 9999 2> /dev/null
+      log_daemon_msg "Status: running ("`cat $PID`")"
+      exit 1
+    else
+      log_daemon_msg "Status: not running"
+      exit 0
+    fi
+    #sig "USR1" && telnet localhost 9999 && log_daemon_msg "Status: running ("`cat $PID`")" && exit 1
+    #log_daemon_msg "Status: not running" && exit 0
+    ;;
+  *)
+    log_action_msg "Usage: /etc/init.d/hived {start|stop|restart|status}" || true
+    exit 1
+esac
+
+exit 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner
 version: !ruby/object:Gem::Version
-  version: 2.1.16
+  version: 2.1.17
 platform: ruby
 authors:
 - Joe Haig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chamber
@@ -266,6 +266,7 @@ files:
 - README.md
 - bin/hive_setup
 - bin/hived
+- bin/init.d.hived
 - bin/start_hive
 - lib/hive.rb
 - lib/hive/controller.rb
@@ -304,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Hive Runner