testlab 1.22.2 → 1.22.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mzk5ZWY5MjMxZTcyOWMwZTViNTA2ODQ0ZmFhYzc3YzBiYjk2MDQ3ZA==
+    YTMyYmRlNjI2NmQ1ZmMwZmE4MGJmN2VkYzI5NzA0NGQwNzY4OWY4NA==
   data.tar.gz: !binary |-
-    ZWI2MmFiNzI2YzVmMDNkOTE5ZGI4ZDY3YmI4NDhhZmYzODFjZDBjMw==
+    Mjk5ZGJlMTQ2ZWRlOWRhM2I0MzgwNGIyNThiYmE4MDMyMDdiNzkyNw==
 SHA512:
   metadata.gz: !binary |-
-    OGI5NGM3NzFiZDNmNTFjNjg2MzZiYmFjODRhMjc3MDYzM2JmNDQ5Y2M2NGMx
-    MzkyNTg0MGMyNjI1MTg2MDdlMmIzNDFmYjIzYWU1MmM0NjRhMmNjNjJkMDYy
-    MWExODQ1ZTFhNzg4YWEwMWY4OTNmNTM4YzZmYjM2M2E2MTJkYTY=
+    ZGU3MGUzZjZlMjU4YmY1MTEwZjViMWJlNDI2MzAzMWM2OWU4MjM4N2UyYzIw
+    YmMyYjAzN2I5YzhhNWZhNTE4YjA0NWY1ZDlmMDQ2YjYyZmQwNmIyYTU2MGNk
+    ZmI3OGY1YjdiYTk4YTM1MDhmNGNkZGE5OWMwMjlmZmRlODAwNjQ=
   data.tar.gz: !binary |-
-    NmJjMDYwNjRmMTM5N2FlZDZjNGM2NDg3N2U2OTU4MmI4MTY2Y2MzZjg3YjM3
-    MDM3YWViN2UwMGE2YzMzZjczZjgxMTkzOWZjNjkzMDI2YzZlNzcwYmJiMjMx
-    NWQ0MGQxMzI5ZWM1NzkxZTJhOWNmNzI5OTQzMWNhYmJiMmYwNzg=
+    OTA0Y2I4YTkyNjNhMzdmMzk0NGU5NmFlYTQyYTBjZGJkZTJiMzM4NjNlZWI0
+    Yzg1YzdjN2UwMDBhYjdkN2IxMzlhMTM1MmEwODg4YzE1YTg0NDRiMTc1ZTFm
+    NWFjN2E0YzI5MWE1ZDhhNGUzMmZiZTgwNDllNDU0MjIwMWNiN2E=

data/.travis.yml

@@ -6,7 +6,6 @@ env:
   - secure: H4MqaotOXE5aboHmv+udPK8sPKpzpgBaKBj3ZOqfqgmkea4sbyIMptAXvMrdWlaJGhfjxhmjwN7UfpYYxv4zN2a+16uQR1waRSt5ugxGY05riRp1vF8silogj8iSaM6TiDmytdyAbPOg+gFsDJNT50Sa29tDkiOA5L2VFAgkwjU=
   - secure: QR7/0AU/pC64kfH9tsd5nANsX/S2QMKT2LVGcFfZhdRyisT597s4LzVj6snBrfh+Qd0mqkZZmkVHRNmi5BdO3qVeA/0R8LOm3WD5gFaBNEbCV7B3j2iX6a386nKYd+9LbLO57cfnVePFRsWmPF3pefhNDnQbWLKjUxT2rj3j/RQ=
 rvm:
-- ree
 - 1.9.2
 - 1.9.3
 - 2.0.0

data/lib/testlab/provisioners/hosts_file.rb

@@ -21,7 +21,7 @@ class TestLab
 
       # HostsFile: Container Provision
       def on_container_callback(container)
-        remove_hosts
+        remove_hosts(container)
         add_hosts(container)
 
         true
@@ -39,9 +39,7 @@ class TestLab
       def add_hosts(container)
         script = <<-EOF
 cat <<EOI | #{sudo} tee -a /etc/hosts
-#{def_tag}
 #{hosts_blob(container)}
-#{end_tag}
 EOI
         EOF
 
@@ -52,23 +50,27 @@ EOI
         command = %(/bin/bash -x #{tempfile.path})
 
         @command.exec(command)
+        container.bootstrap(script)
       end
 
-      def remove_hosts
+      def remove_hosts(container)
         @command.exec(sed_hostsfile)
+        container.exec(sed_hostsfile('linux'))
       end
 
       def hosts_blob(container)
         blob = Array.new
+        blob << def_tag
         container.node.containers.each do |con|
           blob << "#{con.primary_interface.ip}\t#{con.id} #{con.fqdn}"
         end
+        blob << end_tag
 
         blob.join("\n")
       end
 
-      def sed_hostsfile
-        case RUBY_PLATFORM
+      def sed_hostsfile(platform=RUBY_PLATFORM)
+        case platform
         when /darwin/ then
           %(#{sudo} sed -i '' '/#{def_tag}/,/#{end_tag}/d' /etc/hosts)
         when /linux/ then

data/lib/testlab/version.rb

@@ -1,6 +1,6 @@
 class TestLab
   unless const_defined?(:VERSION)
     # TestLab Gem Version
-    VERSION = "1.22.2"
+    VERSION = "1.22.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 1.22.2
+  version: 1.22.3
 platform: ruby
 authors:
 - Zachary Patten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -390,7 +390,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: A toolkit for building virtual computer labs