testlab 0.7.3 → 0.7.4

data/bin/tl

@@ -26,8 +26,6 @@ require 'testlab'
 include GLI::App
 include TestLab::Utility::Misc
 
-HOSTNAME = Socket.gethostname.split('.').first.strip
-
 version TestLab::VERSION
 
 program_desc %(TestLab - A toolkit for building virtual computer labs)
@@ -58,13 +56,13 @@ flag [:r, :repo]
 
 desc 'Path to Configuration directory: ${PWD}/.testlab-$(hostname -s)'
 arg_name 'path/to/directory'
-default_value File.join(Dir.pwd, ".testlab-#{HOSTNAME}")
+default_value File.join(Dir.pwd, ".testlab-#{TestLab.hostname}")
 flag [:c, :config]
 
 pre do |global,command,options,args|
   (global[:verbose] == true) and (ENV['LOG_LEVEL'] = 'DEBUG')
 
-  log_file = File.join(Dir.pwd, "testlab-#{HOSTNAME}.log")
+  log_file = File.join(Dir.pwd, "testlab-#{TestLab.hostname}.log")
   @logger = ZTK::Logger.new(log_file)
 
   @ui = ZTK::UI.new(

data/lib/testlab/container/actions.rb

@@ -119,8 +119,8 @@ class TestLab
 
       # Configure the container
       def configure
-        self.domain  ||= self.node.labfile.config[:domain]
-        self.arch    ||= detect_arch
+        self.domain ||= self.node.domain
+        self.arch   ||= detect_arch
 
         build_lxc_config(self.lxc.config)
 

data/lib/testlab/container/class_methods.rb

@@ -11,7 +11,7 @@ class TestLab
       # @return [Array<String>] A unique array of all defined domain names.
       def domains
         self.all.map do |container|
-          container.domain ||= container.node.labfile.config[:domain]
+          container.domain ||= container.node.domain
           container.domain
         end.compact.uniq
       end

data/lib/testlab/container/status.rb

@@ -36,7 +36,7 @@ class TestLab
       #
       # @return [String] The containers FQDN.
       def fqdn
-        self.domain ||= self.node.labfile.config[:domain]
+        self.domain ||= self.node.domain
 
         [self.id, self.domain].join('.')
       end

data/lib/testlab/node.rb

@@ -58,6 +58,11 @@ class TestLab
       self.labfile.repo_dir
     end
 
+    def domain
+      self.config[:bind] ||= Hash.new
+      self.config[:bind][:domain]
+    end
+
   end
 
 end

data/lib/testlab/utility/logger.rb

@@ -21,7 +21,7 @@ class TestLab
 
       def log_details(testlab)
         {
-          "hostname" => Socket.gethostname.inspect,
+          "hostname" => "%s (%s)" % [Socket.gethostname.inspect, TestLab.hostname.inspect],
           "program" => $0.to_s.inspect,
           "config_dir" => testlab.config_dir.inspect,
           "repo_dir" => testlab.repo_dir.inspect,

data/lib/testlab/version.rb

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

data/lib/testlab.rb

@@ -84,10 +84,6 @@ require 'testlab/monkeys'
 # @author Zachary Patten <zachary AT jovelabs DOT com>
 class TestLab
 
-  unless const_defined?(:HOSTNAME)
-    HOSTNAME = Socket.gethostname.split('.').first.strip
-  end
-
   # TestLab Error Class
   class TestLabError < StandardError; end
 
@@ -112,7 +108,7 @@ class TestLab
     self.ui          = (options[:ui] || ZTK::UI.new)
     self.class.ui    = self.ui
 
-    @config_dir      = (options[:config_dir] || File.join(Dir.pwd, ".testlab-#{HOSTNAME}"))
+    @config_dir      = (options[:config_dir] || File.join(Dir.pwd, ".testlab-#{TestLab.hostname}"))
     @repo_dir        = (options[:repo_dir]   || Dir.pwd)
 
     labfile          = (options[:labfile] || File.join(Dir.pwd, 'Labfile'))
@@ -340,6 +336,15 @@ class TestLab
       value
     end
 
+    # TestLab Hostname
+    #
+    # Gets the hostname portion of the fqdn for the current host.
+    #
+    # @return [String] The hostname for the current host.
+    def hostname
+      Socket.gethostname.split('.').first.strip
+    end
+
     # Test Lab Gem Directory
     #
     # Returns the directory path to where the gem is installed.

data/spec/support/Labfile

@@ -9,12 +9,7 @@ EOF
 
 REPO = File.dirname(__FILE__)
 
-config ({
-  :domain => "default.zone",
-  :repo => REPO
-})
-
-node :localhost do
+node :vagrant do
 
   provider      TestLab::Provider::Vagrant
   provisioners  [
@@ -28,7 +23,10 @@ node :localhost do
       :port     => 22,
       :cpus     => 1,
       :memory   => 512,
-      :file     => REPO
+      :file     => Dir.pwd
+    },
+    :bind => {
+      :domain => "default.zone"
     }
   })
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -303,7 +303,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2578795050458540128
+      hash: -2914304308752783600
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -312,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2578795050458540128
+      hash: -2914304308752783600
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25