chef-dk 1.2.22 → 1.3.40

data/spec/unit/policyfile_services/undelete_spec.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/policyfile_services/undelete'
+require "spec_helper"
+require "chef-dk/policyfile_services/undelete"
 
 describe ChefDK::PolicyfileServices::Undelete do
 
@@ -77,7 +77,7 @@ describe ChefDK::PolicyfileServices::Undelete do
       let(:policy_revision) do
         {
           "name" => "appserver",
-          "revision_id" => "1111111111111111111111111111111111111111111111111111111111111111"
+          "revision_id" => "1111111111111111111111111111111111111111111111111111111111111111",
         }
       end
 
@@ -151,7 +151,7 @@ OUTPUT
     let(:policy_revision) do
       {
         "name" => "appserver",
-        "revision_id" => "1111111111111111111111111111111111111111111111111111111111111111"
+        "revision_id" => "1111111111111111111111111111111111111111111111111111111111111111",
       }
     end
 
@@ -259,7 +259,7 @@ OUTPUT
     let(:policy_revision) do
       {
         "name" => "appserver",
-        "revision_id" => "1111111111111111111111111111111111111111111111111111111111111111"
+        "revision_id" => "1111111111111111111111111111111111111111111111111111111111111111",
       }
     end
 
@@ -299,6 +299,4 @@ OUTPUT
 
   end
 
-
 end
-

data/spec/unit/policyfile_services/update_attributes_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/helpers'
-require 'chef-dk/policyfile_services/update_attributes'
+require "spec_helper"
+require "chef-dk/helpers"
+require "chef-dk/policyfile_services/update_attributes"
 
 describe ChefDK::PolicyfileServices::UpdateAttributes do
 
@@ -115,25 +115,25 @@ E
         "revision_id" => "522d740beba4c4e5857bd8bccdb2d7ffd0bbd45ac4350f92b26e4e3b8f68d530",
         "name" => "install-example",
         "run_list" => ["recipe[local-cookbook::default]"],
-        "cookbook_locks"=> {
-          "local-cookbook"=> {
-            "version"=>"2.3.4",
-            "identifier"=>"fab501cfaf747901bd82c1bc706beae7dc3a350c",
-            "dotted_decimal_identifier"=> "70567763561641081.489844270461035.258281553147148",
-            "source"=>"cookbooks/local-cookbook",
-            "cache_key"=>nil,
+        "cookbook_locks" => {
+          "local-cookbook" => {
+            "version" => "2.3.4",
+            "identifier" => "fab501cfaf747901bd82c1bc706beae7dc3a350c",
+            "dotted_decimal_identifier" => "70567763561641081.489844270461035.258281553147148",
+            "source" => "cookbooks/local-cookbook",
+            "cache_key" => nil,
             "scm_info" => nil,
-            "source_options"=> {
-              "path"=>"cookbooks/local-cookbook"
-            }
-          }
+            "source_options" => {
+              "path" => "cookbooks/local-cookbook",
+            },
+          },
         },
-        "default_attributes" => {"default_attr"=>"new_value_default"},
-        "override_attributes" => {"override_attr"=>"new_value_override"},
+        "default_attributes" => { "default_attr" => "new_value_default" },
+        "override_attributes" => { "override_attr" => "new_value_override" },
         "solution_dependencies" => {
-          "Policyfile"=>[["local-cookbook", ">= 0.0.0"]],
-          "dependencies"=>{"local-cookbook (2.3.4)"=>[]}
-        }
+          "Policyfile" => [["local-cookbook", ">= 0.0.0"]],
+          "dependencies" => { "local-cookbook (2.3.4)" => [] },
+        },
       }
     end
 
@@ -177,25 +177,25 @@ E
           "revision_id" => "522d740beba4c4e5857bd8bccdb2d7ffd0bbd45ac4350f92b26e4e3b8f68d530",
           "name" => "install-example",
           "run_list" => ["recipe[local-cookbook::default]"],
-          "cookbook_locks"=> {
-            "local-cookbook"=> {
-              "version"=>"2.3.4",
-              "identifier"=>"fab501cfaf747901bd82c1bc706beae7dc3a350c",
-              "dotted_decimal_identifier"=> "70567763561641081.489844270461035.258281553147148",
-              "source"=>"cookbooks/local-cookbook",
+          "cookbook_locks" => {
+            "local-cookbook" => {
+              "version" => "2.3.4",
+              "identifier" => "fab501cfaf747901bd82c1bc706beae7dc3a350c",
+              "dotted_decimal_identifier" => "70567763561641081.489844270461035.258281553147148",
+              "source" => "cookbooks/local-cookbook",
               "cache_key" => nil,
               "scm_info" => nil,
-              "source_options"=> {
-                "path"=>"cookbooks/local-cookbook"
-              }
-            }
+              "source_options" => {
+                "path" => "cookbooks/local-cookbook",
+              },
+            },
           },
-          "default_attributes" => {"default_attr"=>"old_value_default"},
-          "override_attributes" => {"override_attr"=>"old_value_override"},
+          "default_attributes" => { "default_attr" => "old_value_default" },
+          "override_attributes" => { "override_attr" => "old_value_override" },
           "solution_dependencies" => {
-            "Policyfile"=>[["local-cookbook", ">= 0.0.0"]],
-            "dependencies"=>{"local-cookbook (2.3.4)"=>[]}
-          }
+            "Policyfile" => [["local-cookbook", ">= 0.0.0"]],
+            "dependencies" => { "local-cookbook (2.3.4)" => [] },
+          },
         }
       end
 
@@ -214,4 +214,3 @@ E
   end
 
 end
-

data/spec/unit/service_exception_inspectors/base_spec.rb

@@ -15,9 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/service_exception_inspectors/base'
-
+require "spec_helper"
+require "chef-dk/service_exception_inspectors/base"
 
 describe ChefDK::ServiceExceptionInspectors::Base do
 
@@ -40,4 +39,3 @@ describe ChefDK::ServiceExceptionInspectors::Base do
   end
 
 end
-

data/spec/unit/service_exception_inspectors/http_spec.rb

@@ -15,10 +15,10 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'net/http'
-require 'chef/monkey_patches/net_http'
-require 'chef-dk/service_exception_inspectors/http'
+require "spec_helper"
+require "net/http"
+require "chef/monkey_patches/net_http"
+require "chef-dk/service_exception_inspectors/http"
 
 describe ChefDK::ServiceExceptionInspectors::HTTP do
 
@@ -29,7 +29,7 @@ describe ChefDK::ServiceExceptionInspectors::HTTP do
   let(:request_headers) do
     {
       "content-type" => "application/json",
-      "accept" => "application/json"
+      "accept" => "application/json",
     }
   end
 
@@ -42,14 +42,14 @@ describe ChefDK::ServiceExceptionInspectors::HTTP do
                         path: "/organizations/chef-oss-dev/cookbooks",
                         body: request_body)
     stub = allow(r).to(receive(:each_header))
-    request_headers.each { |k,v| stub.and_yield(k,v) }
+    request_headers.each { |k, v| stub.and_yield(k, v) }
     r
   end
 
   let(:response_headers) do
     {
       "server" => "ngx_openresty",
-      "date" => "Wed, 29 Oct 2014 22:27:47 GMT"
+      "date" => "Wed, 29 Oct 2014 22:27:47 GMT",
     }
   end
 
@@ -59,15 +59,14 @@ describe ChefDK::ServiceExceptionInspectors::HTTP do
                     message: "Bad Request",
                     body: response_body)
     stub = allow(r).to(receive(:each_header))
-    response_headers.each { |k,v| stub.and_yield(k,v) }
+    response_headers.each { |k, v| stub.and_yield(k, v) }
     r
   end
 
   let(:exception) do
-    Net::HTTPServerException.new(message, response).tap {|e| e.chef_rest_request = request }
+    Net::HTTPServerException.new(message, response).tap { |e| e.chef_rest_request = request }
   end
 
-
   subject(:inspector) { described_class.new(exception) }
 
   it "has an exception" do
@@ -137,4 +136,3 @@ E
   end
 
 end
-

data/spec/unit/shell_out_spec.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/shell_out'
+require "spec_helper"
+require "chef-dk/shell_out"
 
 describe ChefDK::ShellOut do
 

data/spec/unit/tasks/helpers_spec.rb

@@ -26,7 +26,7 @@ describe "Rake 'dependencies' task" do
   let(:rake_mock) { Class.new { include RakeDependenciesTaskHelpers }.new }
   let(:product_name) { "chef" }
   let(:gemfile_name) { "chef" }
-  let(:gemfile) {'gem "chef", github: "chef/chef", branch: "0.0.0"'}
+  let(:gemfile) { 'gem "chef", github: "chef/chef", branch: "0.0.0"' }
   let(:expected_version) { "0.0.1" }
 
   before do
@@ -45,7 +45,7 @@ describe "Rake 'dependencies' task" do
 
     context "when gemfile does contain the expected string" do
       let(:prefix) { "" }
-      let(:expected_output) {"gem \"chef\", github: \"chef/chef\", branch: \"#{prefix}#{expected_version}\""}
+      let(:expected_output) { "gem \"chef\", github: \"chef/chef\", branch: \"#{prefix}#{expected_version}\"" }
 
       context "and the version string does not have a prefix" do
         it "updates the gemfile entry to the newer version" do

data/tasks/bin/bundle-platform

@@ -7,7 +7,7 @@ old_platforms = Gem.platforms
 Gem.platforms = platforms
 puts "bundle-platform set Gem.platforms to #{Gem.platforms.map { |p| p.to_s }} (was #{old_platforms.map { |p| p.to_s } })"
 
-desired_version = ARGV.shift.gsub("_", "")
+desired_version = ARGV.shift.delete("_")
 
 # The rest of this is a normal bundler binstub
 require "pathname"

data/tasks/bundle_util.rb

@@ -63,7 +63,7 @@ module BundleUtil
           bundle_platform,
           ruby_platforms,
           "_#{desired_bundler_version}_",
-          *args
+          *args,
         ])
         puts "#{prefix}#{Shellwords.join(["bundle", *args])}#{platform ? " for #{platform} platform" : ""}:"
         with_gemfile(gemfile) do

data/tasks/dependencies.rb

@@ -22,11 +22,24 @@ require_relative "helpers"
 
 desc "Tasks to update and check dependencies"
 namespace :dependencies do
-  # Update all dependencies to the latest constraint-matching version
+
+  # Running update_ci on your local system wont' work. The best way to update
+  # dependencies locally is by running the dependency update script.
   desc "Update all dependencies."
-  # Until 12.14 is released we've removed this first task from update
-  # dependencies:update_stable_channel_gems
-  task :update => %w{
+  task :update do |t, rake_args|
+    system("#{File.join(Dir.pwd, "ci", "dependency_update.sh")}")
+  end
+
+  desc "Force update (when adding new gems to Gemfiles)"
+  task :force_update do |t, rake_args|
+    FileUtils.rm_f(File.join(Dir.pwd, ".bundle", "config"))
+    system("#{File.join(Dir.pwd, "ci", "dependency_update.sh")}")
+  end
+
+  # Update all dependencies to the latest constraint-matching version
+  desc "Update all dependencies. (CI Only)"
+  task :update_ci => %w{
+                    dependencies:update_stable_channel_gems
                     dependencies:update_gemfile_lock
                     dependencies:update_omnibus_overrides
                     dependencies:update_omnibus_gemfile_lock
@@ -85,7 +98,7 @@ namespace :dependencies do
 
   gemfile_lock_task :update_omnibus_gemfile_lock, dirs: %w{omnibus}
   gemfile_lock_task :update_acceptance_gemfile_lock, dirs: %w{acceptance},
-    other_platforms: false, leave_frozen: false
+                                                     other_platforms: false, leave_frozen: false
 
   desc "Update gems to the versions specified by the stable channel."
   task :update_stable_channel_gems do |t, rake_args|
@@ -147,5 +160,6 @@ namespace :dependencies do
   end
 end
 desc "Update all dependencies and check for outdated gems."
-task :dependencies => [ "dependencies:update", "bundle:outdated" ]
-task :update => [ "dependencies:update", "bundle:outdated"]
+task :dependencies_ci => [ "dependencies:update_ci", "bundle:outdated" ]
+task :dependencies => [ "dependencies:update" ]
+task :update => [ "dependencies:update", "bundle:outdated" ]

data/tasks/gemfile_util.rb

@@ -10,7 +10,7 @@ module GemfileUtil
   #
   # :path does likewise.
   #
-  # :overrideable holds off on processing the 
+  # :overrideable holds off on processing the
   #
   def gemfile_parsing_done?
     overridden_gems == :finished

data/tasks/helpers.rb

@@ -17,7 +17,7 @@
 
 # Putting this method in a module so it is easier to test
 module RakeDependenciesTaskHelpers
-  def update_gemfile_from_stable(gemfile, product_name, gemfile_name, version_prefix="")
+  def update_gemfile_from_stable(gemfile, product_name, gemfile_name, version_prefix = "")
     version = get_latest_version_for(product_name)
     version = "#{version_prefix}#{version}"
     found = gemfile.sub!(/^(\s*gem "#{gemfile_name}", github: "chef\/#{gemfile_name}", branch: ")([^"]*)(")$/m) do
@@ -35,7 +35,7 @@ module RakeDependenciesTaskHelpers
   end
 
   def get_latest_version_for(product_name, channel_name = :stable)
-    require 'mixlib/install'
+    require "mixlib/install"
     puts "Getting latest '#{channel_name}' channel #{product_name} version ..."
     options = {
       channel: channel_name.to_sym,

data/tasks/version.rb

@@ -15,9 +15,32 @@
 # limitations under the License.
 #
 
+task :ci_version_bump do
+  begin
+    require "rake"
+
+    Rake::Task["version:bump_patch"].invoke
+    Rake::Task["version:update_gemfile_lock"].invoke
+
+    begin
+      Rake::Task["changelog:update"].invoke
+    rescue Exception => e
+      puts "There was an error updating the CHANGELOG"
+      puts e
+    end
+
+    begin
+      Rake::Task["update_dockerfile"].invoke
+    rescue Exception => e
+      puts "There was an error updating the Dockerfile"
+      puts e
+    end
+  end
+end
+
 namespace :version do
   desc "Bump patch version in lib/chef-dk/version.rb and update Gemfile*.lock conservatively to include the new version. If Gemfile has changed, this will update modified constraints as well."
-  task :bump => %w{version:bump_patch version:update_gemfile_lock}
+  task :bump => "ci_version_bump"
 
   desc "Show the current version."
   task :show do
@@ -68,6 +91,7 @@ namespace :version do
     puts "Updating version in #{version_rb_path} from #{version} to #{new_version.chomp}"
     IO.write(version_rb_path, new_version_file)
     IO.write(release_notes_path, "# ChefDK #{$2}.#{$3.to_i + 1} Release Notes")
+    Rake::Task["changelog::archive"].invoke
     Rake::Task["version:update_gemfile_lock"].invoke
     Rake::Task["bundle:install"].invoke
   end
@@ -83,6 +107,7 @@ namespace :version do
     puts "Updating version in #{version_rb_path} from #{version} to #{new_version.chomp}"
     IO.write(version_rb_path, new_version_file)
     IO.write(release_notes_path, "# ChefDK #{$2.to_i + 1}.0 Release Notes")
+    Rake::Task["changelog::archive"].invoke
     Rake::Task["version:update_gemfile_lock"].invoke
     Rake::Task["bundle:install"].invoke
   end

data/version_policy.rb

@@ -47,9 +47,8 @@ OMNIBUS_OVERRIDES = {
   # software def so we don't need to override that
   "libzmq" => "4.0.5",
 
-  # For 1.2 stable release only, pin to 1.1.0 of kitchen-dokken. After the 1.2
-  # release, unpin and bring in kitchen-dokken 2.x.
-  "kitchen-dokken" => "1.1.0"
+  # Match what is in Chef Client
+  "openssl" => "1.0.2j",
 }
 
 #
@@ -82,16 +81,17 @@ ACCEPTABLE_OUTDATED_GEMS = [
   "fog-google",        # fog-google 0.2+ requires Ruby 2.0+, fog 2.0.0 will include it
   "google-api-client", # chef-provisioning-fog restricts to < 0.9 for presently unknown reasons
   "json",              # inspec pins this because Ruby 2.0, no eta on fix
-  "rack",              # chef-zero pins this because Ruby 2.0, no eta on fix
   "rbvmomi",           # fog-vsphere restricts this to a patch version, not sure why
   "retriable",         # anchored by outdated google-api-client
-  "rubocop",           # cookstyle pins to 0.39.0 in 0.0.1
+  "rubocop",           # cookstyle pins older releases by design
   "slop",              # expected to disappear with pry 0.11
   "timers",            # anchored by outdated celluloid
   "github_changelog_generator", # we use a forked version that differs from rubygems
   "addressable",       # sawyer limits to < 2.6
   "faraday",           # ridely restrcits this 0.9.x
   "thor",              # berkshelf restricts this to < 0.19.2
+  "nokogiri",          # fog limits to ~> 1.5
+  "mixlib-install",    # test kitchen limits to less than 3.x
 
   # We have a task called update_stable_channel_gems which scans and pins to the
   # latest released chef/chef-config/opscode-pushy-client but it pulls from the
@@ -104,7 +104,7 @@ ACCEPTABLE_OUTDATED_GEMS = [
   "chef",
   "chef-config",
   "opscode-pushy-client",
-  "mixlib-cli"
+  "mixlib-cli",
 
 ]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-dk
 version: !ruby/object:Gem::Version
-  version: 1.2.22
+  version: 1.3.40
 platform: ruby
 authors:
 - Daniel DeLeo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -656,7 +656,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A streamlined development and deployment workflow for Chef platform.