lib/testlab.rb in testlab-0.7.4 vs lib/testlab.rb in testlab-0.7.5

@@ -106,16 +106,21 @@
 
   def initialize(options={})
     self.ui          = (options[:ui] || ZTK::UI.new)
     self.class.ui    = self.ui
 
-    @config_dir      = (options[:config_dir] || File.join(Dir.pwd, ".testlab-#{TestLab.hostname}"))
-    @repo_dir        = (options[:repo_dir]   || Dir.pwd)
+    @repo_dir        = File.expand_path(options[:repo_dir]   || Dir.pwd)
 
-    labfile          = (options[:labfile] || File.join(Dir.pwd, 'Labfile'))
-    @labfile_path    = ZTK::Locator.find(labfile)
+    @config_dir      = File.expand_path(options[:config_dir] || File.join(@repo_dir, ".testlab-#{TestLab.hostname}"))
+    File.exists?(@config_dir) or FileUtils.mkdir_p(@config_dir)
+
+    labfile_path     = (options[:labfile_path] || File.join(@repo_dir, 'Labfile'))
+    @labfile_path    = File.expand_path(ZTK::Locator.find(labfile_path))
+
     @labfile         = TestLab::Labfile.load(labfile_path)
     @labfile.testlab = self
+
+    Dir.chdir(@repo_dir)
   end
 
   # Test Lab Nodes
   #
   # Returns an array of our defined nodes.