chef-dk 0.12.0 → 0.13.21

data/Rakefile

@@ -1,29 +1,22 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "bundler/gem_tasks"
-
-require "github_changelog_generator/task"
-
-GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-  config.user = "chef"
-  config.project = "chef-dk"
-  config.future_release = ChefDK::VERSION
-  config.enhancement_labels = "enhancement,Enhancement,New Feature,Feature".split(",")
-  config.bug_labels = "bug,Bug,Improvement,Upstream Bug".split(",")
-  config.exclude_labels = "duplicate,question,invalid,wontfix,no_changelog,Exclude From Changelog,Question,Discussion".split(",")
-end
+#
+# Copyright:: Copyright (c) 2016 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "bundler/gem_tasks"
+require_relative "tasks/version"
+require_relative "tasks/bundle"
+require_relative "tasks/dependencies"
+require_relative "tasks/github_changelog_generator"

data/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml

@@ -10,7 +10,7 @@ end
 driver:
   name: ec2
   tags:
-    X-Project: Kitchen Tests
+    X-Project: chef-ci-acceptance
   aws_ssh_key_id: <%= ENV['AWS_SSH_KEY_ID'] || ENV['USER'] || ENV['USERNAME'] %>
   # test-specific stuff
   region: us-west-2
@@ -223,7 +223,9 @@ platforms:
     transport:
       username: administrator
 
-  - name: windows-2012
+  - name: windows-2012r2
+    provisioner:
+      architecture: <%= ENV["KITCHEN_CHEF_WIN_ARCHITECTURE"] %>
     driver:
       image_search:
         name: Windows_Server-2012-RTM*-English-*-Base-*
@@ -234,7 +236,9 @@ platforms:
         image-type: machine
     transport:
       username: administrator
-  - name: windows-2008r2
+  - name: windows-2012r2
+    provisioner:
+      architecture: <%= ENV["KITCHEN_CHEF_WIN_ARCHITECTURE"] %>
     driver:
       image_search:
         name: Windows_Server-2008-R2*-English-*-Base-*

data/acceptance/Gemfile

@@ -1,11 +1,10 @@
-source "https://rubygems.org"
-
-gem "mixlib-install", github: "chef/mixlib-install"
-gem "chef-acceptance", github: "chef/chef-acceptance"
-gem "test-kitchen", github: "sersut/test-kitchen", branch: "sersut/mixlib-install-update"
-gem "kitchen-ec2", github: "test-kitchen/kitchen-ec2", branch: "jk/image-search-only"
-gem "kitchen-inspec"
-gem "kitchen-vagrant"
-gem "windows_chef_zero"
-gem "winrm-transport"
-gem "berkshelf"
+source "https://rubygems.org"
+
+gem "chef-acceptance", github: "chef/chef-acceptance"
+gem "test-kitchen"
+gem "kitchen-ec2", github: "test-kitchen/kitchen-ec2", branch: "jk/image-search-only"
+gem "kitchen-inspec"
+gem "kitchen-vagrant"
+gem "windows_chef_zero"
+gem "winrm-fs"
+gem "berkshelf"

data/acceptance/Gemfile.lock

@@ -0,0 +1,242 @@
+GIT
+  remote: git://github.com/chef/chef-acceptance.git
+  revision: 49458ec493dbd12588680eea9f2f9beb76463d09
+  specs:
+    chef-acceptance (0.2.0)
+      mixlib-shellout (~> 2.0)
+      thor (~> 0.19)
+
+GIT
+  remote: git://github.com/test-kitchen/kitchen-ec2.git
+  revision: 61458c354d71a4156263e7f8b33e51c6edcb5aa6
+  branch: jk/image-search-only
+  specs:
+    kitchen-ec2 (1.0.0.dev.0)
+      aws-sdk (~> 2)
+      excon
+      multi_json
+      retryable (~> 2.0)
+      test-kitchen (~> 1.4, >= 1.4.1)
+      ubuntu_ami (~> 0.4.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.4.0)
+    artifactory (2.3.2)
+    aws-sdk (2.2.34)
+      aws-sdk-resources (= 2.2.34)
+    aws-sdk-core (2.2.34)
+      jmespath (~> 1.0)
+    aws-sdk-resources (2.2.34)
+      aws-sdk-core (= 2.2.34)
+    berkshelf (4.3.2)
+      addressable (~> 2.3, >= 2.3.4)
+      berkshelf-api-client (~> 2.0, >= 2.0.2)
+      buff-config (~> 1.0)
+      buff-extensions (~> 1.0)
+      buff-shell_out (~> 0.1)
+      celluloid (= 0.16.0)
+      celluloid-io (~> 0.16.1)
+      cleanroom (~> 1.0)
+      faraday (~> 0.9)
+      httpclient (~> 2.7)
+      minitar (~> 0.5, >= 0.5.4)
+      octokit (~> 4.0)
+      retryable (~> 2.0)
+      ridley (~> 4.5)
+      solve (~> 2.0)
+      thor (~> 0.19)
+    berkshelf-api-client (2.0.2)
+      faraday (~> 0.9.1)
+      httpclient (~> 2.7.0)
+      ridley (~> 4.5)
+    buff-config (1.0.1)
+      buff-extensions (~> 1.0)
+      varia_model (~> 0.4)
+    buff-extensions (1.0.0)
+    buff-ignore (1.1.1)
+    buff-ruby_engine (0.1.0)
+    buff-shell_out (0.2.0)
+      buff-ruby_engine (~> 0.1.0)
+    builder (3.2.2)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    celluloid-io (0.16.2)
+      celluloid (>= 0.16.0)
+      nio4r (>= 1.1.0)
+    chef-config (12.9.38)
+      fuzzyurl (~> 0.8.0)
+      mixlib-config (~> 2.0)
+      mixlib-shellout (~> 2.0)
+    cleanroom (1.0.0)
+    coderay (1.1.1)
+    diff-lcs (1.2.5)
+    docker-api (1.26.2)
+      excon (>= 0.38.0)
+      json
+    erubis (2.7.0)
+    excon (0.49.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.9.10)
+    fuzzyurl (0.8.0)
+    gssapi (1.2.0)
+      ffi (>= 1.0.1)
+    gyoku (1.3.1)
+      builder (>= 2.1.2)
+    hashie (3.4.3)
+    hitimes (1.2.3)
+    httpclient (2.7.1)
+    inspec (0.18.0)
+      json (~> 1.8)
+      method_source (~> 0.8)
+      pry (~> 0)
+      r-train (~> 0.10.4)
+      rainbow (~> 2)
+      rspec (~> 3.3)
+      rspec-its (~> 1.2)
+      rubyzip (~> 1.1)
+      thor (~> 0.19)
+    jmespath (1.2.4)
+      json_pure (>= 1.8.1)
+    json (1.8.3)
+    json_pure (1.8.3)
+    kitchen-inspec (0.12.5)
+      inspec (>= 0.14.1, < 1.0.0)
+      test-kitchen (~> 1.6)
+    kitchen-vagrant (0.20.0)
+      test-kitchen (~> 1.4)
+    little-plugger (1.1.4)
+    logging (2.1.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
+    method_source (0.8.2)
+    minitar (0.5.4)
+    mixlib-authentication (1.4.0)
+      mixlib-log
+      rspec-core (~> 3.2)
+      rspec-expectations (~> 3.2)
+      rspec-mocks (~> 3.2)
+    mixlib-config (2.2.1)
+    mixlib-install (1.0.6)
+      artifactory (>= 2.3.0)
+      mixlib-shellout (>= 2.2.6)
+      mixlib-versioning (>= 1.1.0)
+    mixlib-log (1.6.0)
+    mixlib-shellout (2.2.6)
+    mixlib-versioning (1.1.0)
+    molinillo (0.4.4)
+    multi_json (1.11.2)
+    multipart-post (2.0.0)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (3.1.1)
+    nio4r (1.2.1)
+    nori (2.6.0)
+    octokit (4.3.0)
+      sawyer (~> 0.7.0, >= 0.5.3)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    r-train (0.10.4)
+      docker-api (~> 1.26.2)
+      json (~> 1.8)
+      mixlib-shellout (~> 2.1)
+      net-scp (~> 1.2)
+      net-ssh (>= 2.9, < 4.0)
+      winrm (~> 1.6)
+      winrm-fs (~> 0.3)
+    rainbow (2.1.0)
+    retryable (2.0.3)
+    ridley (4.5.0)
+      addressable
+      buff-config (~> 1.0)
+      buff-extensions (~> 1.0)
+      buff-ignore (~> 1.1)
+      buff-shell_out (~> 0.1)
+      celluloid (~> 0.16.0)
+      celluloid-io (~> 0.16.1)
+      chef-config (>= 12.5.0)
+      erubis
+      faraday (~> 0.9.0)
+      hashie (>= 2.0.2, < 4.0.0)
+      httpclient (~> 2.7)
+      json (>= 1.7.7)
+      mixlib-authentication (>= 1.3.0)
+      retryable (~> 2.0)
+      semverse (~> 1.1)
+      varia_model (~> 0.4.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    rubyntlm (0.6.0)
+    rubyzip (1.2.0)
+    safe_yaml (1.0.4)
+    sawyer (0.7.0)
+      addressable (>= 2.3.5, < 2.5)
+      faraday (~> 0.8, < 0.10)
+    semverse (1.2.1)
+    slop (3.6.0)
+    solve (2.0.3)
+      molinillo (~> 0.4.2)
+      semverse (~> 1.1)
+    test-kitchen (1.7.3)
+      mixlib-install (~> 1.0, >= 1.0.4)
+      mixlib-shellout (>= 1.2, < 3.0)
+      net-scp (~> 1.1)
+      net-ssh (>= 2.9, < 4.0)
+      safe_yaml (~> 1.0)
+      thor (~> 0.18)
+    thor (0.19.1)
+    timers (4.0.4)
+      hitimes
+    ubuntu_ami (0.4.1)
+    varia_model (0.4.1)
+      buff-extensions (~> 1.0)
+      hashie (>= 2.0.2, < 4.0.0)
+    windows_chef_zero (2.0.0)
+      test-kitchen (>= 1.2.1)
+    winrm (1.7.3)
+      builder (>= 2.1.2)
+      gssapi (~> 1.2)
+      gyoku (~> 1.0)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (>= 1.6.1, < 3.0)
+      nori (~> 2.0)
+      rubyntlm (~> 0.6.0)
+    winrm-fs (0.4.2)
+      erubis (~> 2.7)
+      logging (>= 1.6.1, < 3.0)
+      rubyzip (~> 1.1)
+      winrm (~> 1.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  berkshelf
+  chef-acceptance!
+  kitchen-ec2!
+  kitchen-inspec
+  kitchen-vagrant
+  test-kitchen
+  windows_chef_zero
+  winrm-fs
+
+BUNDLED WITH
+   1.11.2

data/chef-dk.gemspec

@@ -1,64 +1,67 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'chef-dk/version'
-
-Gem::Specification.new do |gem|
-  gem.name          = "chef-dk"
-  gem.version       = ChefDK::VERSION
-  gem.authors       = [ "Daniel DeLeo", "Lamont Granquist", "Serdar Sutay" ]
-  gem.email         = [ "dan@chef.io", "lamont@chef.io", "serdar@chef.io"]
-  gem.description   = "A streamlined development and deployment workflow for Chef platform."
-  gem.summary       = gem.description
-  gem.homepage      = "https://www.chef.io/"
-
-  gem.required_ruby_version = '>= 2.0'
-
-  gem.files = %w(Gemfile Rakefile LICENSE README.md CONTRIBUTING.md warning.txt) + Dir.glob("*.gemspec") +
-      Dir.glob("{lib,spec,acceptance}/**/*", File::FNM_DOTMATCH).reject { |f|  File.directory?(f) }
-  gem.executables   = %w( chef )
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
-
-  gem.add_dependency "mixlib-cli", "~> 1.5"
-  gem.add_dependency "mixlib-shellout", "~> 2.0"
-  gem.add_dependency "ffi-yajl", ">= 1.0", "< 3.0"
-
-  gem.add_dependency "minitar", "~> 0.5.4"
-
-  gem.add_dependency "chef", "~> 12.5"
-
-  gem.add_dependency "solve", "~> 2.0", ">= 2.0.1"
-
-  gem.add_dependency "cookbook-omnifetch", "~> 0.2", ">= 0.2.2"
-
-  gem.add_dependency "diff-lcs", "~> 1.0"
-  gem.add_dependency "paint", "~> 1.0"
-
-  gem.add_dependency "chef-provisioning", "~> 1.2"
-
-  gem.add_development_dependency "github_changelog_generator"
-
-  %w(rspec-core rspec-expectations rspec-mocks).each do |dev_gem|
-    gem.add_development_dependency dev_gem, "~> 3.0"
-  end
-
-  gem.post_install_message = File.read(File.join(__dir__, 'warning.txt'))
-
-end
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'chef-dk/version'
+
+Gem::Specification.new do |gem|
+  gem.name          = "chef-dk"
+  gem.version       = ChefDK::VERSION
+  gem.authors       = [ "Daniel DeLeo", "Lamont Granquist", "Serdar Sutay" ]
+  gem.email         = [ "dan@chef.io", "lamont@chef.io", "serdar@chef.io"]
+  gem.description   = "A streamlined development and deployment workflow for Chef platform."
+  gem.summary       = gem.description
+  gem.homepage      = "https://www.chef.io/"
+
+  gem.required_ruby_version = '>= 2.0'
+
+  gem.files = %w{Rakefile LICENSE README.md CONTRIBUTING.md warning.txt} +
+      %w{version_policy.rb omnibus_overrides.rb} +
+      Dir.glob("Gemfile*") + # Includes Gemfile and locks
+      Dir.glob("*.gemspec") +
+      Dir.glob("{lib,spec,acceptance,tasks}/**/*", File::FNM_DOTMATCH).reject { |f|  File.directory?(f) }
+  gem.executables   = %w( chef )
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
+
+  gem.add_dependency "mixlib-cli", "~> 1.5"
+  gem.add_dependency "mixlib-shellout", "~> 2.0"
+  gem.add_dependency "ffi-yajl", ">= 1.0", "< 3.0"
+
+  gem.add_dependency "minitar", "~> 0.5.4"
+
+  gem.add_dependency "chef", "~> 12.5"
+
+  gem.add_dependency "solve", "~> 2.0", ">= 2.0.1"
+
+  gem.add_dependency "cookbook-omnifetch", "~> 0.2", ">= 0.2.2"
+
+  gem.add_dependency "diff-lcs", "~> 1.0"
+  gem.add_dependency "paint", "~> 1.0"
+
+  gem.add_dependency "chef-provisioning", "~> 1.2"
+
+  gem.add_development_dependency "github_changelog_generator"
+
+  %w(rspec-core rspec-expectations rspec-mocks).each do |dev_gem|
+    gem.add_development_dependency dev_gem, "~> 3.0"
+  end
+
+  gem.post_install_message = File.read(File.expand_path("../warning.txt", __FILE__))
+
+end