vagrant-dsc 1.1.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d8b084bcba884bdf9fca4300290c80e2dc5ad4c
-  data.tar.gz: 80b7d911f8205e82ed29dd6164c593db7161263f
+  metadata.gz: 257e8495b08c9b7b2a68472e1645fcc27e2d7b53
+  data.tar.gz: 55e75494825b1d264efa388af9983bbb42967c13
 SHA512:
-  metadata.gz: fbc5c0dabb0a1695a724e4d329b7e0e6b77093255c9880617742a66226ec6d54774d369714daec0a2759c8894d9c19700054c677bb921454dc7c858a915d8415
-  data.tar.gz: 3655d498d3f0e2df00815c603516af03e5178911eec15e8ca8da873c58ff0071726a39e01a3531eba816c0284410d3face44e213f54dd6a9b2fdcdb88acef08d
+  metadata.gz: b3e3b4d479b4a3f3c30355fbfbc4faabf0872bc0c21b00f2b1ed95527091b9abdea5d70449cd2d0694875950cec8aa179d127b5a14fd5cbf619bb5bfcf7e5e72
+  data.tar.gz: 1a0a3f4280c3d6d7bddd2d3d615d88b35b74d30712f6ad90672cd20ea1f0f05a2f98fa06a1719eb56fdf4440862bab1a1ed95be0395b0ef7876b5e71814abc17

data/README.md

@@ -85,6 +85,11 @@ In your Vagrantfile, add the following plugin and configure to your needs:
     # For example, you can set this to "nfs" to use NFS synced folders.
     dsc.synced_folder_type = "nfs"
 
+    # Whether to abort the vagrant run if DSC fails.
+    #
+    # By default, this is false.
+    dsc.abort_on_dsc_failure = true
+
     # Temporary working directory on the guest machine.
     dsc.temp_dir = "/tmp/vagrant-dsc"
   end

data/lib/vagrant-dsc/config.rb

@@ -74,19 +74,22 @@ module VagrantPlugins
       # Do not override this.
       attr_accessor :expanded_configuration_data_file
 
+      attr_accessor :abort_on_dsc_failure
+
       def initialize
         super
 
-        @configuration_file       = UNSET_VALUE
-        @configuration_data_file  = UNSET_VALUE
-        @manifests_path           = UNSET_VALUE
-        @configuration_name       = UNSET_VALUE
-        @mof_path                 = UNSET_VALUE
-        @module_path              = UNSET_VALUE
-        @configuration_params     = {}
-        @synced_folder_type       = UNSET_VALUE
-        @temp_dir                 = UNSET_VALUE
-        @module_install           = UNSET_VALUE
+        @configuration_file             = UNSET_VALUE
+        @configuration_data_file        = UNSET_VALUE
+        @manifests_path                 = UNSET_VALUE
+        @configuration_name             = UNSET_VALUE
+        @mof_path                       = UNSET_VALUE
+        @module_path                    = UNSET_VALUE
+        @configuration_params           = {}
+        @synced_folder_type             = UNSET_VALUE
+        @temp_dir                       = UNSET_VALUE
+        @module_install                 = UNSET_VALUE
+        @abort_on_dsc_failure = UNSET_VALUE
         @logger = Log4r::Logger.new("vagrant::vagrant_dsc")
       end
 
@@ -98,15 +101,16 @@ module VagrantPlugins
         super
 
         # Null checks
-        @configuration_file       = "default.ps1" if @configuration_file == UNSET_VALUE
-        @configuration_data_file  = nil if @configuration_data_file == UNSET_VALUE
-        @module_path              = nil if @module_path == UNSET_VALUE
-        @synced_folder_type       = nil if @synced_folder_type == UNSET_VALUE
-        @temp_dir                 = nil if @temp_dir == UNSET_VALUE
-        @module_install           = nil if @module_install == UNSET_VALUE
-        @mof_path                 = nil if @mof_path == UNSET_VALUE
-        @configuration_name       = File.basename(@configuration_file, File.extname(@configuration_file)) if @configuration_name == UNSET_VALUE
-        @manifests_path           = File.dirname(@configuration_file) if @manifests_path == UNSET_VALUE
+        @configuration_file             = "default.ps1" if @configuration_file == UNSET_VALUE
+        @configuration_data_file        = nil if @configuration_data_file == UNSET_VALUE
+        @module_path                    = nil if @module_path == UNSET_VALUE
+        @synced_folder_type             = nil if @synced_folder_type == UNSET_VALUE
+        @temp_dir                       = nil if @temp_dir == UNSET_VALUE
+        @module_install                 = nil if @module_install == UNSET_VALUE
+        @mof_path                       = nil if @mof_path == UNSET_VALUE
+        @configuration_name             = File.basename(@configuration_file, File.extname(@configuration_file)) if @configuration_name == UNSET_VALUE
+        @manifests_path                 = File.dirname(@configuration_file) if @manifests_path == UNSET_VALUE
+        @abort_on_dsc_failure = false if @abort_on_dsc_failure == UNSET_VALUE
 
         # Can't supply them both!
         if (@configuration_file != nil && @mof_path != nil)

data/lib/vagrant-dsc/locales/en.yml

@@ -42,3 +42,5 @@ en:
         "DSC Status is \"Failure\"."
       winrm_authorization_error_recover: |-
         The host terminated the active connection. Try to wait for the completion of DSC.
+      dsc_configuration_failed: |-
+        Executing the DSC failed. Set 'abort_on_dsc_failure' to false to ignore DSC errors.

data/lib/vagrant-dsc/provisioner.rb

@@ -132,6 +132,7 @@ module VagrantPlugins
         if (get_configuration_status == "Failure")
           @machine.ui.error(I18n.t("failure_status"))
           show_dsc_failure_message
+          fail_vagrant_run_if_requested
         end
       end
 
@@ -157,6 +158,14 @@ module VagrantPlugins
         end
       end
 
+      def fail_vagrant_run_if_requested
+        if (@config.abort_on_dsc_failure)
+          raise DSCError, :dsc_configuration_failed
+        else
+          @machine.ui.info("DSC execution failed. Set 'abort_on_dsc_failure' to true to make this fail the build.")
+        end
+      end
+
       # Cleanup after a destroy action.
       #
       # This is the method called when destroying a machine that allows

data/lib/vagrant-dsc/version.rb

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

data/spec/provisioner/config_spec.rb

@@ -29,17 +29,18 @@ describe VagrantPlugins::DSC::Config do
 
     before { subject.finalize! }
 
-    its("configuration_file")       { expect = "default.ps1" }
-    its("configuration_data_file")  { expect be_nil }
-    its("manifests_path")           { expect = "." }
-    its("configuration_name")       { expect = "default" }
-    its("mof_path")                 { expect be_nil }
-    its("module_path")              { expect be_nil }
-    its("options")                  { expect = [] }
-    its("configuration_params")     { expect = {} }
-    its("synced_folder_type")       { expect be_nil }
-    its("temp_dir")                 { expect match /^\/tmp\/vagrant-dsc-*/ }
-    its("working_directory")        { expect be_nil }
+    its("configuration_file")             { expect = "default.ps1" }
+    its("configuration_data_file")        { expect be_nil }
+    its("manifests_path")                 { expect = "." }
+    its("configuration_name")             { expect = "default" }
+    its("mof_path")                       { expect be_nil }
+    its("module_path")                    { expect be_nil }
+    its("options")                        { expect = [] }
+    its("configuration_params")           { expect = {} }
+    its("synced_folder_type")             { expect be_nil }
+    its("temp_dir")                       { expect match /^\/tmp\/vagrant-dsc-*/ }
+    its("working_directory")              { expect be_nil }
+    its("abort_on_dsc_failure") { expect be_false }
   end
 
   describe "derived settings" do

data/spec/provisioner/provisioner_spec.rb

@@ -283,6 +283,20 @@ describe VagrantPlugins::DSC::Provisioner do
       subject.wait_for_dsc_completion
     end
 
+    it "should throw on failure if requested" do
+      allow_any_instance_of(Object).to receive(:sleep)
+      allow(guest).to receive(:capability?).with(:wait_for_reboot).and_return(true)
+      allow(communicator).to receive(:shell).and_return(shell)
+      allow(guest).to receive(:capability).with(:wait_for_reboot)
+      allow(subject).to receive(:get_lcm_state).and_return("PendingConfiguration")
+      allow(subject).to receive(:get_configuration_status).and_return("Failure")
+      allow(subject).to receive(:get_guest_powershell_version).and_return("5")
+      expect(subject).to receive(:show_dsc_failure_message)
+      allow(root_config).to receive(:abort_on_dsc_failure).and_return(true)
+
+      expect{ subject.wait_for_dsc_completion }.to raise_error(VagrantPlugins::DSC::DSCError)
+    end
+
     it "should not get the lcm state if powershell version is 4" do
       allow(guest).to receive(:capability?).with(:wait_for_reboot).and_return(true)
       allow(communicator).to receive(:shell).and_return(shell)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dsc
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: DSC Provisioner for Vagrant