vagrant-dsc 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a27d30fb1437143bb3969c933581d2a78549134e
-  data.tar.gz: e45f109d21e48ad8d6226f3fa729b89993fffea1
+  metadata.gz: f37a6800d96aab5dc37e1d69a7e44cee9d559b3d
+  data.tar.gz: f2d0898a6c453fcba7a90c1b01e941ee01868644
 SHA512:
-  metadata.gz: aaf2163219c6c17f22d78494b28897ac0c203f2e51658ec509abd19556260b6224c49b02dfd71169a6de6424dc7015b03a9c5131280fe5cb788d9c13bc13e348
-  data.tar.gz: d05416921b9d639382e006e4bae98bda92c1776ee7a45692257ec120f9b0f2c3a80b0056d9703f74133ee9ae4aa3a63346a90e7d4d2d574951303f2312fbed0e
+  metadata.gz: 382688986ac32d39dfd5014a5f9cbdf08517e17baff1196ab653c3e560036d1567e14fedcb023bd4fd0599ee78cf7a474e46937de7be4c4f60c33aee6c34a34e
+  data.tar.gz: 6cada93d1c44481e7cc9d252fae2de0a38b652b9d972e6c0d7fc28f216a9c22101450ee76293f1f2b23f48b9da6929d5167651a6feecff6ab292ac9fa4d7be46

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

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

data/lib/vagrant-dsc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Dsc
-    VERSION = "1.0.5"
+    VERSION = "1.0.6"
   end
 end

data/spec/provisioner/provisioner_spec.rb

@@ -274,12 +274,11 @@ echo \"Running Configuration file: ${script}\"
 
 cd \"/tmp/vagrant-dsc-1\"
 $StagingPath = $(Join-Path \"/tmp/vagrant-dsc-1\" \"staging\")
-$response = MyWebsite -OutputPath $StagingPath  4>&1 5>&1 | Out-String
+MyWebsite -OutputPath $StagingPath 
 
 # Start a DSC Configuration run
-$response += Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath 4>&1 5>&1 | Out-String
-del $StagingPath\\*.mof
-$response"
+Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath
+del $StagingPath\\*.mof"
 
         expect(script).to eq(expect_script)
       end
@@ -316,12 +315,11 @@ echo \"Running Configuration file: ${script}\"
 
 cd \"/tmp/vagrant-dsc-1\"
 $StagingPath = $(Join-Path \"/tmp/vagrant-dsc-1\" \"staging\")
-$response = MyWebsite -OutputPath $StagingPath  4>&1 5>&1 | Out-String
+MyWebsite -OutputPath $StagingPath 
 
 # Start a DSC Configuration run
-$response += Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath 4>&1 5>&1 | Out-String
-del $StagingPath\\*.mof
-$response"
+Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath
+del $StagingPath\\*.mof"
 
         expect(script).to eq(expect_script)
       end
@@ -357,12 +355,11 @@ echo \"Running Configuration file: ${script}\"
 
 cd \"/tmp/vagrant-dsc-1\"
 $StagingPath = $(Join-Path \"/tmp/vagrant-dsc-1\" \"staging\")
-$response = MyWebsite -OutputPath $StagingPath -Foo \"bar\" -ComputerName \"catz\" 4>&1 5>&1 | Out-String
+MyWebsite -OutputPath $StagingPath -Foo \"bar\" -ComputerName \"catz\"
 
 # Start a DSC Configuration run
-$response += Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath 4>&1 5>&1 | Out-String
-del $StagingPath\\*.mof
-$response"
+Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath
+del $StagingPath\\*.mof"
 
         expect(script).to eq(expect_script)
       end
@@ -396,12 +393,11 @@ echo \"Running Configuration file: ${script}\"
 
 cd \"/tmp/vagrant-dsc-1\"
 $StagingPath = $(Join-Path \"/tmp/vagrant-dsc-1\" \"staging\")
-$response = MyWebsite -OutputPath $StagingPath -FooFlag -BarFlag -FooParam \"FooVal\" 4>&1 5>&1 | Out-String
+MyWebsite -OutputPath $StagingPath -FooFlag -BarFlag -FooParam \"FooVal\"
 
 # Start a DSC Configuration run
-$response += Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath 4>&1 5>&1 | Out-String
-del $StagingPath\\*.mof
-$response"
+Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath
+del $StagingPath\\*.mof"
 
         expect(script).to eq(expect_script)
       end
@@ -436,9 +432,8 @@ echo \"Running Configuration file: ${script}\"
 $StagingPath = \"staging\"
 
 # Start a DSC Configuration run
-$response += Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath 4>&1 5>&1 | Out-String
-del $StagingPath\\*.mof
-$response"
+Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath
+del $StagingPath\\*.mof"
 
         expect(script).to eq(expect_script)
       end
@@ -490,12 +485,11 @@ echo \"Running Configuration file: ${script}\"
 
 cd \"/tmp/vagrant-dsc-1\"
 $StagingPath = $(Join-Path \"/tmp/vagrant-dsc-1\" \"staging\")
-$response = MyWebsite -OutputPath $StagingPath -ConfigurationData \"/tmp/vagrant-dsc-1/manifests/MyConfig.psd1\" 4>&1 5>&1 | Out-String
+MyWebsite -OutputPath $StagingPath -ConfigurationData \"/tmp/vagrant-dsc-1/manifests/MyConfig.psd1\"
 
 # Start a DSC Configuration run
-$response += Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath 4>&1 5>&1 | Out-String
-del $StagingPath\\*.mof
-$response"
+Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath
+del $StagingPath\\*.mof"
 
         expect(script).to eq(expect_script)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dsc
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -180,8 +180,6 @@ files:
 - lib/vagrant-dsc/templates/runner.ps1.erb
 - lib/vagrant-dsc/version.rb
 - spec/base.rb
-- spec/command_builder_spec.rb
-- spec/provisioner/base_test.rb.bak
 - spec/provisioner/config_spec.rb
 - spec/provisioner/provisioner_spec.rb
 - spec/spec_helper.rb
@@ -206,14 +204,12 @@ 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
 test_files:
 - spec/base.rb
-- spec/command_builder_spec.rb
-- spec/provisioner/base_test.rb.bak
 - spec/provisioner/config_spec.rb
 - spec/provisioner/provisioner_spec.rb
 - spec/spec_helper.rb

data/spec/command_builder_spec.rb

@@ -1,105 +0,0 @@
-# require_relative "../../../base"
-
-# require Vagrant.source_root.join("plugins/provisioners/chef/command_builder")
-
-# describe VagrantPlugins::Chef::CommandBuilder do
-
-#   let(:machine) { double("machine") }
-#   let(:chef_config) { double("chef_config") }
-
-#   before(:each) do
-#     allow(chef_config).to receive(:provisioning_path).and_return('/tmp/vagrant-chef-1')
-#     allow(chef_config).to receive(:arguments).and_return(nil)
-#     allow(chef_config).to receive(:binary_env).and_return(nil)
-#     allow(chef_config).to receive(:binary_path).and_return(nil)
-#     allow(chef_config).to receive(:binary_env).and_return(nil)
-#   end
-
-#   describe '.initialize' do
-#     it 'should raise when chef type is not client or solo' do
-#       expect { VagrantPlugins::Chef::CommandBuilder.new(chef_config, :client_bad) }.
-#         to raise_error
-#     end
-#   end
-
-#   describe 'build_command' do
-#     describe 'windows' do
-#       subject do
-#         VagrantPlugins::Chef::CommandBuilder.new(chef_config, :client, true)
-#       end
-
-#       it "executes the chef-client in PATH by default" do
-#         expect(subject.build_command()).to match(/^chef-client/)
-#       end
-
-#       it "executes the chef-client using full path if binary_path is specified" do
-#         allow(chef_config).to receive(:binary_path).and_return(
-#           "c:\\opscode\\chef\\bin\\chef-client")
-#         expect(subject.build_command()).to match(/^c:\\opscode\\chef\\bin\\chef-client\\chef-client/)
-#       end
-
-#       it "builds a guest friendly client.rb path" do
-#         expect(subject.build_command()).to include(
-#           '-c c:\\tmp\\vagrant-chef-1\\client.rb')
-#       end
-
-#       it "builds a guest friendly solo.json path" do
-#         expect(subject.build_command()).to include(
-#           '-j c:\\tmp\\vagrant-chef-1\\dna.json')
-#       end
-
-#       it 'includes Chef arguments if specified' do
-#         allow(chef_config).to receive(:arguments).and_return("-l DEBUG")
-#         expect(subject.build_command()).to include(
-#           '-l DEBUG')
-#       end
-
-#       it 'includes --no-color if UI is not colored' do
-#         expect(subject.build_command()).to include(
-#           ' --no-color')
-#       end
-#     end
-
-#     describe 'linux' do
-#       subject do
-#         VagrantPlugins::Chef::CommandBuilder.new(chef_config, :client, false)
-#       end
-
-#       it "executes the chef-client in PATH by default" do
-#         expect(subject.build_command()).to match(/^chef-client/)
-#       end
-
-#       it "executes the chef-client using full path if binary_path is specified" do
-#         allow(chef_config).to receive(:binary_path).and_return(
-#           "/opt/chef/chef-client")
-#         expect(subject.build_command()).to match(/^\/opt\/chef\/chef-client/)
-#       end
-
-#       it "builds a guest friendly client.rb path" do
-#         expect(subject.build_command()).to include(
-#           '-c /tmp/vagrant-chef-1/client.rb')
-#       end
-
-#       it "builds a guest friendly solo.json path" do
-#         expect(subject.build_command()).to include(
-#           '-j /tmp/vagrant-chef-1/dna.json')
-#       end
-
-#       it 'includes Chef arguments if specified' do
-#         allow(chef_config).to receive(:arguments).and_return("-l DEBUG")
-#         expect(subject.build_command()).to include(
-#           '-l DEBUG')
-#       end
-
-#       it 'includes --no-color if UI is not colored' do
-#         expect(subject.build_command()).to include(
-#           ' --no-color')
-#       end
-
-#       it 'includes environment variables if specified' do
-#         allow(chef_config).to receive(:binary_env).and_return("ENVVAR=VAL")
-#         expect(subject.build_command()).to match(/^ENVVAR=VAL /)
-#       end
-#     end
-#   end
-# end

data/spec/provisioner/base_test.rb.bak

@@ -1,49 +0,0 @@
-require_relative "../../../../base"
-
-require Vagrant.source_root.join("plugins/provisioners/chef/provisioner/base")
-
-describe VagrantPlugins::Chef::Provisioner::Base do
-  include_context "unit"
-
-  let(:machine) { double("machine") }
-  let(:config)  { double("config") }
-
-  subject { described_class.new(machine, config) }
-
-  describe "#encrypted_data_bag_secret_key_path" do
-    let(:env) { double("env") }
-    let(:root_path) { "/my/root" }
-
-    before do
-      allow(machine).to receive(:env).and_return(env)
-      allow(env).to receive(:root_path).and_return(root_path)
-    end
-
-    it "returns absolute path as is" do
-      expect(config).to receive(:encrypted_data_bag_secret_key_path).
-        and_return("/foo/bar")
-      expect(subject.encrypted_data_bag_secret_key_path).to eq "/foo/bar"
-    end
-
-    it "returns relative path joined to root_path" do
-      expect(config).to receive(:encrypted_data_bag_secret_key_path).
-        and_return("secret")
-      expect(subject.encrypted_data_bag_secret_key_path).to eq "/my/root/secret"
-    end
-  end
-
-  describe "#guest_encrypted_data_bag_secret_key_path" do
-    it "returns nil if host path is not configured" do
-      allow(config).to receive(:encrypted_data_bag_secret_key_path).and_return(nil)
-      allow(config).to receive(:provisioning_path).and_return("/tmp/foo")
-      expect(subject.guest_encrypted_data_bag_secret_key_path).to be_nil
-    end
-
-    it "returns path under config.provisioning_path" do
-      allow(config).to receive(:encrypted_data_bag_secret_key_path).and_return("secret")
-      allow(config).to receive(:provisioning_path).and_return("/tmp/foo")
-      expect(File.dirname(subject.guest_encrypted_data_bag_secret_key_path)).
-        to eq "/tmp/foo"
-    end
-  end
-end