vagrant-dsc 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a23d07bfdced212c1036b9e3d36092a018eecb6a
-  data.tar.gz: 382422fdff1951d30eda2baab87ce2e8d53364b5
+  metadata.gz: 32a6233f447ba5f18cc19f0f7e55e4856ae2bf67
+  data.tar.gz: 8aa7f0c18bc920583e62bebe13beb33a9e818133
 SHA512:
-  metadata.gz: f33aaf4511ccba1237e193f7e908fdd21a34a9e4d9277bb53b8ed004d3333235d2215995c9d9287660266034b8276198733525b73ff1d1becd848e21e477eb41
-  data.tar.gz: d0bb148d250e5917b3a23a89f76df674e15fa87622b90af2d7f5a9b41e15b47ca208c947c226e280a17a1fde17ae409822affc4d3a8fe863fe01532e8f3fac58
+  metadata.gz: fa1bbe12cd6c2916092d25b834bf3fb87319774b9b53eb7e3676be67d8a98f3b9183c6c7e0b855c35dccfed057bffa7e569369216e3ed3fbd895b79f9c7f66f0
+  data.tar.gz: a6188461eaa121535bd8e62129257f127c9be8c258f192695807ebf7064406fb553e09a2b266903b693e60f7584125054bfcedbcbc1685519e2ba9966897e209

data/.gitignore

@@ -21,5 +21,4 @@ tmp
 *.a
 mkmf.log
 .vagrant
-.idea
-.tags*
+.idea

data/README.md

@@ -65,6 +65,10 @@ In your Vagrantfile, add the following plugin and configure to your needs:
     #dsc.temp_dir = "/tmp/vagrant-dsc"
   end
 ```
+## Example
+
+There is a [sample](https://github.com/mefellows/vagrant-dsc/tree/master/development) Vagrant setup used for development of this plugin. 
+This is a great real-life example to get you on your way.
 
 ## Roadmap
 

data/development/Vagrantfile

@@ -16,16 +16,17 @@ 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 = "kensykora/windows_2012_r2_standard"
+  #config.vm.box = "kensykora/windows_2012_r2_standard"
+  config.vm.box = "seek-base-v3"
 
   config.vm.guest = :windows
   config.vm.communicator = "winrm"
 
   config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
   config.vm.network :forwarded_port, guest: 80,   host: 8000, id: "web" # Port forward for IIS
-  config.vm.network :forwarded_port, guest: 443, host: 8443,  id: "ssl" # Port forward for SSL IIS
+  # config.vm.network :forwarded_port, guest: 443, host: 8443,  id: "ssl" # Port forward for SSL IIS
   config.vm.network :forwarded_port, guest: 22, host: 9222,  id: "ssh" # Port forward for SSL IIS
-
+  config.winrm.guest_port = 5985
   config.vm.provider "virtualbox" do |v|
     v.gui = true
   end
@@ -45,10 +46,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # environment to enable local modules to be addressed.
     #
     # @return [Array] Set of relative module paths.
-    dsc.module_path = ["manifests", "modules"]
+    # dsc.module_path = ["manifests", "modules"]
+    dsc.module_path = ["modules"]
 
     # The path relative to `dsc.manifests_path` pointing to the Configuration file
-    dsc.configuration_file  = "manifests/MyWebsite.ps1"
+    dsc.configuration_file  = "MyWebsite.ps1"
 
     # The Configuration Command to run. Assumed to be the same as the `dsc.configuration_file`
     # (sans extension) if not provided.
@@ -67,7 +69,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # Defaults to 'manifests'.
     #
     # Path is relative to the folder containing the Vagrantfile.
-    # dsc.manifests_path = "manifests"
+    dsc.manifests_path = "manifests"
 
     # The type of synced folders to use when sharing the data
     # required for the provisioner to work properly.

data/lib/vagrant-dsc/provisioner.rb

@@ -160,7 +160,9 @@ module VagrantPlugins
             module_paths: @module_paths.map { |k,v| v }.join(";"),
             mof_path: @config.mof_path,
             configuration_file: @config.configuration_file,
+            configuration_file_path: "#{@config.manifests_path}/#{File.basename @config.configuration_file}",
             configuration_name: @config.configuration_name,
+            manifests_path: @config.manifests_path,
             temp_path: @config.temp_dir,
             parameters: @config.configuration_params.map { |k,v| "#{k}" + (!v.nil? ? " \"#{v}\"": '') }.join(" ")
         })

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

@@ -7,14 +7,15 @@
 #
 
 # Set the local PowerShell Module environment path
-<% if options[:module_paths]  %>
+<% if !options[:module_paths].empty?  %>
 $absoluteModulePaths = [string]::Join(";", ("<%= options[:module_paths] %>".Split(";") | ForEach-Object { $_ | Resolve-Path }))
 
 echo "Adding to path: $absoluteModulePaths"
 $env:PSModulePath="$absoluteModulePaths;${env:PSModulePath}"
+("<%= options[:module_paths] %>".Split(";") | ForEach-Object { gci -Recurse  $_ | ForEach-Object { Unblock-File  $_.FullName} })
 <% end %>
 
-$script = $(Join-Path "<%= options[:temp_path] %>" "<%= options[:configuration_file] %>")
+$script = $(Join-Path "<%= options[:temp_path] %>" "<%= options[:configuration_file_path] %>" -Resolve)
 echo "PSModulePath Configured: ${env:PSModulePath}"
 echo "Running Configuration file: ${script}"
 

data/lib/vagrant-dsc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Dsc
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

data/spec/provisioner/config_spec.rb

@@ -101,6 +101,11 @@ describe VagrantPlugins::DSC::Config do
       expect(subject.expanded_module_paths('/path/to/vagrant/')).to eq(["/path/to/vagrant/foo/modules"])
     end
 
+    it "should generate a module path on the host machine relative to the Vagrantfile with relative paths" do
+      subject.module_path = "../modules"
+      expect(subject.expanded_module_paths('/path/to/vagrant/')).to eq(["/path/to/modules"])
+    end
+
     it "should generate module paths on the host machine relative to the Vagrantfile" do
       subject.module_path = ["dont/exist", "also/dont/exist"]
       expect(subject.expanded_module_paths('/path/to/vagrant/')).to eq(["/path/to/vagrant/dont/exist", "/path/to/vagrant/also/dont/exist"])

data/spec/provisioner/provisioner_spec.rb

@@ -244,7 +244,7 @@ describe VagrantPlugins::DSC::Provisioner do
 
     end
 
-    context "with default parameters" do
+context "with default parameters" do
       it "should generate a valid powershell command" do
         script = subject.generate_dsc_runner_script
         expect_script = "#
@@ -260,8 +260,50 @@ $absoluteModulePaths = [string]::Join(\";\", (\"/tmp/vagrant-dsc-1/modules-0;/tm
 
 echo \"Adding to path: $absoluteModulePaths\"
 $env:PSModulePath=\"$absoluteModulePaths;${env:PSModulePath}\"
+(\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\".Split(\";\") | ForEach-Object { gci -Recurse  $_ | ForEach-Object { Unblock-File  $_.FullName} })
 
-$script = $(Join-Path \"/tmp/vagrant-dsc-1\" \"manifests/MyWebsite.ps1\")
+$script = $(Join-Path \"/tmp/vagrant-dsc-1\" \"manifests/MyWebsite.ps1\" -Resolve)
+echo \"PSModulePath Configured: ${env:PSModulePath}\"
+echo \"Running Configuration file: ${script}\"
+
+# Generate the MOF file, only if a MOF path not already provided.
+# Import the Manifest
+. $script
+
+cd \"/tmp/vagrant-dsc-1\"
+$StagingPath = $(Join-Path \"/tmp/vagrant-dsc-1\" \"staging\")
+$response = MyWebsite -OutputPath $StagingPath  4>&1 5>&1 | Out-String
+
+# Start a DSC Configuration run
+$response += Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath 4>&1 5>&1 | Out-String
+$response"
+
+        expect(script).to eq(expect_script)
+      end
+    end
+
+    context "with a relative manifests_path" do
+      it "should generate a valid powershell command" do
+        root_config.manifests_path = "../manifests"
+        root_config.configuration_file = configuration_file
+        
+        script = subject.generate_dsc_runner_script
+        expect_script = "#
+# DSC Runner.
+#
+# Bootstraps the DSC environment, sets up configuration data
+# and runs the DSC Configuration.
+#
+#
+
+# Set the local PowerShell Module environment path
+$absoluteModulePaths = [string]::Join(\";\", (\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\".Split(\";\") | ForEach-Object { $_ | Resolve-Path }))
+
+echo \"Adding to path: $absoluteModulePaths\"
+$env:PSModulePath=\"$absoluteModulePaths;${env:PSModulePath}\"
+(\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\".Split(\";\") | ForEach-Object { gci -Recurse  $_ | ForEach-Object { Unblock-File  $_.FullName} })
+
+$script = $(Join-Path \"/tmp/vagrant-dsc-1\" \"../manifests/MyWebsite.ps1\" -Resolve)
 echo \"PSModulePath Configured: ${env:PSModulePath}\"
 echo \"Running Configuration file: ${script}\"
 
@@ -299,8 +341,9 @@ $absoluteModulePaths = [string]::Join(\";\", (\"/tmp/vagrant-dsc-1/modules-0;/tm
 
 echo \"Adding to path: $absoluteModulePaths\"
 $env:PSModulePath=\"$absoluteModulePaths;${env:PSModulePath}\"
+(\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\".Split(\";\") | ForEach-Object { gci -Recurse  $_ | ForEach-Object { Unblock-File  $_.FullName} })
 
-$script = $(Join-Path \"/tmp/vagrant-dsc-1\" \"manifests/MyWebsite.ps1\")
+$script = $(Join-Path \"/tmp/vagrant-dsc-1\" \"manifests/MyWebsite.ps1\" -Resolve)
 echo \"PSModulePath Configured: ${env:PSModulePath}\"
 echo \"Running Configuration file: ${script}\"
 
@@ -336,8 +379,9 @@ $absoluteModulePaths = [string]::Join(\";\", (\"/tmp/vagrant-dsc-1/modules-0;/tm
 
 echo \"Adding to path: $absoluteModulePaths\"
 $env:PSModulePath=\"$absoluteModulePaths;${env:PSModulePath}\"
+(\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\".Split(\";\") | ForEach-Object { gci -Recurse  $_ | ForEach-Object { Unblock-File  $_.FullName} })
 
-$script = $(Join-Path \"/tmp/vagrant-dsc-1\" \"manifests/MyWebsite.ps1\")
+$script = $(Join-Path \"/tmp/vagrant-dsc-1\" \"manifests/MyWebsite.ps1\" -Resolve)
 echo \"PSModulePath Configured: ${env:PSModulePath}\"
 echo \"Running Configuration file: ${script}\"
 
@@ -376,8 +420,9 @@ $absoluteModulePaths = [string]::Join(\";\", (\"/tmp/vagrant-dsc-1/modules-0;/tm
 
 echo \"Adding to path: $absoluteModulePaths\"
 $env:PSModulePath=\"$absoluteModulePaths;${env:PSModulePath}\"
+(\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\".Split(\";\") | ForEach-Object { gci -Recurse  $_ | ForEach-Object { Unblock-File  $_.FullName} })
 
-$script = $(Join-Path \"/tmp/vagrant-dsc-1\" \"manifests/MyWebsite.ps1\")
+$script = $(Join-Path \"/tmp/vagrant-dsc-1\" \"manifests/MyWebsite.ps1\" -Resolve)
 echo \"PSModulePath Configured: ${env:PSModulePath}\"
 echo \"Running Configuration file: ${script}\"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dsc
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: DSC Provisioner for Vagrant