mixlib-install 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b1656c932888d4fe4b9ab8018dc030cc981cf55
-  data.tar.gz: 62607468ef95716b1e60b226bf210b11140704fa
+  metadata.gz: 9fc991d852b256ce4a6a95d7d7263fb6189bde37
+  data.tar.gz: 40951a053a87cbc27c3a1dbdd9aeb5cdd99ed1db
 SHA512:
-  metadata.gz: 1948e2bb80f13534f45976eac8b0ad4fd348fdd1376585ef9ea2558ad9fd4521062429519844fa72c0404313bb9578eebd4e1aafd340ad0ff1e8c486ec399741
-  data.tar.gz: cbb02b511bfc708c7d2302835b522163d8243a18a0c2c81f47914fb071ef6dbd49028c308741e95f46f3cb3388e65aa3d9138fee19af802fa57ef382c395288c
+  metadata.gz: cca181d4b9a1049457ca73f1a7104d5a341918fc1540ab7b0f0cbe8bd2f9089331021813095747fe2fc6067517419d2eac5acb66140d44fe2f9d51b22bea38ea
+  data.tar.gz: a68d2666633af91189bc34e943b210601382c7104430a77c73044fab65c9ced6643027d9a0cf3d18f77d7a05baa7255b2f0e8ca0668a060736388fbafb609ecb

data/.rubocop.yml

@@ -0,0 +1,2 @@
+AllCops:
+  TargetRubyVersion: 1.9

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 sudo: false
-dist: trusty # https://github.com/travis-ci/travis-ci/issues/7131
+dist: precise
+cache: bundler
 
 addons:
   apt:
@@ -12,8 +13,24 @@ addons:
       - unzip
       - ssh
 
+before_install:
+  - gem install bundler
+  - bundle --version
+  - gem update --system
+  - gem --version
+
+branches:
+  only:
+  - master
+
 matrix:
   include:
+    # WE SUPPORT UPGRADES OF CHEF 11.x on RUBY 1.9.3 VIA chef_client_updater COOKBOOK
+  - rvm: 1.9.3
+    bundler_args: --without chefstyle functional --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
+    script:
+      - bundle exec rake unit
+      - bundle exec rake functional
   - rvm: 2.0
   - rvm: 2.2
   - rvm: 2.3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [3.3.1]
+- Add download_url_override and checksum options for powershell version of installer script
+- Update powershell execution due to policy changes in Windows 8, Windows Server 2012, and Windows 8.1
+
 ## [3.3.0]
 - `available_versions` now returns a sorted list of versions (per mixlib-versioning)
 

data/Gemfile

@@ -1,3 +1,25 @@
 source "https://rubygems.org"
 
 gemspec
+
+group :test, :development do
+  gem "rake"
+  gem "rspec"
+  gem "vcr"
+  gem "webmock", "~> 2.3.2"      # ruby 1.9.3
+  gem "addressable", "~> 2.4.0"  # ruby 1.9.3
+  gem "aruba", "~> 0.14"
+  gem "cucumber", "~> 1.3.20"
+end
+
+if RUBY_VERSION =~ /^2/
+  group :chefstyle do
+    gem "chefstyle"
+  end
+end
+
+instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
+
+# If you want to load debugging tools into the bundle exec sandbox,
+# add these additional dependencies into Gemfile.local
+eval(IO.read(__FILE__ + ".local"), binding) if File.exist?(__FILE__ + ".local")

data/README.md

@@ -2,6 +2,11 @@
 
 # Mixlib::Install
 
+## Supports
+
+- Ruby 1.9.3+
+- Chef 11.6.2+ chef-client upgrades
+
 ## Command Line Usage
 ```
 $ gem install mixlib-install

data/Rakefile

@@ -11,10 +11,14 @@ require "rspec/core/rake_task"
   end
 end
 
-require "chefstyle"
-require "rubocop/rake_task"
-RuboCop::RakeTask.new(:chefstyle) do |task|
-  task.options << "--display-cop-names"
+begin
+  require "chefstyle"
+  require "rubocop/rake_task"
+  RuboCop::RakeTask.new(:chefstyle) do |task|
+    task.options << "--display-cop-names"
+  end
+rescue LoadError
+  puts "chefstyle gem is not installed"
 end
 
 namespace :travis do

data/lib/mixlib/install.rb

@@ -148,13 +148,17 @@ module Mixlib
                  # powershell.exe program with Mixlib::ShellOut
                  Dir.mktmpdir do |d|
                    File.open(File.join(d, "detect_platform.ps1"), "w+") do |f|
-                     f.puts self.detect_platform_ps1
+                     f.puts detect_platform_ps1
                    end
 
-                   Mixlib::ShellOut.new("powershell.exe -file #{File.join(d, "detect_platform.ps1")}").run_command
+                   # An update to most Windows versions > 2008r2 now sets the execution policy
+                   # to disallow unsigned powershell scripts. This changes it for just this
+                   # powershell session, which allows this to run even if the execution policy
+                   # is set higher.
+                   Mixlib::ShellOut.new("powershell.exe -file #{File.join(d, "detect_platform.ps1")}", :env => { "PSExecutionPolicyPreference" => "Bypass" }).run_command
                  end
                else
-                 Mixlib::ShellOut.new(self.detect_platform_sh).run_command
+                 Mixlib::ShellOut.new(detect_platform_sh).run_command
                end
 
       platform_info = output.stdout.split

data/lib/mixlib/install/artifact_info.rb

@@ -74,7 +74,7 @@ module Mixlib
       end
 
       def clone_with(data)
-        ArtifactInfo.new(self.to_hash.merge(data))
+        ArtifactInfo.new(to_hash.merge(data))
       end
 
       def appx_artifact?

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

@@ -47,13 +47,27 @@ function Install-Project {
     [string]
     $daemon = 'auto',
     [string]
-    $http_proxy
+    $http_proxy,
+    [string]
+    $download_url_override,
+    # Specify an alternate download url, must also include checksum
+    [string]
+    $checksum
+    # SHA256 checksum of the download file
+    # Must be present when using download_url_override
   )
 
   # Set http_proxy as env var
   $env:http_proxy = $http_proxy
 
-  $package_metadata = Get-ProjectMetadata -project $project -channel $channel -version $version -prerelease:$prerelease -nightlies:$nightlies -architecture $architecture
+  if (-not [string]::IsNullOrEmpty($download_url_override)) {
+    $download_url = $download_url_override
+    $sha256 = $checksum
+  } else {
+    $package_metadata = Get-ProjectMetadata -project $project -channel $channel -version $version -prerelease:$prerelease -nightlies:$nightlies -architecture $architecture
+    $download_url = $package_metadata.url
+    $sha256 = $package_metadata.sha256
+  }
 
   if (-not [string]::IsNullOrEmpty($filename)) {
     $download_directory = split-path $filename
@@ -63,7 +77,7 @@ function Install-Project {
     }
   }
   else {
-    $filename = ($package_metadata.url -split '/')[-1]
+    $filename = ($download_url -split '/')[-1]
   }
   Write-Verbose "Download directory: $download_directory"
   Write-Verbose "Filename: $filename"
@@ -75,18 +89,18 @@ function Install-Project {
   $download_destination = join-path $download_directory $filename
 
   if ((test-path $download_destination) -and
-    (Test-ProjectPackage -Path $download_destination -Algorithm 'SHA256' -Hash $package_metadata.sha256 -ea SilentlyContinue)){
+    (Test-ProjectPackage -Path $download_destination -Algorithm 'SHA256' -Hash $sha256 -ea SilentlyContinue)){
     Write-Verbose "Found existing valid installer at $download_destination."
   }
   else {
-    if ($pscmdlet.ShouldProcess("$($package_metadata.url)", "Download $project")) {
-      Write-Verbose "Downloading $project from $($package_metadata.url) to $download_destination."
-      Get-WebContent $package_metadata.url -filepath $download_destination
+    if ($pscmdlet.ShouldProcess("$($download_url)", "Download $project")) {
+      Write-Verbose "Downloading $project from $($download_url) to $download_destination."
+      Get-WebContent $download_url -filepath $download_destination
     }
   }
 
   if ($pscmdlet.ShouldProcess("$download_destination", "Installing")){
-    if (Test-ProjectPackage -Path $download_destination -Algorithm 'SHA256' -Hash $package_metadata.sha256) {
+    if (Test-ProjectPackage -Path $download_destination -Algorithm 'SHA256' -Hash $sha256) {
       Write-Host "Installing $project from $download_destination"
       $installingProject = $True
       $installAttempts = 0

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "3.3.0"
+    VERSION = "3.3.1"
   end
 end

data/mixlib-install.gemspec

@@ -20,15 +20,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mixlib-shellout"
   spec.add_dependency "mixlib-versioning"
   spec.add_dependency "thor"
-
-  spec.add_development_dependency "aruba"
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "chefstyle"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rb-readline"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "vcr"
-  spec.add_development_dependency "webmock"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -53,146 +53,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: chefstyle
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rb-readline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - thom@chef.io
@@ -205,6 +65,7 @@ files:
 - ".gitattributes"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md