lab 0.1.0 → 0.1.1

data/lab.gemspec

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+require 'lab/version'
+
+Gem::Specification.new do |s|
+  s.name        = "lab"
+  s.version     = Lab::VERSION
+  s.authors     = ["Jonathan Cran"]
+  s.email       = ["jcran@rapid7.com"]
+  s.homepage    = "http://www.github.com/rapid7/lab/wiki"
+  s.summary     = %q{Manage VMs like a boss}
+  s.description = %q{Start/Stop/Revert and do other cool stuff w/ Vmware, Virtualbox, and ESXi vms. This gem wraps common CLI utilities and other gems to create a common inteface for vms. }
+
+  s.rubyforge_project = "lab"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  # specify any dependencies here; for example:
+  # s.add_development_dependency "rspec"
+   s.add_runtime_dependency "nokogiri"
+   s.add_runtime_dependency "net-ssh"
+   s.add_runtime_dependency "net-scp"
+end

data/lib/lab/driver/vm_driver.rb

@@ -111,32 +111,39 @@ class VmDriver
 
 private
 
+	# The only reason we don't filter here is because we need
+	# the ability to still run clean (controlled entirely by us)
+	# command lines.
+	def system_command(command)
+		puts "DEBUG: system command #{command}"
+		system(command)
+	end
+
+	def remote_system_command(command)
+		puts "DEBUG: remote system command #{command} running with user #{@user}@#{@host}"
+		system_command("ssh #{@user}@#{@host} \"#{command}\"")
+	end
+
 	def scp_to(local,remote)
-		::Net::SCP.start(@hostname, @vm_user, :password => @vm_pass) do |scp|
+		puts "DEBUG: copying #{local} to #{remote}"
+		Net::SCP.start(@hostname, @vm_user, :password => @vm_pass) do |scp|
 			scp.upload!(from,to)
 		end	
-
-		#system_command("scp #{local} #{@vm_user}@#{@hostname}:#{remote}")
 	end
 	
 	def scp_from(local,remote)
 		# download a file from a remote server
-		::Net::SCP.start(@hostname, @vm_user, :password => @vm_pass) do |scp|
+		puts "DEBUG: copying #{remote} to #{local}"
+		Net::SCP.start(@hostname, @vm_user, :password => @vm_pass) do |scp|
 			scp.download!(from,to)
 		end
-		
-		#system_command("scp #{@vm_user}@#{@hostname}:#{remote} #{local}")
 	end
 	
 	def ssh_exec(command)
-	
-		puts "DEBUG: ssh command: #{command}"
-
+		puts "DEBUG: ssh command: #{command} on host #{hostname}"
 		Net::SSH.start(@hostname, @vm_user, :password => @vm_pass) do |ssh|
 			result = ssh.exec!(command)
 		end
-		
-		`scp #{@vm_user}@#{@hostname} from to`
 	end
 
 	def filter_input(string)
@@ -160,19 +167,6 @@ private
 
 	string
 	end
-	
-	# The only reason we don't filter here is because we need
-	# the ability to still run clean (controlled entirely by us)
-	# command lines.
-	def system_command(command)
-		puts "DEBUG: system command #{command}"
-		system(command)
-	end
-	
-	
-	def remote_system_command(command)
-		system_command("ssh #{@user}@#{@host} \"#{command}\"")
-	end
 end
 
 end

data/lib/lab/driver/workstation_driver.rb

@@ -98,7 +98,7 @@ class WorkstationDriver < VmDriver
 				output_file = "/tmp/lab_command_output_#{rand(1000000)}"
 				
 				scp_to(local_tempfile_path, remote_tempfile_path)
-				ssh_exec(remote_run_command + "> #{output_file}")
+				ssh_exec(command + "> #{output_file}")
 				scp_from(output_file, output_file)
 				
 				ssh_exec("rm #{output_file}")

data/lib/lab/version.rb

@@ -1,3 +1,3 @@
 module Lab
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/lab.rb

@@ -1,4 +1,2 @@
-# TODO - use autoload 
-
 require 'lab/vm_controller'
 require 'lab/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lab
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &21378460 !ruby/object:Gem::Requirement
+  requirement: &9870560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21378460
+  version_requirements: *9870560
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &21378040 !ruby/object:Gem::Requirement
+  requirement: &9870140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21378040
+  version_requirements: *9870140
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &21377620 !ruby/object:Gem::Requirement
+  requirement: &9869720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21377620
+  version_requirements: *9869720
 description: ! 'Start/Stop/Revert and do other cool stuff w/ Vmware, Virtualbox, and
   ESXi vms. This gem wraps common CLI utilities and other gems to create a common
   inteface for vms. '
@@ -58,6 +58,7 @@ files:
 - README.md
 - Rakefile
 - TODO
+- lab.gemspec
 - lib/lab.rb
 - lib/lab/controller/dynagen_controller.rb
 - lib/lab/controller/fog_controller.rb