testlab 0.6.17 → 0.7.0

data/Rakefile

@@ -39,7 +39,7 @@ require 'yard'
 require 'yard/rake/yardoc_task'
 
 GEM_NAME = File.basename(Dir.pwd)
-DOC_PATH = File.expand_path(File.join("..", "/", "#{GEM_NAME}.doc"))
+DOC_PATH = File.expand_path(File.join("..", "", "#{GEM_NAME}.doc"))
 
 namespace :doc do
   YARD::Rake::YardocTask.new(:pages) do |t|

data/bin/tl

@@ -51,22 +51,36 @@ arg_name 'path/to/file'
 default_value File.join(Dir.pwd, 'Labfile')
 flag [:l, :labfile]
 
+desc 'Path to configuration directory'
+arg_name 'path/to/directory'
+default_value File.join(Dir.pwd, ".testlab-#{HOSTNAME}")
+flag [:c, :config]
+
 pre do |global,command,options,args|
-  (global[:verbose] == true) and ENV['LOG_LEVEL'] = 'DEBUG'
+  (global[:verbose] == true) and (ENV['LOG_LEVEL'] = 'DEBUG')
 
   log_file = File.join(Dir.pwd, "testlab-#{HOSTNAME}.log")
   @logger = ZTK::Logger.new(log_file)
 
-  @logger.debug { "global(#{global.inspect})" }
-  @logger.debug { "options(#{options.inspect})" }
-  @logger.debug { "args(#{args.inspect})" }
+  @ui = ZTK::UI.new(
+    :logger  => @logger,
+    :verbose => global[:verbose],
+    :quiet   => global[:quiet]
+  )
+
+  @testlab = TestLab.new(
+    :ui => @ui,
+    :labfile    => global[:labfile],
+    :config_dir => global[:config]
+  )
 
-  @ui = ZTK::UI.new(:logger => @logger)
-  @testlab = TestLab.new(:ui => @ui, :labfile => global[:labfile])
+  @ui.logger.debug { "global(#{global.inspect})" }
+  @ui.logger.debug { "options(#{options.inspect})" }
+  @ui.logger.debug { "args(#{args.inspect})" }
 
   TestLab::Utility.log_header(@testlab).each { |line| @logger.info { line } }
 
-  if (global[:quiet] == false)
+  if !@ui.quiet?
     message = format_message("TestLab v#{TestLab::VERSION} Loaded".black.bold)
     @testlab.ui.stdout.puts(message)
   end

data/lib/testlab/container/io.rb

@@ -14,7 +14,7 @@ class TestLab
 
         self.down
 
-        sc_file = File.join("/", "tmp", "#{self.id}.sc")
+        sc_file = %(/tmp/#{self.id}.sc)
         local_file ||= File.join(Dir.pwd, File.basename(sc_file))
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Compress', :cyan)) do
@@ -48,7 +48,7 @@ EOF
         self.down
         self.destroy
 
-        sc_file = File.join("/", "tmp", "#{self.id}.sc")
+        sc_file = %(/tmp/#{self.id}.sc)
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Import', :cyan)) do
           self.node.ssh.exec(%(sudo rm -fv #{sc_file}), :silence => true, :ignore_exit_status => true)

data/lib/testlab/labfile.rb

@@ -7,9 +7,15 @@ class TestLab
   #
   # @author Zachary Patten <zachary AT jovelabs DOT com>
   class Labfile < ZTK::DSL::Base
+    attribute  :testlab
     has_many   :nodes,   :class_name => 'TestLab::Node'
 
     attribute  :config,  :default => Hash.new
+
+    def config_dir
+      self.testlab.config_dir
+    end
+
   end
 
 end

data/lib/testlab/node.rb

@@ -50,6 +50,10 @@ class TestLab
       raise NodeError, "You must specify a provider class!" if self.provider.nil?
     end
 
+    def config_dir
+      self.labfile.config_dir
+    end
+
   end
 
 end

data/lib/testlab/providers/local.rb

@@ -75,7 +75,7 @@ class TestLab
       end
 
       def identity
-        File.join(ENV['HOME'], ".ssh", "id_rsa")
+        File.join(Dir.home, ".ssh", "id_rsa")
       end
 
       def ip

data/lib/testlab/providers/vagrant.rb

@@ -131,7 +131,7 @@ class TestLab
       end
 
       def identity
-        (@config[:vagrant][:identity] || File.join(ENV['HOME'], ".vagrant.d", "insecure_private_key"))
+        (@config[:vagrant][:identity] || File.join(Dir.home, ".vagrant.d", "insecure_private_key"))
       end
 
       def ip

data/lib/testlab/provisioners/apt_cacher_ng.rb

@@ -42,7 +42,7 @@ class TestLab
           }
         }
 
-        apt_conf_d_proxy_file = File.join("/", "etc", "apt", "apt.conf.d", "00proxy")
+        apt_conf_d_proxy_file = %(/etc/apt/apt.conf.d/00proxy)
         node.ssh.file(:target => apt_conf_d_proxy_file, :chown => "root:root", :chmod => "0644") do |file|
           file.puts(ZTK::Template.render(@apt_conf_d_proxy_file_template, context))
         end
@@ -60,7 +60,7 @@ class TestLab
 
         # Ensure the container APT calls use apt-cacher-ng on the node
         gateway_ip                     = container.primary_interface.network.ip
-        apt_conf_d_proxy_file          = File.join("/", "etc", "apt", "apt.conf.d", "00proxy")
+        apt_conf_d_proxy_file          = %(/etc/apt/apt.conf.d/00proxy)
 
         @config[:apt][:cacher_ng] = { :proxy_url => "http://#{gateway_ip}:3142" }.merge(@config[:apt][:cacher_ng])
 
@@ -69,7 +69,7 @@ class TestLab
         end
 
         # Fix the APT sources since LXC mudges them when using apt-cacher-ng
-        apt_conf_sources_file = File.join("/", "etc", "apt", "sources.list")
+        apt_conf_sources_file = %(/etc/apt/sources.list)
         container.ssh.exec(%(sudo sed -i 's/127.0.0.1:3142\\///g' #{apt_conf_sources_file}))
       end
 

data/lib/testlab/provisioners/bind.rb

@@ -92,7 +92,7 @@ class TestLab
       def build_bind_db(ssh, zone, records)
         bind_db_template = File.join(TestLab::Provisioner.template_dir, "bind", 'bind-db.erb')
 
-        ssh.file(:target => "/etc/bind/db.#{zone}", :chown => "bind:bind") do |file|
+        ssh.file(:target => %(/etc/bind/db.#{zone}), :chown => "bind:bind") do |file|
           file.puts(ZTK::Template.do_not_edit_notice(:message => "TestLab v#{TestLab::VERSION} BIND DB: #{zone}", :char => ';'))
           file.puts(ZTK::Template.render(bind_db_template, { :zone => zone, :records => records }))
         end
@@ -100,7 +100,7 @@ class TestLab
 
       # Builds the BIND configuration
       def build_bind_conf(ssh)
-        ssh.file(:target => File.join("/etc/bind/named.conf"), :chown => "bind:bind") do |file|
+        ssh.file(:target => %(/etc/bind/named.conf), :chown => "bind:bind") do |file|
           build_bind_main_partial(file)
           build_bind_zone_partial(ssh, file)
         end

data/lib/testlab/provisioners/resolv.rb

@@ -49,7 +49,7 @@ class TestLab
       def render_resolv_conf(object)
         resolv_conf_template = File.join(TestLab::Provisioner.template_dir, "resolv", "resolv.conf.erb")
 
-        object.ssh.file(:target => File.join("/etc/resolv.conf"), :chown => "root:root") do |file|
+        object.ssh.file(:target => %(/etc/resolv.conf), :chown => "root:root") do |file|
           file.puts(ZTK::Template.do_not_edit_notice(:message => "TestLab v#{TestLab::VERSION} RESOLVER Configuration"))
           file.puts(ZTK::Template.render(resolv_conf_template, @config))
         end

data/lib/testlab/version.rb

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

data/lib/testlab.rb

@@ -25,7 +25,7 @@ require 'testlab/monkeys'
 #
 #   config Hash[
 #     :domain => "default.zone",
-#     :repo => File.join(ENV['HOME'], "code", "personal", "testlab-repo")
+#     :repo => File.join(Dir.home, "code", "personal", "testlab-repo")
 #   ]
 #
 #   node :localhost do
@@ -84,6 +84,8 @@ require 'testlab/monkeys'
 # @author Zachary Patten <zachary AT jovelabs DOT com>
 class TestLab
 
+  HOSTNAME ||= Socket.gethostname.split('.').first.strip
+
   # TestLab Error Class
   class TestLabError < StandardError; end
 
@@ -100,13 +102,18 @@ class TestLab
 
   include TestLab::Utility::Misc
 
+  attr_accessor :config_dir
+
   def initialize(options={})
-    self.ui      = (options[:ui] || ZTK::UI.new)
+    self.ui          = (options[:ui] || ZTK::UI.new)
+    self.class.ui    = self.ui
+
+    @config_dir      = (options[:config_dir] || File.join(Dir.pwd, ".testlab-#{HOSTNAME}"))
 
-    labfile      = (options[:labfile] || File.join(Dir.pwd, 'Labfile'))
-    labfile_path = ZTK::Locator.find(labfile)
-    @labfile     = TestLab::Labfile.load(labfile_path)
-    @labfile.config.merge!(:testlab => self)
+    labfile          = (options[:labfile] || File.join(Dir.pwd, 'Labfile'))
+    labfile_path     = ZTK::Locator.find(labfile)
+    @labfile         = TestLab::Labfile.load(labfile_path)
+    @labfile.testlab = self
   end
 
   # Test Lab Nodes
@@ -136,6 +143,15 @@ class TestLab
     TestLab::Network.all
   end
 
+  # Test Lab Labfile
+  #
+  # Returns our top-level Labfile instance.
+  #
+  # @return [TestLab::Labfile] The top-level Labfile instance.
+  def labfile
+    @labfile
+  end
+
   # Test Lab Configuration
   #
   # The hash defined in our *Labfile* DSL object which represents any high-level
@@ -274,18 +290,6 @@ class TestLab
     end
   end
 
-  # TestLab Configuration Directory
-  #
-  # Returns the path to the test lab configuration directory which is located
-  # off the repo directory under '.testlab'.
-  #
-  # @return [String] The path to the TestLab configuration directory.
-  def config_dir
-    @hostname ||= Socket.gethostname.split('.').first.strip
-    directory = File.join(self.config[:repo], ".testlab-#{@hostname}")
-    File.expand_path(directory, File.dirname(__FILE__))
-  end
-
   # Provider Method Handler
   #
   # Proxies missing provider method calls to all nodes.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.6.17
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -303,7 +303,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2300226116598449906
+      hash: -1493470985312203031
 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: -2300226116598449906
+      hash: -1493470985312203031
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25