testlab 1.18.0 → 1.18.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjA5MDQwYmI3MThhNWJhZjQzZjk0ZjdhZTA4NTFlZDJhZTU3Y2UwMQ==
+    ZTBiNzQ4NzUwY2JlYWVjMTE0NzcwNmMwYzM0OTQ3ZTY2OTQwZDIzOQ==
   data.tar.gz: !binary |-
-    ZTcwOWNiOGY3MTg4YWVjNmIzZDJmZTk1MDA2M2Q0OWQ2NDgwMDJjZQ==
+    M2RhODk4NGFjYjViYjE2NzEwMTE2Nzg2OGI0NTMyMGY0NGIzMWFhMA==
 SHA512:
   metadata.gz: !binary |-
-    ZDgxZWRkNDllOTI4ZjlmNTQ1YmUxODk1NGNjMDNiM2MyOTk0NDAyNTE4OTY3
-    MjFiMGE2YzJhNTkxYWJiMmFjMzI0MWI3M2U1YmQzYjE5NDFkN2JlZTJkYjU1
-    NGNhODA5ODQ1ZDk5N2IyNjM1OGQzMDk5NGQxYjlkYjhlNGE5NGY=
+    ZDBmN2Q5OGQ3OGY4MTgxNGM1MDFmNzY4MzU1MjMwNWFmMzFmYzM4NjM1NTdj
+    OTFlZTYyNTUxMmQ0YTA4ZTM3NWJjMDI2YmMyZWE1MzYxYzZhYjgyMzgwOGJk
+    MTVjOTUwNTgyOGJkOTM4ODk0NTgwYmQ4MDgyNDY1NDc5MGMyODI=
   data.tar.gz: !binary |-
-    ZjhlMzYyM2ExNzVhNjFlYmYxYWIxMGYzZTdlNzA0NmY0YzEwYTdmYTc2MmRj
-    N2Q5MmUyZGM2MTMzM2JhYTkxNGNjNmI1OWQ0NjNiYWE1YmI2ZDk0ZjJjNjJi
-    ZjU2MDVjMTFjNDZjMzcxNmMzOTJjNTc1NGE5ZGY0YTdhOWUyNTQ=
+    OTRiNTBjN2UxMzQzMjAyZGJmNThjN2VkM2I1ZDEzYmZlOTUzMjRhNjdjMjNl
+    NzdkYzIxNTYxMmYzNzkxNTQ3MTcwMGI1MDlmNDI5ZWU5ZTJmMGEyZjFlNDk4
+    ZjIyZmNiM2Y0NThiYmU4M2UxMmUzZGI5ZTE4ZGY1MTQ2OTM0NTE=

data/.gitignore

@@ -18,3 +18,4 @@ tmp
 *log
 Vagrantfile
 .vagrant
+vendor

data/.travis.yml

@@ -1,22 +1,33 @@
 language: ruby
+env:
+  global:
+  - secure: YbxuFSMIVppYT99C+klcWpzLr0w/sLqjfxbBVorzTLgHhFpUVIdK4tIu5dQDohrVEuMskPzqilFjnW+bqKQ6rfG9pgkN9Gkp5LbxzTRdWPT5u9111fQSjW/hdqN+z0Beqdi1k2ZoPQRTgVPaPq9UHlX8/4LK021gTTbe2EGMcSg=
+  - secure: KMwqbWoqcYmmyNoGHxBUnmWmQ1zzoxpcNggrcU7VeWB1NrUIeeAsvX1zAmb1xiuFZDaIrnto9mmiWVuphGpK5FDOGzFGWCO4vISBUzRkcJQE8rU1K4G3O/meXJ9W1pADHE4b/50uEGQjPMry4lwOiugKMc5x7+364de2YoALx6E=
+  - secure: H4MqaotOXE5aboHmv+udPK8sPKpzpgBaKBj3ZOqfqgmkea4sbyIMptAXvMrdWlaJGhfjxhmjwN7UfpYYxv4zN2a+16uQR1waRSt5ugxGY05riRp1vF8silogj8iSaM6TiDmytdyAbPOg+gFsDJNT50Sa29tDkiOA5L2VFAgkwjU=
+  - secure: QR7/0AU/pC64kfH9tsd5nANsX/S2QMKT2LVGcFfZhdRyisT597s4LzVj6snBrfh+Qd0mqkZZmkVHRNmi5BdO3qVeA/0R8LOm3WD5gFaBNEbCV7B3j2iX6a386nKYd+9LbLO57cfnVePFRsWmPF3pefhNDnQbWLKjUxT2rj3j/RQ=
 rvm:
-  - ree
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
+- ree
+- 1.9.2
+- 1.9.3
+- 2.0.0
+- 2.1.0
 branches:
   only:
-    - master
-before_install: ./spec/support/before_install.sh
+  - master
+before_install:
+- "sudo ./scripts/before_install.sh"
+after_script:
+- "travis-artifacts upload --path testlab.log"
+after_test:
+- "travis-artifacts upload --target-path artifacts/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID"
 notifications:
   email:
     recipients:
-      - testlab-ci@lookout.com
+    - "testlab-ci@lookout.com"
     on_success: always
     on_failure: always
   irc:
     channels:
-      - "irc.freenode.net#jovelabs"
+    - "irc.freenode.net#jovelabs"
     use_notice: true
     skip_join: true

data/Rakefile

@@ -19,16 +19,11 @@
 ################################################################################
 
 require 'rake/clean'
-require 'bundler/gem_tasks'
 
-################################################################################
+require 'bundler/gem_tasks'
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
-task :default => [:spec]
-task :test => [:spec]
-
-################################################################################
 
 require 'cucumber/rake/task'
 desc 'Run features'
@@ -39,49 +34,15 @@ Cucumber::Rake::Task.new(:features) do |t|
   t.fork = false
 end
 
-################################################################################
-
 require 'coveralls/rake/task'
 Coveralls::RakeTask.new
-task :coveralls => [:spec, 'coveralls:push']
-
-################################################################################
 
-require 'yard'
-require 'yard/rake/yardoc_task'
+require 'ztk/rake/docs'
 
-GEM_NAME = File.basename(Dir.pwd)
-DOC_PATH = File.expand_path(File.join("..", "", "#{GEM_NAME}.doc"))
-
-namespace :doc do
-  YARD::Rake::YardocTask.new(:pages) do |t|
-
-    # t.files = ['lib/**/*.rb']
-    t.options = ['--verbose', '-o', DOC_PATH]
-  end
-
-  namespace :pages do
-
-    desc 'Generate and publish YARD Documentation to GitHub pages'
-    task :publish => ['doc:pages'] do
-      describe = %x(git describe).chomp
-      stats = %x(bundle exec yard stats).chomp
-
-      commit_message = Array.new
-      commit_message << "Generated YARD Documentation for #{GEM_NAME.upcase} #{describe}\n\n"
-      commit_message << stats
-
-      Dir.chdir(DOC_PATH) do
-        puts(%x{git add -Av})
-        puts(%x{git commit -m"#{commit_message.join}"})
-        puts(%x{git push origin gh-pages})
-      end
-    end
-
-  end
+################################################################################
 
-end
-desc 'Alias to doc:yard'
-task 'doc' => 'doc:yard'
+task :coveralls => [:spec, 'coveralls:push']
+task :default => [:spec]
+task :test => [:spec]
 
 ################################################################################

data/features/step_definitions/testlab_steps.rb

@@ -32,5 +32,6 @@ end
 
 def testlab_cmd(app_name, *args)
   args = args.join(' ')
-  step %(I run `#{app_name} --repo=#{TEST_REPO} --labfile=#{TEST_LABFILE} #{args}`)
+  log_file = File.join(TEST_ROOT, 'testlab.log')
+  step %(I run `#{app_name} --repo=#{TEST_REPO} --labfile=#{TEST_LABFILE} --log=#{log_file} #{args}`)
 end

data/features/support/{Labfile.local → Labfile.bare-metal}

@@ -5,7 +5,7 @@ version ">= 1.5.1"
 
 node 'vagrant' do
 
-  provider      TestLab::Provider::Local
+  provider TestLab::Provider::BareMetal
 
   provisioners  [
     TestLab::Provisioner::Raring,
@@ -36,8 +36,8 @@ node 'vagrant' do
     user do
       username         'deployer'
       password         'deployer'
-      identity         File.join(ENV['HOME'], '.ssh', 'id_rsa')
-      public_identity  File.join(ENV['HOME'], '.ssh', 'id_rsa.pub')
+      identity         File.join(Dir.pwd, 'spec', 'support', 'test')
+      public_identity  File.join(Dir.pwd, 'spec', 'support', 'test.pub')
       uid              2600
       gid              2600
     end

data/features/support/env.rb

@@ -3,10 +3,11 @@ require 'aruba/cucumber'
 ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
 LIB_DIR = File.join(File.expand_path(File.dirname(__FILE__)),'..','..','lib')
 
+TEST_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
 TEST_REPO = File.dirname(__FILE__)
 
-if ENV['USER'] == 'vagrant'
-  TEST_LABFILE = File.join(TEST_REPO, 'Labfile.local')
+if %w( vagrant travis ).include?(ENV['USER'])
+  TEST_LABFILE = File.join(TEST_REPO, 'Labfile.bare-metal')
 else
   TEST_LABFILE = File.join(TEST_REPO, 'Labfile.vagrant')
 end

data/lib/testlab/container/actions.rb

@@ -84,7 +84,10 @@ class TestLab
           end
 
           # Ensure the hostname is set
-          self.exec(%(sudo hostname #{self.fqdn}))
+          self.lxc.attach(%(-- /bin/bash -c 'hostname #{self.id}'))
+          self.lxc.attach(%(-- /bin/bash -c 'echo "#{self.id}" | tee /etc/hostname'))
+          self.lxc.attach(%(-- /bin/bash -c 'sed -i "s/\\(127\\.0\\.1\\.1\\).*/\\1\t#{self.id} #{self.fqdn}/g" /etc/hosts'))
+          self.lxc.attach(%(-- /bin/bash -c '(grep "#{self.id}" /etc/hosts) || (echo "127.0.1.1\t#{self.id} #{self.fqdn}" | tee -a /etc/hosts)'))
 
           do_provisioner_callbacks(self, :up, @ui)
         end

data/lib/testlab/container/io.rb

@@ -43,9 +43,9 @@ class TestLab
         when :get, :put then
           elapsed      = (Time.now - @start_time)
           current_size = (args[1] + args[2].length)
-          message      = ((action == :get) ? 'downloading from' : 'uploading to')
+          message      = ((action == :get) ? 'downloading to local host from' : 'uploading from local host to')
 
-          transfer_message(%(#{message} node:), args[0].local, current_size, @total_size, elapsed)
+          transfer_message(%(#{message} TestLab node #{self.node.id.inspect}:), args[0].local, current_size, @total_size, elapsed)
 
         when :finish
           @ui.stdout.puts

data/lib/testlab/container/status.rb

@@ -124,6 +124,17 @@ class TestLab
         end
       end
 
+      # Container Importable
+      #
+      # If the container has a non-nil sc_url value, we assume since we can
+      # supposedly download a shipping container image for the container
+      # that it is therefore importable.
+      # @return [Boolean] True if the container has a non-nil sc_url attribute,
+      #   False otherwise.
+      def importable?
+        !self.sc_url.nil?
+      end
+
     end
 
   end

data/lib/testlab/node.rb

@@ -52,6 +52,8 @@ class TestLab
 
       super(*args)
 
+      self.config.merge!(:node => { :id => self.id.dup })
+
       @provider = self.provider.new(self.config, @ui)
 
       raise NodeError, "You must specify a provider class!" if self.provider.nil?

data/lib/testlab/providers/vagrant.rb

@@ -190,7 +190,8 @@ class TestLab
       ####################
 
       def instance_id
-        (@config[:vagrant][:id] || "#{File.basename(@config[:vagrant][:file])}-#{TestLab.hostname}".downcase)
+        default_id = "#{TestLab.hostname}-#{@config[:node][:id]}-#{File.basename(@config[:vagrant][:file])}"
+        (@config[:vagrant][:id] || default_id.downcase)
       end
 
       def user

data/lib/testlab/provisioners/resolv.rb

@@ -54,7 +54,8 @@ class TestLab
           :object => :container
         )
 
-        container.bootstrap(ZTK::Template.render(provision_template, @config))
+        script = ZTK::Template.render(provision_template, @config)
+        container.lxc.attach(%(-- /bin/bash -c '#{script}'))
 
         true
       end

data/lib/testlab/provisioners/templates/raring/provision.erb

@@ -1,13 +1,13 @@
 export DEBIAN_FRONTEND="noninteractive"
 
 # Update APT and ensure our required packages are installed
-apt-get -y update
+apt-get -qq update
 <% %w(lxc apparmor bridge-utils debootstrap yum iptables iptables-persistent ntpdate ntp pbzip2).each do |package| -%>
-dpkg --status <%= package %> &> /dev/null || apt-get -y install <%= package %>
+dpkg --status <%= package %> &> /dev/null || apt-get -qq install <%= package %>
 <% end -%>
 
 # Ensure the default lxc networking services are off
-service lxc-net stop || (service lxc-net start ; service lxc-net stop)
+service lxc-net stop || true
 echo "manual" | tee /etc/init/lxc-net.override
 
 # Ensure NTP services are enabled and running
@@ -18,8 +18,7 @@ sed -i 's/#net.ipv4.ip_forward=1/net.ipv4.ip_forward=1/' /etc/sysctl.conf
 sysctl -w net.ipv4.ip_forward=1
 
 # Install an iptable NAT rule
-
-if ! iptables -t nat -v --list | grep "MASQUERADE"; then
+if ! (iptables -t nat -v --list | grep "MASQUERADE"); then
   iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
   iptables-save | tee /etc/iptables/rules.v4
 fi

data/lib/testlab/utility/logger.rb

@@ -35,7 +35,8 @@ class TestLab
           "hostname" => "%s (%s)" % [Socket.gethostname.inspect, TestLab.hostname.inspect],
           "program" => $0.to_s.inspect,
           "argv" => ARGV.join(' ').inspect,
-          "timezone" => Time.now.zone.inspect
+          "timezone" => Time.now.zone.inspect,
+          "user" => ENV['USER'].inspect
         }
       end
 

data/lib/testlab/version.rb

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

data/scripts/before_install.sh

@@ -0,0 +1,58 @@
+################################################################################
+#
+#      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
+set -x
+
+cat <<EOF | tee /usr/sbin/policy-rc.d
+#!/bin/sh
+exit 101
+EOF
+chmod 755 /usr/sbin/policy-rc.d
+
+mkdir -p /lib/modules/$(uname -r)
+depmod -a
+
+apt-get -qq update
+add-apt-repository -y ppa:serge-hallyn/lxc-backport
+apt-get -qq update
+
+apt-get -qq install lxc
+lxc-version
+
+apt-get -qq install slirp
+git clone git://github.com/jpetazzo/sekexe
+
+(iptables -L -t nat) || true
+(grep -i iptables /etc/vz/vz.conf) || true
+(lsmod | grep nat) || true
+
+mkdir -p $HOME/.ssh
+ssh-keygen -N '' -f $HOME/.ssh/id_rsa
+
+cat $HOME/.ssh/id_rsa.pub | tee $HOME/.ssh/authorized_keys
+cat $HOME/.ssh/id_rsa.pub | tee $HOME/.ssh/authorized_keys2
+
+chown -R $SUDO_USER:$SUDO_USER $HOME/.ssh
+
+ls -la $HOME/.ssh
+
+eval `ssh-agent -s`
+ssh-add $HOME/.ssh/id_rsa
+ssh-add -L

data/{spec/support/install-lxc.sh → scripts/test.sh}

@@ -18,11 +18,13 @@
 #
 ################################################################################
 #!/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
+set -e
+set -x
+
+# For Travis-CI sekexe:
+#
+# script:
+# - sekexe/run "export HOME=$HOME USER=$USER PWD=$(pwd) ; env ; cd $(pwd) ; $(pwd)/scripts/test.sh"
+
+
+/home/$USER/.rvm/bin/rvm $(cat $PWD/.ruby-version)@$(cat $PWD/.ruby-gemset) do bundle exec rake

data/testlab.gemspec

@@ -49,4 +49,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency("rspec")
   spec.add_development_dependency("yard")
   spec.add_development_dependency("coveralls")
+
+  spec.add_development_dependency("travis")
+  spec.add_development_dependency("travis-artifacts")
+  spec.add_development_dependency("typhoeus", "~> 0.6.7")
+  spec.add_development_dependency("websocket-native")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.18.1
 platform: ruby
 authors:
 - Zachary Patten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -178,6 +178,62 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: travis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: travis-artifacts
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.7
+- !ruby/object:Gem::Dependency
+  name: websocket-native
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A toolkit for building virtual computer labs
 email:
 - zachary AT jovelabs DOT com
@@ -205,7 +261,7 @@ files:
 - features/step_definitions/network_steps.rb
 - features/step_definitions/node_steps.rb
 - features/step_definitions/testlab_steps.rb
-- features/support/Labfile.local
+- features/support/Labfile.bare-metal
 - features/support/Labfile.vagrant
 - features/support/env.rb
 - features/testlab.feature
@@ -293,6 +349,8 @@ files:
 - lib/testlab/utility/logger.rb
 - lib/testlab/utility/misc.rb
 - lib/testlab/version.rb
+- scripts/before_install.sh
+- scripts/test.sh
 - spec/container_spec.rb
 - spec/interface_spec.rb
 - spec/labfile_spec.rb
@@ -304,7 +362,6 @@ files:
 - spec/provisioners/generic_spec.rb
 - spec/spec_helper.rb
 - spec/support/Labfile
-- spec/support/install-lxc.sh
 - spec/support/test
 - spec/support/test.pub
 - spec/testlab_spec.rb
@@ -340,7 +397,7 @@ test_files:
 - features/step_definitions/network_steps.rb
 - features/step_definitions/node_steps.rb
 - features/step_definitions/testlab_steps.rb
-- features/support/Labfile.local
+- features/support/Labfile.bare-metal
 - features/support/Labfile.vagrant
 - features/support/env.rb
 - features/testlab.feature
@@ -355,7 +412,6 @@ test_files:
 - spec/provisioners/generic_spec.rb
 - spec/spec_helper.rb
 - spec/support/Labfile
-- spec/support/install-lxc.sh
 - spec/support/test
 - spec/support/test.pub
 - spec/testlab_spec.rb