derelict 0.2.2.travis.82 → 0.2.2.travis.84

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGFlNDcwODViNzI1MjVmOWFjODEyZGRjMzYwYWUzNzFjM2MxOTVkYw==
+    YjJlNzVkODdiMWY5MWFhMDg3MmQ4ODQxZDg3NTFlZmI1ZDNiYzdkMg==
   data.tar.gz: !binary |-
-    ZTJkMWJhYTcyMzYxYWYzYWU4MjQxNTllMDNmZmZlMmQwYmE4ZTk5ZA==
+    Y2Y1MjBiOWU0ZjNmNzdhYTJhZTQ4Y2Y2Mjk3MmUzNjA4NDgzYzI0Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWFhNzI4MWFmYTFkMTY1ZGFkMWY2YjcxMjBkMDNkNWEzZDRjNDk3NDZkYTdj
-    M2IyZTk5MDc4YTk4NzU0YTdhYmRjNGI4ZWFiYWYxYmQxMDI0OGQ2MmVjY2Mz
-    NjVmOWQzYjMwMjI4MDZiMjg3NzlkNTMzNWNlOTc2OTU4MzZlNTA=
+    NWVmNDFiZDM3NTkxOGE5MzIwZjU2ZWNjZDBlMzZlZjQ5MTAzNWQ3M2NjZWMw
+    ZDBkZGU3YTQ4YThkMmQ3NDBhYWM0YjFmZjk0M2MzMjk5ZDA5NDIwOTZmYzUz
+    MmQ2MzM0NjQwMWRhZjQyYTIyYjVkMTFiYmFhM2JiOGU1M2Y4NDA=
   data.tar.gz: !binary |-
-    MzcyNGZkNTZlM2RiNzdiOTQ0YWE2ZmEwZDIyZGIzN2UxOTQ5ZDAwMDk0OWJm
-    ZThiZjZjM2MxMzc1YjRkNzAyMjIzNGY1Yjc4NzI2YWIwYTEyYWQ1NjA1ZjZi
-    MmM3YTFkZTQ1MjRlNzY1ODJlMDFkZDRmZTA2YzMzMTI4OWVjOGE=
+    ZDBiOGJiYTNhNzI2MWIzNmI1NWM5YWUyNWIwNDhiYWZhNjIwYmE2M2VkN2Qw
+    MmMxMzM1NmNiOWIyMDhhMWY0NzM1NGJkNDdkNDhmNDQ3YWU5MGY4NDcwZjVh
+    OTIwNzE2Y2FhMzE3MDFkYTc4MmFiYjg4MTgwNGU1NjgwY2RkYTQ=

data/lib/derelict/virtual_machine.rb

@@ -99,11 +99,14 @@ module Derelict
         logger.info message unless message.nil?
 
         # Set defaults for the options hash
-        options = {:log => false}.merge args.first
+        options = {:log => false, :color => false}.merge args.first
 
         # Execute the command, optionally logging output
         log_block = options[:log] ? shell_log_block : nil
-        connection.execute! command, name, *arguments_for(command), &log_block
+
+        args = [command, name, *arguments_for(command)]
+        args << "--color" if options[:color]
+        connection.execute! *args, &log_block
       end
     end
 

data/spec/derelict/virtual_machine_spec.rb

@@ -124,8 +124,9 @@ describe Derelict::VirtualMachine do
     end
 
     context "with correct number of arguments" do
+      let(:args) { [:up, name] }
       before do
-        expect(connection).to receive(:execute!).with(:up, name).and_yield("foo").and_return result
+        expect(connection).to receive(:execute!).with(*args).and_yield("foo").and_return result
       end
 
       context "with external logging disabled" do
@@ -145,6 +146,12 @@ describe Derelict::VirtualMachine do
           " INFO virtualmachine: Bringing up Derelict::VirtualMachine 'testvm' from test\n",
           " INFO external: foo\n",
         ]}
+
+        context "with color enabled" do
+          let(:options) { {:log => true, :color => true} }
+          let(:args) { [:up, name, '--color'] }
+          it { should be result }
+        end
       end
     end
   end
@@ -154,8 +161,9 @@ describe Derelict::VirtualMachine do
     let(:result) { double("result") }
     subject { vm.halt! options }
 
+    let(:args) { [:halt, name] }
     before do
-      expect(connection).to receive(:execute!).with(:halt, name).and_yield("foo").and_return result
+      expect(connection).to receive(:execute!).with(*args).and_yield("foo").and_return result
     end
 
     context "with external logging disabled" do
@@ -175,6 +183,12 @@ describe Derelict::VirtualMachine do
         " INFO virtualmachine: Halting Derelict::VirtualMachine 'testvm' from test\n",
         " INFO external: foo\n",
       ]}
+
+      context "with color enabled" do
+        let(:options) { {:log => true, :color => true} }
+        let(:args) { [:halt, name, '--color'] }
+        it { should be result }
+      end
     end
   end
 
@@ -183,8 +197,9 @@ describe Derelict::VirtualMachine do
     let(:result) { double("result") }
     subject { vm.destroy! options }
 
+    let(:args) { [:destroy, name, '--force'] }
     before do
-      expect(connection).to receive(:execute!).with(:destroy, name, '--force').and_yield("foo").and_return result
+      expect(connection).to receive(:execute!).with(*args).and_yield("foo").and_return result
     end
 
     context "with external logging disabled" do
@@ -204,6 +219,12 @@ describe Derelict::VirtualMachine do
         " INFO virtualmachine: Destroying Derelict::VirtualMachine 'testvm' from test\n",
         " INFO external: foo\n",
       ]}
+
+      context "with color enabled" do
+        let(:options) { {:log => true, :color => true} }
+        let(:args) { [:destroy, name, '--force', '--color'] }
+        it { should be result }
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: derelict
 version: !ruby/object:Gem::Version
-  version: 0.2.2.travis.82
+  version: 0.2.2.travis.84
 platform: ruby
 authors:
 - Brad Feehan