vagrant-dsc 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62685e91971c7c7cb5efccec0e81fd8af44e0d20
-  data.tar.gz: 2bb9b7e13583abed3f226e9734a77d30c4bed9ea
+  metadata.gz: 8d8b084bcba884bdf9fca4300290c80e2dc5ad4c
+  data.tar.gz: 80b7d911f8205e82ed29dd6164c593db7161263f
 SHA512:
-  metadata.gz: 53db6b5272916a49bd32bfb2f512fffb63340565705ef0be7113cebc512904127bf64167b2928466e0a285d41cef6157b1f4d4423f59ce11ff5b932c6d43fab6
-  data.tar.gz: 8a862de42af21ad8cb703102e2635a6a63bd062f6456ab857d315d57d7aa21651ae1ac1f4aa3fcef57d1d88f2a1878f31aa16bca478023abb6a31a6eae3db089
+  metadata.gz: fbc5c0dabb0a1695a724e4d329b7e0e6b77093255c9880617742a66226ec6d54774d369714daec0a2759c8894d9c19700054c677bb921454dc7c858a915d8415
+  data.tar.gz: 3655d498d3f0e2df00815c603516af03e5178911eec15e8ca8da873c58ff0071726a39e01a3531eba816c0284410d3face44e213f54dd6a9b2fdcdb88acef08d

data/lib/vagrant-dsc/provisioner.rb

@@ -247,17 +247,15 @@ module VagrantPlugins
           manifest: config.configuration_file))
 
         # A bit of an ugly dance, but this is how we get neat, colourised output and exit codes from a Powershell run
-        last_type = nil
-        new_line = ""
         error = false
         machine.communicate.shell.powershell("powershell -ExecutionPolicy Bypass -OutputFormat Text -file #{DSC_GUEST_RUNNER_PATH}") do |type, data|
           if !data.chomp.empty?
             error = true if type == :stderr
             if [:stderr, :stdout].include?(type)
               color = type == :stdout ? :green : :red
-              new_line = "\r\n" if last_type != nil and last_type != type
-              last_type = type
-              @machine.ui.info( new_line + data.chomp, color: color, new_line: false, prefix: false)
+              # Remove the \r\n since the dsc output uses this if line is to long. A Line break is a simple \n
+              data = data.gsub(/\r\n/,"") if type == :stdout
+              @machine.ui.info( data.strip(), color: color, prefix: false)
             end
           end
         end

data/lib/vagrant-dsc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Dsc
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

data/spec/provisioner/config_spec.rb

@@ -17,7 +17,7 @@ describe VagrantPlugins::DSC::Config do
     before do
       env = double("environment", root_path: "/tmp/vagrant-dsc-path")
       config = double("config")
-      machine.stub(config: config, env: env)
+      allow(machine).to receive_messages(config: config, env: env)
 
       allow(machine).to receive(:root_path).and_return("/c/foo")
     end
@@ -65,7 +65,7 @@ describe VagrantPlugins::DSC::Config do
     it "should detect the fully qualified path to the manifest automatically" do
       env = double("environment", root_path: "")
       config = double("config")
-      machine.stub(config: config, env: env)
+      allow(machine).to receive_messages(config: config, env: env)
       allow(machine).to receive(:root_path).and_return(".")
 
       subject.configuration_file = "manifests/MyWebsite.ps1"
@@ -83,7 +83,7 @@ describe VagrantPlugins::DSC::Config do
     before do
       env = double("environment", root_path: "")
       config = double("config")
-      machine.stub(config: config, env: env)
+      allow(machine).to receive_messages(config: config, env: env)
 
       allow(machine).to receive(:root_path).and_return("/path/to/vagrant")
     end
@@ -138,7 +138,7 @@ describe VagrantPlugins::DSC::Config do
     it "should detect the fully qualified path to the configuration data file automatically" do
       env = double("environment", root_path: "")
       config = double("config")
-      machine.stub(config: config, env: env)
+      allow(machine).to receive_messages(config: config, env: env)
       allow(machine).to receive(:root_path).and_return(".")
 
       subject.configuration_data_file = "manifests/foo.psd1"

data/spec/provisioner/provisioner_spec.rb

@@ -23,7 +23,7 @@ describe VagrantPlugins::DSC::Provisioner do
   describe "configure" do
     before do
       allow(machine).to receive(:root_config).and_return(root_config)
-      machine.stub(config: root_config, env: env)
+      allow(machine).to receive_messages(config: root_config, env: env)
       root_config.module_path = module_path
       root_config.configuration_file = configuration_file
       root_config.finalize!
@@ -79,7 +79,7 @@ describe VagrantPlugins::DSC::Provisioner do
 
     before do
       allow(machine).to receive(:root_config).and_return(root_config)
-      machine.stub(config: root_config, env: env, communicate: communicator)
+      allow(machine).to receive_messages(config: root_config, env: env, communicate: communicator)
       root_config.module_path = module_path
       root_config.configuration_file = configuration_file
       root_config.finalize!
@@ -123,7 +123,7 @@ describe VagrantPlugins::DSC::Provisioner do
       root_config.validate(machine)
       subject.configure(root_config)
       # allow(root_config).to receive(:vm).and_return(vm)
-      machine.stub(config: root_config, env: env, communicate: communicator, guest: guest)
+      allow(machine).to receive_messages(config: root_config, env: env, communicate: communicator, guest: guest)
     end
 
     it "should allow reboot capability when capability exists" do
@@ -357,7 +357,7 @@ describe VagrantPlugins::DSC::Provisioner do
 
       allow(machine).to receive(:root_config).and_return(root_config)
       root_config.configuration_file = configuration_file
-      machine.stub(config: root_config, env: env)
+      allow(machine).to receive_messages(config: root_config, env: env)
       root_config.module_path = module_path
       root_config.configuration_file = configuration_file
       root_config.finalize!
@@ -584,7 +584,7 @@ del $StagingPath\\*.mof
         allow(machine).to receive(:root_config).and_return(root_config)
         root_config.configuration_file = configuration_file
         root_config.configuration_data_file = configuration_data_file
-        machine.stub(config: root_config, env: env)
+        allow(machine).to receive_messages(config: root_config, env: env)
         root_config.module_path = module_path
         root_config.configuration_file = configuration_file
         root_config.finalize!
@@ -695,7 +695,7 @@ del $StagingPath\\*.mof
       script = "myscript"
       path = "/local/runner/path"
       guest_path = "c:/tmp/vagrant-dsc-runner.ps1"
-      machine.stub(config: root_config, env: env, communicate: communicator)
+      allow(machine).to receive_messages(config: root_config, env: env, communicate: communicator)
       file = double("file")
       allow(file).to receive(:path).and_return(path)
       allow(Tempfile).to receive(:new) { file }
@@ -716,7 +716,7 @@ del $StagingPath\\*.mof
       expect(shell).to receive(:powershell).with("powershell -ExecutionPolicy Bypass -OutputFormat Text -file c:/tmp/vagrant-dsc-runner.ps1").and_yield(:stdout, "provisioned!")
       root_config.configuration_file = configuration_file
       expect(ui).to receive(:info).with("\"Running DSC Provisioner with manifests/MyWebsite.ps1...\"")
-      expect(ui).to receive(:info).with("provisioned!", {color: :green, new_line: false, prefix: false}).once
+      expect(ui).to receive(:info).with("provisioned!", {color: :green, prefix: false}).once
 
       subject.run_dsc_apply
     end
@@ -727,10 +727,32 @@ del $StagingPath\\*.mof
 
       root_config.configuration_file = configuration_file
       expect(ui).to receive(:info).with("\"Running DSC Provisioner with manifests/MyWebsite.ps1...\"")
-      expect(ui).to receive(:info).with("not provisioned!", {color: :red, new_line: false, prefix: false}).once
+      expect(ui).to receive(:info).with("not provisioned!", {color: :red, prefix: false}).once
       expect(shell).to receive(:powershell).with("powershell -ExecutionPolicy Bypass -OutputFormat Text -file c:/tmp/vagrant-dsc-runner.ps1").and_yield(:stderr, "not provisioned!")
 
       subject.run_dsc_apply
     end
+
+        it "should format DSC Output correct" do
+      allow(machine).to receive(:communicate).and_return(communicator)
+      allow(communicator).to receive(:shell).and_return(shell)
+
+      root_config.configuration_file = configuration_file
+      expect(ui).not_to receive(:info).with(/\r\n/, any_args)
+      expect(ui).not_to receive(:info).with(/^\n/, any_args)
+      expect(ui).not_to receive(:info).with(/\n$/, any_args)
+      expect(shell).to receive(:powershell)
+        .and_yield(:stout, "PSModulePath Configured: C:\\Users\\vagrant\\Documents\\WindowsPowerShell\\Modules;C:\\Program Files\\WindowsPowerShell\\Modules;C:\\Windows\\system32\\WindowsPowerShell\\v1.0\\Modules")
+        .and_yield(:stout, "\r\nRunning Configuration file: C:\\tmp\\vagrant-dsc-3\\manifests\\Reboot.ps1\r\n")
+        .and_yield(:stout, "\r\n    Directory: C:\\tmp\\vagrant-dsc-3\\staging\r\n\r\n\r\nMode                LastWriteTime         Length Name                                                                  \r\n----                -------------         ------ ----                                 \r\n-a----       10/17/2016   7:09 AM           3420 localhost.mof                                                         \r\n")
+        .and_yield(:stout, "VERBOSE: Perform operation 'Invoke CimMethod' with following parameters, ''methodName' = \r\nSendConfigurationApply,'className' = MSFT_DSCLocalConfigurationManager,'namespaceName' = \r\nroot/Microsoft/Windows/DesiredStateConfiguration'.")
+        .and_yield(:stout, "VERBOSE: An LCM method call arrived from computer WIN-QRTPA0OO7EK with user sid \r\nS-1-5-21-678342207-3002680417-1007590926-1000.\nVERBOSE: [WIN-QRTPA0OO7EK]: LCM:  [ Start  Set      ]\n")
+        .and_yield(:stout, "VERBOSE: [WIN-QRTPA0OO7EK]: LCM:  [ Start  Resource ]  [[Script]Reboot]")
+        .and_yield(:stout, "\nVERBOSE: [WIN-QRTPA0OO7EK]: LCM:  [ Start  Test     ]  [[Script]Reboot]\nVERBOSE: [WIN-QRTPA0OO7EK]: LCM:  [ End    Test     ]  [[Script]Reboot]  in 0.0000 seconds.\nVERBOSE: [WIN-QRTPA0OO7EK]: LCM:  [ Skip   Set      ]  [[Script]Reboot]\nVERBOSE: [WIN-QRTPA0OO7EK]: LCM:  [ End    Resource ]  [[Script]Reboot]\nVERBOSE: [WIN-QRTPA0OO7EK]: LCM:  [ Start  Resource ]  [[Script]Error]\nVERBOSE: [WIN-QRTPA0OO7EK]: LCM:  [ Start  Test     ]  [[Script]Error]\nVERBOSE: [WIN-QRTPA0OO7EK]: LCM:  [ End    Test     ]  [[Script]Error]  in 0.0000 seconds.\n")
+        .and_yield(:stderr, "PowerShell DSC resource MSFT_ScriptResource  failed to execute Test-TargetResource functionality with error message: \r\n")
+        .and_yield(:stderr, "\nVERBOSE: Operation 'Invoke CimMethod' complete.\nVERBOSE: Time taken for configuration job to complete is 0.198 seconds\n\r\n\r\n")
+
+      subject.run_dsc_apply
+    end
   end
 end

data/spec/spec_helper.rb

@@ -6,10 +6,10 @@ require 'vagrant-dsc/plugin'
 require 'rspec/its'
 require 'base'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
     SimpleCov::Formatter::HTMLFormatter,
     Coveralls::SimpleCov::Formatter
-]
+])
 
 SimpleCov.start do
   coverage_dir('tmp/coverage')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dsc
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake