mixlib-install 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af96827b91f93939e6376192d760548132394e7e
-  data.tar.gz: 39e849c94aebecb08b7f0f5e4328aeb8a45cb038
+  metadata.gz: 2d18d8c1c90dce1d5b13dc0a8a07100e3edd6d00
+  data.tar.gz: 35c920addbde19c96293902799a43740f5211444
 SHA512:
-  metadata.gz: 0cb34501343fb8891d181076ef8c213d034cdcbad866fc758754fdf24830883660bbca4c77282b0006118d48f1c22748a74ec6aba3935482349ed0fe446ed8af
-  data.tar.gz: 7320f109233968d75a508f959fc3a5c71964c40eb7921563dd21a5c1cf353ed5a2a8103e04b2770755d1e05981c356f7504a5948c4eb9229453250cffceb656c
+  metadata.gz: c1dca339b332b64c7bd0dab7a00a256309c0020d0271cb511cb77fc33afa104a18f63c6dc5418f5fa5bae70f0fb2eb27df3d7956cb6e064fafcacf1e2834fd1b
+  data.tar.gz: 849619cd75412e711e3ecba1d7b107ab5d730fd06280fdca4671807ec91a8b0c5247ef3e9974369ba2529b791d338bca4f88e168d653d4980c3dbdc006b995b5

data/.gitattributes

@@ -0,0 +1,3 @@
+# Managing line ending conversions
+# See http://git-scm.com/docs/gitattributes#_end-of-line_conversion
+* text eol=lf

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [1.2.2]
+- Add a .gitattributes file to ensure files are checked out with lf line endings
+
+## [1.2.1]
+- Fix nano appx installs replacing the symlink with a full copy
+
 ## [1.2.0]
 - Fix omnibus project mappings
 - Add `available_versions` method to API

data/lib/mixlib/install/generator/powershell/scripts/install_project.ps1

@@ -118,21 +118,22 @@ Function Install-ChefAppx($appx, $project) {
   Add-AppxPackage -Path $appx -ErrorAction Stop
   $package = (Get-AppxPackage -Name $project).InstallLocation
   $installRoot = "$env:SystemDrive/opscode"
-  $link = Join-Path $installRoot $project
-
-  # Remove link from a previous install
-  # There is currently a bug in removing symbolic links from Powershell
-  # so we use the fisher-price cmd shell to do it
-  if(Test-Path $link) {
-    cmd /c rmdir $link
-  }
+  $omnibusRoot = Join-Path $installRoot $project
 
   if(!(Test-Path $installRoot)) {
     New-Item -ItemType Directory -Path $installRoot
   }
-  push-Location $installRoot
-  New-Item -ItemType SymbolicLink -Name $project -Target $package
-  Pop-Location
+
+  # Remove old version of chef if it is here
+  if(Test-Path $omnibusRoot) {
+    Remove-Item -Path $omnibusRoot -Recurse -Force
+  }
+
+  # copy the appx install to the omnibus root. There are serious
+  # ACL related issues with running chef from the appx InstallLocation
+  # Hoping this is temporary and we can eventually just symlink
+  Copy-Item $package $omnibusRoot -Recurse
+
   return $true
 }
 

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "1.2.0"
+    VERSION = "1.2.2"
   end
 end

data/support/install_command.ps1

@@ -83,23 +83,21 @@ Function Install-ChefAppx($appx, $chef_omnibus_root) {
   Add-AppxPackage -Path $appx -ErrorAction Stop
 
   $rootParent = Split-Path $chef_omnibus_root -Parent
-  $rootFolder = Split-Path $chef_omnibus_root -Leaf
-  $link = Join-Path $rootParent $rootFolder
-
-  # Remove link from a previous install
-  # There is currently a bug in removing symbolic links from Powershell
-  # so we use the fisher-price cmd shell to do it
-  if(Test-Path $link) {
-    cmd /c rmdir $link
-  }
 
-  $package = (Get-AppxPackage -Name chef).InstallLocation
   if(!(Test-Path $rootParent)) {
     New-Item -ItemType Directory -Path $rootParent
   }
-  push-Location $rootParent
-  New-Item -ItemType SymbolicLink -Name $rootFolder -Target $package
-  Pop-Location
+
+  # Remove old version of chef if it is here
+  if(Test-Path $chef_omnibus_root) {
+    Remove-Item -Path $chef_omnibus_root -Recurse -Force
+  }
+
+  # copy the appx install to the omnibus_root. There are serious
+  # ACL related issues with running chef from the appx InstallLocation
+  # Hoping this is temporary and we can eventually just symlink
+  $package = (Get-AppxPackage -Name chef).InstallLocation
+  Copy-Item $package $chef_omnibus_root -Recurse
 
   return $true
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artifactory
@@ -173,6 +173,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitattributes"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -249,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A mixin to help with omnitruck installs