vagrant-dsc 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad002dd5d38e499e3db27f370028e30d5b373360
-  data.tar.gz: e7ec00cd1d284a69ed1b86888bcb9fa0ca554370
+  metadata.gz: 1d1c1a1d0ef61204a99cb1ec1fbf7c6db9bdb29a
+  data.tar.gz: f9151a44b34075f8a5884ad6ef2317253e910b47
 SHA512:
-  metadata.gz: 01783134cf80689edcb6adabcc8c4fcec63ac7b4efa2f8d9ae56cb39de17bbac05256be6fa11f26e248bc3d6853233f8ad44283ee165b091cecd45361348e85f
-  data.tar.gz: 08e1295ff52a3294d71dd5ded953724e74fe65ffb2e8a41275a1efaf81d90978625da1c6958b9c3b571dacd788d25ca3b17df3da5d2e83c6cbb8a82f18e45be5
+  metadata.gz: 8af8d5c182bc7c6f811782cbb44384afde9b1e963dcbf65b0cc8109bd8184f76eb873c7f89cb17b6bf296b4b4a8741a0be20ace4c82a25089db0d9e4b4fee5ef
+  data.tar.gz: cb90c6b1e8116ecae50066a80c1e6a421d170cbd4f4e0673e607552b460801582ec21960f59495e54a76903da8df6d2611866e380a308c83e8c9e764491e10e3

data/README.md

@@ -22,7 +22,7 @@ In your Vagrantfile, add the following plugin and configure to your needs:
 
 ```ruby
   config.vm.provision "dsc" do |dsc|
-  
+
     # The path relative to `dsc.manifests_path` pointing to the Configuration file
     dsc.configuration_file  = "MyWebsite.ps1"
 
@@ -45,6 +45,9 @@ In your Vagrantfile, add the following plugin and configure to your needs:
     # Relative path to a folder containing a pre-generated MOF file.
     #
     # Path is relative to the folder containing the Vagrantfile.
+    # When set, `configuration_name`, `configuration_data_file_path`,
+    # `configuration_file_path`, `configuration_data_file` and
+    # `manifests_path` are ignored.
     dsc.mof_path = "mof_output"
 
     # Relative path to the folder containing the root Configuration manifest file.
@@ -72,9 +75,17 @@ In your Vagrantfile, add the following plugin and configure to your needs:
     dsc.temp_dir = "/tmp/vagrant-dsc"
   end
 ```
+
+### Specifying a MOF file
+
+If `mof_path` is set then `configuration_name`, `configuration_data_file_path`, `configuration_file_path`, `configuration_data_file` and `manifests_path` are all not required, and will be ignored. Once you have a MOF file, you have everything you need (except possibly any paths to modules i.e. `module_paths`) to execute DSC
+
+If you don't know what a MOF file is, you probably don't need it and can safely ignore this setting.
+Vagrant DSC will create and manage it for you automatically.
+
 ## Example
 
-There is a [sample](https://github.com/mefellows/vagrant-dsc/tree/master/development) Vagrant setup used for development of this plugin. 
+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.
 
 ## Creating Windows Vagrant boxes
@@ -94,7 +105,7 @@ The plugin works on older platforms that have a later version of .NET (4.5) and
 
 As a general guide, configuring your Windows Server
 
-From the [DSC Book](https://onedrive.live.com/view.aspx?cid=7F868AA697B937FE&resid=7F868AA697B937FE!156&app=Word):
+From the [DSC Book](https://www.penflip.com/powershellorg/the-dsc-book):
 
 > **DSC Overview and Requirements**
 > Desired State Configuration (DSC) was first introduced as part of Windows Management Framework (WMF) 4.0, which is preinstalled in Windows 8.1 and Windows Server 2012 R2, and is available for Windows 7, Windows Server 2008 R2, and Windows Server 2012. Because Windows 8.1 is a free upgrade to Windows 8, WMF 4 is not available for Windows 8.
@@ -107,10 +118,35 @@ We may consider automatically installing and configuring DSC in a future release
 
 ```vagrant plugin uninstall vagrant-dsc```
 
+## Development
+
+Before getting started, read the Vagrant plugin [development basics](https://docs.vagrantup.com/v2/plugins/development-basics.html) and [packaging](https://docs.vagrantup.com/v2/plugins/packaging.html] documentation.
+
+You will need Ruby 1.9.3+ and Bundler installed before proceeding.
+
+```
+git clone git@github.com:mefellows/vagrant-dsc.git
+cd vagrant-dsc
+bundle install
+```
+
+Run tests:
+```
+bundle exec rake spec
+```
+
+Run Vagrant in context of current vagrant-dsc plugin:
+```
+cd <directory>
+bundle exec vagrant up
+```
+
+There is a test Vagrant DSC setup in `./development` that is a good example of a simple acceptance test.
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/vagrant-dsc/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Squash commits & push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+1. Create your feature branch (`git checkout -b my-new-feature`)
+1. Commit your changes, including relevant tests (`git commit -am 'Add some feature'`)
+1. Squash commits & push to the branch (`git push origin my-new-feature`)
+1. Create a new Pull Request

data/development/Vagrantfile

@@ -2,11 +2,8 @@
 # vi: set ft=ruby :
 
 $shell_script = <<SCRIPT
-  #(iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')))>$null 2>&1
-  #choco install seek-dsc
-  (New-Object System.Net.WebClient).DownloadFile('https://gallery.technet.microsoft.com/scriptcenter/xWebAdministration-Module-3c8bb6be/file/131367/3/xWebAdministration_1.3.2.zip','c:\\xwebadmin.zip')
-  choco install 7zip
-  & 'C:\\Program Files\\7-Zip\\7z.exe' x -y C:\\xwebadmin.zip -o'C:\\Program Files\\WindowsPowerShell\\Modules'
+  choco install seek-dsc -y
+  Install-WindowsFeature Web-Server
   Get-DSCResource
 SCRIPT
 
@@ -20,15 +17,22 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Every Vagrant virtual environment requires a box to build off of.
   config.vm.box = "mfellows/windows2012r2"
-  config.vm.box_version = "1.0.1"
+  config.vm.box_version = "1.0.0"
 
+
+  hostname = "vagrantdsc.local"
+  ip_address = "10.0.0.30"
   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: 22, host: 9222,  id: "ssh" # Port forward for SSL IIS
+  config.vm.network "private_network", ip: ip_address
+
+  if Vagrant.has_plugin?("vagrant-multi-hostsupdater")
+    config.multihostsupdater.aliases = {ip_address => [hostname]}
+  end
 
   config.vm.provider "virtualbox" do |v|
     v.gui = true
@@ -38,7 +42,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision "shell", inline: $shell_script
 
   # Upload Website
-  config.vm.provision "file", source: "website", destination: "c:\\my-web-app"
+  config.vm.provision "file", source: "website", destination: "c:\\MyWebApp"
 
   # Run DSC
   config.vm.provision "dsc" do |dsc|
@@ -75,7 +79,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # 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", "-HostName" => "#{hostname}"}
 
     # The type of synced folders to use when sharing the data
     # required for the provisioner to work properly.

data/development/manifests/MyWebsite.ps1

@@ -1,6 +1,6 @@
 Configuration MyWebsite
 {
-  param ($MachineName)
+  param ($MachineName, $HostName)
 
   Import-DscResource -Module MyWebapp
   Import-DscResource -Module cNetworking
@@ -17,7 +17,7 @@ Configuration MyWebsite
     {
         Ensure = "Present"
         Name = "Web-Mgmt-Tools"
-    }    
+    }
 
     cFirewallRule webFirewall
     {
@@ -26,13 +26,14 @@ Configuration MyWebsite
         LocalPort = "80"
         Protocol = "TCP"
         Action = "Allow"
-        Ensure = "Present"   
+        Ensure = "Present"
     }
 
     SimpleWebsite sWebsite
     {
-        WebAppPath = "c:\my-new-webapp"
+        WebAppPath = "c:\MyWebApp"
         DependsOn  = '[cWebsite]DefaultWebsite'
-    }    
+        HostName = $HostName
+    }
   }
-}
+}

data/development/modules/MyWebapp/DSCResources/SimpleWebsite/SimpleWebsite.schema.psm1

@@ -1,60 +1,46 @@
-Configuration SimpleWebsite
+Configuration SimpleWebsite
 {
     param
     (
-        [String]$WebAppPath = "c:\myWebApp",
-        [String]$WebAppName = "MyWebApp",
+        [String]$WebAppPath             = "c:\myWebApp",
+        [String]$WebSiteName            = "MyWebApp",
+        [String]$HostNameSuffix         = "local",
+        [String]$HostName               = "vagrantdsc.${HostNameSuffix}",
+        [String]$ApiAppPoolName         = "MyWebAppPool",
         [HashTable]$AuthenticationInfo = @{Anonymous = "true"; Basic = "false"; Digest = "false"; Windows = "false"}
     )
 
-    # Import-DscResource -Module cWebAdministration
-    Import-DscResource -Module xWebAdministration 
+    Import-DscResource -Module cWebAdministration
+    Import-DscResource -Module cNetworking
 
-     # Stop the default website 
-    xWebsite DefaultSite  
-    { 
-        Ensure          = "Present" 
-        Name            = "Default Web Site" 
-        State           = "Stopped" 
-        PhysicalPath    = "C:\inetpub\wwwroot" 
-        DependsOn       = "[File]websiteIndex" 
-    }
-
-    # Create a Web Application Pool 
-    xWebAppPool NewWebAppPool 
-    { 
-        Name   = "${WebAppName}AppPool"
-        Ensure = "Present" 
-        State  = "Started" 
-    } 
-
-    #Create a New Website with Port 
-    xWebSite NewWebSite 
-    { 
-        Name   = $WebAppName
-        Ensure = "Present" 
-        BindingInfo = MSFT_xWebBindingInformation 
-                    { 
-                        Port = 80
-                    } 
-        PhysicalPath = $WebAppPath
-        State = "Started" 
-        DependsOn = @("[xWebAppPool]NewWebAppPool") 
-    } 
-
-    File websiteIndex
+    # Stop the default website
+    cWebsite DefaultSite
     {
-      Ensure = "Present"
-      Type = "File"
-      DestinationPath = "$WebAppPath\index.html"
-      SourcePath = "c:\vagrant\website\index.html"
-      DependsOn  = '[File]website'
+        Ensure          = "Absent"
+        Name            = "Default Web Site"
+        State           = "Stopped"
+        PhysicalPath    = "C:\inetpub\wwwroot"
     }
 
-    File website
+    cWebsite UrlSvcWebsite
     {
-      Ensure = "Present"
-      Type = "Directory"
-      DestinationPath = $WebAppPath
+        Ensure = "Present"
+        Name   = $WebSiteName
+        BindingInfo = @(SEEK_cWebBindingInformation
+        {
+            Protocol = "http"
+            Port = 80
+            IPAddress = "*"
+        })
+        AuthenticationInfo = SEEK_cWebAuthenticationInformation { Anonymous = "true" }
+        HostFileInfo = @(SEEK_cHostEntryFileInformation
+        {
+            RequireHostFileEntry = $True
+            HostEntryName = $HostName
+            HostIpAddress = "10.0.0.30"
+        })
+        PhysicalPath = $WebAppPath
+        State = "Started"
+        DependsOn = @("[cWebsite]DefaultSite")
     }
-}
+}

data/development/website/index.html

@@ -1 +1,2 @@
-Hello from Vagrant DSC!
+<h1>Hello from Vagrant DSC!</h1>
+<img src="http://www.drodd.com/images10/funny-cat-gifs17.gif" />

data/lib/vagrant-dsc/provisioner.rb

@@ -10,7 +10,7 @@ module VagrantPlugins
     end
     class DSCUnsupportedOperation < DSCError
       error_key(:unsupported_operation)
-    end    
+    end
 
     # DSC Provisioner Plugin.
     #
@@ -219,6 +219,10 @@ module VagrantPlugins
       # on the guest machine.
       def verify_shared_folders(folders)
         folders.each do |folder|
+          # Warm up PoSH communicator for new instances - any stderr results
+          # in failure: https://github.com/mefellows/vagrant-dsc/issues/21
+          @machine.communicate.test("test -d #{folder}", sudo: true)
+
           @logger.info("Checking for shared folder: #{folder}")
           if !@machine.communicate.test("test -d #{folder}", sudo: true)
             raise DSCError, :missing_shared_folders

data/lib/vagrant-dsc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Dsc
-    VERSION = "1.0.7"
+    VERSION = "1.0.8"
   end
 end

data/spec/provisioner/provisioner_spec.rb

@@ -89,7 +89,7 @@ describe VagrantPlugins::DSC::Provisioner do
     it "should raise error if folders not shared" do
       root_config.synced_folder_type = "nfs"
 
-      expect(communicator).to receive(:test).with("test -d foo/modules", {:sudo=>true}).and_return(false)
+      expect(communicator).to receive(:test).twice.with("test -d foo/modules", {:sudo=>true}).and_return(false)
 
       subject.configure(root_config)
 
@@ -100,9 +100,9 @@ describe VagrantPlugins::DSC::Provisioner do
     it "should ensure shared folders are properly shared" do
       root_config.synced_folder_type = "nfs"
 
-      expect(communicator).to receive(:test).with("test -d foo/modules", {:sudo=>true}).and_return(true)
-      expect(communicator).to receive(:test).with("test -d foo/modules2", {:sudo=>true}).and_return(true)
-      expect(communicator).to receive(:test).with("test -d manifests", {:sudo=>true}).and_return(true)
+      expect(communicator).to receive(:test).twice.with("test -d foo/modules", {:sudo=>true}).and_return(true)
+      expect(communicator).to receive(:test).twice.with("test -d foo/modules2", {:sudo=>true}).and_return(true)
+      expect(communicator).to receive(:test).twice.with("test -d manifests", {:sudo=>true}).and_return(true)
 
       subject.configure(root_config)
 
@@ -183,12 +183,12 @@ describe VagrantPlugins::DSC::Provisioner do
       expect(subject).to receive(:run_dsc_apply)
 
       subject.provision
-    end    
+    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(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?)
@@ -225,7 +225,7 @@ describe VagrantPlugins::DSC::Provisioner do
 
     it "should raise an error if Powershell version is invalid" do
 
-    end    
+    end
   end
 
   describe "DSC runner script" do
@@ -288,7 +288,7 @@ del $StagingPath\\*.mof"
       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.

data/vagrant-dsc.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "rake", '~> 10.3', '>= 10.3.0'
-  spec.add_development_dependency "bundler", "~> 1.6", '>= 1.6.0'
-  spec.add_development_dependency "coveralls", "~> 0.7.1", '>= 0.7.1'
-  spec.add_development_dependency "rspec-core", '~> 3.1', '>= 3.1.0'
-  spec.add_development_dependency "rspec-expectations", '~> 3.1', '>= 3.1.0'
-  spec.add_development_dependency "rspec-mocks", '~> 3.1', '>= 3.1.0'
-  spec.add_development_dependency "rspec-its", "~> 1.0.1", '>= 1.0.0'
+  spec.add_development_dependency "rake"#, '~> 10.3', '>= 10.3.0'
+  # spec.add_development_dependency "bundler", "~> 1.6", '>= 1.6.0'
+  spec.add_development_dependency "coveralls"#, "~> 0.7.1", '>= 0.7.1'
+  spec.add_development_dependency "rspec-core"#, '~> 3.1', '>= 3.1.0'
+  spec.add_development_dependency "rspec-expectations"#, '~> 3.1', '>= 3.1.0'
+  spec.add_development_dependency "rspec-mocks" #, '~> 3.1', '>= 3.1.0'
+  spec.add_development_dependency "rspec-its" #, "~> 1.0.1", '>= 1.0.0'
 end

metadata

@@ -1,155 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dsc
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.3'
     - - '>='
       - !ruby/object:Gem::Version
-        version: 10.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.3'
     - - '>='
       - !ruby/object:Gem::Version
-        version: 10.3.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.1
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.1
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.1
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.1
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 description: Desired State Configuration (http://technet.microsoft.com/en-au/library/dn249912.aspx)
   provisioning plugin for Vagrant.
 email:
@@ -204,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: DSC Provisioner for Vagrant
@@ -213,3 +157,4 @@ test_files:
 - spec/provisioner/config_spec.rb
 - spec/provisioner/provisioner_spec.rb
 - spec/spec_helper.rb
+has_rdoc: