vagrant-hivemind 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37e005addc8503ba5ab6d4258211d6467da98cc2
-  data.tar.gz: cb535a157c3ec342bf9f6f5463bb4f97647e8e0b
+  metadata.gz: 50d4a8040973f3f420d21e5d57b4caa10a4d4cee
+  data.tar.gz: cef39ddce159974e3fddceebab5fa654f114c5ad
 SHA512:
-  metadata.gz: 8aa3bf6452dfb1f4d2a369de2901813a0c39731960dcc6ca7964a8ac820c72efbc1295e42780ab30badc447aaae590251072736e470746060599712358fc87b7
-  data.tar.gz: fc57c480818d6eda514e92566b47ee8a2d3cccddaac2ba8090ae4e7bc956ad5e88341753117e730761af62af462885828eedf942cb3cc21a9214db9f65c5dbda
+  metadata.gz: 0f56a4b3aeb1ad4b0409366be075419ac6276eb18a0f69949e0d43aa82613581fb485d2520151794951171df9a583643013980b9fd8258a3d20e3051dd7e6458
+  data.tar.gz: bee703c4db7d000cdde0f576df72d2db3afcd5c8238e87b9360905ef442d084aa235bfb42b1085582c63ec24f15eec79c62c712634b549044f1c73a5b64b9d95

data/lib/vagrant/hivemind/commands/desc.rb

@@ -24,8 +24,8 @@ module Vagrant
             o.separator "Options:"
             o.separator ""
 
-            o.on("-n", "--hostname HOSTNAME", "The hostname of the Drone (REQUIRED)") do |n|
-              options[:hostname] = n
+            o.on("-n", "--hostname HOSTNAME", "A comma-separated list of Drone hostnames (REQUIRED)") do |n|
+              options[:hostname] = Args.from_csv n
             end
 
             o.on("-d", "--directory DIRECTORY", "Specify the directory where '#{HIVE_FILE}' is located (default: current directory)") do |d|
@@ -51,12 +51,18 @@ module Vagrant
 
           hosts = HiveFile.read_from root_path
 
-          unless hosts.values.map(&:hostname).include? options[:hostname]
-            @env.ui.error "The specified hostname does not exist!"
-            return 1
+          hostnames = []
+          options[:hostname].each do |hostname|
+            if hosts.values.map(&:hostname).include? hostname
+              hostnames << hostname
+            else
+              @env.ui.warn "The hostname '#{hostname}' does not exist in the Hive!"
+            end
           end
 
-          host = hosts[options[:hostname]]
+          hostnames.each do |hostname|
+
+          host = hosts[hostname]
 
           @env.ui.info "Hostname        : #{host.hostname}"
           @env.ui.info "IP Address      : #{host.ip_address}"
@@ -65,14 +71,15 @@ module Vagrant
           @env.ui.info "Box Type        : #{BOX_TYPES[host.box_type.to_sym][:name]} (#{BOX_TYPES[host.box_type.to_sym][:box_id]})"
           @env.ui.info "GUI Machine     : #{BOX_TYPES[host.box_type.to_sym][:is_gui] ? 'Yes' : 'No'}"
           @env.ui.info "Detached Data   : #{host.is_data_detached ? 'Yes' : 'No'}"
-          @env.ui.info ""
 
           if host.forwarded_ports and !host.forwarded_ports.empty?
             @env.ui.info "Forwarded Ports"
             host.forwarded_ports.each do |forwarded_port|
               @env.ui.info "#{'%15.15s' % forwarded_port["guest_port"]} : #{forwarded_port["host_port"]}"
             end
-            @env.ui.info ""
+          end
+          @env.ui.info ""
+
           end
 
           0

data/lib/vagrant/hivemind/commands/halt.rb

@@ -24,8 +24,8 @@ module Vagrant
             o.separator "Options:"
             o.separator ""
 
-            o.on("-n", "--hostname HOSTNAME", "The hostname of the Drone (REQUIRED)") do |n|
-              options[:hostname] = n
+            o.on("-n", "--hostname HOSTNAME", "A comma-separated list of Drone hostnames (REQUIRED)") do |n|
+              options[:hostname] = Args.from_csv n
             end
 
             o.on("-f", "--force", "Force shut down (equivalent of pulling power)") do |f|
@@ -55,14 +55,18 @@ module Vagrant
 
           hosts = HiveFile.read_from root_path
 
-          unless hosts.values.map(&:hostname).include? options[:hostname]
-            @env.ui.error "The specified hostname does not exist!"
-            return 1
+          hostnames = []
+          options[:hostname].each do |hostname|
+            if hosts.values.map(&:hostname).include? hostname
+              hostnames << hostname
+            else
+              @env.ui.warn "The hostname '#{hostname}' does not exist in the Hive!"
+            end
           end
 
           Vagrant::Hivemind::Util::Vagrantfile.generate_hivemind_vagrantfile @env, hosts, root_path
 
-          with_target_vms(options[:hostname]) do |vm|
+          with_target_vms(hostnames) do |vm|
             vm.action(:halt, force_halt: options[:force])
           end
 

data/lib/vagrant/hivemind/commands/kill.rb

@@ -24,8 +24,8 @@ module Vagrant
             o.separator "Options:"
             o.separator ""
 
-            o.on("-n", "--hostname HOSTNAME", "The hostname of the Drone (REQUIRED)") do |n|
-              options[:hostname] = n
+            o.on("-n", "--hostname HOSTNAME", "A comma-separated list of Drone hostnames (REQUIRED)") do |n|
+              options[:hostname] = Args.from_csv n
             end
 
             o.on("-d", "--directory DIRECTORY", "Specify the directory where '#{HIVE_FILE}' is located (default: current directory)") do |d|
@@ -51,20 +51,26 @@ module Vagrant
 
           hosts = HiveFile.read_from root_path
 
-          unless hosts.values.map(&:hostname).include? options[:hostname]
-            @env.ui.error "The specified hostname does not exist!"
-            return 1
+          hostnames = []
+          options[:hostname].each do |hostname|
+            if hosts.values.map(&:hostname).include? hostname
+              hostnames << hostname
+            else
+              @env.ui.warn "The hostname '#{hostname}' does not exist in the Hive!"
+            end
           end
 
           Vagrant::Hivemind::Util::Vagrantfile.generate_hivemind_vagrantfile @env, hosts, root_path
 
-          with_target_vms(options[:hostname]) do |vm|
+          with_target_vms(hostnames) do |vm|
             action_env = vm.action(:destroy, force_confirm_destroy: true)
           end
 
-          hosts.delete options[:hostname]
-          HiveFile.write_to hosts, root_path
-          @env.ui.info "Killed the Drone with hostname '#{options[:hostname]}'"
+          hostnames.each do |hostname|
+            hosts.delete hostname
+            HiveFile.write_to hosts, root_path
+            @env.ui.info "Killed the Drone with hostname '#{hostname}'"
+          end
 
           0
         end

data/lib/vagrant/hivemind/commands/spawn.rb

@@ -24,8 +24,8 @@ module Vagrant
             o.separator "Options:"
             o.separator ""
 
-            o.on("-n", "--hostname HOSTNAME", "The hostname of the Drone (REQUIRED)") do |n|
-              options[:hostname] = n
+            o.on("-n", "--hostname HOSTNAME", "A comma-separated list of Drone hostnames (REQUIRED)") do |n|
+              options[:hostname] = Args.from_csv n
             end
 
             o.on("-c", "--control", "Assign the Drone to be a Control Machine") do |c|
@@ -67,29 +67,40 @@ module Vagrant
 
           hosts = HiveFile.read_from root_path
 
-          if hosts.values.map(&:hostname).include? options[:hostname]
-            @env.ui.error "The specified hostname already exists!"
-            return 1
+          hostnames = []
+          options[:hostname].each do |hostname|
+            if hosts.values.map(&:hostname).include? hostname
+              @env.ui.warn "The hostname '#{hostname}' already exists in the Hive!"
+            else
+              if Network.is_valid_hostname? hostname
+                hostnames << hostname
+              else
+                @env.ui.warn "Invalid hostname format!"
+              end
+            end
           end
 
-          unless Network.is_valid_hostname? options[:hostname]
-            @env.ui.error "Invalid hostname format!"
+          if hostnames.empty?
+            @env.ui.warn "No Drones to spawn!"
             return 1
           end
 
-          drone = {
-            options[:hostname] => Vagrant::Hivemind::Host.new(
-              options[:hostname],
-              Network.next_ip_address(hosts),
-              {
-                is_control: options[:control],
-                box_size:   options[:size],
-                box_type:   options[:type],
-                is_data_detached: options[:detach]
-              })
-          }
-          HiveFile.write_to hosts.merge(drone), root_path
-          @env.ui.info "Spawned the Drone with hostname '#{options[:hostname]}'"
+          hostnames.each do |hostname|
+            drone = {
+              hostname => Vagrant::Hivemind::Host.new(
+                hostname,
+                Network.next_ip_address(hosts),
+                {
+                  is_control: options[:control],
+                  box_size:   options[:size],
+                  box_type:   options[:type],
+                  is_data_detached: options[:detach]
+                })
+            }
+            hosts = hosts.merge(drone)
+            @env.ui.info "Spawned the Drone with hostname '#{hostname}'"
+          end
+          HiveFile.write_to hosts, root_path
 
           0
         end

data/lib/vagrant/hivemind/commands/up.rb

@@ -25,8 +25,8 @@ module Vagrant
             o.separator "Options:"
             o.separator ""
 
-            o.on("-n", "--hostname HOSTNAME", "The hostname of the Drone (REQUIRED)") do |n|
-              options[:hostname] = n
+            o.on("-n", "--hostname HOSTNAME", "A comma-separated list of Drone hostnames (REQUIRED)") do |n|
+              options[:hostname] = Args.from_csv n
             end
 
             o.on("-d", "--directory DIRECTORY", "Specify the directory where '#{HIVE_FILE}' is located (default: current directory)") do |d|
@@ -52,9 +52,13 @@ module Vagrant
 
           hosts = HiveFile.read_from root_path
 
-          unless hosts.values.map(&:hostname).include? options[:hostname]
-            @env.ui.error "The specified hostname does not exist!"
-            return 1
+          hostnames = []
+          options[:hostname].each do |hostname|
+            if hosts.values.map(&:hostname).include? hostname
+              hostnames << hostname
+            else
+              @env.ui.warn "The hostname '#{hostname}' does not exist in the Hive!"
+            end
           end
 
           Vagrant::Hivemind::Util::Vagrantfile.generate_hivemind_vagrantfile @env, hosts, root_path
@@ -63,7 +67,7 @@ module Vagrant
 
           machines = []
           @env.batch do |batch|
-            with_target_vms(options[:hostname]) do |machine|
+            with_target_vms(hostnames) do |machine|
               @env.ui.info(I18n.t("vagrant.commands.up.upping",
                 name: machine.name,
                 provider: machine.provider_name))

data/lib/vagrant/hivemind/util.rb

@@ -36,6 +36,14 @@ module Vagrant
           end
       end
 
+      class Args
+        def self.from_csv(csv)
+          return nil unless csv
+          tokens = csv.delete(" ").split(",").select do |token| !token.empty? end
+          tokens.empty? ? nil : tokens
+        end
+      end
+
       class Network
         def self.is_valid_hostname?(hostname)
           return false unless hostname and hostname.size > 0 and hostname.size <= Vagrant::Hivemind::Constants::SIMPLE_HOSTNAME_MAX_LENGTH

data/lib/vagrant/hivemind/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Hivemind
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hivemind
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Nap Ramirez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler