tenderloin 0.4.2 → 0.4.3

data/README.md

@@ -5,7 +5,7 @@ Tenderloin is a tool for building and distributing virtualized development envir
 It is based on [Vagrant](http://vagrantup.com), specifically the 0.1.4 release. This was
 the simplest, and provided a good starting point
 
-It is designed to use VMWare Fusion as the underlying provider. You will need Fusion 5.
+It is designed to use VMWare Fusion as the underlying provider. It has only been tested with Version 5. In theory this should be adaptable easily to VMWare workstation on other platforms, by updating the path to vmrun/the DHCP config.
 
 Features:
 
@@ -21,14 +21,35 @@ Features:
 To build your first virtual environment:
 
     loin init
-    loin box add base http://s3.lstoll.net/<todo>.box
+    # Warning! I'm 2gb's and un-optimized
+    loin box add base http://s3.lstoll.net/tenderloin/precise64.box
     loin up
 
 The file describing your VM is called 'Tenderfile', but you can optionally change this with
-the -f flag, to allow multiple VM descriptions in the same place.
+the -f flag, to allow multiple VM descriptions in the same place, e.g `loin up -f esxi.loin`
+
+## Using Vagrant Boxes.
+
+You can reference vagrant boxes directly, and the importer will convert them to native VMWare. The imported VM won't have additions installed, so you won't be able to use shared folders.
+
+## Provisioning
+
+Provisioning is either via a shell script, or by launching a command directly. Chef and Puppet provisioning isn't natively supported - if you wish to use these you will need to write your own launcher script.
+
+You can also set up paths to rsync using the provisioner, these wil be synced with --delete before the proisioning script/command runs. This is useful for machines that don't have the additions installed, and avoids using shared folders
+
+## Tenderfile
+
+You can [view the template](tenderloin/tree/master/templates/Tenderfile) to see all available options.
+
+## Project status
+
+This project is currently still in a pretty raw state. It is a quick hack to see how it would work, and to directly achieve a goal. The tests are broken, and the code might still be rough. I am currently using it on a daily basis though, so it's definitely usable.
 
 ## Building base boxes
 
+*Note:* [Veewee](https://github.com/jedi4ever/veewee) supports building bases boxes with VMWare. The VMDK from this can be used in a Tenderloin box. More automation around this coming soon!
+
 Currently base boxes are built manually. The process:
 
 * Create image in Fusion

data/lib/tenderloin/cli.rb

@@ -61,5 +61,17 @@ module Tenderloin
       Tenderloin::Commands.ssh
     end
 
+    desc "ip [--file <tenderfile>]", "Shows the IP to access the VM"
+    def ip()
+      setup
+      Tenderloin::Commands.show_ip
+    end
+
+    desc "jsondump [--file <tenderfile>]", "Dumps a JSON representation of the VM"
+    def jsondump
+      setup
+      Tenderloin::Commands.json_dump
+    end
+
   end
 end

data/lib/tenderloin/commands.rb

@@ -150,6 +150,26 @@ error
         Env.persisted_vm.execute!(Actions::VM::Provision)
       end
 
+      # Gets the IP
+      def show_ip
+        Env.load!
+        Env.require_persisted_vm
+        puts Env.persisted_vm.fusion_vm.ip
+      end
+
+      def json_dump
+        # Bump log level, don't want other output
+        Tenderloin::Logger.set_level Logger::ERROR
+        Env.load!
+        ret = {:config => Tenderloin.config.to_hash}
+        if Env.persisted_vm
+          ret[:vm] = Env.persisted_vm.fusion_vm.to_hash
+        else
+          ret[:vm] = {:running => false}
+        end
+        puts ret.to_json
+      end
+
       private
 
       def act_on_vm(&block)

data/lib/tenderloin/config.rb

@@ -60,6 +60,12 @@ module Tenderloin
       attr_accessor :max_tries
       attr_accessor :timeout
       attr_accessor :key
+      def keys=(keys)
+        @keys=keys
+      end
+      def keys
+        @keys || (key ? [key] : nil)
+      end
       attr_accessor :port
     end
 
@@ -99,7 +105,7 @@ module Tenderloin
       end
     end
 
-    class ProvisioningConfig
+    class ProvisioningConfig < Base
       attr_accessor :script
       attr_accessor :command
       attr_accessor :rsync
@@ -108,7 +114,7 @@ module Tenderloin
       end
     end
 
-    class SharedFoldersConfig
+    class SharedFoldersConfig < Base
       attr_accessor :enabled
       attr_accessor :folders
     end
@@ -139,6 +145,20 @@ module Tenderloin
       def loaded!
         @loaded = true
       end
+
+      def to_hash
+        hsh = Tenderloin.config.instance_variables_hash
+        hsh.delete(:tenderloin)
+        hsh = hsh.inject({}) do |h, (k, iv)|
+          if iv.class.to_s =~ /Tenderloin::Config/
+            h[k] = iv.instance_variables_hash
+          else
+            h[k] = iv
+          end
+          h
+        end
+        hsh
+      end
     end
   end
 end

data/lib/tenderloin/downloaders/file.rb

@@ -9,7 +9,7 @@ module Tenderloin
         # For now we read the contents of one into a buffer
         # and copy it into the other. In the future, we should do
         # a system-level file copy (FileUtils.cp).
-        open(source_url) do |f|
+        open(::File.expand_path(source_url)) do |f|
           loop do
             break if f.eof?
             destination_file.write(f.read(BUFFERSIZE))
@@ -18,4 +18,4 @@ module Tenderloin
       end
     end
   end
-end
+end

data/lib/tenderloin/fusion_vm.rb

@@ -7,16 +7,19 @@ module Tenderloin
     end
 
     def run(cmd, opts='')
+      runcmd = "#{VMRUN} #{cmd} #{@vmx} #{opts}"
       retrycount = 0
       while true
-        res = `#{VMRUN} #{cmd} #{@vmx} #{opts}`
+        res = `#{runcmd}`
         if $? == 0
           return res
+        elsif res =~ /The virtual machine is not powered on/
+          return
         else
           if res =~ /VMware Tools are not running/
             sleep 1; next unless retrycount > 10
           end
-          raise "Error running vmrun command #{cmd}: " + res
+          raise "Error running vmrun command:\n#{runcmd}\nResponse: " + res
         end
       end
     end
@@ -50,8 +53,10 @@ module Tenderloin
     end
 
     def ip
-      ip = get_guest_var('ip').strip
-      unless ip =~ /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/
+      ip = get_guest_var('ip')
+      if ip && ip.strip =~ /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/
+        ip = ip.strip
+      else
         mac_address = VMXFile.load(@vmx)["ethernet0.generatedAddress"]
         ip = dhcp_leases[mac_address]
       end
@@ -86,5 +91,9 @@ module Tenderloin
       end
       mac_ip
     end
+
+    def to_hash
+      {:ip => ip, :running => running?}
+    end
   end
 end

data/lib/tenderloin/ssh.rb

@@ -4,7 +4,7 @@ module Tenderloin
 
     class << self
       def connect(ip)
-        if options.key
+        if options.keys
           Kernel.exec "#{cmd_ssh_opts} #{options.username}@#{ip}"
         else
           Kernel.exec cmd_ssh_opts(ip).strip
@@ -50,8 +50,9 @@ module Tenderloin
       end
 
       def cmd_ssh_opts(ip=nil)
-        if options.key
-          "ssh -i #{options.key} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p #{options.port}"
+        if options.keys
+          keyopts = options.keys.map {|k| "-i #{File.expand_path(k)}"}.join(' ')
+          "ssh #{keyopts} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p #{options.port}"
         else
           "#{SCRIPT} #{options.username} #{options.password} #{options.host || ip} #{options.port}".strip
         end
@@ -62,7 +63,7 @@ module Tenderloin
         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[:keys] = Tenderloin.config[:ssh][:keys] if Tenderloin.config[:ssh][:keys]
         opts
       end
     end

data/lib/tenderloin/util.rb

@@ -27,15 +27,23 @@ error
 
   class Logger < ::Logger
     @@singleton_logger = nil
+    @@level = Logger::INFO
 
     class << self
+      def set_level(level)
+        @@singleton_logger.level = level if @@singleton_logger
+        @@level = level
+      end
+
       def singleton_logger
         # TODO: Buffer messages until config is loaded, then output them?
-        if Tenderloin.config.loaded?
-          @@singleton_logger ||= Tenderloin::Logger.new(Tenderloin.config.tenderloin.log_output)
-        else
-          Tenderloin::Logger.new(nil)
-        end
+        logger = if Tenderloin.config.loaded?
+                   @@singleton_logger ||= Tenderloin::Logger.new(Tenderloin.config.tenderloin.log_output)
+                 else
+                   Tenderloin::Logger.new(nil)
+                 end
+        logger.level = @@level
+        logger
       end
 
       def reset_logger!
@@ -48,4 +56,3 @@ error
     end
   end
 end
-

data/templates/Tenderfile

@@ -13,6 +13,8 @@ Tenderloin::Config.run do |config|
   # config.ssh.username = 'youruser'
   # config.ssh.password = 'yourpass'
   # config.ssh.key = '~/.ssh/id_rsa'
+  ## SSH key can also be an array of keys
+  # config.ssh.keys = ['~/.ssh/id_rsa', '~/.ssh/id_rsa_other']
 
   ## Provisioning can either provide a shell script, or a command to execute.
   ## You can also provide folders to rsync (over SSH)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tenderloin
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors: