zergrush 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f924664a04bc1e0605d12801bca3741380730040
-  data.tar.gz: 4a9616f8ce6752c06e2e659a8d08b13f43a43b51
+  metadata.gz: 844bb8bd048291c52f73b059cf340e77bed04a10
+  data.tar.gz: 8f0f0fcc66cf2f8b343069e5584bb06f8a2c1094
 SHA512:
-  metadata.gz: 9df78ac67d6dd997b3b3882f822501ab0aa51df9962a15ddf47257cca166fb526236ccd1c9644adf4db96e4270811023b703fffb76260959e2062e8348977a56
-  data.tar.gz: 0b1d6fa697102325d58567390bab7b17a82dccafa8270bd96eca3a50b31e417276c1c7c7c62388c8ffaa040669d683ac2db304d55c049aafb8f5a5ccbf03b914
+  metadata.gz: 93e4655161b2f76b6d4ed89c36c31cf25c1be5dcb62eae005adc66cff9ec69530a81cd5db3bb0746ea175c975ece829fe1948b8b414663ce257020d7dc1044dd
+  data.tar.gz: 9c936ece2eb8ae857e74c32dc402c1396430311873cd4c7a8673e9a0add222716a9872a942c8909bf7fb64afaa7cddd28b68cc9ae0e65ee2ec7a59a147b780f3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zergrush (0.0.1)
+    zergrush (0.0.2)
       awesome_print
       highline
       json-schema

data/data/ke.schema

@@ -306,6 +306,10 @@
         "bridge_description": {
           "type": "string",
           "id": "com.mtnsat.zerg.json.ke.vm.bridge_description"
+        },
+        "keepalive": {
+          "type": "boolean",
+          "id": "com.mtnsat.zerg.json.ke.vm.keepalive"
         }
       },
       "required": [

data/features/support/setup.rb

@@ -1,4 +1,4 @@
 require 'aruba/cucumber'
 Before do
-    @aruba_timeout_seconds = 120
+    @aruba_timeout_seconds = 1200
 end

data/features/task.feature

@@ -29,3 +29,58 @@ Feature: Tasks
         ERROR:
         """
         And the exit status should be 1
+
+    Scenario: Running a task
+        When I run `zerg init`
+        When I run `zerg rush helloworld`
+        Then the output should contain:
+        """
+        SUCCESS!
+        """
+        And the exit status should be 0
+
+    Scenario: Halting a task with keepalive
+        Given a file named "arubatask.ke" with:
+        """
+        {
+            "instances": 1,
+            "tasks": [
+                {
+                    "type": "shell",
+                    "inline": "echo \"ZERG RUSH!\""
+                }        
+            ],
+            "vm": {
+                "driver": {
+                    "drivertype": "vagrant",
+                    "providertype": "virtualbox",
+                    "provider_options": [
+                        "virtualbox.gui = false",
+                        "virtualbox.memory = 256"
+                    ]
+                },
+                "keepalive": true,
+                "basebox": "http://files.vagrantup.com/precise32.box",
+                "private_network": false
+            }
+        }
+        """
+        
+        When I run `zerg init`
+        When I run `zerg hive import arubatask.ke`
+        When I run `zerg rush arubatask`
+        Then the output should contain:
+        """
+        Will leave instances running.
+        SUCCESS!
+        """
+        And the exit status should be 0
+
+        When I run `zerg halt arubatask`
+        Then the output should contain:
+        """
+        [zergling_0] Attempting graceful shutdown of VM...
+        SUCCESS!
+        """
+        And the exit status should be 0
+

data/lib/zerg/cli.rb

@@ -78,6 +78,11 @@ module Zerg
         desc "clean [TASK]", "cleans a task"
         def clean(task)
             puts Zerg::Runner.clean(task, options[:debug])
+        end 
+
+        desc "halt [TASK]", "stops all task vm instances"
+        def halt(task)
+            puts Zerg::Runner.halt(task, options[:debug])
         end
           
         register(HiveCLI, 'hive', 'hive [COMMAND]', 'Manage hive - a collection of task descriptions.')

data/lib/zerg/runner.rb

@@ -56,7 +56,7 @@ module Zerg
         end
 
         # cross platform way of checking if command is available in PATH
-        def which(cmd)
+        def self.which(cmd)
             exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
             ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
                 exts.each { |ext|
@@ -95,11 +95,11 @@ module Zerg
                 end
             }
 
-            run(taskname, task["vm"]["driver"]["drivertype"], task["vm"]["driver"]["providertype"], task["instances"], debug)
+
+            run(taskname, task["vm"]["driver"]["drivertype"], task["vm"]["driver"]["providertype"], task["instances"], (task["vm"]["keepalive"] == nil) ? false : task["vm"]["keepalive"], debug)
         end
 
         def cleanup(taskname, task, debug)
-            abort("ERROR: Vagrant not installed!") unless which("vagrant") != nil
             puts ("Will cleanup task #{taskname}...")
 
             # TODO: generalize for multiple drivers
@@ -136,10 +136,25 @@ module Zerg
             Process.wait(cleanup_pid)
         end
 
-        def run(taskname, driver, provider, instances, debug)
-            # TODO: generalize to multiple drivers
-            abort("ERROR: Vagrant not installed!") unless which("vagrant") != nil
+        def halt(taskname, driver, provider, instances, debug)
+            puts("Halting all vagrant virtual machines...")
+            debug_string = (debug == true) ? " --debug" : ""  
+
+            # halt all machines
+            halt_pid = nil
+            for index in 0..instances - 1
+                halt_pid = Process.spawn(
+                    {
+                        "VAGRANT_CWD" => File.join("#{Dir.pwd}", ".hive", "driver", driver, taskname),
+                        "VAGRANT_DEFAULT_PROVIDER" => "#{provider}"
+                    },
+                    "vagrant halt zergling_#{index}#{debug_string}")
+                Process.wait(halt_pid)
+                abort("ERROR: vagrant halt failed on machine zergling_#{index}!") unless $?.exitstatus == 0
+            end
+        end
 
+        def run(taskname, driver, provider, instances, keepalive, debug)
             check_provider(driver, provider)
 
             debug_string = (debug == true) ? " --debug" : ""                
@@ -187,18 +202,10 @@ module Zerg
                 }.join 
             }
 
-            puts("DONE! Halting all vagrant virtual machines...")
-            # halt all machines
-            halt_pid = nil
-            for index in 0..instances - 1
-                halt_pid = Process.spawn(
-                    {
-                        "VAGRANT_CWD" => File.join("#{Dir.pwd}", ".hive", "driver", driver, taskname),
-                        "VAGRANT_DEFAULT_PROVIDER" => "#{provider}"
-                    },
-                    "vagrant halt zergling_#{index}#{debug_string}")
-                Process.wait(halt_pid)
-                abort("ERROR: vagrant halt failed on machine zergling_#{index}!") unless $?.exitstatus == 0
+            if keepalive == false
+                halt(taskname, driver, provider, instances, debug)
+            else
+                puts "Will leave instances running."
             end
 
             abort("ERROR: Finished with errors in: #{errors.to_s}") unless errors.length == 0
@@ -206,6 +213,8 @@ module Zerg
         end
 
         def self.rush(task, debug)
+            abort("ERROR: Vagrant not installed!") unless which("vagrant") != nil
+
             # load the hive first
             Zerg::Hive.instance.load
 
@@ -217,7 +226,24 @@ module Zerg
             runner.process(task, Zerg::Hive.instance.hive[task], debug);
         end
 
+        def self.halt(task, debug)
+            abort("ERROR: Vagrant not installed!") unless which("vagrant") != nil
+
+            # load the hive first
+            Zerg::Hive.instance.load
+
+            puts "Loaded hive. Looking for task #{task}..."
+            abort("ERROR: Task #{task} not found in current hive!") unless Zerg::Hive.instance.hive.has_key?(task) 
+
+            # halt!
+            runner = Runner.new
+            runner.halt(task, Zerg::Hive.instance.hive[task]["vm"]["driver"]["drivertype"], Zerg::Hive.instance.hive[task]["vm"]["driver"]["providertype"], Zerg::Hive.instance.hive[task]["instances"], debug)
+            puts("SUCCESS!")
+        end
+
         def self.clean(task, debug)
+            abort("ERROR: Vagrant not installed!") unless which("vagrant") != nil
+
             # load the hive first
             Zerg::Hive.instance.load
 

data/lib/zerg/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Zerg
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zergrush
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - MTN Satellite Communications
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler