hive-runner 2.0.11 → 2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b5910241ae9d856425265db20202573a23cb604
-  data.tar.gz: a29e983a1893894f8cf440f3f7bf19b315368354
+  metadata.gz: 042debdaacef0d30c5d6b0d28e09d6c58aa0641a
+  data.tar.gz: e4084d0a7436469a4ca4c34b3da03fb84e653839
 SHA512:
-  metadata.gz: e2d30586bc644793b88ebf52f63f45e7423f2e930e712ef864b108ed458d034a66d5786b19033ad111846b18b47bbf8bad339b377f1bf25cce6248648ecc8ed5
-  data.tar.gz: 5539bcb9dfd4fa78c75f789f6f8f4cf535cc9332983fb2addfbb1baecb138f521ba66dbd680a8387ae588380cda7d32e29e43e36d14e9e61344824ff46a6caa7
+  metadata.gz: e50f6cca84576eeda4b614ee490347a6c6b981f4d0bb4873e9618b86235fd72728c4c6022d433abf779a1855fa2640584754d226108ce593669829219deefe79
+  data.tar.gz: 86cbd34195e4bc7b6d6e21a4aa9c3443f6c18d7c3411964b42f5fd7a71bf30e6260e552b13190479e16251c5f8f6c2247648cdfac9c9dd8764fa4a70f74c0d5f

data/bin/hive_setup

@@ -11,6 +11,8 @@ if ARGV.length < 1
   exit 1
 end
 
+headless = ARGV.include?("--ni")
+
 dir = File.expand_path('', ARGV[0])
 if Dir.exists?(dir)
   if ! Dir["#{dir}/*"].empty?
@@ -34,150 +36,160 @@ def yn question
   yn =~ /^[yY]/
 end
 
-# Choose options
-opt = ''
-mods = []
-while opt.upcase != 'X'
-  table = Terminal::Table.new headings: ['Device', 'Module', 'Source']
-  mods.each do |mod|
-    table.add_row [
-      mod[:device],
-      mod[:name],
-      mod.has_key?(:git_account) ?
-        "git@github.com:#{mod[:git_account]}/#{mod[:name]}" :
-        "https://rubygems.org/gems/#{mod[:name]}"
-    ]
-  end
-
-  puts ''
-  puts table
-  puts ''
-  puts '1) Add module'
-  puts 'X) Continue'
-  puts ''
-  print "> "
-  opt = STDIN.gets.chomp
-
-  case opt
-  when '1'
-    mod = {}
-    puts ''
-    print "Module name: "
-    mod[:device] = STDIN.gets.chomp
-    mod[:name] = "hive-runner-#{mod[:device]}"
-    puts ''
-    if yn "Get '#{mod[:name]}' from Github? "
-      print "Enter GIT account name: "
-      mod[:git_account] = STDIN.gets.chomp
+def add_modules
+  # Choose options
+  opt = ''
+  mods = []
+  while opt.upcase != 'X'
+    table = Terminal::Table.new headings: ['Device', 'Module', 'Source']
+    mods.each do |mod|
+      table.add_row [
+        mod[:device],
+        mod[:name],
+        mod.has_key?(:git_account) ?
+          "git@github.com:#{mod[:git_account]}/#{mod[:name]}" :
+          "https://rubygems.org/gems/#{mod[:name]}"
+      ]
     end
 
     puts ''
-    puts "Module '#{mod[:name]}'"
-    if mod.has_key?(:git_account)
-      puts "  from git@github.com:#{mod[:git_account]}/#{mod[:name]}"
-    else
-      puts "  from https://rubygems.org/gems/#{mod[:name]}"
-    end
+    puts table
     puts ''
+    puts '1) Add module'
+    puts 'X) Continue'
+    puts ''
+    print "> "
+    opt = STDIN.gets.chomp
+
+    case opt
+    when '1'
+      mod = {}
+      puts ''
+      print "Module name: "
+      mod[:device] = STDIN.gets.chomp
+      mod[:name] = "hive-runner-#{mod[:device]}"
+      puts ''
+      if yn "Get '#{mod[:name]}' from Github? "
+        print "Enter GIT account name: "
+        mod[:git_account] = STDIN.gets.chomp
+      end
+
+      puts ''
+      puts "Module '#{mod[:name]}'"
+      if mod.has_key?(:git_account)
+        puts "  from git@github.com:#{mod[:git_account]}/#{mod[:name]}"
+      else
+        puts "  from https://rubygems.org/gems/#{mod[:name]}"
+      end
+      puts ''
 
-    if yn "Correct? "
-      mods << mod
+      if yn "Correct? "
+        mods << mod
+      end
     end
   end
+
+  mods
 end
 
-FileUtils.mkdir_p("#{dir}/config")
-FileUtils.mkdir_p("#{dir}/log")
-FileUtils.mkdir_p("#{dir}/pids")
-FileUtils.mkdir_p("#{dir}/workspaces")
-
-File.open("#{dir}/config/settings.yml", 'w') do |f|
-  f.puts "#{ENV['HIVE_ENVIRONMENT'] || 'test'}:"
-  f.puts '  daemon_name: HIVE'
-  f.puts ''
-  f.puts '  controllers:'
-  f.puts '    shell:'
-  f.puts '      # Number of shell workers to allocate'
-  f.puts '      workers: 5'
-  f.puts '      # Queue for each shell worker'
-  f.puts '      queues:'
-  f.puts '        - bash'
-  f.puts '      # Number of ports to allocate to each shell worker'
-  f.puts '      port_range_size: 50'
-  f.puts '      name_stub: SHELL_WORKER'
-  mods.each do |m|
-    f.puts "    #{m[:device]}:"
-    f.puts '      # Number of ports to allocate to each #{m[:device]} worker'
+def setup_hive(dir, mods)
+  FileUtils.mkdir_p("#{dir}/config")
+  FileUtils.mkdir_p("#{dir}/log")
+  FileUtils.mkdir_p("#{dir}/pids")
+  FileUtils.mkdir_p("#{dir}/workspaces")
+
+  File.open("#{dir}/config/settings.yml", 'w') do |f|
+    f.puts "#{ENV['HIVE_ENVIRONMENT'] || 'test'}:"
+    f.puts '  daemon_name: HIVE'
+    f.puts ''
+    f.puts '  controllers:'
+    f.puts '    shell:'
+    f.puts '      # Number of shell workers to allocate'
+    f.puts '      workers: 5'
+    f.puts '      # Queue for each shell worker'
+    f.puts '      queues:'
+    f.puts '        - bash'
+    f.puts '      # Number of ports to allocate to each shell worker'
     f.puts '      port_range_size: 50'
-    f.puts "      name_stub: #{m[:device].upcase}_WORKER"
+    f.puts '      name_stub: SHELL_WORKER'
+    mods.each do |m|
+      f.puts "    #{m[:device]}:"
+      f.puts '      # Number of ports to allocate to each #{m[:device]} worker'
+      f.puts '      port_range_size: 50'
+      f.puts "      name_stub: #{m[:device].upcase}_WORKER"
+    end
+    f.puts ''
+    f.puts '  # Range of ports to be made available to workers'
+    f.puts '  ports:'
+    f.puts '    minimum: 4000'
+    f.puts '    maximum: 5000'
+    f.puts ''
+    f.puts '  # Logging configuration'
+    f.puts '  logging:'
+    f.puts "    directory: #{dir}/log"
+    f.puts "    pids: #{dir}/pids"
+    f.puts '    main_filename: hive.log'
+    f.puts '    main_level: INFO'
+    f.puts '    worker_level: INFO'
+    f.puts "    home: #{dir}/workspaces"
+    f.puts '    homes_to_keep: 5'
+    f.puts ''
+    f.puts '  # Timing configuration'
+    f.puts '  timings:'
+    f.puts '    worker_loop_interval: 5'
+    f.puts '    controller_loop_interval: 5'
+    f.puts ''
+    f.puts '  # Configuration for various network options'
+    f.puts '  network:'
+    f.puts '    scheduler: http://localhost:3000'
+    f.puts '    #hive_mind: http://localhost:3001'
+    f.puts '    # Optional cert paths:'
+    f.puts '    # cert: /path/to/certificate.pem'
+    f.puts '    # cafile: /path/to/certificate-authorities.pem'
+    f.puts ''
+    f.puts '  # Configuration for diagnostic plugins'
+    f.puts '  diagnostics:'
   end
-  f.puts ''
-  f.puts '  # Range of ports to be made available to workers'
-  f.puts '  ports:'
-  f.puts '    minimum: 4000'
-  f.puts '    maximum: 5000'
-  f.puts ''
-  f.puts '  # Logging configuration'
-  f.puts '  logging:'
-  f.puts "    directory: #{dir}/log"
-  f.puts "    pids: #{dir}/pids"
-  f.puts '    main_filename: hive.log'
-  f.puts '    main_level: INFO'
-  f.puts '    worker_level: INFO'
-  f.puts "    home: #{dir}/workspaces"
-  f.puts '    homes_to_keep: 5'
-  f.puts ''
-  f.puts '  # Timing configuration'
-  f.puts '  timings:'
-  f.puts '    worker_loop_interval: 5'
-  f.puts '    controller_loop_interval: 5'
-  f.puts ''
-  f.puts '  # Configuration for various network options'
-  f.puts '  network:'
-  f.puts '    scheduler: http://scheduler'
-  f.puts '    devicedb: http://devicedb'
-  f.puts '    #hive_mind: http://hive_mind'
-  f.puts '    # cert: /path/to/certificate.pem'
-  f.puts '    # cafile: /path/to/certificate-authorities.pem'
-  f.puts ''
-  f.puts '  # Configuration for diagnostic plugins'
-  f.puts '  diagnostics:'
-end
 
-File.open("#{dir}/Gemfile", 'w') do |f|
-  f.puts "source 'https://rubygems.org/'"
-  f.puts ""
-  f.puts "gem 'hive-runner'"
-  mods.each do |m|
-    source = m.has_key?(:git_account) ? ", git: 'git@github.com:#{m[:git_account]}/#{m[:name]}'" : ''
-    f.puts "gem '#{m[:name]}'#{source}"
+  File.open("#{dir}/Gemfile", 'w') do |f|
+    f.puts "source 'https://rubygems.org/'"
+    f.puts ""
+    f.puts "gem 'hive-runner'"
+    mods.each do |m|
+      source = m.has_key?(:git_account) ? ", git: 'git@github.com:#{m[:git_account]}/#{m[:name]}'" : ''
+      f.puts "gem '#{m[:name]}'#{source}"
+    end
   end
-end
 
-print "Executing 'bundle install' ... "
-Dir.chdir dir
-if system("bundle install > bundle_install.out 2>&1")
-  print "SUCCESS\n"
-  File.delete('bundle_install.out')
-else
-  print "FAILED\n"
-  puts "See #{dir}/bundle_install.out for details"
-  exit
-end
+  print "Executing 'bundle install' ... "
+  Dir.chdir dir
+  if system("bundle install > bundle_install.out 2>&1")
+    print "SUCCESS\n"
+    File.delete('bundle_install.out')
+  else
+    print "FAILED\n"
+    puts "See #{dir}/bundle_install.out for details"
+    exit
+  end
 
-puts ''
-puts 'Configuration required:'
-puts
-puts '  * Add to config/settings.yml'
-puts '      - scheduler'
-puts '      - devicedb'
-puts '      - cert'
-puts '      - cafile'
-if mods.length > 0
-  puts '  * Configure these modules in config/settings.yml'
-  mods.each do |m|
-    puts "      - #{m[:device]}"
+  puts ''
+  puts 'Configuration required:'
+  puts
+  puts '  * Add to config/settings.yml'
+  puts '      - scheduler'
+  puts '      - devicedb'
+  puts '      - cert'
+  puts '      - cafile'
+  if mods.length > 0
+    puts '  * Configure these modules in config/settings.yml'
+    mods.each do |m|
+      puts "      - #{m[:device]}"
+    end
   end
+  puts '  * Add to ~/.bashrc'
+  puts "      - export HIVE_CONFIG=#{dir}/config"
 end
-puts '  * Add to ~/.bashrc'
-puts "      - export HIVE_CONFIG=#{dir}/config"
+
+mods = []
+mods = add_modules unless headless
+setup_hive(dir, mods)

data/lib/hive/worker.rb

@@ -34,9 +34,7 @@ module Hive
         pem: Chamber.env.network.cert ? Chamber.env.network.cert : nil,
         ca_file: Chamber.env.network.cafile ? Chamber.env.network.cafile : nil,
         verify_mode: Chamber.env.network.verify_mode ? Chamber.env.network.verify_mode : nil,
-        device: {
-          id: @options['id']
-        }
+        device: hive_mind_device_identifiers
       )
       @device_identity = @options['device_identity'] || 'unknown-device'
       pid = Process.pid
@@ -48,8 +46,11 @@ module Hive
       )
       @devicedb_register = true if @devicedb_register.nil?
 
+      # When DeviceDB is dumped in favour of Hive Mind the 'queues' argument
+      # will not be passed in and instead be generated by the
+      # autogenerated_queues method
       @queues = @options['queues'].class == Array ? @options['queues'] : []
-      self.update_queue_log
+      self.update_queues
 
       @port_allocator = (@options.has_key?('port_allocator') ? @options['port_allocator'] : Hive::PortAllocator.new(ports: []))
       
@@ -248,6 +249,11 @@ module Hive
       @device_status = status
     end
 
+    # List of autogenerated queues for the worker
+    def autogenerated_queues
+      []
+    end
+
     def update_queues
       if @devicedb_register
         details = Hive.devicedb('Device').find(@options['id'])
@@ -266,6 +272,13 @@ module Hive
           @log.warn("Queue list missing from DeviceDB response")
         end
       end
+
+      # Get Queues from Hive Mind
+      #@log.debug("Getting queues from Hive Mind")
+      #@queues = (autogenerated_queues + @hive_mind.hive_queues(true)).uniq
+      #@log.debug("hive queues: #{@hive_mind.hive_queues}")
+      #@log.debug("Full list of queues: #{@queues}")
+      #update_queue_log
     end
     
     def update_queue_log
@@ -436,5 +449,10 @@ module Hive
         f.puts "#{Process.pid} #{state}"
       end
     end
+
+    # Parameters for uniquely identifying the device
+    def hive_mind_device_identifiers
+      { id: @device_id }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.12
 platform: ruby
 authors:
 - Joe Haig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chamber
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: code_cache
   requirement: !ruby/object:Gem::Requirement