zergrush 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWUwZWU4OTlhNDkwZGYyNjJmMTM5ODAzMjJmNGJlMDlkZjYwOWFlMg==
+    NmRiYzkxMDc5YWM3YWQ5NThmOTRjYWNiMGM4MmUxNzA1NmQyYzVjOA==
   data.tar.gz: !binary |-
-    OTAwZDMzODdlNGFiM2E0YWQ4ZDViZWVkMjBhZGNiODNjNjRjMDc1MQ==
+    ZDJhZjNkZDhhNGQyYTU4MWY0ODQxZWJjNThmY2RkNDQ4YWQ3YjkwOA==
 SHA512:
   metadata.gz: !binary |-
-    YzQ4YjY0MTkzZTEyZDJlNzQxNTQ4YmZlZTA5N2FkZWUzNDE2Y2M1OWExMDA2
-    ZWZiZThkMTUwOGMxMDM5Zjc2N2FkOTZjZjE2YTI3ZmVhZjNmYTc2MjU2OWZm
-    OWRiMDJjZjVmNTc5OTUwMWQ3ZWViNGFjNzEyOTc5ZDQyYTRlZjQ=
+    NDNmNjBiYzQ3OWQxMGNjMzUxZmQxMTlkOGQwMjZkYTI2YzNlMWNhNTJmMjk2
+    MDVlYWRjODIzNTg0YWUwMmJkYmU2OTJhY2EyMjczZjNjZmM0ZWQxMzM5MjM3
+    NGYxZmZhMjY1YmQ3MWZkYTc3MzAxNjIwMWExMTg2NDA5NzY4Mjk=
   data.tar.gz: !binary |-
-    YTdlMGVkZmQzYTU0MmRlYjBhMjUwMjg4ZmE2NDg3YTMyZTNmYzFkMjc5MmVj
-    N2VmOTczYjYzODEzNGVmN2M3MTdmNzg3NjkzMDEyY2NjMDQ5ODY1ODYyNTkw
-    MjA3YTU0YzgyNTkyYWUyNTE0ZThmNWNiZjM0ZWNiODdlMWM2OTI=
+    ZWJlYzQzNDhhOTY3NzUyOWE2MjM5MzQ1ZDk5ZjU4NjNlNjVkMzYwMWI5NTk4
+    ZGVhYjhjNTc5ZTlkZjVlNDQwYTY0NmFhMjMzMjFkZDQwOTliZTI3OWJiMDBl
+    ZmM5NTQ2Y2M2Zjg5ZmFjZTQzMzYzM2I3OWYyNmI1MzA3MjkyYzA=

data/data/ke.schema

@@ -133,7 +133,29 @@
             ],
             "additionalProperties": false
           }
-        } 
+        },
+        "additional_files": {
+          "type": "array",
+          "items": {
+            "properties": {
+              "file": {
+                "type": "object",
+                "properties": {
+                  "from": {
+                    "type": "string"
+                  },
+                  "to": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "from",
+                  "to"
+                ]
+              }
+            }
+          }
+        }
       },
       "required": [
           "driver",

data/features/hive.feature

@@ -6,8 +6,8 @@ Feature: Hive
     Scenario: Initializing hive
         When I run `zerg init`
             Then the following files should exist:
-                | .hive/helloworld.ke | .hive/helloaws.ke | 
-            Then the file ".hive/helloworld.ke" should contain:
+                | .hive/helloworld/helloworld.ke | .hive/helloaws/helloaws.ke | 
+            Then the file ".hive/helloworld/helloworld.ke" should contain:
                 """
                 {
                     "num_instances": 3,
@@ -73,7 +73,7 @@ Feature: Hive
                 }
                 """
 
-            Then the file ".hive/helloaws.ke" should contain:
+            Then the file ".hive/helloaws/helloaws.ke" should contain:
                 """
                 {
                     "num_instances": 3,
@@ -214,8 +214,8 @@ Feature: Hive
             | HIVE_CWD           | ./overriden/hive/dir |
         When I run `zerg init`
         Then the following files should exist:
-            | overriden/hive/dir/.hive/helloworld.ke | overriden/hive/dir/.hive/helloaws.ke | 
-        Then the file "overriden/hive/dir/.hive/helloworld.ke" should contain:
+            | overriden/hive/dir/.hive/helloworld/helloworld.ke | overriden/hive/dir/.hive/helloaws/helloaws.ke | 
+        Then the file "overriden/hive/dir/.hive/helloworld/helloworld.ke" should contain:
             """
             {
                 "num_instances": 3,
@@ -281,7 +281,7 @@ Feature: Hive
             }
             """
 
-        Then the file "overriden/hive/dir/.hive/helloaws.ke" should contain:
+        Then the file "overriden/hive/dir/.hive/helloaws/helloaws.ke" should contain:
             """
             {
                 "num_instances": 3,

data/lib/zerg/generators/hivegen.rb

@@ -40,8 +40,8 @@ module Zerg
 
             def copy_sample_task
                 load_path = (ENV['HIVE_CWD'] == nil) ? File.join("#{Dir.pwd}", ".hive") : File.join("#{ENV['HIVE_CWD']}", ".hive")
-                template("template.ke", "#{File.join(load_path, "helloworld.ke")}")
-                template("awstemplate.ke", "#{File.join(load_path, "helloaws.ke")}")
+                template("template.ke", "#{File.join(load_path, "helloworld", "helloworld.ke")}")
+                template("awstemplate.ke", "#{File.join(load_path, "helloaws", "helloaws.ke")}")
             end
         end
     end

data/lib/zerg/hive.rb

@@ -48,7 +48,7 @@ module Zerg
 
             # load all .ke files into one big hash
             @hive = Hash.new
-            Dir.glob(File.join("#{@load_path}", "*.ke")) do |ke_file|
+            Dir["#{File.join(@load_path, "**/*.ke")}"].each { |ke_file|
                 # do work on files ending in .rb in the desired directory
                 begin 
                     ke_file_hash = JSON.parse( IO.read(ke_file) )
@@ -56,11 +56,16 @@ module Zerg
                 rescue JSON::ParserError
                     abort("ERROR: Could not parse #{ke_file}. Likely invalid JSON.")
                 end
-            end
+            }
 
             @loaded = true
         end
 
+        def self.copy_with_path(src, dst)
+            FileUtils.mkdir_p(File.dirname(dst))
+            FileUtils.cp(src, dst)
+        end
+
         def self.list
             instance.load
 
@@ -85,7 +90,7 @@ module Zerg
         def self.verify
             instance.load
 
-            Dir.glob(File.join("#{instance.load_path}", "*.ke")) do |ke_file|
+            Dir["#{File.join("#{instance.load_path}", "**/*.ke")}"].each { |ke_file|
                 begin 
                     ke_file_hash = JSON.parse( File.open(ke_file, 'r').read )
 
@@ -112,7 +117,7 @@ module Zerg
                 rescue ZergGemPlugin::PluginNotLoaded
                     abort("ERROR: driver #{ke_file_hash["vm"]["driver"]["drivertype"]} not found. Did you install the plugin gem?")
                 end
-            end
+            }
 
             puts "SUCCESS!"
         end
@@ -120,7 +125,7 @@ module Zerg
         def self.import(file, force)
             instance.load
             abort("ERROR: '#{file}' not found!") unless File.exist?(file) 
-            abort("ERROR: '#{File.basename(file)}' already exists in hive!") unless !File.exist?(File.join(instance.load_path, File.basename(file))) || force == true
+            abort("ERROR: '#{File.basename(file)}' already exists in hive!") unless !File.directory?(File.join(instance.load_path, File.basename(file))) || force == true
 
             # check the file against schema.
             begin
@@ -145,7 +150,26 @@ module Zerg
                 errors = JSON::Validator.fully_validate(full_schema, ke_file_hash, :errors_as_objects => true)
                 abort("ERROR: #{file} failed validation. Errors: #{errors.ai}") unless errors.empty?
 
-                FileUtils.cp(file, File.join(instance.load_path, File.basename(file)))
+                # copy the .ke file
+                copy_with_path(file, File.join(instance.load_path, File.basename(file, ".*"), File.basename(file)))
+
+                # copy additonal files
+                if ke_file_hash["vm"]["additional_files"] != nil
+                    ke_file_hash["vm"]["additional_files"].each { |additonal_file|
+                        additonal_file_path = additonal_file["from"]
+                        
+                        # eval possible environment variables
+                        if additonal_file_path =~ /^ENV\['.+'\]$/
+                            additonal_file_path = eval(additonal_file_path)
+                        end
+
+                        # determine if a relative path or a full path is provided. relative path should be relative to 
+                        # location of the .ke file
+                        additonal_file_path = ((Pathname.new additonal_file_path).absolute?) ? additonal_file_path : File.expand_path(File.dirname(additonal_file_path), file)
+                        abort("ERROR: '#{additonal_file_path}' not found!") unless File.exist?(additonal_file_path) 
+                        copy_with_path(additonal_file_path, File.join(instance.load_path, File.basename(file, ".*"), additonal_file["to"]))
+                    }
+                end 
             rescue JSON::ParserError => err
                 abort("ERROR: Could not parse #{file}. Likely invalid JSON.")
             end
@@ -154,10 +178,7 @@ module Zerg
 
         def self.remove(taskname, force)
             instance.load 
-            abort("ERROR: '#{taskname}' not found!") unless File.exist?(File.join(instance.load_path, "#{taskname}.ke")) 
-
-            # check the file against schema.
-            taskfile = File.join(instance.load_path, "#{taskname}.ke")
+            abort("ERROR: '#{taskname}' not found!") unless File.directory?(File.join(instance.load_path, "#{taskname}")) 
 
             agreed = true
             if force != true
@@ -167,7 +188,7 @@ module Zerg
             abort("Cancelled!") unless agreed == true
 
             FileUtils.rm_rf(File.join(instance.load_path, "driver", taskname))
-            FileUtils.rm(File.join(instance.load_path, "#{taskname}.ke"))
+            FileUtils.rm_rf(File.join(instance.load_path, "#{taskname}"))
 
             puts "SUCCESS!"
         end

data/lib/zerg/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Zerg
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/zerg.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency "thor"
   s.add_dependency "highline"
   s.add_dependency "zergrush_vagrant", ">= 0.0.4"
-  s.add_dependency "zergrush_cf", ">= 0.0.1"
+  s.add_dependency "zergrush_cf", ">= 0.0.2"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zergrush
 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-03-14 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
 description: Zerg is a tool for launching an arbitrary number of virtual machines
   and running a task on all of them at once
 email: