testlab 1.6.1 → 1.6.2

data/lib/testlab/container/actions.rb

@@ -68,10 +68,10 @@ class TestLab
           if self.is_ephemeral?
             self.lxc_clone.start_ephemeral(clone_args)
           else
-            self.lxc.start(%(--daemon))
+            self.lxc.start(start_args)
           end
 
-          (self.state != :running) and raise ContainerError, "The container failed to online!"
+          (self.state != :running) and raise ContainerError, "The container failed to online! (did you create it? Check status with 'tl status')"
 
           ZTK::TCPSocketCheck.new(:ui => @ui, :host => self.primary_interface.ip, :port => 22).wait
 

data/lib/testlab/container/support.rb

@@ -15,6 +15,26 @@ class TestLab
         end
       end
 
+      # Returns arguments for lxc-start
+      #
+      # @return [Array<String>] An array of arguments for lxc-start
+      def start_args
+        arguments = Array.new
+
+        unless self.aa_profile.nil?
+          arguments << %W(-s lxc.aa_profile="#{self.aa_profile}")
+        end
+
+        unless self.cap_drop.nil?
+          cap_drop = [self.cap_drop].flatten.compact.map(&:downcase).join(' ')
+          arguments << %W(-s lxc.cap.drop="#{cap_drop}")
+        end
+
+        arguments << %W(-d)
+
+        arguments.flatten.compact
+      end
+
       # Returns arguments for lxc-start-ephemeral
       #
       # @return [Array<String>] An array of arguments for lxc-start-ephemeral

data/lib/testlab/providers/templates/vagrant/Vagrantfile.erb

@@ -16,6 +16,7 @@ Vagrant.configure("2") do |config|
       vb.name = <%= @hostname.inspect %>
       vb.customize(["modifyvm", :id, "--cpus", <%= @cpus.inspect %>])
       vb.customize(["modifyvm", :id, "--memory", <%= @memory.inspect %>])
+      vb.customize(["modifyvm", :id, "--resize", <%= @resize.inspect %>])
     end
 
     testlab.ssh.username = <%= @user.inspect %>

data/lib/testlab/providers/vagrant.rb

@@ -164,7 +164,11 @@ class TestLab
       end
 
       def memory
-        (@config[:vagrant][:memory] || 2048)
+        (@config[:vagrant][:memory] || (1024 * 2))
+      end
+
+      def resize
+        (@config[:vagrant][:resize] || (1024 * 16))
       end
 
 ################################################################################
@@ -198,6 +202,7 @@ class TestLab
           :port => self.port,
           :cpus => self.cpus,
           :memory => self.memory,
+          :resize => self.resize,
           :box => self.box,
           :box_url => self.box_url
         }

data/lib/testlab/version.rb

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

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
+  prerelease: 
 platform: ruby
 authors:
 - Zachary Patten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-08-30 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
@@ -305,26 +330,33 @@ 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'
+      segments:
+      - 0
+      hash: 3684891986863418964
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3684891986863418964
 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 |-
-    ZTdhZGU1YzE1Y2MyYzQyOTQ0OGQxZjMyZTdjYjczYTdiNzQ0M2UxMg==
-  data.tar.gz: !binary |-
-    NTFjMjc4OTJhMTI5YTMwZjdhOGI4MzRjYjQzMmE4N2Y0NDU5ZmFmZg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YjgxNzVjMjdlNzAxNWQzMGFjOWUxOTJlMWE1OTg3Zjc3NzMyNzFkY2Q1MGIz
-    MDhiY2Y2NTU2YWI3MWI5ZTkyNjg4ZGUwYTRjNTFmZDNkYjRlODlmMDZjNzdm
-    YzIyYTQ1MmM4NTg1Y2M4MWNhMGMyMjEzZTU1YmNiNjEyNmQ4ZjI=
-  data.tar.gz: !binary |-
-    NTZlZGE4MWVhNjUxNWNlMDJhYWZjYTYwNTMwNTRiNzc5MjdiYmJkOWE4NjQ5
-    Y2E5ZjFkN2Y1ZDJmYTIzYWI3Zjc4MWQwMjI3NmUxN2RmYzZlYzIwNTZjZTBm
-    NzZiMDUyNTQ1MGQ4ODRkNjVhMTE4MjhmYTI3ZTgyZTEzODIwMTM=