testlab 1.5.1 → 1.6.0

data/features/support/Labfile.local

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 #^syntax detection
 
+version ">= 1.5.1"
+
 node 'vagrant' do
 
   provider      TestLab::Provider::Local

data/features/support/Labfile.vagrant

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 #^syntax detection
 
+version ">= 1.5.1"
+
 node 'vagrant' do
 
   provider      TestLab::Provider::Vagrant

data/lib/testlab.rb

@@ -121,12 +121,14 @@ class TestLab
 
   # Main Classes
   autoload :Container,   'testlab/container'
+  autoload :Dependency,  'testlab/dependency'
   autoload :Interface,   'testlab/interface'
   autoload :Labfile,     'testlab/labfile'
   autoload :Network,     'testlab/network'
   autoload :Node,        'testlab/node'
   autoload :Provider,    'testlab/provider'
   autoload :Provisioner, 'testlab/provisioner'
+  autoload :Source,      'testlab/source'
   autoload :Support,     'testlab/support'
   autoload :User,        'testlab/user'
   autoload :Utility,     'testlab/utility'

data/lib/testlab/container.rb

@@ -72,7 +72,7 @@ class TestLab
     # An array of symbols of the various keys in our status hash.
     #
     # @see TestLab::Container::Status
-    STATUS_KEYS   = %w(id node_id mode fqdn state distro release interfaces provisioners).map(&:to_sym)
+    STATUS_KEYS   = %w(id node_id mode fqdn state distro release interfaces provisioners inherited).map(&:to_sym)
 
     # Sub-Modules
     autoload :Actions,       'testlab/container/actions'
@@ -125,18 +125,53 @@ class TestLab
     attribute   :release,       :default => 'precise'
     attribute   :arch
 
+    attribute   :tags,          :default => Array.new
+
     # Instructs ephemeral containers to persist; otherwise tmpfs will be used
     # as the backend store for ephemeral containers.
     # NOTE: tmpfs is very memory intensive and is disabled by default.
     attribute   :persist,       :default => true
 
+    # Is this a template?  Never build it if so.
+    attribute   :template,      :default => false
+
+    # Should we inherit a container?
+    attribute   :inherit
+
 
     def initialize(*args)
       @ui = TestLab.ui
 
-      @ui.logger.info { "Loading Container '#{self.id}'" }
+      @ui.logger.debug { "Loading Container" }
       super(*args)
-      @ui.logger.info { "Container '#{self.id}' Loaded" }
+      @ui.logger.debug { "Container '#{self.id}' Loaded" }
+
+      self.tags ||= [ self.id ]
+
+      if !self.inherit.nil?
+        @ui.logger.debug { "INHERIT: #{self.inherit}" }
+
+        parent = TestLab::Container.first(self.inherit)
+        if parent.nil?
+          raise ContainerError, "Could not find the container you specified to inherit attributes from!"
+        end
+
+        # Inherit the containers attributes
+        parent.attributes.reject{ |k,v| [:id, :node_id, :inherit, :template].include?(k) }.each do |key, value|
+          self.send("#{key}=", (value.dup rescue value))
+        end
+
+        # Inherit the containers users
+        parent.users.each do |user|
+          inherited_user = TestLab::User.new
+          inherited_user.container_id = self.id
+
+          user.attributes.reject{ |k,v| [:id, :container_id].include?(k) }.each do |key, value|
+            inherited_user.send("#{key}=", (value.dup rescue value))
+          end
+        end
+
+      end
     end
 
     def config_dir

data/lib/testlab/container/class_methods.rb

@@ -10,7 +10,7 @@ class TestLab
       #
       # @return [Array<String>] A unique array of all defined domain names.
       def domains
-        self.all.map do |container|
+        self.all.select{ |container| (!container.template rescue true) }.map do |container|
           container.domain ||= container.node.domain
           container.domain
         end.compact.uniq

data/lib/testlab/container/status.rb

@@ -60,7 +60,8 @@ class TestLab
           :release => self.release,
           :interfaces => interfaces,
           :provisioners => self.provisioners.map(&:to_s).collect{ |p| p.split('::').last }.join(','),
-          :node_id => self.node.id
+          :node_id => self.node.id,
+          :inherited => (self.inherit.nil? ? 'none' : self.inherit)
         }
       end
 

data/lib/testlab/dependency.rb

@@ -0,0 +1,23 @@
+class TestLab
+
+  # Dependency Error Class
+  class DependencyError < TestLabError; end
+
+  # Dependency Class
+  #
+  # @author Zachary Patten <zachary AT jovelabs DOT com>
+  class Dependency < ZTK::DSL::Base
+    # Associations and Attributes
+    belongs_to :labfile,       :class_name => 'TestLab::Labfile'
+
+    def initialize(*args)
+      @ui = TestLab.ui
+
+      @ui.logger.info { "Loading Dependency '#{self.id}'" }
+      super(*args)
+      @ui.logger.info { "Dependency '#{self.id}' Loaded" }
+    end
+
+  end
+
+end

data/lib/testlab/interface.rb

@@ -21,9 +21,9 @@ class TestLab
     def initialize(*args)
       @ui = TestLab.ui
 
-      @ui.logger.info { "Loading Interface '#{self.id}'" }
+      @ui.logger.debug { "Loading Interface" }
       super(*args)
-      @ui.logger.info { "Interface '#{self.id}' Loaded" }
+      @ui.logger.debug { "Interface '#{self.id}' Loaded" }
     end
 
     def ip

data/lib/testlab/labfile.rb

@@ -7,18 +7,40 @@ class TestLab
   #
   # @author Zachary Patten <zachary AT jovelabs DOT com>
   class Labfile < ZTK::DSL::Base
-    has_many   :nodes,   :class_name => 'TestLab::Node'
+    has_many   :dependencies,  :class_name => 'TestLab::Dependency'
+    has_many   :sources,       :class_name => 'TestLab::Source'
+    has_many   :nodes,         :class_name => 'TestLab::Node'
 
     attribute  :testlab
-    attribute  :config,  :default => Hash.new
-    attribute  :version, :default => TestLab::VERSION
+    attribute  :config,        :default => Hash.new
+    attribute  :version
 
     def initialize(*args)
       @ui = TestLab.ui
 
-      @ui.logger.info { "Loading Labfile '#{self.id}'" }
+      @ui.logger.debug { "Loading Labfile" }
       super(*args)
-      @ui.logger.info { "Labfile '#{self.id}' Loaded" }
+      @ui.logger.debug { "Labfile '#{self.id}' Loaded" }
+
+      if version.nil?
+        raise LabfileError, 'You must version the Labfile!'
+      else
+        @ui.logger.debug { "Labfile Version: #{version}" }
+        version_arguments = version.split
+        @ui.logger.debug { version_arguments.inspect }
+
+        if version_arguments.count == 1
+          if (TestLab::VERSION != version_arguments.first)
+            raise LabfileError, "This Labfile is not compatible with this version of TestLab! (#{version})"
+          end
+        elsif version_arguments.count == 2
+          if !TestLab::VERSION.send(version_arguments.first, version_arguments.last)
+            raise LabfileError, "This Labfile is not compatible with this version of TestLab! (#{version})"
+          end
+        else
+          raise LabfileError, 'Invalid version!'
+        end
+      end
     end
 
     def config_dir

data/lib/testlab/network.rb

@@ -41,9 +41,9 @@ class TestLab
     def initialize(*args)
       @ui = TestLab.ui
 
-      @ui.logger.info { "Loading Network '#{self.id}'" }
+      @ui.logger.debug { "Loading Network" }
       super(*args)
-      @ui.logger.info { "Network '#{self.id}' Loaded" }
+      @ui.logger.debug { "Network '#{self.id}' Loaded" }
     end
 
   end

data/lib/testlab/node.rb

@@ -46,7 +46,7 @@ class TestLab
     def initialize(*args)
       @ui = TestLab.ui
 
-      @ui.logger.info { "Loading Node '#{self.id}'" }
+      @ui.logger.debug { "Loading Node" }
 
       super(*args)
 
@@ -54,7 +54,7 @@ class TestLab
 
       raise NodeError, "You must specify a provider class!" if self.provider.nil?
 
-      @ui.logger.info { "Node '#{self.id}' Loaded" }
+      @ui.logger.debug { "Node '#{self.id}' Loaded" }
     end
 
     def config_dir

data/lib/testlab/provisioners/bind.rb

@@ -41,7 +41,7 @@ class TestLab
       def on_container_provision(container)
         @ui.logger.debug { "BIND Provisioner: Container #{container.id}" }
 
-        bind_provision(container.node)
+        bind_reload(container.node)
 
         true
       end
@@ -54,7 +54,7 @@ class TestLab
       def on_network_provision(network)
         @ui.logger.debug { "BIND Provisioner: Network #{network.id}" }
 
-        bind_provision(network.node)
+        bind_reload(network.node)
 
         true
       end

data/lib/testlab/source.rb

@@ -0,0 +1,23 @@
+class TestLab
+
+  # Source Error Class
+  class SourceError < TestLabError; end
+
+  # Source Class
+  #
+  # @author Zachary Patten <zachary AT jovelabs DOT com>
+  class Source < ZTK::DSL::Base
+    # Associations and Attributes
+    belongs_to :labfile,       :class_name => 'TestLab::Labfile'
+
+    def initialize(*args)
+      @ui = TestLab.ui
+
+      @ui.logger.info { "Loading Source '#{self.id}'" }
+      super(*args)
+      @ui.logger.info { "Source '#{self.id}' Loaded" }
+    end
+
+  end
+
+end

data/lib/testlab/user.rb

@@ -30,9 +30,9 @@ class TestLab
     def initialize(*args)
       @ui = TestLab.ui
 
-      @ui.logger.info { "Loading User '#{self.id}'" }
+      @ui.logger.debug { "Loading User" }
       super(*args)
-      @ui.logger.info { "User '#{self.id}' Loaded" }
+      @ui.logger.debug { "User '#{self.id}' Loaded" }
     end
 
   end

data/lib/testlab/user/lifecycle.rb

@@ -9,7 +9,7 @@ class TestLab
       def provision
         @ui.logger.debug { "User Create: #{self.username} " }
 
-        node_home_dir = ((self.container.node.user == "root") ? %(/root) : %(/home/#{self.container.node.user}))
+        node_home_dir = home_dir(self.container.node.user)
         node_authkeys = File.join(node_home_dir, ".ssh", "authorized_keys")
 
         # ensure the container user exists
@@ -48,6 +48,12 @@ class TestLab
           end
         end
 
+        if (public_identities.count > 0)
+          id_rsa_pub = File.join(user_home_dir, ".ssh", "id_rsa.pub")
+          self.container.node.exec(%(sudo grep -e "#{public_identities.first}" #{id_rsa_pub} || echo "#{public_identities.first}" | sudo tee #{id_rsa_pub}), :ignore_exit_status => true)
+          self.container.node.exec(%(sudo chmod -v 644 #{id_rsa_pub}), :ignore_exit_status => true)
+        end
+
         authkeys.each do |destination, source|
           @ui.logger.info { "SOURCE: #{source} >>> #{destination}" }
           self.container.node.exec(%(sudo mkdir -pv #{File.dirname(destination)}))
@@ -61,6 +67,19 @@ class TestLab
           self.container.node.exec(%(sudo chmod -v 644 #{destination}))
         end
 
+        identities = Array.new
+        !self.identity.nil? and [self.identity].flatten.compact.each do |i|
+          if File.exists?(i)
+            identities << ::IO.read(i).strip
+          end
+        end
+
+        if (identities.count > 0)
+          id_rsa = File.join(user_home_dir, ".ssh", "id_rsa")
+          self.container.node.exec(%(sudo grep -e "#{identities.first}" #{id_rsa} || echo "#{identities.first}" | sudo tee #{id_rsa}), :ignore_exit_status => true)
+          self.container.node.exec(%(sudo chmod -v 400 #{id_rsa}), :ignore_exit_status => true)
+        end
+
         # ensure the container user home directory is owned by them
         home_dir = self.container.lxc.attach(%(-- /bin/bash -c 'grep #{self.username} /etc/passwd | cut -d ":" -f6')).strip
         self.container.lxc.attach(%(-- /bin/bash -c 'sudo chown -Rv $(id -u #{self.username}):$(id -g #{self.username}) #{home_dir}'))

data/lib/testlab/utility/gli.rb

@@ -76,10 +76,10 @@ class TestLab
         klass_name = klass.to_s.split('::').last.downcase
 
         if name.nil?
-          objects = klass.all
+          objects = klass.all.select{ |object| (!object.template rescue true) }
         else
           names = name.split(',')
-          objects = klass.find(names)
+          objects = klass.find(names).select{ |object| (!object.template rescue true) }
         end
 
         (objects.nil? || (objects.count == 0)) and raise TestLab::TestLabError, "We could not find any of the #{klass_name}s you supplied!"

data/lib/testlab/version.rb

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

data/spec/support/Labfile

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 #^syntax detection
 
+version ">= 1.5.1"
+
 shell_provision_script = <<-EOF
 set -x
 apt-get -y update

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
+  prerelease: 
 platform: ruby
 authors:
 - Zachary Patten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: lxc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ztk
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,6 +190,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,6 +198,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -229,6 +254,7 @@ files:
 - lib/testlab/container/status.rb
 - lib/testlab/container/support.rb
 - lib/testlab/container/user.rb
+- lib/testlab/dependency.rb
 - lib/testlab/interface.rb
 - lib/testlab/labfile.rb
 - lib/testlab/monkeys.rb
@@ -277,6 +303,7 @@ files:
 - lib/testlab/provisioners/templates/chef/ruby_gem_server.erb
 - lib/testlab/provisioners/templates/raring/provision.erb
 - lib/testlab/provisioners/templates/resolv/provision.erb
+- lib/testlab/source.rb
 - lib/testlab/support.rb
 - lib/testlab/support/execution.rb
 - lib/testlab/support/lifecycle.rb
@@ -303,26 +330,27 @@ files:
 homepage: http://hackers.lookout.com/testlab/
 licenses:
 - Apache 2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A toolkit for building virtual computer labs
 test_files:
 - features/step_definitions/container_steps.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjVlY2RkMzUzYzVhZjA4NTBlM2FjMDQxZjJiMzY0ZTEwOTgwMTExYw==
-  data.tar.gz: !binary |-
-    MzQwNzNmZDcxYmUzZjBhNjEwYTAzZWMxYjA1YTgyNDU3MzViMmFhYw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    N2VmM2YwZDg1YmUzNTliNGQ3ODhlNGYyY2YyYzU2YzliZmY3NTM3MmMxNDI0
-    Zjc1YjJlODYxYWIyNzJiYjZkMWQzNGU3MTM1ODc4MTdlYTM1OWRlNDVlNGU5
-    ZjRmMzIwODA1NThjZTUzYWEwMzQxZjJiYTJkYmYzMmYzY2Q5ZTI=
-  data.tar.gz: !binary |-
-    N2UwN2Q2ZjE5YWMzNTUxZTkzNWU1NDM4MjMwM2NkN2EyYjQwNDhhMWViZGY2
-    MTg1NmIwNzZjNDdjNjRkY2JlYjNjY2FmZDMwNTY0NTU5YmYxYzRhMTFjMWJj
-    ZDJiNDQ5OTA0YjI4N2I2MDlkYTkxYTY2MWU5NjBhMjNjZTAxMzM=