chef-dk 2.0.28 → 2.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7c538127b41469986112eb247d10d88cb61ad50
-  data.tar.gz: 762a7278a191796c23999ef213e4ee759f4c7abd
+  metadata.gz: 829f122f43726668a549776bfcf08866bd964d1f
+  data.tar.gz: 706b08e7b6fd30398637987668619ce630a3cf99
 SHA512:
-  metadata.gz: 0e60359a3e42359a7f0921566aec2eb27b03a601ca01649f1afd6d77eddfc44cea1baaa2d3fd61ce573551c2904d255c74f6a71e9b11df1a0242415c7b962231
-  data.tar.gz: 6abcb025604915f25f1d27c0ce8531d83dc0b3d0abeb9f8c8bda02840e0be03f4fa54c4fadf6ba74d5d02386ba36b9b45284dce8f0a66f8b146f1cd8ec130fe3
+  metadata.gz: 6386fc330b45fd81d06588320e496d6aa166c5b5c071f8f60a4c96467c467a273cf1fbe9a9f419c87387cada9d5200b464329f1b1e8cc13a4b020d8b1875035d
+  data.tar.gz: d3319d7259f4190a6368af6d2be959ad50d68e25a81e458ea63f386984895958838ac48c460def6badc30c944f89f042b9d8283c942ce9e62da296a5b2a59dde

data/Gemfile

@@ -19,6 +19,9 @@ source "https://rubygems.org"
 
 gemspec
 
+# temporary pin until molinillo is fixed
+gem "molinillo", "< 0.6.0"
+
 gem "bundler"
 
 group(:omnibus_package, :development, :test) do
@@ -38,7 +41,7 @@ end
 # We equality pin the chef gem itself to assert which version we're shipping.
 group(:omnibus_package) do
   gem "appbundler"
-  gem "berkshelf", ">= 6.2"
+  gem "berkshelf", ">= 6.3"
   gem "chef-provisioning", ">= 2.4.0"
   gem "chef-provisioning-aws", ">= 2.0"
   gem "chef-provisioning-azure", ">= 0.6.0"
@@ -72,6 +75,7 @@ group(:omnibus_package) do
   # All of the following used to be software definitions we included:
   gem "knife-spork"
   gem "dep-selector-libgecode"
+  gem "mixlib-install"
   gem "nokogiri"
   gem "pry-byebug"
   gem "pry-remote"
@@ -93,13 +97,6 @@ group(:ruby_shadow) do
   gem "ruby-shadow", platform: :ruby
 end
 
-group(:changelog) do
-  gem "github_changelog_generator", git: "https://github.com/chef/github-changelog-generator"
-end
-
-# mixlib-install is used by two groups
-gem "mixlib-install", :group => [:changelog, :omnibus_package]
-
 # TODO delete this when we figure out how to include the pushy windows dependencies
 # correctly
 platforms :mswin, :mingw do

data/Gemfile.lock

@@ -1,20 +1,7 @@
-GIT
-  remote: https://github.com/chef/github-changelog-generator
-  revision: 7ab4953b47598dccf10e106058673c1592b8f9bf
-  specs:
-    github_changelog_generator (1.14.2)
-      activesupport
-      faraday-http-cache
-      multi_json
-      octokit (~> 4.6)
-      rainbow (>= 2.1)
-      rake (>= 10.0)
-      retriable (>= 1.4)
-
 PATH
   remote: .
   specs:
-    chef-dk (2.0.28)
+    chef-dk (2.1.11)
       addressable (>= 2.3.5, < 2.6)
       chef (~> 13.0)
       chef-provisioning (~> 2.0)
@@ -47,22 +34,21 @@ GEM
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
-    aws-sdk (2.10.10)
-      aws-sdk-resources (= 2.10.10)
-    aws-sdk-core (2.10.10)
+    aws-sdk (2.10.24)
+      aws-sdk-resources (= 2.10.24)
+    aws-sdk-core (2.10.24)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.10)
-      aws-sdk-core (= 2.10.10)
+    aws-sdk-resources (2.10.24)
+      aws-sdk-core (= 2.10.24)
     aws-sdk-v1 (1.67.0)
       json (~> 1.4)
       nokogiri (~> 1)
     aws-sigv4 (1.0.1)
-    berkshelf (6.2.0)
-      addressable (~> 2.3, >= 2.3.4)
-      berkshelf-api-client (>= 4.0.0)
+    berkshelf (6.3.0)
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
+      chef (>= 12.7.2)
       cleanroom (~> 1.0)
       concurrent-ruby (~> 1.0)
       faraday (~> 0.9)
@@ -75,8 +61,6 @@ GEM
       ridley (~> 5.0)
       solve (> 2.0, < 4.0)
       thor (~> 0.19, < 0.19.2)
-    berkshelf-api-client (4.0.1)
-      chef (>= 12.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     blankslate (2.1.2.4)
@@ -171,10 +155,10 @@ GEM
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
-    chef-provisioning (2.4.0)
+    chef-provisioning (2.5.0)
       cheffish (>= 4.0, < 14.0)
       inifile (>= 2.0.2)
-      mixlib-install (>= 1.0, < 3.0)
+      mixlib-install (>= 1.0)
       net-scp (~> 1.0)
       net-ssh (>= 2.9, < 5.0)
       net-ssh-gateway (> 1.2, < 3.0)
@@ -201,7 +185,7 @@ GEM
       winrm-elevated
     chef-sugar (3.5.0)
     chef-vault (3.2.0)
-    chef-zero (13.0.0)
+    chef-zero (13.1.0)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
       mixlib-log (~> 1.3)
@@ -246,13 +230,11 @@ GEM
       excon (>= 0.38.0)
       json
     erubis (2.7.0)
-    excon (0.57.1)
+    excon (0.58.0)
     extlib (0.9.16)
-    faraday (0.12.1)
+    faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
-    faraday-http-cache (2.0.0)
-      faraday (~> 0.8)
-    fauxhai (5.2.0)
+    fauxhai (5.3.0)
       net-ssh
     ffi (1.9.18)
     ffi (1.9.18-x64-mingw32)
@@ -267,18 +249,20 @@ GEM
       libyajl2 (~> 1.2)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
-    fog (1.40.0)
+    fog (1.41.0)
       fog-aliyun (>= 0.1.0)
       fog-atmos
       fog-aws (>= 0.6.0)
       fog-brightbox (~> 0.4)
       fog-cloudatcost (~> 0.1.0)
-      fog-core (~> 1.43)
+      fog-core (~> 1.45)
       fog-digitalocean (>= 0.3.0)
       fog-dnsimple (~> 1.0)
       fog-dynect (~> 0.0.2)
       fog-ecloud (~> 0.1)
       fog-google (<= 0.1.0)
+      fog-internet-archive
+      fog-joyent
       fog-json
       fog-local
       fog-openstack
@@ -299,7 +283,7 @@ GEM
       fog-xml (~> 0.1.1)
       ipaddress (~> 0.5)
       json (>= 1.8, < 2.0)
-    fog-aliyun (0.1.0)
+    fog-aliyun (0.2.0)
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       ipaddress (~> 0.8)
@@ -312,7 +296,7 @@ GEM
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-brightbox (0.11.0)
+    fog-brightbox (0.13.0)
       fog-core (~> 1.22)
       fog-json
       inflecto (~> 0.0.2)
@@ -321,9 +305,9 @@ GEM
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (1.44.3)
+    fog-core (1.45.0)
       builder
-      excon (~> 0.49)
+      excon (~> 0.58)
       formatador (~> 0.2)
     fog-digitalocean (0.3.0)
       fog-core (~> 1.42)
@@ -344,6 +328,13 @@ GEM
       fog-core
       fog-json
       fog-xml
+    fog-internet-archive (0.0.1)
+      fog-core
+      fog-json
+      fog-xml
+    fog-joyent (0.0.1)
+      fog-core (~> 1.42)
+      fog-json (>= 1.0)
     fog-json (1.0.2)
       fog-core (~> 1.0)
       multi_json (~> 1.10)
@@ -357,7 +348,7 @@ GEM
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
-    fog-profitbricks (3.0.0)
+    fog-profitbricks (4.0.0)
       fog-core (~> 1.42)
       fog-json (~> 1.0)
     fog-rackspace (0.1.5)
@@ -376,7 +367,7 @@ GEM
     fog-sakuracloud (1.7.5)
       fog-core
       fog-json
-    fog-scaleway (0.2.1)
+    fog-scaleway (0.3.0)
       fog-core (~> 1.42)
       fog-json (~> 1.0)
     fog-serverlove (0.1.2)
@@ -397,7 +388,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (1.11.2)
+    fog-vsphere (1.11.3)
       fog-core
       rbvmomi (~> 1.9)
     fog-xenserver (0.3.0)
@@ -429,8 +420,8 @@ GEM
       multi_json (~> 1.10)
       retriable (~> 1.4)
       signet (~> 0.6)
-    googleauth (0.5.1)
-      faraday (~> 0.9)
+    googleauth (0.5.3)
+      faraday (~> 0.12)
       jwt (~> 1.4)
       logging (~> 2.0)
       memoist (~> 0.12)
@@ -452,15 +443,15 @@ GEM
       builder (>= 2.1.2)
     hashie (3.5.6)
     highline (1.7.8)
-    hitimes (1.2.5)
-    hitimes (1.2.5-x86-mingw32)
+    hitimes (1.2.6)
+    hitimes (1.2.6-x86-mingw32)
     htmlentities (4.3.4)
     httpclient (2.8.3)
     i18n (0.8.6)
     inflecto (0.0.2)
     inifile (3.0.0)
     iniparse (1.4.4)
-    inspec (1.31.1)
+    inspec (1.33.1)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
       hashie (~> 3.4)
@@ -479,13 +470,13 @@ GEM
       sslshake (~> 1.2)
       thor (~> 0.19)
       toml (~> 0.1)
-      train (>= 0.24.0, < 1.0)
+      train (~> 0.26)
     ipaddress (0.8.3)
     iso8601 (0.9.1)
     jmespath (1.3.1)
     json (1.8.6)
     jwt (1.5.6)
-    kitchen-dokken (2.5.1)
+    kitchen-dokken (2.6.1)
       docker-api (~> 1.33)
       lockfile (~> 2.1)
       test-kitchen (~> 1.15)
@@ -501,10 +492,10 @@ GEM
       hashie (~> 3.4)
       inspec (>= 0.34.0, < 2.0.0)
       test-kitchen (~> 1.6)
-    kitchen-vagrant (1.1.0)
+    kitchen-vagrant (1.2.0)
       test-kitchen (~> 1.4)
     knife-opc (0.3.2)
-    knife-push (1.0.2)
+    knife-push (1.0.3)
       chef (>= 12.7.2)
     knife-spork (1.6.3)
       app_conf (>= 0.4.0)
@@ -536,7 +527,7 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.2.0)
     minitar (0.5.4)
-    minitest (5.10.2)
+    minitest (5.10.3)
     mixlib-archive (0.4.1)
       mixlib-log
     mixlib-authentication (1.4.1)
@@ -549,11 +540,11 @@ GEM
       mixlib-versioning
       thor
     mixlib-log (1.7.1)
-    mixlib-shellout (2.2.7)
-    mixlib-shellout (2.2.7-universal-mingw32)
+    mixlib-shellout (2.3.2)
+    mixlib-shellout (2.3.2-universal-mingw32)
       win32-process (~> 0.8.2)
       wmi-lite (~> 1.0)
-    mixlib-versioning (1.1.0)
+    mixlib-versioning (1.2.2)
     molinillo (0.5.7)
     multi_json (1.12.1)
     multi_test (0.1.2)
@@ -583,7 +574,7 @@ GEM
       shellany (~> 0.0)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (13.2.0)
+    ohai (13.3.0)
       chef-config (>= 12.5.0.alpha.1, < 14)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -602,7 +593,7 @@ GEM
       uuidtools
     os (0.9.6)
     paint (1.0.1)
-    parallel (1.11.2)
+    parallel (1.12.0)
     parser (2.4.0.0)
       ast (~> 2.2)
     parslet (1.5.0)
@@ -632,7 +623,7 @@ GEM
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rb-readline (0.5.4)
+    rb-readline (0.5.5)
     rbvmomi (1.11.3)
       builder (~> 3.0)
       json (>= 1.8)
@@ -698,7 +689,7 @@ GEM
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
     semverse (2.0.0)
-    serverspec (2.39.1)
+    serverspec (2.40.0)
       multi_json
       rspec (~> 3.0)
       rspec-its
@@ -711,10 +702,10 @@ GEM
       jwt (~> 1.5)
       multi_json (~> 1.10)
     slop (3.6.0)
-    solve (3.1.0)
+    solve (3.1.1)
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
-    specinfra (2.68.2)
+    specinfra (2.70.1)
       net-scp
       net-ssh (>= 2.7, < 5.0)
       net-telnet
@@ -728,7 +719,7 @@ GEM
       uuid (~> 2.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    test-kitchen (1.16.0)
+    test-kitchen (1.17.0)
       mixlib-install (>= 1.2, < 3.0)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -742,7 +733,7 @@ GEM
       hitimes
     toml (0.1.2)
       parslet (~> 1.5.0)
-    train (0.25.0)
+    train (0.26.0)
       docker-api (~> 1.26)
       json (>= 1.8, < 3.0)
       mixlib-shellout (~> 2.0)
@@ -815,7 +806,7 @@ PLATFORMS
 DEPENDENCIES
   appbundler
   artifactory
-  berkshelf (>= 6.2)
+  berkshelf (>= 6.3)
   bundler
   chef (= 13.2.20)
   chef-dk!
@@ -836,7 +827,6 @@ DEPENDENCIES
   ffi
   ffi-rzmq-core
   foodcritic (>= 11.2)
-  github_changelog_generator!
   guard
   inspec (>= 0.29.0)
   kitchen-dokken (>= 2.5.0)
@@ -851,6 +841,7 @@ DEPENDENCIES
   listen
   mixlib-install
   mixlib-versioning
+  molinillo (< 0.6.0)
   nokogiri
   ohai (>= 13.1.0)
   opscode-pushy-client (>= 2.3.0)
@@ -882,4 +873,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.15.1
+   1.15.3

data/Rakefile

@@ -16,20 +16,9 @@
 #
 
 require "bundler/gem_tasks"
-require_relative "tasks/version"
 require_relative "tasks/dependencies"
-require_relative "tasks/github_changelog_generator"
 require_relative "tasks/announce"
 
-desc "Keep the Dockerfile up-to-date"
-task :update_dockerfile do
-  require "mixlib/install"
-  latest_stable_version = Mixlib::Install.available_versions("chefdk", "stable").last
-  text = File.read("Dockerfile")
-  new_text = text.gsub(/^ARG VERSION=[\d\.]+$/, "ARG VERSION=#{latest_stable_version}")
-  File.open("Dockerfile", "w+") { |f| f.write(new_text) }
-end
-
 namespace :style do
   begin
     require "rubocop/rake_task"

data/lib/chef-dk/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefDK
-  VERSION = "2.0.28"
+  VERSION = "2.1.11"
 end

data/omnibus_overrides.rb

@@ -4,7 +4,7 @@
 override :rubygems, version: "2.6.11"
 override :bundler, version: "1.15.1"
 override "libffi", version: "3.2.1"
-override "libiconv", version: "1.14"
+override "libiconv", version: "1.15"
 override "liblzma", version: "5.2.3"
 override "libtool", version: "2.4.2"
 override "libxml2", version: "2.9.4"
@@ -18,5 +18,5 @@ override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
 override "util-macros", version: "1.19.0"
 override "xproto", version: "7.0.28"
 override "zlib", version: "1.2.11"
-override "libzmq", version: "4.0.5"
+override "libzmq", version: "4.0.7"
 override "openssl", version: "1.0.2l"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-dk
 version: !ruby/object:Gem::Version
-  version: 2.0.28
+  version: 2.1.11
 platform: ruby
 authors:
 - Daniel DeLeo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -605,10 +605,8 @@ files:
 - tasks/announce.rb
 - tasks/bin/bundle-platform.bat
 - tasks/dependencies.rb
-- tasks/github_changelog_generator.rb
 - tasks/templates/prerelease.md.erb
 - tasks/templates/release.md.erb
-- tasks/version.rb
 - warning.txt
 homepage: https://www.chef.io/
 licenses: []

data/tasks/github_changelog_generator.rb

@@ -1,48 +0,0 @@
-#
-# 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.
-#
-
-begin
-  require "github_changelog_generator/task"
-  require "mixlib/install"
-
-  namespace :changelog do
-    # Fetch the latest version from mixlib-install
-    latest_stable_version = Mixlib::Install.available_versions("chefdk", "stable").last
-
-    # Take the changelog from the latest stable release and put it into history.
-    desc "Archive current CHANGELOG to HISTORY"
-    task :archive do
-      changelog = Net::HTTP.get(URI("https://raw.githubusercontent.com/chef/chef-dk/v#{latest_stable_version}/CHANGELOG.md")).chomp.split("\n")
-      File.open("HISTORY.md", "w+") { |f| f.write(changelog[2..-4].join("\n")) }
-    end
-
-    # Run this to just update the changelog for the current release. This will
-    # take what is in HISTORY and generate a changelog of PRs between the most
-    # recent stable version and HEAD.
-    GitHubChangelogGenerator::RakeTask.new :update do |config|
-      config.future_release = "v#{ChefDK::VERSION}"
-      config.between_tags = ["v#{latest_stable_version}", "v#{ChefDK::VERSION}"]
-      config.max_issues = 0
-      config.add_issues_wo_labels = false
-      config.header = "This changelog reflects the current state of chef-dk's master branch on github and may not reflect the current released version of chef-dk, which is [![Gem Version](https://badge.fury.io/rb/chef-dk.svg)](https://badge.fury.io/rb/chef-dk)."
-    end
-  end
-
-  task :changelog => "changelog:update"
-rescue LoadError
-  puts "github_changelog_generator is not available. gem install github_changelog_generator to generate changelogs"
-end

data/tasks/version.rb

@@ -1,147 +0,0 @@
-#
-# Copyright:: Copyright (c) 2016-2017, 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.
-#
-
-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 => "ci_version_bump"
-
-  # Can be deleted when we migrate fully to expeditor
-  desc "Show the current version."
-  task :show do
-    puts version
-  end
-
-  def version
-    if IO.read(version_rb_path) =~ /^\s*VERSION\s*=\s*"([^"]+)"\s*$/
-      $1
-    else
-      raise "Could not read version from #{version_rb_path}. Contents:\n#{IO.read(version_rb_path)}"
-    end
-  end
-
-  def version_file
-    File.expand_path("../../VERSION", __FILE__)
-  end
-
-  def version_rb_path
-    File.expand_path("../../lib/chef-dk/version.rb", __FILE__)
-  end
-
-  def gemfile_lock_path
-    File.expand_path("../../Gemfile.lock", __FILE__)
-  end
-
-  def release_notes_path
-    File.expand_path("../../RELEASE_NOTES.md", __FILE__)
-  end
-
-  # Can be deleted when we migrate fully to expeditor
-  # Add 1 to the current patch version in the VERSION file, and write it back out.
-  desc "Bump the patch version in lib/chef-dk/version.rb."
-  task :bump_patch do
-    current_version_file = IO.read(version_rb_path)
-    new_version = nil
-    new_version_file = current_version_file.sub(/^(\s*VERSION\s*=\s*")(\d+\.\d+\.)(\d+)/) do
-      new_version = "#{$2}#{$3.to_i + 1}"
-      "#{$1}#{new_version}"
-    end
-    puts "Updating version in #{version_rb_path} from #{version} to #{new_version.chomp}"
-    IO.write(version_rb_path, new_version_file)
-  end
-
-  # Can be deleted when we migrate fully to expeditor
-  desc "Bump the minor version in lib/chef-dk/version.rb"
-  task :bump_minor do
-    current_version_file = IO.read(version_rb_path)
-    new_version = nil
-    new_version_file = current_version_file.sub(/^(\s*VERSION\s*=\s*")(\d+)\.(\d+)\.(\d+)/) do
-      new_version = "#{$2}.#{$3.to_i + 1}.0"
-      "#{$1}#{new_version}"
-    end
-    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")
-  end
-
-  # Can be deleted when we migrate fully to expeditor
-  desc "Bump the major version in lib/chef-dk/version.rb"
-  task :bump_major do
-    current_version_file = IO.read(version_rb_path)
-    new_version = nil
-    new_version_file = current_version_file.sub(/^(\s*VERSION\s*=\s*")(\d+)\.(\d+)\.(\d+)/) do
-      new_version = "#{$2.to_i + 1}.0.0"
-      "#{$1}#{new_version}"
-    end
-    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")
-  end
-
-  # Called from .expeditor/update_version.sh
-  desc "Propogate the version from VERSION to the necessary parts of the repo"
-  task :update do
-    version = IO.read(version_file).chomp
-
-    updated_version_file = IO.read(version_rb_path).sub(/^(\s*VERSION\s*=\s*")(\d+\.\d+\.\d+)/) do
-      "#{$1}#{version}"
-    end
-
-    updated_gemfile_lock = IO.read(gemfile_lock_path).gsub!(/^\s*(chef-dk)\s*\((= )?\S+\)\s*$/) do |line|
-      line.gsub(/\((= )?\d+(\.\d+)+/) { "(#{$1}#{version}" }
-    end
-
-    IO.write(version_rb_path, updated_version_file)
-    IO.write(gemfile_lock_path, updated_gemfile_lock)
-  end
-
-  # Can be deleted when we migrate fully to expeditor
-  desc "Update the Gemfile.lock to include the current chef-dk version"
-  task :update_gemfile_lock do
-    if File.exist?(gemfile_lock_path)
-      puts "Updating #{gemfile_lock_path} to include version #{version} ..."
-      contents = IO.read(gemfile_lock_path)
-      contents.gsub!(/^\s*(chef-dk)\s*\((= )?\S+\)\s*$/) do |line|
-        line.gsub(/\((= )?\d+(\.\d+)+/) { "(#{$1}#{version}" }
-      end
-      IO.write(gemfile_lock_path, contents)
-    end
-  end
-
-end