mtncd 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDBlMWM4ZjQxOTY5MzZlMDhhYjIyNzA3MWY1ZTJhZTRlZDEzZjExMw==
+    YmE3Zjk5ZTM2N2NlMmYzODg2NjQzMDJlYmQ0YzQyNzNiNjhkZTQ4MQ==
   data.tar.gz: !binary |-
-    Mjg1YmJlZTU0NDFlZjBhN2Y3ODdiYjczYTJhZDA1ZDM1YTMwNmExMg==
+    NzA1Y2I5Yzc2M2YxN2QzODM5NzBiMTFhMGRkYThhM2JlZDJjODgyNQ==
 SHA512:
   metadata.gz: !binary |-
-    OWMwZjk3MDY2NWFiYmJmMGZkNWRlZGI1ZDVmYmQyOWMzMTkwOTc4YmRjZDU3
-    NWFiNmM0OTIwOTRlYWZmZjBlOWYwY2E3M2FmYjQ0ZWRhM2MzOWQ1NmYwOGY3
-    ODA3OTJhYWZkNjljOGIxODJmY2I3MTE3OGUyZGI2ZjdkNWFmODU=
+    Nzc0Njg0ZWNkNGQ5ZDNmZjkxZjE3OTQyYTA5NDI1ODhmMWNkODg0YzI5ZDA0
+    N2ZmM2JhM2ZjYjI0YjE4ODYxNjNmMWY3MjA1ODg1ZmZiYjM0ODMwNGY1ZmJi
+    NjE3NDY1N2MyNGMxYTA3N2ZiNDg0MTdhNjI3ZTRlYjI1ZGNmYjE=
   data.tar.gz: !binary |-
-    Zjk1ZjAwNWVkNGMxZmE1ODQ0MDZiMGFhZjIxYTUzN2RjNmQwZTdhOWRlZjJl
-    NjlmNmE5ZDVhOWJkYjhiODIzNTVjOTEyYmQ1YWJmODBhM2M2MTdkOGU0Y2E0
-    N2Q4YWE0YWZhZWYyYTVlODlkMjU2NDU0MmEwMmUyMTQyMmJmM2E=
+    M2I3YjFhNWVhNDUzYjcwYTIxYWYzNmY4NzZkZGI4YWZjMjljYTI1MmFjNThl
+    MGVlZDg3ZTMyNDUyYzFjYWI2MTI2NDg3ZTIzYjM0ZGVjMzYyZDU5YjNkYzZl
+    NDU5Yzg5OTU3YjVjZjVlYzM3YWVhMmMwNjdlNjVkMDI0YjE5NWE=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mtncd (0.0.4)
+    mtncd (0.0.8)
       awesome_print (= 1.2.0)
       gli (= 2.12.2)
       msgpack (= 0.5.9)
@@ -37,7 +37,7 @@ GEM
     msgpack (0.5.9)
     multi_json (1.10.1)
     multi_test (0.1.1)
-    rack (1.5.2)
+    rack (1.6.0)
     rack-protection (1.5.3)
       rack
     rake (10.3.2)

data/bin/mtncd

@@ -2,7 +2,7 @@
 # encoding
 require 'gli'
 require 'mtncd'
-require 'yaml'
+require 'json'
 require 'securerandom'
 require 'serfx'
 require 'resque'
@@ -10,6 +10,8 @@ require 'msgpack'
 require 'awesome_print'
 require 'redis'
 require 'open3'
+require 'resque'
+require 'highline/import'
 
 include GLI::App
 
@@ -35,7 +37,7 @@ command :deploy do |deploy|
     }
 
     start.desc 'use deployment id'
-    start.default_value SecureRandom.uuid
+    start.default_value SecureRandom.hex(4)
     start.flag :id
 
     start.desc 'local or global cluster command'
@@ -56,17 +58,6 @@ command :deploy do |deploy|
     start.switch :single
 
     start.action do |global_options,options,args|
-      if $config['role'] == 'sled' && options[:cluster] == 'global'
-        raise 'global commands are only available on central or infra nodes'
-      end
-
-      if $config['role'] == 'central' && options[:cluster] == 'local'
-        raise 'local commands are only available on infra or sled nodes'
-      end
-
-      if $config['role'] == 'zi' && options[:cluster] == 'local'
-        raise "local status is only available on infra or sled nodes"
-      end
 
       event_options_hash = { 
         'id' => "#{options[:id]}", 
@@ -77,10 +68,10 @@ command :deploy do |deploy|
       event_options_hash['shipcodes'] = options[:ships].split(",") unless options[:ships].nil?
 
       serf_options_hash = {
-        'ip' => $config['system']['serf'][options[:cluster]]['ip'],
-        'port' => $config['system']['serf'][options[:cluster]]['port'],
-        'auth' => $config['system']['serf'][options[:cluster]]['auth'],
-        'event' => $config['deploy'][options[:cluster]]['start']
+        'ip' => $config['serf'][options[:cluster]]['rpc_ip'],
+        'port' => $config['serf'][options[:cluster]]['rpc_port'],
+        'auth' => $config['serf'][options[:cluster]]['rpc_auth'],
+        'event' => 'deploy'
       }
 
       begin
@@ -107,27 +98,16 @@ command :deploy do |deploy|
     }
 
     stop.action do |global_options,options,args|
-      if $config['role'] == 'sled' && options[:cluster] == 'global'
-        raise 'global commands are only available on central or infra nodes'
-      end
-
-      if $config['role'] == 'central' && options[:cluster] == 'local'
-        raise 'local commands are only available on infra or sled nodes'
-      end
-
-      if $config['role'] == 'zi' && options[:cluster] == 'local'
-        raise "local status is only available on infra or sled nodes"
-      end
 
       event_options_hash = { 
         'id' => "#{options[:id]}"
       }
 
       serf_options_hash = {
-        'ip' => $config['system']['serf'][options[:cluster]]['ip'],
-        'port' => $config['system']['serf'][options[:cluster]]['port'],
-        'auth' => $config['system']['serf'][options[:cluster]]['auth'],
-        'event' => $config['deploy'][options[:cluster]]['stop']
+        'ip' => $config['serf'][options[:cluster]]['rpc_ip'],
+        'port' => $config['serf'][options[:cluster]]['rpc_port'],
+        'auth' => $config['serf'][options[:cluster]]['rpc_auth'],
+        'event' => 'stop_deploy'
       }
 
       begin
@@ -161,22 +141,10 @@ command :status do |status|
 
   status.action do |global_options,options,args| 
 
-    if $config['role'] == 'sled' && options[:cluster] == 'global'
-      raise "global status is only available on central or infra nodes"
-    end
-
-    if $config['role'] == 'central' && options[:cluster] == 'local'
-      raise "local status is only available on infra or sled nodes"
-    end
-
-    if $config['role'] == 'zi' && options[:cluster] == 'local'
-      raise "local status is only available on infra or sled nodes"
-    end
-
     serf_options_hash = {
-      'ip' => $config['system']['serf'][options[:cluster]]['ip'],
-      'port' => $config['system']['serf'][options[:cluster]]['port'],
-      'auth' => $config['system']['serf'][options[:cluster]]['auth']
+      'ip' => $config['serf'][options[:cluster]]['rpc_ip'],
+      'port' => $config['serf'][options[:cluster]]['rpc_port'],
+      'auth' => $config['serf'][options[:cluster]]['rpc_auth']
     }
 
     command_string = serf_options_hash['auth'].nil? ? "serf members -rpc-addr=#{serf_options_hash['ip']}:#{serf_options_hash['port']}" : "serf members -rpc-addr=#{serf_options_hash['ip']}:#{serf_options_hash['port']} -rpc-auth=#{serf_options_hash['auth']}" 
@@ -190,7 +158,6 @@ command :status do |status|
   end
 end
 
-
 desc 'Status of pipeline components on this particular machine'
 command :system do |system|
   system.action do |global_options,options,args|
@@ -198,26 +165,26 @@ command :system do |system|
     # check redis
     result = "OK"
     begin 
-      redis = Redis.new(:host => $config['system']['redis']['ip'], :port => $config['system']['redis']['port'], :db => $config['system']['redis']['db'])
+      redis = Redis.new(:host => $config['resque']['redis_ip'], :port => $config['resque']['redis_port'], :db => $config['resque']['redis_db'])
       redis.ping
     rescue
       result = "\033[31mFAIL\033[0m"
       success = false
     end
-    puts "Redis - Connected to #{$config['system']['redis']['ip']}:#{$config['system']['redis']['port']}/#{$config['system']['redis']['db']} - [#{result}]"
+    puts "Redis - Connected to #{$config['resque']['redis_ip']}:#{$config['resque']['redis_port']}/#{$config['resque']['redis_db']} - [#{result}]"
 
     # check resque
     begin
-      Resque.redis = "#{$config['system']['redis']['ip']}:#{$config['system']['redis']['port']}/#{$config['system']['redis']['db']}"
+      Resque.redis = "#{$config['resque']['redis_ip']}:#{$config['resque']['redis_port']}/#{$config['resque']['redis_db']}"
 
       # clean up any workers that didn't exit gracefuly.
       Resque.workers.each { |worker| 
         worker.prune_dead_workers
       }
 
-      result = (Resque.workers.count == $config['system']['resque']['workers']) ? "OK" : "\033[31mFAIL\033[0m"
-      success = Resque.workers.count == $config['system']['resque']['workers'] unless success == false
-      puts "Resque - Should have #{$config['system']['resque']['workers']} workers, running #{Resque.workers.count} workers - [#{result}]"
+      result = (Resque.workers.count == $config['resque']['worker_count']) ? "OK" : "\033[31mFAIL\033[0m"
+      success = Resque.workers.count == $config['resque']['worker_count'] unless success == false
+      puts "Resque - Should have #{$config['resque']['worker_count']} workers, running #{Resque.workers.count} workers - [#{result}]"
     rescue
       result = "\033[31mFAIL\033[0m"
       success = false
@@ -225,9 +192,9 @@ command :system do |system|
     end
     
     # check serf
-    if $config['role'] != 'central' && $config['role'] != 'zi'
+    if $config['role'] == 'ship' || $config['role'] == 'sled'
       begin
-        Serfx.connect(host: $config['system']['serf']['local']['ip'], port: $config['system']['serf']['local']['port'], authkey:$config['system']['serf']['local']['auth']) do |conn|
+        Serfx.connect(host: $config['serf']['local']['rpc_ip'], port: $config['serf']['local']['rpc_port'], authkey: $config['serf']['local']['rpc_auth']) do |conn|
           result = (conn.members.body['Members'].length > 1) ? "OK" : "\033[31mFAIL\033[0m"
         end
       rescue Serfx::RPCError => e
@@ -240,7 +207,7 @@ command :system do |system|
 
     if $config['role'] != 'sled'
       begin
-        Serfx.connect(host: $config['system']['serf']['global']['ip'], port: $config['system']['serf']['global']['port'], authkey:$config['system']['serf']['global']['auth']) do |conn|
+        Serfx.connect(host: $config['serf']['global']['rpc_ip'], port: $config['serf']['global']['rpc_port'], authkey:$config['serf']['global']['rpc_auth']) do |conn|
           result = (conn.members.body['Members'].length > 1) ? "OK" : "\033[31mFAIL\033[0m"
         end
       rescue Serfx::RPCError => e
@@ -251,54 +218,69 @@ command :system do |system|
       puts "Serf Global Cluster - connected and has more than one member - [#{result}]"
     end
 
-    raise "Pipeline node #{$config['node']} is likely unstable" unless success == true
+    node_name = ($config['role'] == 'sled') ? $config['serf']['local']['node_name'] : $config['serf']['global']['node_name']
+
+    raise "Pipeline node #{node_name} is likely unstable" unless success == true
   end
 end
 
-pre do |global,command,options,args|
-  $config = nil
-  begin
-    $config = YAML.load_file(File.join(Dir.home, '.mtncdconf'))
-  rescue
-    raise "Missing #{File.join(Dir.home, '.mtncdconf')}"
-  end
+desc 'resque information'
+command :resque do |resque|
+  resque.desc 'resque information'
+  resque.command :info do |info|
+    info.action do |global_options,options,args|
+      Resque.redis = "#{$config['resque']['redis_ip']}:#{$config['resque']['redis_port']}/#{$config['resque']['redis_db']}"
+
+      # get the queues
+      queues = Resque.queues
+      puts "Resque queues: #{queues.inspect}"
+      queues.each do |queue|
+        puts "Jobs in queue #{queue}: #{Resque.size(queue)}"
+        queued_jobs = Resque.peek(queue)
+        unless queued_jobs.nil?
+          Resque.peek(queue, 0, Resque.size(queue)).each { |job|
+            puts job
+          }
+        end
+      end
 
-  # check the file
-  raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['node'].nil?
-  raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['role'].nil?
-  raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['deploy'].nil?
-  
-  if $config['role'] == 'central' || $config['role'] == 'ship' || $config['role'] == 'zi'
-    raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['deploy']['global'].nil?
-    raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['deploy']['global']['stop'].nil?
-    raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['deploy']['global']['start'].nil?
-  end
+      puts "All worker info:"
+      Resque::Worker.all.each { |worker|
+        puts "Worker #{worker.to_s} assigned to queue #{worker.queues}"
+      }
 
-  if $config['role'] == 'ship' || $config['role'] == 'sled'
-    raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['deploy']['local'].nil?
-    raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['deploy']['local']['stop'].nil?
-    raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['deploy']['local']['start'].nil?
+      puts "Currently processing workers:"
+      Resque::Worker.working.each { |worker|
+        puts "Worker #{worker.to_s} processing job #{worker.job}"
+      }
+    end
+  end  
+
+  resque.desc 'flush redis (destructive)'
+  resque.command :flush do |flush|
+    flush.action do |global_options,options,args|
+      redis = Redis.new(:host => $config['resque']['redis_ip'], :port => $config['resque']['redis_port'], :db => $config['resque']['redis_db'])
+      
+      res = ask("Enter 'flush' to continue or anything else to cancel.")
+      if res == 'flush'
+        redis.flushall
+      else
+        puts 'Cancelled'
+      end
+    end
   end
-  
-  raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['system'].nil?
-  raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['system']['resque'].nil?
-  raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['system']['resque']['workers'].nil?
-
-  raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['system']['redis'].nil?
-  raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['system']['redis']['ip'].nil?
-  raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['system']['redis']['port'].nil?
-  raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['system']['redis']['db'].nil?
-
-  raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['system']['serf'].nil?
-  if $config['role'] == 'central' || $config['role'] == 'ship' || $config['role'] == 'zi'
-    raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['system']['serf']['global'].nil?
-    raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['system']['serf']['global']['ip'].nil?
-    raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['system']['serf']['global']['port'].nil?
+end
+
+
+pre do |global,command,options,args|
+  $config = JSON.parse(File.read(File.join(Dir.home, '.cicdconfig')))
+
+  if $config['role'] == 'sled' && options[:cluster] == 'global'
+    raise 'global commands are not available on sled nodes'
   end
-  if $config['role'] == 'ship' || $config['role'] == 'sled'
-    raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['system']['serf']['local'].nil?
-    raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['system']['serf']['local']['ip'].nil?
-    raise "Invalid #{File.join(Dir.home, '.mtncdconf')}" if $config['system']['serf']['local']['port'].nil?
+
+  if $config['role'] == 'central' && options[:cluster] == 'local'
+    raise 'local commands are not available on central nodes'
   end
 
   true
@@ -311,9 +293,19 @@ post do |global,command,options,args|
 end
 
 on_error do |exception|
-  # Error logic here
-  # return false to skip default error handling
-  true
+  case exception
+  when SystemCallError
+      $stderr.puts "Could not find pipeline configuration file at #{File.join(Dir.home, '.cicdconfig')}"
+      false
+  when JSON::ParserError
+      $stderr.puts "Configuration file at #{File.join(Dir.home, '.cicdconfig')} is not valid JSON"
+      false
+  when NoMethodError
+      $stderr.puts "Configuration file at #{File.join(Dir.home, '.cicdconfig')} is most likely missing required sections"
+      false
+  else
+    true
+  end
 end
 
 exit run(ARGV)

data/lib/mtncd/version.rb

@@ -1,3 +1,3 @@
 module Mtncd
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/mtncd.gemspec

@@ -21,6 +21,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('msgpack', '0.5.9')
   s.add_dependency('awesome_print', '1.2.0')
   s.add_dependency('redis', '3.1.0')
+  s.add_dependency('highline', '1.6.21')
   s.add_development_dependency('rake')
   s.add_development_dependency('rdoc')
   s.add_development_dependency('aruba')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mtncd
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - MTN Satellite Communications
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -80,6 +80,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.21
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.21
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement