landrush 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce32119bf22f210583466e45565a25bb76d50c11
-  data.tar.gz: 1422b70557f4fb76170b4a234eddf8e151c6ac40
+  metadata.gz: 670ea146b0661d80ba8dccc6e17eaa48989c409d
+  data.tar.gz: 341f19fbcf9994d579fae39930f31409462feead
 SHA512:
-  metadata.gz: 4ffb382a44d8bb6812ca230d15d25db1832737888dde303daba4f1c0f67e6e6f03692a4e6d34ca0f2fe0c7ea10d3d08e695d2654b4864ec9469b43f0a7fad1ab
-  data.tar.gz: 73f06fab9d25d8c2958b66e1a0390e83c342035ee48b8268fb3dd136fa3052ad99b4efe4bb8dd81fc11298dec3c13390caed8f6fab6fc427847ba6468aa80de5
+  metadata.gz: 446a5d4bdf416bcdf72a0f21539fdb50a985439708a10ff61daa61da93ec84950366f6dfd37a2468dce6250ea2fd6bd6528132dca6162e2cdb25a5520ab906b7
+  data.tar.gz: 09197818c44b00c92dc9fd41f44c169bd4cfd921247a0dfb4512b72c25cc103f6e50bba30de25bdbcc25e2996b4f1b610b9f46218c536b492da3c977109e36bc

data/lib/landrush/action/common.rb

@@ -63,7 +63,20 @@ module Landrush
       end
 
       def machine_hostname
-        machine.config.vm.hostname
+        @machine_hostname ||= read_machine_hostname
+      end
+
+      def read_machine_hostname
+        # Get hostname from vm config.
+        return machine.config.vm.hostname if machine.config.vm.hostname.to_s.length > 0
+
+        # Or gt machine's current hostname.
+        machine.communicate.execute("hostname") do |type, data|
+          return data if type == :stdout && data.to_s.length > 0
+        end
+
+        # Or default to "guest-vm"
+        return "guest-vm"
       end
 
       def enabled?

data/lib/landrush/action/redirect_dns.rb

@@ -23,7 +23,7 @@ module Landrush
         when :virtualbox then
           '10.0.2.2'
         when :vmware_fusion then
-          _gateway_for_ip(machine.guest.capability(:configured_dns_server))
+          _gateway_for_ip(machine.guest.capability(:configured_dns_servers).first)
         when :parallels then
           machine.provider.capability(:host_address)
         end

data/lib/landrush/config.rb

@@ -73,13 +73,6 @@ module Landrush
 
     def validate(machine)
       errors = _detected_errors
-
-      if enabled?
-        unless machine.config.vm.hostname.to_s.length > 0
-          errors << 'you must specify a hostname so we can make a DNS entry for it'
-        end
-      end
-
       { 'landrush' => errors }
     end
   end

data/lib/landrush/plugin.rb

@@ -76,9 +76,9 @@ module Landrush
       Cap::Redhat::InstallIptables
     end
 
-    guest_capability('linux', 'configured_dns_server') do
-      require_relative 'cap/linux/configured_dns_server'
-      Cap::Linux::ConfiguredDnsServer
+    guest_capability('linux', 'configured_dns_servers') do
+      require_relative 'cap/linux/configured_dns_servers'
+      Cap::Linux::ConfiguredDnsServers
     end
 
     guest_capability('linux', 'redirect_dns') do

data/lib/landrush/version.rb

@@ -1,3 +1,3 @@
 module Landrush
-  VERSION = "0.15.0"
+  VERSION = "0.15.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: landrush
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Paul Hinze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubydns