testlab 0.9.0 → 0.9.1

data/bin/tl

@@ -61,6 +61,8 @@ arg_name 'path/to/directory'
 flag [:c, :config]
 
 pre do |global,command,options,args|
+  @testlab_start_time = Time.now.utc
+
   (global[:verbose] == true) and (ENV['LOG_LEVEL'] = 'DEBUG')
 
   log_file = File.join(global[:repo], "testlab-#{TestLab.hostname}.log")
@@ -97,14 +99,20 @@ pre do |global,command,options,args|
 end
 
 post do |global,command,options,args|
-  # Post logic here
-  # Use skips_post before a command to skip this
-  # block on that command only
+  testlab_run_time = (Time.now.utc - @testlab_start_time)
+
+  message = format_message("TestLab v#{TestLab::VERSION} Finished (%0.4f seconds)".black.bold % testlab_run_time)
+  @testlab.ui.stdout.puts(message)
+  @testlab.ui.logger.info { message }
+
+  true
 end
 
 on_error do |exception|
+  testlab_run_time = (Time.now.utc - @testlab_start_time)
+
   @ui.stderr.puts
-  @ui.stderr.puts(format_message(["ERROR:".red, exception.message.red.bold].join(' ')))
+  @ui.stderr.puts(format_message(["ERROR:".red, exception.inspect.red.bold].join(' ')))
 
   case exception
   when GLI::BadCommandLine, GLI::UnknownCommand, GLI::UnknownCommandArgument, GLI::UnknownGlobalArgument then
@@ -121,6 +129,10 @@ on_error do |exception|
       @logger.logdev.write("#{line}\n")
     end
 
+    message = format_message("TestLab v#{TestLab::VERSION} Aborted (%0.4f seconds)".black.bold % testlab_run_time)
+    @testlab.ui.stderr.puts(message)
+    @testlab.ui.logger.info { message }
+
     false
   end
 end

data/lib/commands/container.rb

@@ -84,6 +84,21 @@ EOF
     end
   end
 
+  # CONTAINER CONSOLE
+  ####################
+  c.desc 'Container console'
+  c.command :console do |console|
+
+    console.action do |global_options, options, args|
+      help_now!('a name is required') if options[:name].nil?
+
+      container = @testlab.containers.select{ |n| n.id.to_sym == options[:name].to_sym }.first
+      container.nil? and raise TestLab::TestLabError, "We could not find the container you supplied!"
+
+      container.console
+    end
+  end
+
   # CONTAINER RECYCLE
   ####################
   c.desc 'Recycle containers'
@@ -124,6 +139,27 @@ EOF
     end
   end
 
+  # CONTAINER COPY
+  #################
+  c.desc 'Copy containers'
+  c.long_desc <<-EOF
+Creates a copy of a container.
+
+NOTE: This will result in the source container being stopped before the copy operation commences.
+EOF
+  c.command :copy do |copy|
+
+    copy.desc %(The container ID we wish to copy the original container to.)
+    copy.arg_name %(container)
+    copy.flag [:t, :to]
+
+    copy.action do |global_options, options, args|
+      iterate_objects_by_name(options[:name], TestLab::Container) do |container|
+        container.copy(options[:to])
+      end
+    end
+  end
+
   # CONTAINER EXPORT
   ###################
   c.desc 'Export containers'

data/lib/testlab/container/actions.rb

@@ -10,7 +10,7 @@ class TestLab
       #
       # @return [Boolean] True if successful.
       def create
-        @ui.logger.debug { "Container Create: #{self.id} " }
+        @ui.logger.debug { "Container Create: #{self.id}" }
 
         (self.node.state != :running) and return false
         (self.lxc.state != :not_created) and return false
@@ -30,7 +30,7 @@ class TestLab
       #
       # @return [Boolean] True if successful.
       def destroy
-        @ui.logger.debug { "Container Destroy: #{self.id} " }
+        @ui.logger.debug { "Container Destroy: #{self.id}" }
 
         (self.node.state != :running) and return false
         (self.lxc.state == :not_created) and return false
@@ -49,7 +49,7 @@ class TestLab
       #
       # @return [Boolean] True if successful.
       def up
-        @ui.logger.debug { "Container Up: #{self.id} " }
+        @ui.logger.debug { "Container Up: #{self.id}" }
 
         (self.node.state != :running) and return false
         (self.lxc.state == :running) and return false
@@ -68,6 +68,7 @@ class TestLab
             user.setup
           end
 
+          self.ssh.exec(%(sudo hostname #{self.fqdn}))
         end
 
         true
@@ -79,14 +80,13 @@ class TestLab
       #
       # @return [Boolean] True if successful.
       def down
-        @ui.logger.debug { "Container Down: #{self.id} " }
+        @ui.logger.debug { "Container Down: #{self.id}" }
 
         (self.node.state != :running) and return false
         (self.lxc.state != :running) and return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Down', :red)) do
           self.lxc.stop
-          self.lxc.wait(:stopped)
 
           (self.lxc.state == :running) and raise ContainerError, "The container failed to offline!"
         end
@@ -112,7 +112,7 @@ class TestLab
           ephemeral_arguments = Array.new
           ephemeral_arguments << %W(-o #{self.lxc_clone.name} -n #{self.lxc.name} -d)
           ephemeral_arguments << %W(--keep-data) if self.persist
-          ephemeral_arguments = ephemeral_arguments.flatten.compact
+          ephemeral_arguments.flatten!.compact!
 
           self.lxc_clone.start_ephemeral(ephemeral_arguments)
         end
@@ -121,6 +121,10 @@ class TestLab
       end
 
       # Configure the container
+      #
+      # Configures the LXC subsystem for the container.
+      #
+      # @return [Boolean] True if successful.
       def configure
         self.domain ||= self.node.domain
         self.arch   ||= detect_arch

data/lib/testlab/container/io.rb

@@ -30,9 +30,11 @@ set -x
 set -e
 
 du -sh #{self.lxc.container_root}
+
 cd #{self.lxc.container_root}
 find #{root_fs_path} -depth -print0 | cpio -o0 | pbzip2 -#{compression} -vfczm#{PBZIP2_MEMORY} > #{remote_file}
 chown ${SUDO_USER}:${SUDO_USER} #{remote_file}
+
 ls -lah #{remote_file}
 EOF
         end
@@ -42,7 +44,9 @@ EOF
           self.node.ssh.download(remote_file, local_file)
         end
 
-        puts("Your shipping container is now exported and available at '#{local_file}'!")
+        @ui.stdout.puts
+        @ui.stdout.puts("Your shipping container is now exported and available at '#{local_file}'!".green.bold)
+        @ui.stdout.puts
 
         true
       end
@@ -76,14 +80,40 @@ set -x
 set -e
 
 ls -lah #{remote_file}
+
+rm -rf #{self.lxc.fs_root}
 cd #{self.lxc.container_root}
-rm -rf #{root_fs_path}
 pbzip2 -vdcm#{PBZIP2_MEMORY} #{remote_file} | cpio -uid && rm -fv #{remote_file}
+
 du -sh #{self.lxc.container_root}
 EOF
         end
 
-        puts("Your shipping container is now imported and available for use!")
+        @ui.stdout.puts
+        @ui.stdout.puts("Your shipping container is now imported and available for use!".green.bold)
+        @ui.stdout.puts
+
+        true
+      end
+
+      # Copy the container
+      #
+      # Duplicates this container under another container definition.
+      #
+      # @return [Boolean] True if successful.
+      def copy(to_name)
+        @ui.logger.debug { "Container Copy: #{self.id}" }
+
+        to_container = self.node.containers.select{ |c| c.id.to_sym == to_name.to_sym }.first
+        to_container.nil? and raise ContainerError, "We could not locate the target container!"
+
+        to_container.demolish
+        to_container.create
+
+        please_wait(:ui => @ui, :message => format_object_action(self, 'Copy', :yellow)) do
+          self.node.ssh.exec(%(sudo rm -rf #{to_container.lxc.fs_root}))
+          self.node.ssh.exec(%(sudo rsync -a #{self.lxc.fs_root} #{to_container.lxc.container_root}))
+        end
 
         true
       end

data/lib/testlab/container/lxc.rb

@@ -25,6 +25,18 @@ class TestLab
         end
       end
 
+      # Container Console
+      #
+      # Opens an LXC console into the container.
+      #
+      # This command will replace the current process with an SSH session that
+      # will execute the appropriate LXC console command on the parent node of
+      # this container.
+      def console
+        @ui.stdout.puts("Press CTRL-A Q to exit the console.  (CTRL-A CTRL-A to enter a CTRL-A itself)".red.bold)
+        self.node.ssh.console(%(-t 'sudo lxc-console -n #{self.id}'))
+      end
+
       # LXC::Container object
       #
       # Returns a *LXC::Container* class instance configured for this container.
@@ -142,8 +154,8 @@ class TestLab
       def build_lxc_config(lxc_config)
         lxc_config.clear
 
-        lxc_config['lxc.utsname'] = self.fqdn
         lxc_config['lxc.arch']    = self.arch
+        lxc_config['lxc.utsname'] = self.fqdn
         lxc_config.networks       = build_lxc_network_conf(self.interfaces)
 
         lxc_config.save

data/lib/testlab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -331,7 +331,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2591373511513958371
+      hash: 4125715587205282977
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -340,7 +340,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2591373511513958371
+      hash: 4125715587205282977
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25