hive-runner 2.1.11 → 2.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83530d15d6a4329e30c6625875c158df68b70124
-  data.tar.gz: b147876312ad0a0d89160deab9c14c1be4dc9628
+  metadata.gz: abe451df28b200455681ed819de8683bc2b022c1
+  data.tar.gz: 0f14a25e38f20b79bc769af6f1e8822ac33d817a
 SHA512:
-  metadata.gz: 01d8d291ac95cd222f694e38285bd5718ed42aa5aa0228e73d68b8ff01bd73cf4565144824b9ddfc570bf72d521de255a4dbc61389db0faccaabd5510bc0131b
-  data.tar.gz: 9e4592d70e5d54e4302760828e014cb7087e58052fa1e294fbdbbd58b58170f1172ca50f7f1420b813b760bdf06288299198bf2188583dde5bf06c95bc6457cc
+  metadata.gz: c793b5aff267ae40343d190381e5f7592d788a58f4301f17f5833e7ccab35d292c560dd737792f9616573702e20b93cbcba832a5105428ebb1a7b4a87c501b03
+  data.tar.gz: 12a30f507e0ec2140f987f5682aafbc461004268f08f5f343754a6a80c881dcd5068b907ac58ffaceead3d7a35ca0fde92921e85e3e2e24a2bd902616d22e157

data/bin/hive_setup

@@ -3,6 +3,7 @@
 require 'optparse'
 require 'fileutils'
 require 'terminal-table'
+require 'etc'
 
 if ARGV.length < 1
   puts "Usage:"
@@ -36,10 +37,69 @@ def yn question
   yn =~ /^[yY]/
 end
 
-def add_modules
+def os
+  if /mswin/ =~ RUBY_PLATFORM
+    'Windows'
+  elsif /darwin/ =~ RUBY_PLATFORM
+    'Mac'
+  elsif /linux/ =~ RUBY_PLATFORM
+    'Linux'
+  else
+    'Unknown'
+  end
+end
+
+def find_ruby use_default = false
+  ruby_versions = []
+
+  manager = nil
+  if system("which rvm > /dev/null 2> /dev/null")
+    list = `rvm list`.split /\n/
+    match = /^.(.).(ruby-\S+)/
+  elsif system("which rbenv > /dev/null 2> /dev/null")
+    list = `rbenv versions`.split /\n/
+    match = /^(.).(\S+)/
+  else
+    return ['system', 1]
+  end
+
+  version_table = Terminal::Table.new headings: ['#', 'Version', '']
+  default = nil
+  list.each do |line|
+    if line =~ match
+      default = ruby_versions.length if $1 == '*'
+      ruby_versions << $2
+      version_table.add_row [ ruby_versions.length, $2, $1 == '*' ? 'Default' : '' ]
+    end
+  end
+
+  if ruby_versions.length == 0
+    [ 'system', 0 ]
+  elsif ruby_versions.length == 1
+    [ ruby_versions[0], 1 ]
+  elsif use_default && ! default.nil?
+    [ ruby_versions[default], ruby_versions.length ]
+  else
+    puts
+    puts 'Multiple ruby versions available:'
+    puts version_table
+    puts ''
+    opt = -1
+    while opt <= 0 || opt > ruby_versions.length
+      print "[1 - #{ruby_versions.length}] > "
+      opt = STDIN.gets.chomp.to_i
+    end
+    [ ruby_versions[opt-1], ruby_versions.length ]
+  end
+end
+
+def gather_options
   # Choose options
   opt = ''
   mods = []
+  ruby, nrubies = find_ruby true
+  daemons = ( os != 'Unknown' )
+
   while opt.upcase != 'X'
     table = Terminal::Table.new headings: ['Device', 'Module', 'Source']
     mods.each do |mod|
@@ -54,8 +114,17 @@ def add_modules
 
     puts ''
     puts table
+    puts "Operating System: #{os}"
+    puts "Set up daemon script: #{daemons ? 'Yes (requires admin access)' : 'No'}"
+    print "Ruby version: #{ruby}"
+    print " (#{nrubies} versions available)" if nrubies > 1
+    puts ''
     puts ''
     puts '1) Add module'
+    puts '2) Change ruby version'
+    if os != 'Unknown'
+      puts "3) #{ daemons ? 'Do not s' : 'S'}et up daemon script"
+    end
     puts 'X) Continue'
     puts ''
     print "> "
@@ -74,13 +143,26 @@ def add_modules
       if yn "Correct? "
         mods << mod
       end
+    when '2'
+      ruby, nrubies = find_ruby
+    when '3'
+      daemons = ! daemons if os != 'Unknown'
     end
   end
 
-  mods
+  {
+    mods: mods,
+    daemons: daemons,
+    ruby: ruby
+  }
 end
 
-def setup_hive(dir, mods)
+def setup_hive(options)
+  dir = options[:dir]
+  mods = options[:mods]
+  daemons = options[:daemons]
+  ruby = options[:ruby] || 'system'
+
   FileUtils.mkdir_p("#{dir}/config")
   FileUtils.mkdir_p("#{dir}/log")
   FileUtils.mkdir_p("#{dir}/pids")
@@ -137,6 +219,9 @@ def setup_hive(dir, mods)
     f.puts ''
     f.puts '  # Configuration for diagnostic plugins'
     f.puts '  diagnostics:'
+    f.puts '    hive:'
+    f.puts '      load_warning: 0.7'
+    f.puts '      load_error: 1.5'
   end
 
   File.open("#{dir}/Gemfile", 'w') do |f|
@@ -149,11 +234,65 @@ def setup_hive(dir, mods)
     end
   end
 
+  puts '=========================='
+  print "Setting ruby ... "
+  File.open("#{dir}/.ruby-version", 'w') do |rv|
+    rv.write ruby
+  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
+
+    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"
+
+    print "Moving daemon startup script... "
+    if daemons
+      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
+        daemons = false
+        print "FAILED\n"
+      end
+    else
+      print "SKIPPED\n"
+    end
+  else
+    startup_script = '??'
+    daemons = false
+    print "FAILED\n"
+    puts "  Cannot set up daemons for '#{os}'"
+  end
+
   print "Executing 'bundle install' ... "
-  Dir.chdir dir
-  if system("bundle install > bundle_install.out 2>&1")
+  if system("bash -l -c 'cd #{dir}; gem install bundler; bundle install' > #{dir}/bundle_install.out 2>&1")
     print "SUCCESS\n"
-    File.delete('bundle_install.out')
+    File.delete("#{dir}/bundle_install.out")
   else
     print "FAILED\n"
     puts "See #{dir}/bundle_install.out for details"
@@ -176,8 +315,22 @@ def setup_hive(dir, mods)
   end
   puts '  * Add to ~/.bashrc'
   puts "      - export HIVE_CONFIG=#{dir}/config"
+  if ! daemons
+    puts '  * Move daemons startup script to correct location'
+    puts "      - File currently at '#{startup_script}'"
+  end
 end
 
-mods = []
-mods = add_modules unless headless
-setup_hive(dir, mods)
+if headless
+  options = {
+    mods: [],
+    daemons: ( os != 'Unknown' )
+  }
+  options[:ruby], nrubies = find_ruby true
+else
+  options = gather_options unless headless
+end
+
+options[:dir] = dir
+
+setup_hive options

data/bin/start_hive

@@ -12,9 +12,16 @@ $LOAD_PATH << File.expand_path('../../lib', __FILE__)
 require 'socket'
 require 'terminal-table'
 require 'hive'
+require 'optparse'
 
 $PROGRAM_NAME = Hive::DAEMON_NAME
 
+OptionParser.new do |opts|
+  opts.on('-p', '--pidfile PIDFILE', 'PID file') do |pid|
+    File.write(pid, Process.pid)
+  end
+end.parse!
+
 # Version information
 gems = {}
 Gem::Specification.all.select{ |g| g.name =~ /hive-*/ }.each do |g|

data/lib/hive/file_system.rb

@@ -56,10 +56,14 @@ module Hive
 
     def check_build_integrity( destination_path )
       output = `file #{destination_path}`
-      if output =~ /zip/
+      if output =~ /\s[Zz]ip\s/
         result = `zip -T #{destination_path}`
         @log.info(result)
         $? == 0
+      elsif output =~ /\sgzip\s/
+        result = `tar -tzf #{destination_path} > /dev/null`
+        @log.info(result)
+        $? == 0
       else
         true
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner
 version: !ruby/object:Gem::Version
-  version: 2.1.11
+  version: 2.1.12
 platform: ruby
 authors:
 - Joe Haig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chamber
@@ -192,20 +192,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.2
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -298,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Hive Runner