testlab 0.7.1 → 0.7.2

data/.ruby-version

@@ -1 +1 @@
-ree
+ruby-1.9.3

data/README.md

@@ -26,13 +26,15 @@ The TestLab command-line program `tl` follows in the style of git:
         tl [global options] command [command options] [arguments...]
 
     VERSION
-        0.6.9
+        0.7.1
 
     GLOBAL OPTIONS
-        --version          -
-        -v, --[no-]verbose - Show verbose output
-        -q, --[no-]quiet   - Quiet mode
-        --help             - Show this message
+        -l, --labfile=path/to/file     - Path to Labfile (default: /home/zpatten/code/personal/testlab-repo/Labfile)
+        -c, --config=path/to/directory - Path to configuration directory (default: /home/zpatten/code/personal/testlab-repo/.testlab-zsp-desktop)
+        --version                      - Display the program version
+        -v, --[no-]verbose             - Show verbose output
+        -q, --[no-]quiet               - Quiet mode
+        --help                         - Show this message
 
     COMMANDS
         help      - Shows a list of commands or help for one command

data/bin/tl

@@ -46,12 +46,17 @@ desc 'Quiet mode'
 default_value false
 switch [:q, :quiet]
 
-desc 'Path to Labfile'
+desc 'Path to Labfile: ${PWD}/Labfile'
 arg_name 'path/to/file'
 default_value File.join(Dir.pwd, 'Labfile')
 flag [:l, :labfile]
 
-desc 'Path to configuration directory'
+desc 'Path to Repository directory: ${PWD}'
+arg_name 'path/to/directory'
+default_value Dir.pwd
+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}")
 flag [:c, :config]
@@ -71,7 +76,8 @@ pre do |global,command,options,args|
   @testlab = TestLab.new(
     :ui => @ui,
     :labfile    => global[:labfile],
-    :config_dir => global[:config]
+    :config_dir => global[:config],
+    :repo_dir   => global[:repo]
   )
 
   @ui.logger.debug { "global(#{global.inspect})" }

data/lib/testlab/container.rb

@@ -126,6 +126,14 @@ class TestLab
       super(*args)
     end
 
+    def config_dir
+      self.node.config_dir
+    end
+
+    def repo_dir
+      self.node.repo_dir
+    end
+
   end
 
 end

data/lib/testlab/labfile.rb

@@ -16,6 +16,10 @@ class TestLab
       self.testlab.config_dir
     end
 
+    def repo_dir
+      self.testlab.repo_dir
+    end
+
   end
 
 end

data/lib/testlab/node.rb

@@ -54,6 +54,10 @@ class TestLab
       self.labfile.config_dir
     end
 
+    def repo_dir
+      self.labfile.repo_dir
+    end
+
   end
 
 end

data/lib/testlab/provisioners/bind.rb

@@ -15,6 +15,7 @@ class TestLab
         @ui     = (ui     || TestLab.ui)
 
         @config[:bind] ||= Hash.new
+        @config[:bind][:domain] ||= "default.zone"
 
         @ui.logger.debug { "config(#{@config.inspect})" }
       end
@@ -44,7 +45,7 @@ class TestLab
         reverse_records = Hash.new
 
         TestLab::Container.all.each do |container|
-          container.domain ||= container.node.labfile.config[:domain]
+          container.domain ||= @config[:bind][:domain]
 
           container.interfaces.each do |interface|
             forward_records[container.domain] ||= Array.new

data/lib/testlab/version.rb

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

data/lib/testlab.rb

@@ -105,12 +105,14 @@ class TestLab
   include TestLab::Utility::Misc
 
   attr_accessor :config_dir
+  attr_accessor :repo_dir
 
   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-#{HOSTNAME}"))
+    @repo_dir        = (options[:repo_dir]   || Dir.pwd)
 
     labfile          = (options[:labfile] || File.join(Dir.pwd, 'Labfile'))
     labfile_path     = ZTK::Locator.find(labfile)

metadata

@@ -1,186 +1,200 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: testlab
-version: !ruby/object:Gem::Version 
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 0.7.2
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 1
-  version: 0.7.1
 platform: ruby
-authors: 
+authors:
 - Zachary Patten
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-07-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  type: :runtime
-  requirement: *id001
+date: 2013-07-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: gli
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: lxc
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: ztk
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: activesupport
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  type: :development
-  requirement: *id005
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bundler
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: pry
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id008
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: redcarpet
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id009
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id010
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: yard
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id011
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A toolkit for building virtual computer labs
-email: 
+email:
 - zachary AT jovelabs DOT com
-executables: 
+executables:
 - tl
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .coveralls.yml
 - .gitignore
 - .rspec
@@ -275,39 +289,37 @@ files:
 - spec/utility_spec.rb
 - testlab.gemspec
 homepage: https://github.com/zpatten/testlab
-licenses: 
+licenses:
 - Apache 2.0
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3436193439365071171
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3436193439365071171
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A toolkit for building virtual computer labs
-test_files: 
+test_files:
 - spec/container_spec.rb
 - spec/network_spec.rb
 - spec/node_spec.rb