tenderloin 0.3.0 → 0.4.0

data/config/default.rb

@@ -6,6 +6,8 @@ Tenderloin::Config.run do |config|
 
   config.ssh.username = "tenderloin"
   config.ssh.password = "tenderloin"
+  config.ssh.key = nil
+  config.ssh.port = 22
   # config.ssh.host = "localhost"
   config.ssh.max_tries = 10
   config.ssh.timeout = 30
@@ -18,6 +20,7 @@ Tenderloin::Config.run do |config|
 
   config.provisioning.script = nil
   config.provisioning.command = nil
+  config.provisioning.rsync = []
 
   config.shared_folders.enabled = true
   config.shared_folders.folders = []

data/lib/tenderloin/actions/box/add.rb

@@ -15,6 +15,7 @@ module Tenderloin
 
           @runner.add_action(Download)
           @runner.add_action(Unpackage)
+          @runner.add_action(Convert)
         end
       end
     end

data/lib/tenderloin/actions/box/convert.rb

@@ -0,0 +1,42 @@
+module Tenderloin
+  module Actions
+    module Box
+      # If the box is vagrant format, it converts it to something suitible for tenderloin
+      class Convert < Base
+
+        def execute!
+          if !Dir[@runner.directory + '/Tenderfile'].empty?
+            # We can do nothing - pretenderized
+            logger.info "Tenderloin box provided"
+          elsif !Dir[@runner.directory + '/Vagrantfile'].empty?
+            # Need to import from Vagrant. Convert the ovf to vmx using OVFtool, then write a base tenderfile
+            logger.info "Vagrant box provided, converting"
+            convert_ovf
+            write_tenderfile
+            logger.info "Vagrant box converted. It has a basic Tenderfile, you may want to customize this if needed"
+            logger.info "This file can be found in #{@runner.directory}"
+          else
+            raise "Invalid box - No Tenderfile or Vagrantfile"
+          end
+        end
+
+        def convert_ovf
+          ovf = File.join(@runner.directory, 'box.ovf')
+          vmx = File.join(@runner.directory, 'vmwarebox.vmx')
+          OVFTool.ovf2vmx(ovf, vmx, :lax => true)
+          FileUtils.rm_rf(@runner.directory)
+          FileUtils.mv(@runner.directory + ".vmwarevm", @runner.directory)
+        end
+
+        def write_tenderfile
+          tenderfile = <<EOF
+Tenderloin::Config.run do |config|
+    config.vm.box_vmx = "vmwarebox.vmx"
+end
+EOF
+          File.open(File.join(@runner.directory, 'Tenderfile'), 'w') {|f| f.write(tenderfile) }
+        end
+      end
+    end
+  end
+end

data/lib/tenderloin/actions/vm/provision.rb

@@ -3,10 +3,22 @@ module Tenderloin
     module VM
       class Provision < Base
         def execute!
+          run_rsync if Tenderloin.config.provisioning.rsync
           setup_script if Tenderloin.config.provisioning.script
           run_command if Tenderloin.config.provisioning.command
         end
 
+        def run_rsync
+          logger.info "Running rsync..."
+          Tenderloin.config.provisioning.rsync.each do |rsync|
+            src, dst = *rsync
+            SSH.execute(@runner.fusion_vm.ip) do |ssh|
+              ssh.exec!("mkdir -p #{dst}")
+            end
+            logger.info SSH.rsync(@runner.fusion_vm.ip, File.expand_path(src), File.expand_path(dst))
+          end
+        end
+
         def setup_script
           logger.info "Uploading provisioning script..."
 

data/lib/tenderloin/actions/vm/shared_folders.rb

@@ -1,3 +1,5 @@
+require 'timeout'
+
 module Tenderloin
   module Actions
     module VM
@@ -29,8 +31,14 @@ module Tenderloin
             logger.info "Creating shared folders metadata..."
 
             shared_folders.each do |name, hostpath, guestpath|
-              @runner.fusion_vm.share_folder(name, File.expand_path(hostpath))
-              @runner.fusion_vm.enable_shared_folders
+              begin
+                status = Timeout::timeout(10) {
+                  @runner.fusion_vm.share_folder(name, File.expand_path(hostpath))
+                  @runner.fusion_vm.enable_shared_folders
+                }
+              rescue Timeout::Error
+                logger.warn "Sharing folder #{name} timed out"
+              end
             end
 
             logger.info "Linking shared folders..."

data/lib/tenderloin/actions/vm/up.rb

@@ -16,6 +16,7 @@ msg
 
           # Up is a "meta-action" so it really just queues up a bunch
           # of other actions in its place:
+          Tenderloin::Box.add(Tenderloin.config.vm.box, Tenderloin.config.vm.box_url) unless Tenderloin::Env.box
           steps = [Import, SharedFolders, Boot]
           steps << Provision if Tenderloin.config.provisioning.enabled
           steps.insert(0, MoveHardDrive) if Tenderloin.config.vm.hd_location
@@ -46,6 +47,7 @@ msg
             data.delete "ethernet1.generatedAddress"
             data.delete "ethernet0.generatedAddressOffset"
             data.delete "ethernet1.generatedAddressOffset"
+            data.delete 'displayname'
             data['displayName'] = "tenderloin-" + @runner.vm_id
           end
         end

data/lib/tenderloin/commands.rb

@@ -72,7 +72,7 @@ error
       def ssh
         Env.load!
         Env.require_persisted_vm
-        SSH.connect :host => Env.persisted_vm.fusion_vm.ip
+        SSH.connect Env.persisted_vm.fusion_vm.ip
       end
 
       # Halts a running tenderloin instance. This forcibly halts the instance;

data/lib/tenderloin/config.rb

@@ -59,10 +59,13 @@ module Tenderloin
       attr_accessor :host
       attr_accessor :max_tries
       attr_accessor :timeout
+      attr_accessor :key
+      attr_accessor :port
     end
 
     class VMConfig < Base
       attr_accessor :box
+      attr_accessor :box_url
       attr_accessor :box_vmx
       attr_accessor :project_directory
       attr_accessor :hd_location
@@ -99,8 +102,9 @@ module Tenderloin
     class ProvisioningConfig
       attr_accessor :script
       attr_accessor :command
+      attr_accessor :rsync
       def enabled
-        script || command
+        script || command || !rsync.empty?
       end
     end
 

data/lib/tenderloin/env.rb

@@ -11,11 +11,14 @@ module Tenderloin
     extend Tenderloin::Util
 
     class << self
-      def box; @@box; end
+      def box
+        load_box! unless @@box
+        @@box
+      end
       def persisted_vm; @@persisted_vm; end
       def root_path; @@root_path; end
       def dotfile_path
-        File.join(root_path, $ROOTFILE_NAME + ".loinstate")
+        File.join(root_path, "." + $ROOTFILE_NAME + ".loinstate")
       end
       def home_path; File.expand_path(Tenderloin.config.tenderloin.home); end
       def tmp_path; File.join(home_path, "tmp"); end
@@ -127,7 +130,7 @@ No base box was specified! A base box is required as a staring point
 for every tenderloin virtual machine. Please specify one in your Tenderfile
 using `config.vm.box`
 msg
-          else
+          elsif !Tenderloin.config.vm.box_url
             error_and_exit(<<-msg)
 Specified box `#{Tenderloin.config.vm.box}` does not exist!
 

data/lib/tenderloin/ovftool.rb

@@ -0,0 +1,21 @@
+module Tenderloin
+  class OVFTool
+    TOOL = "/Applications/VMware\\ Fusion.app//Contents/Library/VMware\\ OVF\\ Tool/ovftool"
+
+    def self.run(cmd, opts = '')
+      res = `#{TOOL} #{opts} #{cmd}`
+      if $? == 0
+        return res
+      else
+        raise "Error running ovftool command #{cmd}: " + res
+      end
+    end
+
+    def self.ovf2vmx(ovf, vmx, opts = {})
+      cmd_opts = []
+      cmd_opts << '--lax' if opts[:lax]
+      run("#{cmd_opts.join(' ')} #{ovf} #{vmx}")
+    end
+
+  end
+end

data/lib/tenderloin/ssh.rb

@@ -3,17 +3,16 @@ module Tenderloin
     SCRIPT = File.join(File.dirname(__FILE__), '..', '..', 'script', 'tenderloin-ssh-expect.sh')
 
     class << self
-      def connect(opts={})
-        options = {}
-        [:host, :password, :username].each do |param|
-          options[param] = opts[param] || Tenderloin.config.ssh.send(param)
+      def connect(ip)
+        if options.key
+          Kernel.exec "#{cmd_ssh_opts} #{options.username}@#{ip}"
+        else
+          Kernel.exec cmd_ssh_opts.strip
         end
-
-        Kernel.exec "#{SCRIPT} #{options[:username]} #{options[:password]} #{options[:host]} #{port(opts)}".strip
       end
 
       def execute(ip)
-        Net::SSH.start(ip, Tenderloin.config[:ssh][:username], :port => port, :password => Tenderloin.config[:ssh][:password]) do |ssh|
+        Net::SSH.start(ip, Tenderloin.config[:ssh][:username], net_ssh_opts) do |ssh|
           yield ssh
         end
       end
@@ -25,11 +24,16 @@ module Tenderloin
         end
       end
 
+      def rsync(ip,src,dst)
+        cmd = "rsync -avz --delete -e \"#{cmd_ssh_opts}\" #{src} #{options.username}@#{ip}:#{dst}"
+        `#{cmd}`
+      end
+
       def up?(ip)
         check_thread = Thread.new do
           begin
             Thread.current[:result] = false
-            Net::SSH.start(ip, Tenderloin.config.ssh.username, :port => port, :password => Tenderloin.config.ssh.password, :timeout => Tenderloin.config.ssh.timeout) do |ssh|
+            Net::SSH.start(ip, Tenderloin.config.ssh.username, net_ssh_opts) do |ssh|
               Thread.current[:result] = true
             end
           rescue Errno::ECONNREFUSED, Net::SSH::Disconnect
@@ -41,8 +45,25 @@ module Tenderloin
         return check_thread[:result]
       end
 
-      def port(opts={})
-        opts[:port] || 22
+      def options
+        Tenderloin.config.ssh
+      end
+
+      def cmd_ssh_opts
+        if options.key
+          "ssh -i #{options.key} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p #{options.port}"
+        else
+          "#{SCRIPT} #{options.username} #{options.password} #{options.host} #{options.port}".strip
+        end
+      end
+
+      def net_ssh_opts
+        opts = {}
+        opts[:port] = Tenderloin.config.ssh.port
+        opts[:password] = Tenderloin.config.ssh.password
+        opts[:timeout] = Tenderloin.config.ssh.timeout
+        opts[:keys] = [Tenderloin.config[:ssh][:key]] if Tenderloin.config[:ssh][:key]
+        opts
       end
     end
   end

data/templates/Tenderfile

@@ -5,19 +5,27 @@ Tenderloin::Config.run do |config|
 
   # Every Tenderloin virtual environment requires a box to build off of.
   config.vm.box = "base"
+  # You can optionally specify a path or URL to automatically retrieve it from
+  # config.vm.box_url = "http://download"
 
   ## SSH username and password defaults to 'tenderloin'. You can change this.
+  ## If you provide a key, this will be used over the password
   # config.ssh.username = 'youruser'
   # config.ssh.password = 'yourpass'
+  # config.ssh.key = '~/.ssh/id_rsa'
 
-  ## Provisioning can either provide a shell script, or a command to execute
+  ## Provisioning can either provide a shell script, or a command to execute.
+  ## You can also provide folders to rsync (over SSH)
   # config.provisioning.script = <<EOF
 # ls /usr
 # EOF
   # config.provisioning.command = "apt-get install -y ruby"
+  ## This is destructive - it uses the --delete flag
+  # config.provisioning.rsync << ["src/", "dst"]
 
   ## Shared folders are enabled by default, and the project dir is always shared
   ## You can turn this off, or add additional folders
   # config.shared_folders.enabled = false
-  # config.shared_folders.folders = [[["my-files", "src", "/mnt/src"], ["bin-files", "bin", "/mnt/bin"]
+  # config.shared_folders.folders << ["my-files", "src", "/mnt/src"]
+  # config.shared_folders.folders << ["bin-files", "bin", "/mnt/bin"]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tenderloin
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -108,6 +108,7 @@ extra_rdoc_files:
 files:
 - lib/tenderloin/actions/base.rb
 - lib/tenderloin/actions/box/add.rb
+- lib/tenderloin/actions/box/convert.rb
 - lib/tenderloin/actions/box/destroy.rb
 - lib/tenderloin/actions/box/download.rb
 - lib/tenderloin/actions/box/unpackage.rb
@@ -132,6 +133,7 @@ files:
 - lib/tenderloin/downloaders/http.rb
 - lib/tenderloin/env.rb
 - lib/tenderloin/fusion_vm.rb
+- lib/tenderloin/ovftool.rb
 - lib/tenderloin/ssh.rb
 - lib/tenderloin/util.rb
 - lib/tenderloin/vm.rb