testlab 0.7.5 → 0.7.6

data/.travis.yml

@@ -7,5 +7,7 @@ rvm:
   - 1.9.3
   - 2.0.0
 
+before_install: sudo ./spec/support/install-lxc.sh
+
 notifications:
   irc: "irc.freenode.net#jovelabs"

data/README.md

@@ -26,12 +26,12 @@ The TestLab command-line program `tl` follows in the style of git:
         tl [global options] command [command options] [arguments...]
 
     VERSION
-        0.7.2
+        0.7.5
 
     GLOBAL OPTIONS
-        -l, --labfile=path/to/file     - Path to Labfile: ${PWD}/Labfile (default: /home/zpatten/code/personal/testlab-repo/Labfile)
-        -r, --repo=path/to/directory   - Path to Repository directory: ${PWD} (default: /home/zpatten/code/personal/testlab-repo)
-        -c, --config=path/to/directory - Path to Configuration directory: ${PWD}/.testlab-$(hostname -s) (default: /home/zpatten/code/personal/testlab-repo/.testlab-zsp-desktop)
+        -l, --labfile=path/to/file     - Path to Labfile: ${REPO}/Labfile (default: none)
+        -r, --repo=path/to/directory   - Path to Repository directory: ${PWD} (default: /home/zpatten/code/personal/testlab-repo/vendor/checkouts/testlab)
+        -c, --config=path/to/directory - Path to Configuration directory: ${REPO}/.testlab-$(hostname -s) (default: none)
         --version                      - Display the program version
         -v, --[no-]verbose             - Show verbose output
         -q, --[no-]quiet               - Quiet mode

data/lib/testlab/container/io.rb

@@ -14,8 +14,9 @@ class TestLab
 
         self.down
 
-        sc_file = %(/tmp/#{self.id}.sc)
+        sc_file      = %(/tmp/#{self.id}.sc)
         local_file ||= File.join(Dir.pwd, File.basename(sc_file))
+        local_file   = File.expand_path(local_file)
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Compress', :cyan)) do
           self.node.ssh.bootstrap(<<-EOF)
@@ -48,7 +49,8 @@ EOF
         self.down
         self.destroy
 
-        sc_file = %(/tmp/#{self.id}.sc)
+        sc_file    = %(/tmp/#{self.id}.sc)
+        local_file = File.expand_path(local_file)
 
         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/providers/local.rb

@@ -30,12 +30,12 @@ class TestLab
 
       # This is a NO-OP
       def up
-        self.state
+        true
       end
 
       # This is a NO-OP
       def down
-        self.state
+        true
       end
 
       # This is a NO-OP
@@ -43,7 +43,7 @@ class TestLab
         self.down
         self.up
 
-        self.state
+        true
       end
 
       # This is a NO-OP
@@ -67,7 +67,7 @@ class TestLab
       end
 
       def instance_id
-        %x(hostname).strip
+        TestLab.hostname
       end
 
       def user

data/lib/testlab/providers/vagrant.rb

@@ -46,6 +46,8 @@ class TestLab
       # Create the Vagrant instance
       def create
         self.up
+
+        true
       end
 
       # Destroy Vagrant-controlled VM
@@ -55,7 +57,7 @@ class TestLab
         self.down
         self.vagrant_cli("destroy", "--force", self.instance_id)
 
-        self.state
+        true
       end
 
 ################################################################################
@@ -65,7 +67,7 @@ class TestLab
         self.vagrant_cli("up", self.instance_id)
         ZTK::TCPSocketCheck.new(:host => self.ip, :port => self.port, :wait => 120, :ui => @ui).wait
 
-        self.state
+        true
       end
 
       # Halt Vagrant-controlled VM
@@ -74,7 +76,7 @@ class TestLab
 
         self.vagrant_cli("halt", self.instance_id)
 
-        self.state
+        true
       end
 
 ################################################################################
@@ -84,7 +86,7 @@ class TestLab
         self.down
         self.up
 
-        self.state
+        true
       end
 
 ################################################################################

data/lib/testlab/version.rb

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

data/spec/support/install-lxc.sh

@@ -0,0 +1,28 @@
+################################################################################
+#
+#      Author: Zachary Patten <zachary AT jovelabs DOT com>
+#   Copyright: Copyright (c) Zachary Patten
+#     License: Apache License, Version 2.0
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+################################################################################
+#!/bin/bash
+apt-get -qq update
+cat <<EOF | tee /usr/sbin/policy-rc.d
+#!/bin/sh
+exit 101
+EOF
+chmod 755 /usr/sbin/policy-rc.d
+apt-get -qq install lxc
+lxc-version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
   prerelease: 
 platform: ruby
 authors:
@@ -308,6 +308,7 @@ files:
 - spec/provisioners/shell_spec.rb
 - spec/spec_helper.rb
 - spec/support/Labfile
+- spec/support/install-lxc.sh
 - spec/testlab_spec.rb
 - spec/utility_spec.rb
 - testlab.gemspec
@@ -326,7 +327,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1054202206124374407
+      hash: -3143129893742225023
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -335,7 +336,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1054202206124374407
+      hash: -3143129893742225023
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -358,6 +359,7 @@ test_files:
 - spec/provisioners/shell_spec.rb
 - spec/spec_helper.rb
 - spec/support/Labfile
+- spec/support/install-lxc.sh
 - spec/testlab_spec.rb
 - spec/utility_spec.rb
 has_rdoc: