tenderloin 0.4.3 → 0.4.4

data/lib/tenderloin/actions/base.rb

@@ -24,7 +24,8 @@ module Tenderloin
     # documentation below.
     class Base
       # The {Runner runner} which is executing the action
-      attr_reader :runner
+      # The {Array arguments} which are passed when executing the action
+      attr_reader :runner, :run_args
 
       # Included so subclasses don't need to include it themselves.
       include Tenderloin::Util
@@ -33,7 +34,8 @@ module Tenderloin
       # been given to the {Runner runner}. This method can be used by subclasses
       # to save any of the configuration options which are passed in.
       def initialize(runner, *args)
-        @runner = runner
+        @runner   = runner
+        @run_args = args
       end
 
       # This method is called once per action, allowing the action

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

@@ -30,12 +30,16 @@ module Tenderloin
           if Tenderloin.config.shared_folders.enabled
             logger.info "Creating shared folders metadata..."
 
+            # Enable Shared Folders. It fails if it's already enabled.
+            # If it's a real error the command to add a shared folder will fail,
+            # so we can ignore this one.
+            @runner.fusion_vm.enable_shared_folders rescue nil
+
             shared_folders.each do |name, hostpath, guestpath|
-              for i in 0..3
+              4.times do
                 begin
-                  status = Timeout::timeout(10) {
+                  Timeout::timeout(10) {
                     @runner.fusion_vm.share_folder(name, File.expand_path(hostpath))
-                    @runner.fusion_vm.enable_shared_folders
                     break
                   }
                 rescue Timeout::Error

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

@@ -18,7 +18,7 @@ msg
           # 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 << Provision if provision_enabled?
           steps.insert(0, MoveHardDrive) if Tenderloin.config.vm.hd_location
 
           steps.each do |action_klass|
@@ -51,6 +51,10 @@ msg
             data['displayName'] = "tenderloin-" + @runner.vm_id
           end
         end
+
+        def provision_enabled?
+          Tenderloin.config.provisioning.enabled && !run_args.include?(:no_provision)
+        end
       end
     end
   end

data/lib/tenderloin/cli.rb

@@ -12,10 +12,16 @@ module Tenderloin
       end
     end
 
-    desc "up [--file <tenderfile>]", "Boots the VM"
+    desc "up [--file <tenderfile> --no-provision]", "Boots the VM"
+    method_option :provision, :default => true
     def up()
       setup
-      Tenderloin::Commands.up
+
+      if !options[:provision]
+        Tenderloin::Commands.up(:no_provision)
+      else
+        Tenderloin::Commands.up
+      end
     end
 
     desc "halt [--file <tenderfile>]", "Force shuts down the running VM"
@@ -55,10 +61,11 @@ module Tenderloin
       Tenderloin::Commands.provision
     end
 
-    desc "ssh [--file <tenderfile>]", "SSH's in to the VM"
+    desc "ssh [--file <tenderfile> --command <ssh command>]", "SSH's in to the VM"
+    method_option :command, :aliases => "-c"
     def ssh()
       setup
-      Tenderloin::Commands.ssh
+      Tenderloin::Commands.ssh(options[:command])
     end
 
     desc "ip [--file <tenderfile>]", "Shows the IP to access the VM"

data/lib/tenderloin/commands.rb

@@ -28,7 +28,7 @@ error
       # the base VM, setting up shared folders, forwarded ports, etc to
       # provisioning the instance with chef. {up} also starts the instance,
       # running it in the background.
-      def up
+      def up(provision = nil)
         Env.load!
 
         if Env.persisted_vm
@@ -36,7 +36,7 @@ error
           Env.persisted_vm.start
         else
           Env.require_box
-          VM.execute!(Actions::VM::Up)
+          VM.execute!(Actions::VM::Up, provision)
         end
       end
 
@@ -69,10 +69,12 @@ error
       #
       # This command requires that an instance already be brought up with
       # `tenderloin up`.
-      def ssh
+      #
+      # Command: shell command to run on the remote host
+      def ssh(command)
         Env.load!
         Env.require_persisted_vm
-        SSH.connect Env.persisted_vm.fusion_vm.ip
+        SSH.connect Env.persisted_vm.fusion_vm.ip, command
       end
 
       # Halts a running tenderloin instance. This forcibly halts the instance;

data/lib/tenderloin/ssh.rb

@@ -3,7 +3,33 @@ module Tenderloin
     SCRIPT = File.join(File.dirname(__FILE__), '..', '..', 'script', 'tenderloin-ssh-expect.sh')
 
     class << self
-      def connect(ip)
+      def connect(ip, command = nil)
+        if command
+          remote_exec(ip, command)
+        else
+          ssh_connect(ip)
+        end
+      end
+
+      def remote_exec(ip, command)
+        execute(ip) do |ssh|
+          ssh.open_channel do |channel|
+            channel.exec command do |ch, success|
+              raise "could not execute remote command: #{command}" unless success
+
+              ch.on_data do |c, data|
+                STDOUT.print data
+              end
+
+              ch.on_extended_data do |c, type, data|
+                STDERR.print data
+              end
+            end
+          end
+        end
+      end
+
+      def ssh_connect(ip)
         if options.keys
           Kernel.exec "#{cmd_ssh_opts} #{options.username}@#{ip}"
         else

data/test/tenderloin/actions/vm/up_test.rb

@@ -95,4 +95,16 @@ class UpActionTest < Test::Unit::TestCase
       @action.setup_mac_address
     end
   end
+
+  context "booting without provisioning" do
+    should "not add the provision task to the expected sequence" do
+      mock_vm, vm, action = mock_action(Tenderloin::Actions::VM::Up, :no_provision)
+
+      mock_config do |config|
+        config.chef.enabled = true
+      end
+
+      action.should_not be_provision_enabled
+    end
+  end
 end

metadata

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