derelict 0.2.3.travis.85 → 0.2.3.travis.89

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGRhOGExOTg2OWY3MzE0NzI4ZWJjMjM3NmM5ZTVmZmFiNzE2MDM0ZA==
+    ZDNiNDkwZjE4NzM5NjZiNThlMjJiMTQ3NDhlZmUxMDY1YTc1OTNjYQ==
   data.tar.gz: !binary |-
-    ZGE0NWE4ZTY3MWZmYjMwNDc0ODc4NTBiZWNmNzA4NjI3ODJjZjJkNw==
+    YWM2Mzk4NWRjYWFmZWJjNWIxN2ExZjdkN2JkMDgxNmZlYWExZjhjNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTBkMWVlNDkwZjFmZGRiNGUzNzIyN2ZkMWE1Mjk3YjIwMGUzZDZmMTJjMjVh
-    YjFiODc4ODkzNmQzNmJkYWU3MTkyNDExNWZlZTVlNzdmOGM5Njk2YTBmM2U3
-    NzNiNGVjZThmOGZiZTljMDdmYzRmN2JiMDVkYjhmMmExZDc4ZmI=
+    OWFmMjE5ZmRiMDg1YmE4N2E2YWZlOGNlYzgyZWM1MDFjOWU3NjExNWRjNDVi
+    M2Q1MDY5Zjk2ZGMyZDA1YjI3ZGUyZTg5ODBmOWJiN2U2ZTNhNmNmOGU0Zjlm
+    ZWM5NjZiOWQ1NjdiMzc2ZWRmNWUwNTRiMGZmNzJiZmVmMTQ4Y2M=
   data.tar.gz: !binary |-
-    MTA3ZTFiMjRhMTYzZmVmMTBiYTI5MmI5Mjg2ZGQyMmIzZTYwZmVlMjllZjkz
-    Y2U3OGY4NGY1NTIwYmU1MTdlYzUxOThkOTE5ZWRkZTNkM2M4ZWRlZGQwZDFm
-    ZjllNjAzMWEwZDNiNjFmMDRhMTZmNjZmNTRjNDVjMzRkNzdiNDQ=
+    YTY0MmI5ZmU5ZjE0NTg0MjA2NzE0NjVhOGU3ZmE1ZDQyNzlmNTdkM2UxZTA0
+    NGUwOTE4MTg1ZmUwZWVhZDY2ZWU5NmZlMTU2NWU0M2RlNjM3YTEyYjFiODY2
+    ZWFjMjM0NTRlMDMzY2VlZjgwYjI0YTc0YTdkNzg1ODJlMDQwMTE=

data/lib/derelict/virtual_machine.rb

@@ -86,27 +86,27 @@ module Derelict
     #
     #     * log: Should the log output be printed? (defaults to false)
     COMMANDS.each do |command|
-      define_method :"#{command}!" do |*args|
-        if args.length > 1
-          message = "wrong number of arguments (#{args.length} for 0-1)"
+      define_method :"#{command}!" do |*opts|
+        # Ideally this block would have one argument with a default
+        # value of an empty Hash. Unfortunately, setting a default
+        # value for the arguments to a block is only supported in Ruby
+        # 1.9+. The splatted arguments thing is a way to allow zero or
+        # one argument, but it actually allows any number of arguments.
+        # So we need to emulate the error Ruby would throw if you give
+        # the wrong number of arguments.
+        if opts.length > 1
+          message = "wrong number of arguments (#{opts.length} for 0-1)"
           raise ArgumentError.new message
         end
 
-        args = [{}] if args.length == 0
+        # Set defaults for the opts hash
+        opts = {:color => false, :log => false}.merge(opts.first || {})
 
         # Log message if there's one for this command
-        message = log_message_for command
-        logger.info message unless message.nil?
+        log_message_for(command).tap {|m| logger.info m unless m.nil? }
 
-        # Set defaults for the options hash
-        options = {:log => false, :color => false}.merge args.first
-
-        # Execute the command, optionally logging output
-        log_block = options[:log] ? shell_log_block : nil
-
-        args = [command, name, *arguments_for(command)]
-        args << "--color" if options[:color]
-        connection.execute! *args, &log_block
+        # Execute the command!
+        execute! command, opts
       end
     end
 
@@ -126,10 +126,39 @@ module Derelict
     end
 
     private
+      # Executes a command on the connection for this VM
+      #
+      #   * command: The command to execute (as a symbol)
+      #   * options: A Hash of options, with the following optional keys:
+      #       * log:      Logs the output of the command if true
+      #                   (defaults to false)
+      #       * color:    Uses color in the log output (defaults to
+      #                   false, only relevant if log is true)
+      #       * provider: The Vagrant provider to use, one of
+      #                   "virtualbox" or "vmware_fusion" (defaults to
+      #                   "virtualbox")
+      def execute!(command, options)
+        # Build up the arguments to pass to connection.execute!
+        arguments = [command, name, *arguments_for(command)]
+        arguments << "--color" if options[:color]
+        if options[:provider]
+          arguments << "--provider"
+          arguments << options[:provider]
+        end
+
+        # Set up the block to use when executing -- if logging is
+        # enabled, use a block that logs the output; otherwise no block.
+        block = options[:log] ? shell_log_block : nil
+
+        # Execute the command
+        connection.execute! *arguments, &block
+      end
+
       # A block that can be passed to #execute to log the output
       def shell_log_block
-        Proc.new do |line|
-          logger(:type => :external).info line
+        Proc.new do |stdout, stderr|
+          # Only stdout or stderr is populated, the other will be nil
+          logger(:type => :external).info(stdout || stderr)
         end
       end
       memoize :shell_log_block

data/spec/derelict/virtual_machine_spec.rb

@@ -125,19 +125,31 @@ describe Derelict::VirtualMachine do
 
     context "with correct number of arguments" do
       let(:args) { [:up, name] }
-      before do
-        expect(connection).to receive(:execute!).with(*args).and_yield("foo").and_return result
-      end
 
       context "with external logging disabled" do
+        before do
+          expect(connection).to receive(:execute!).with(*args).and_return result
+        end
+
         include_context "logged messages"
         let(:expected_logs) {[
           "DEBUG virtualmachine: Successfully initialized Derelict::VirtualMachine 'testvm' from test\n",
           " INFO virtualmachine: Bringing up Derelict::VirtualMachine 'testvm' from test\n",
         ]}
+
+        context "with different provider" do
+          let(:options) { {:provider => "foobar"} }
+          let(:args) { [:up, name, "--provider", "foobar"] }
+
+          it { should be result }
+        end
       end
 
       context "with external logging enabled" do
+        before do
+          expect(connection).to receive(:execute!).with(*args).and_yield("foo", nil).and_return result
+        end
+
         let(:options) { {:log => true} }
 
         include_context "logged messages"
@@ -163,7 +175,7 @@ describe Derelict::VirtualMachine do
 
     let(:args) { [:halt, name] }
     before do
-      expect(connection).to receive(:execute!).with(*args).and_yield("foo").and_return result
+      expect(connection).to receive(:execute!).with(*args).and_yield("foo", nil).and_return result
     end
 
     context "with external logging disabled" do
@@ -199,7 +211,7 @@ describe Derelict::VirtualMachine do
 
     let(:args) { [:destroy, name, '--force'] }
     before do
-      expect(connection).to receive(:execute!).with(*args).and_yield("foo").and_return result
+      expect(connection).to receive(:execute!).with(*args).and_yield("foo", nil).and_return result
     end
 
     context "with external logging disabled" do
@@ -234,7 +246,7 @@ describe Derelict::VirtualMachine do
     subject { vm.reload! options }
 
     before do
-      expect(connection).to receive(:execute!).with(:reload, name).and_yield("foo").and_return result
+      expect(connection).to receive(:execute!).with(:reload, name).and_yield("foo", nil).and_return result
     end
 
     context "with external logging disabled" do
@@ -263,7 +275,7 @@ describe Derelict::VirtualMachine do
     subject { vm.suspend! options }
 
     before do
-      expect(connection).to receive(:execute!).with(:suspend, name).and_yield("foo").and_return result
+      expect(connection).to receive(:execute!).with(:suspend, name).and_yield("foo", nil).and_return result
     end
 
     context "with external logging disabled" do
@@ -292,7 +304,7 @@ describe Derelict::VirtualMachine do
     subject { vm.resume! options }
 
     before do
-      expect(connection).to receive(:execute!).with(:resume, name).and_yield("foo").and_return result
+      expect(connection).to receive(:execute!).with(:resume, name).and_yield("foo", nil).and_return result
     end
 
     context "with external logging disabled" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: derelict
 version: !ruby/object:Gem::Version
-  version: 0.2.3.travis.85
+  version: 0.2.3.travis.89
 platform: ruby
 authors:
 - Brad Feehan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r