vagrant-dsc 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8ec166dab0cf1c326f7d0f943abcee534574d68
-  data.tar.gz: aad0961c447ebf11921c64c920d43463fb2410b5
+  metadata.gz: 8240a3495c72f76f0e6401942afde084014bc466
+  data.tar.gz: 3e8f36d14b7ef86b7e556435e8fd3d151f2e0b62
 SHA512:
-  metadata.gz: 16b406fbc437d601f40536c687efac1536588655a4813a3592ebfc9f19f0496cfaa1750a87b640d8ba5e429e68e453fd07d45774c1817408e1650b0ad3eac0bb
-  data.tar.gz: 603e019f5b4444ef240733f8a8eb417f3ed003a3ed394fe64212218736936c5549b8401409d47ea7f901a962d119694411758c9920b26504520631bf1027662d
+  metadata.gz: 24fa42974fa2cbf15b6d3e170a4f66a7dcc5b45f405f55a4f693fd93c2c550495f5d9f793adcfbe8749ee88d2d609d4a7f3bfa300723a40cc93a2e717415acbe
+  data.tar.gz: e5a2da9736b7bdcd84d10ae2bb5d2a33db9654b34c8c0b256e18e3f46575563e1e6bd2989eda3e266cc967ef4eaed13fe6f4c0829f6799822a8c4a4db737e4f8

data/README.md

@@ -1,7 +1,7 @@
 # Vagrant DSC Plugin
 
 [![Build Status](https://travis-ci.org/mefellows/vagrant-dsc.svg)](https://travis-ci.org/mefellows/vagrant-dsc)
-[![Coverage Status](https://coveralls.io/repos/mefellows/vagrant-dsc/badge.png)](https://coveralls.io/r/mefellows/vagrant-dsc)
+[![Coverage Status](https://coveralls.io/repos/mefellows/vagrant-dsc/badge.png?branch=master)](https://coveralls.io/r/mefellows/vagrant-dsc?branch=master)
 [![Gem Version](https://badge.fury.io/rb/vagrant-dsc.svg)](http://badge.fury.io/rb/vagrant-dsc)
 
 [Desired State Configuration](http://technet.microsoft.com/en-au/library/dn249912.aspx) provisioning plugin for Vagrant, enabling you to quickly configure & bootstrap a Windows Virtual Machine in a repeatable, reliable fashion - the Vagrant way.
@@ -33,7 +33,7 @@ In your Vagrantfile, add the following plugin and configure to your needs:
     # Set of Parameters to pass to the DSC Configuration.
     #
     # To pass in flags, simply set the value to `nil`
-    dsc.configuration_params = {"machineName => "localhost", "-EnableDebug" => nil}
+    dsc.configuration_params = {"machineName" => "localhost", "-EnableDebug" => nil}
 
     # Relative path to a folder containing a pre-generated MOF file.
     #

data/development/Vagrantfile

@@ -10,66 +10,28 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # please see the online documentation at vagrantup.com.
 
   # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "win-dev"
+  config.vm.box = "kensykora/windows_2012_r2_standard"
 
   config.vm.guest = :windows
   config.vm.communicator = "winrm"
 
-  config.vm.network :forwarded_port, guest: 3389, host: 3389
   config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
-  config.vm.network :forwarded_port, guest: 80, host: 8000 # Port forward for IIS
+  config.vm.network :forwarded_port, guest: 80,   host: 8000, id: "web" # Port forward for IIS
+  config.vm.network :forwarded_port, guest: 8443, host: 443,  id: "ssl" # Port forward for SSL IIS
 
   config.vm.provider "virtualbox" do |v|
+    v.customize ["modifyvm", :id, "--vram", "128"]
     v.gui = true
   end
 
-  $script = <<SCRIPT
-#
-# Script that gets executed on the remote machine
-#
-
-function Write-BootstrapProgress
-{
-    param($message)
-    Write-Host "        ${message}"
-}
-
-# Install Choco if not already installed
-
-if ( (Get-Command "choco" -errorAction SilentlyContinue) ) {
-    Write-BootstrapProgress "Chocolatey already installed. Skipping."
-} else {
-    Write-BootstrapProgress "Installing Chocolatey"
-    $wc=new-object net.webclient; $wp=[system.net.WebProxy]::GetDefaultProxy(); $wp.UseDefaultCredentials=$true; $wc.Proxy=$wp; iex ($wc.DownloadString('https://chocolatey.org/install.ps1'))
-    # Add to path
-    $env:Path = $env:Path + ";C:\ProgramData\chocolatey\bin"
-    [Environment]::SetEnvironmentVariable( "Path", $env:Path, [System.EnvironmentVariableTarget]::Machine )
-}
-
-Write-BootstrapProgress "Installing required software"
-if ( -Not (Get-Command "Install-Module" -errorAction SilentlyContinue) ) {
-    Write-BootstrapProgress "Installing PSGet"
-    (new-object Net.WebClient).DownloadString("http://psget.net/GetPsGet.ps1") | iex
-}
-Install-Module Posh-Git
-
-Write-BootstrapProgress "Installing required packages"
-$packages = @(
-    "git.commandline"
-    "git"
-    "seek-dsc"
-    "NuGet.CommandLine"
-    "invokemsbuild"
-)
-
-Write-BootstrapProgress "Packages installed"
-SCRIPT
-
-  # First pre-configure the machine with required software
-  config.vm.provision "shell", inline: $script
-
   config.vm.provision "dsc" do |dsc|
-    # The (Vagrantfile) relative path(s) to any folder containing DSC Resources
+
+    # Set of module paths relative to the Vagrantfile dir.
+    #
+    # These paths are added to the DSC Configuration running
+    # environment to enable local modules to be addressed.
+    #
+    # @return [Array] Set of relative module paths.
     dsc.module_path = ["manifests", "modules"]
 
     # The path relative to `dsc.manifests_path` pointing to the Configuration file
@@ -81,12 +43,12 @@ SCRIPT
 
     # Commandline arguments to the Configuration run
     # Set of Parameters to pass to the DSC Configuration.
-    dsc.configuration_params = {[:machineName] => "localhost"}
+    dsc.configuration_params = {"-MachineName" => "localhost"}
 
     # Relative path to a pre-generated MOF file.
     #
     # Path is relative to the folder containing the Vagrantfile.
-    #dsc.mof_file = "localhost.mof"
+    #dsc.mof_path = "mof"
 
     # Relative path to the folder containing the root Configuration manifest file.
     # Defaults to 'manifests'.
@@ -94,14 +56,6 @@ SCRIPT
     # Path is relative to the folder containing the Vagrantfile.
     # dsc.manifests_path = "manifests"
 
-    # Set of module paths relative to the Vagrantfile dir.
-    #
-    # These paths are added to the DSC Configuration running
-    # environment to enable local modules to be addressed.
-    #
-    # @return [Array] Set of relative module paths.
-    #dsc.module_path = []
-
     # The type of synced folders to use when sharing the data
     # required for the provisioner to work properly.
     #

data/lib/vagrant-dsc/provisioner.rb

@@ -96,7 +96,9 @@ module VagrantPlugins
 
         verify_dsc
 
-        run_dsc_apply(generate_dsc_runner_script)
+        write_dsc_runner_script(generate_dsc_runner_script)
+
+        run_dsc_apply
       end
 
       # Cleanup after a destroy action.
@@ -170,6 +172,7 @@ module VagrantPlugins
       # @return [String] the Path to the uploaded location on the guest machine.
       def write_dsc_runner_script(script)
         guest_script_path = DSC_GUEST_RUNNER_PATH
+        # TODO: Get a counter in here in case of multiple runs
         file = Tempfile.new(["vagrant-dsc-runner", "ps1"])
         begin
           file.write(script)
@@ -183,24 +186,9 @@ module VagrantPlugins
         guest_script_path
       end
 
-      # Runs the DSC Configuration over the guest machine.
-      #
-      # Expects
+      # Runs the DSC Configuration on the guest machine.
       def run_dsc_apply
-
-        # Check the DSC_GUEST_RUNNER_PATH exists?
-
-        # Set up Configuration arguments (hostname, manifest/module location, error levels ...)
-
-          # Where are the modules?
-
-          # Where is the manifest
-
-        # TODO: Get a counter in here in case of multiple runs
-
-        # Import starting point configuration into scope
-
-        command = ".\\'#{DSC_GUEST_RUNNER_PATH}'"
+        command = ". '#{DSC_GUEST_RUNNER_PATH}'"
 
         @machine.ui.info(I18n.t(
           "vagrant_dsc.running_dsc",
@@ -209,12 +197,21 @@ module VagrantPlugins
         opts = {
           elevated: true,
           error_key: :ssh_bad_exit_status_muted,
-          good_exit: [0,2],
+          good_exit: 0,
+          shell: :powershell
         }
 
         @machine.communicate.sudo(command, opts) do |type, data|
           if !data.chomp.empty?
-            @machine.ui.info(data.chomp)
+            if [:stderr, :stdout].include?(type)
+              # Output the data with the proper color based on the stream.
+              # TODO: Seems the WinRM communicator or a bug in my powershell code
+              # precludes from errors coming back in the :stderr stream
+              color = type == :stdout ? :green : :red
+              @machine.ui.info(
+                data.chomp,
+                color: color, new_line: false, prefix: false)
+            end
           end
         end
       end

data/lib/vagrant-dsc/templates/runner.ps1.erb

@@ -23,13 +23,11 @@ echo "Running Configuration file: ${script}"
 
 cd "<%= options[:temp_path] %>"
 $StagingPath = $(Join-Path "<%= options[:temp_path] %>" "staging")
-<%=options[:configuration_name]%> -MachineName "localhost" -OutputPath $StagingPath <%= options[:parameters] %>
-<% else %>
+$response = <%=options[:configuration_name]%> -OutputPath $StagingPath <%= options[:parameters] %> 4>&1 5>&1 | Out-String
+<% else %> 
 $StagingPath = "<%= options[:mof_path] %>"
 <% end %>
 
 # Start a DSC Configuration run
-Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath
-
-# Cleanup
-del -Path $StagingPath -Recurse
+$response += Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath 4>&1 5>&1 | Out-String
+$response

data/lib/vagrant-dsc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Dsc
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/spec/provisioner/provisioner_spec.rb

@@ -127,6 +127,7 @@ describe VagrantPlugins::DSC::Provisioner do
     it "should allow reboot capability when capability exists" do
       allow(communicator).to receive(:sudo)
       allow(communicator).to receive(:test)
+      allow(communicator).to receive(:upload)
       allow(subject).to receive(:verify_shared_folders).and_return(true)
       allow(subject).to receive(:verify_dsc).and_return(true)
       allow(subject).to receive(:run_dsc_apply).and_return(true)
@@ -139,6 +140,7 @@ describe VagrantPlugins::DSC::Provisioner do
     it "should not allow reboot capability when capability does not exist" do
       allow(communicator).to receive(:sudo)
       allow(communicator).to receive(:test)
+      allow(communicator).to receive(:upload)
       allow(subject).to receive(:verify_shared_folders).and_return(true)
       allow(subject).to receive(:verify_dsc).and_return(true)
       allow(subject).to receive(:run_dsc_apply).and_return(true)
@@ -150,6 +152,7 @@ describe VagrantPlugins::DSC::Provisioner do
 
     it "should create temporary folders on the guest" do
       allow(communicator).to receive(:test)
+      allow(communicator).to receive(:upload)
       allow(subject).to receive(:verify_shared_folders).and_return(true)
       allow(subject).to receive(:verify_dsc).and_return(true)
       allow(subject).to receive(:run_dsc_apply).and_return(true)
@@ -162,9 +165,28 @@ describe VagrantPlugins::DSC::Provisioner do
       subject.provision
     end
 
+    it "should generate and write the runner script to the guest" do
+      allow(communicator).to receive(:test)
+      allow(communicator).to receive(:upload)
+      allow(subject).to receive(:verify_shared_folders).and_return(true)
+      allow(subject).to receive(:verify_dsc).and_return(true)
+      allow(subject).to receive(:run_dsc_apply).and_return(true)
+      allow(guest).to receive(:capability?)
+      allow(guest).to receive(:capability)
+
+      expect(communicator).to receive(:sudo).with("mkdir -p #{root_config.temp_dir}")
+      expect(communicator).to receive(:sudo).with("chmod 0777 #{root_config.temp_dir}")
+      expect(subject).to receive(:verify_dsc)
+      expect(subject).to receive(:write_dsc_runner_script)
+      expect(subject).to receive(:run_dsc_apply)
+
+      subject.provision
+    end    
+
     it "should ensure shared folders are properly configured" do
       allow(communicator).to receive(:test)
       allow(communicator).to receive(:sudo)
+      allow(communicator).to receive(:upload)      
       allow(subject).to receive(:verify_dsc).and_return(true)
       allow(subject).to receive(:run_dsc_apply).and_return(true)
       allow(guest).to receive(:capability?)
@@ -247,20 +269,14 @@ echo \"Running Configuration file: ${script}\"
 
 cd \"/tmp/vagrant-dsc-1\"
 $StagingPath = $(Join-Path \"/tmp/vagrant-dsc-1\" \"staging\")
-MyWebsite -MachineName \"localhost\" -OutputPath $StagingPath 
+$response = MyWebsite -OutputPath $StagingPath  4>&1 5>&1 | Out-String
 
 # Start a DSC Configuration run
-Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath
-
-# Cleanup
-del -Path $StagingPath -Recurse"
+$response += Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath 4>&1 5>&1 | Out-String
+$response"
 
         expect(script).to eq(expect_script)
       end
-
-      it "should skip MOF file generation if one already provided" do
-
-      end
     end
 
     context "with custom DSC Parameters" do
@@ -290,13 +306,11 @@ echo \"Running Configuration file: ${script}\"
 
 cd \"/tmp/vagrant-dsc-1\"
 $StagingPath = $(Join-Path \"/tmp/vagrant-dsc-1\" \"staging\")
-MyWebsite -MachineName \"localhost\" -OutputPath $StagingPath -Foo \"bar\" -ComputerName \"catz\"
+$response = MyWebsite -OutputPath $StagingPath -Foo \"bar\" -ComputerName \"catz\" 4>&1 5>&1 | Out-String
 
 # Start a DSC Configuration run
-Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath
-
-# Cleanup
-del -Path $StagingPath -Recurse"
+$response += Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath 4>&1 5>&1 | Out-String
+$response"
 
         expect(script).to eq(expect_script)
       end
@@ -327,13 +341,11 @@ echo \"Running Configuration file: ${script}\"
 
 cd \"/tmp/vagrant-dsc-1\"
 $StagingPath = $(Join-Path \"/tmp/vagrant-dsc-1\" \"staging\")
-MyWebsite -MachineName \"localhost\" -OutputPath $StagingPath -FooFlag -BarFlag -FooParam \"FooVal\"
+$response = MyWebsite -OutputPath $StagingPath -FooFlag -BarFlag -FooParam \"FooVal\" 4>&1 5>&1 | Out-String
 
 # Start a DSC Configuration run
-Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath
-
-# Cleanup
-del -Path $StagingPath -Recurse"
+$response += Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath 4>&1 5>&1 | Out-String
+$response"
 
         expect(script).to eq(expect_script)
       end      
@@ -365,10 +377,8 @@ echo \"Running Configuration file: ${script}\"
 $StagingPath = \"staging\"
 
 # Start a DSC Configuration run
-Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath
-
-# Cleanup
-del -Path $StagingPath -Recurse"
+$response += Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath 4>&1 5>&1 | Out-String
+$response"
 
         expect(script).to eq(expect_script)
       end
@@ -397,9 +407,19 @@ del -Path $StagingPath -Recurse"
   describe "Apply DSC" do
     it "should invoke the DSC Runner and notify the User of provisioning status" do
       expect(ui).to receive(:info).with(any_args).once
-      expect(ui).to receive(:info).with("provisioned!").once
+      expect(ui).to receive(:info).with("provisioned!", {color: :green, new_line: false, prefix: false}).once
       allow(machine).to receive(:communicate).and_return(communicator)
-      expect(communicator).to receive(:sudo).with('.\\' + "'c:/tmp/vagrant-dsc-runner.ps1'",{:elevated=>true, :error_key=>:ssh_bad_exit_status_muted, :good_exit=>[0, 2]}).and_yield("type", "provisioned!")
+      expect(communicator).to receive(:sudo).with('. ' + "'c:/tmp/vagrant-dsc-runner.ps1'",{:elevated=>true, :error_key=>:ssh_bad_exit_status_muted, :good_exit=>0, :shell=>:powershell}).and_yield(:stdout, "provisioned!")
+
+      subject.run_dsc_apply
+    end
+
+    it "should show error output in red" do
+      expect(ui).to receive(:info).with(any_args).once
+      expect(ui).to receive(:info).with("provisioned!", {color: :red, new_line: false, prefix: false}).once
+      allow(machine).to receive(:communicate).and_return(communicator)
+      expect(communicator).to receive(:sudo).with('. ' + "'c:/tmp/vagrant-dsc-runner.ps1'",{:elevated=>true, :error_key=>:ssh_bad_exit_status_muted, :good_exit=>0, :shell=>:powershell}).and_yield(:stderr, "provisioned!")
+
       subject.run_dsc_apply
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dsc
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-01 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake