chef-dk 0.17.17 → 0.18.26

data/lib/chef-dk/command/undelete.rb

@@ -46,7 +46,7 @@ manually reapply any ACL customizations you have made.
 
 See our detailed README for more information:
 
-https://github.com/chef/chef-dk/blob/master/POLICYFILE_README.md
+https://docs.chef.io/policyfile.html
 
 Options:
 

data/lib/chef-dk/command/update.rb

@@ -42,7 +42,7 @@ future version.
 
 See our detailed README for more information:
 
-https://github.com/chef/chef-dk/blob/master/POLICYFILE_README.md
+https://docs.chef.io/policyfile.html
 
 Options:
 

data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/recipes/default.rb

@@ -5,4 +5,4 @@ log "Welcome to Chef, #{node["example"]["name"]}!" do
   level :info
 end
 
-# For more information, see the documentation: https://docs.chef.io/essentials_cookbook_recipes.html
+# For more information, see the documentation: https://docs.chef.io/recipes.html

data/lib/chef-dk/skeletons/code_generator/files/default/repo/data_bags/README.md

@@ -14,7 +14,7 @@ Then we can upload the items in the data bag's directory to the Chef Server.
 
 For more information on data bags, see the Chef wiki page:
 
-https://docs.chef.io/essentials_data_bags.html
+https://docs.chef.io/data_bags.html
 
 # Encrypted Data Bags
 
@@ -53,4 +53,4 @@ Use the secret_key to view the contents.
 
 For more information on encrypted data bags, see the Chef wiki page:
 
-https://docs.chef.io/essentials_data_bags.html
+https://docs.chef.io/data_bags.html

data/lib/chef-dk/skeletons/code_generator/files/default/repo/roles/README.md

@@ -6,4 +6,4 @@ For example, in this directory you'll find an example role file called `example.
 
 For more information on roles, see the Chef wiki page:
 
-https://docs.chef.io/essentials_roles.html
+https://docs.chef.io/roles.html

data/lib/chef-dk/skeletons/code_generator/recipes/build_cookbook.rb

@@ -1,6 +1,7 @@
 
 context = ChefDK::Generator.context
 delivery_project_dir = context.delivery_project_dir
+pipeline = context.pipeline
 dot_delivery_dir = File.join(delivery_project_dir, ".delivery")
 
 generator_desc("Ensuring delivery configuration")
@@ -156,8 +157,8 @@ if context.have_git && context.delivery_project_git_initialized && !context.skip
     only_if "git status --porcelain |grep \".\""
   end
 
-  execute("git-return-to-master-branch") do
-    command("git checkout master")
+  execute("git-return-to-#{pipeline}-branch") do
+    command("git checkout #{pipeline}")
     cwd delivery_project_dir
   end
 
@@ -169,7 +170,7 @@ if context.have_git && context.delivery_project_git_initialized && !context.skip
   end
 
   execute("git-remove-delivery-config-branch") do
-    command("git branch -d add-delivery-configuration")
+    command("git branch -D add-delivery-configuration")
     cwd delivery_project_dir
   end
 end

data/lib/chef-dk/skeletons/code_generator/templates/default/Policyfile.rb.erb

@@ -1,7 +1,7 @@
 # Policyfile.rb - Describe how you want Chef to build your system.
 #
 # For more information on the Policyfile feature, visit
-# https://github.com/chef/chef-dk/blob/master/POLICYFILE_README.md
+# https://docs.chef.io/policyfile.html
 
 # A name that describes what the system you're building with Chef does.
 name "<%= policy_name %>"

data/lib/chef-dk/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefDK
-  VERSION = "0.17.17"
+  VERSION = "0.18.26"
 end

data/omnibus_overrides.rb

@@ -1,5 +1,4 @@
 # DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead.
-override :rubygems, version: "2.6.6"
 override :bundler, version: "1.12.5"
 override "libffi", version: "3.2.1"
 override "libiconv", version: "1.14"
@@ -11,7 +10,7 @@ override "libyaml", version: "0.1.6"
 override "makedepend", version: "1.0.5"
 override "ncurses", version: "5.9"
 override "pkg-config-lite", version: "0.28-1"
-override "ruby", version: "2.1.8"
+override "ruby", version: "2.3.1"
 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"

data/spec/unit/command/generator_commands/cookbook_spec.rb

@@ -126,10 +126,10 @@ EOF
       expect(stderr_io.string).to include(message)
     end
 
-    it "errors if a hyphenated cookbook name is passed" do
-      expect(with_argv(%w{my-cookbook}).run).to eq(1)
-      message = "Hyphens are not allowed in cookbook names. Please specify a cookbook name without hyphens."
-      expect(stderr_io.string).to include(message)
+    it "warns if a hyphenated cookbook name is passed" do
+      expect(with_argv(%w{my-cookbook}).run).to eq(0)
+      message = "Hyphens are discouraged in cookbook names as they may cause problems with custom resources. See https://docs.chef.io/ctl_chef.html#chef-generate-cookbook for more information."
+      expect(stdout_io.string).to include(message)
     end
 
   end
@@ -503,7 +503,7 @@ OUTPUT
 # Policyfile.rb - Describe how you want Chef to build your system.
 #
 # For more information on the Policyfile feature, visit
-# https://github.com/chef/chef-dk/blob/master/POLICYFILE_README.md
+# https://docs.chef.io/policyfile.html
 
 # A name that describes what the system you're building with Chef does.
 name "new_cookbook"

data/spec/unit/command/generator_commands/policyfile_spec.rb

@@ -118,7 +118,7 @@ describe ChefDK::Command::GeneratorCommands::Policyfile do
 # Policyfile.rb - Describe how you want Chef to build your system.
 #
 # For more information on the Policyfile feature, visit
-# https://github.com/chef/chef-dk/blob/master/POLICYFILE_README.md
+# https://docs.chef.io/policyfile.html
 
 # A name that describes what the system you're building with Chef does.
 name "my-app-frontend"

data/spec/unit/command/generator_commands/repo_spec.rb

@@ -333,7 +333,7 @@ For example, in this directory you'll find an example role file called `example.
 
 For more information on roles, see the Chef wiki page:
 
-https://docs.chef.io/essentials_roles.html
+https://docs.chef.io/roles.html
 README
             end
 

data/tasks/dependencies.rb

@@ -24,8 +24,9 @@ desc "Tasks to update and check dependencies"
 namespace :dependencies do
   # Update all dependencies to the latest constraint-matching version
   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{
-                    dependencies:update_stable_channel_gems
                     dependencies:update_gemfile_lock
                     dependencies:update_omnibus_overrides
                     dependencies:update_omnibus_gemfile_lock

data/tasks/version.rb

@@ -17,17 +17,29 @@
 
 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 bundle:install}
+  task :bump => %w{version:bump_patch version:update_gemfile_lock}
 
   desc "Show the current version."
   task :show do
-    puts ChefDK::VERSION
+    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_rb_path
     File.expand_path("../../lib/chef-dk/version.rb", __FILE__)
   end
 
+  def gemfile_lock_path
+    File.expand_path("../../Gemfile.lock", __FILE__)
+  end
+
   # 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
@@ -37,8 +49,21 @@ namespace :version do
       new_version = "#{$2}#{$3.to_i + 1}"
       "#{$1}#{new_version}"
     end
-    puts "Updating version in #{version_rb_path} from #{ChefDK::VERSION} to #{new_version.chomp}"
+    puts "Updating version in #{version_rb_path} from #{version} to #{new_version.chomp}"
     IO.write(version_rb_path, new_version_file)
   end
 
+  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

data/version_policy.rb

@@ -17,6 +17,8 @@
 
 # Explicit omnibus overrides.
 OMNIBUS_OVERRIDES = {
+  # Until 1.13.0 is released
+  :bundler => "1.12.5",
   # Lower level library pins
   ## according to comment in omnibus-sw, latest versions don't work on solaris
   # https://github.com/chef/omnibus-software/blob/aefb7e79d29ca746c3f843673ef5e317fa3cba54/config/software/libtool.rb#L23
@@ -32,7 +34,7 @@ OMNIBUS_OVERRIDES = {
   "makedepend" => "1.0.5",
   "ncurses" => "5.9",
   "pkg-config-lite" => "0.28-1",
-  "ruby" => "2.1.8",
+  "ruby" => "2.3.1",
   # Leave dev-kit pinned to 4.5 on 32-bit, because 4.7 is 20MB larger and we don't want
   # to unnecessarily make the client any fatter. (Since it's different between
   # 32 and 64, we have to do it in the project file still.)
@@ -58,8 +60,8 @@ OMNIBUS_OVERRIDES = {
 # name of the rubygem (gem list -re <rubygem name> gets us the latest version).
 #
 OMNIBUS_RUBYGEMS_AT_LATEST_VERSION = {
-  rubygems: "rubygems-update",
-  bundler: "bundler",
+  #rubygems: "rubygems-update", # pinned to 2.6.4 until https://github.com/rubygems/rubygems/pull/1683 is released
+  # bundler: "bundler", # pinned to 1.12.5 until we figure out how we're failing on 1.13.0
 }
 
 #
@@ -71,25 +73,22 @@ OMNIBUS_RUBYGEMS_AT_LATEST_VERSION = {
 # list of outdated gems.
 #
 ACCEPTABLE_OUTDATED_GEMS = [
-  "celluloid",
-  "celluloid-io",
-  "docker-api",
-  "fog-cloudatcost",
-  "fog-google",
-  "gherkin", # fixed in cucumber-core > 1.4.0
-  "google-api-client",
-  "jwt", # fixed in oauth2 > 1.1.0
-  "listen",
-  "mime-types",
-  "mini_portile2", # dep removed in nokogiri > 1.6.7.2
-  "retriable",
-  "rubocop",
-  "slop", # deo removed in pry > 0.10.3
-  "timers",
-  "unicode-display_width",
-  "varia_model",
-  "httpclient",
-  "molinillo",
+  "activesupport",     # anchored by outdated google-api-client
+  "celluloid",         # ridley requires 0.16.x
+  "celluloid-io",      # ridley requires 0.16.x
+  "cucumber-core", # Until cucumber 2.0
+  "fog-cloudatcost",   # fog restricts this for probably no good reason
+  "fog-dynect",        # fog restricts this for probably no good reason
+  "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
+  "slop",              # expected to disappear with pry 0.11
+  "timers",            # anchored by outdated celluloid
+
   # 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
   # chef repo instead of from rubygems. Bundler currently considers any git
@@ -102,6 +101,7 @@ ACCEPTABLE_OUTDATED_GEMS = [
   "chef-config",
   "opscode-pushy-client",
   "mixlib-cli"
+
 ]
 
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-dk
 version: !ruby/object:Gem::Version
-  version: 0.17.17
+  version: 0.18.26
 platform: ruby
 authors:
 - Daniel DeLeo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -92,9 +92,6 @@ dependencies:
   name: solve
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.1
@@ -102,9 +99,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.1
@@ -162,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
@@ -642,7 +636,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="