Pin everything down with Gemfile.lock, add rake dependencies to update

.bundle/config

@@ -0,0 +1,3 @@
+---
+BUNDLE_WITHOUT: omnibus_package
+BUNDLE_FROZEN: '1'

.gitignore

@@ -8,32 +8,13 @@ tags
 .chef
 
 # You should check in your Gemfile.lock in applications, and not in gems
-# This also matches Berksfile.lock
-Gemfile.lock
-Berksfile.lock
 external_tests/*.lock
-acceptance/Gemfile.lock
-omnibus/Gemfile.lock
-/*.lock
 /Gemfile.local
 
-# Do not check in the .bundle directory, or any of the files inside it. Those
-# files are specific to each particular machine, and are used to persist
-# installation options between runs of the bundle install command.
-.bundle
-
 # ignore some common Bundler 'binstubs' directory names
 # http://gembundler.com/man/bundle-exec.1.html
 b/
 binstubs/
-bin
-!bin/chef-apply
-!bin/chef-client
-!bin/chef-service-manager
-!bin/chef-shell
-!bin/chef-solo
-!bin/chef-windows-service
-!bin/knife
 # RVM and RBENV ruby version files
 .rbenv-version
 .rvmrc

Gemfile

@@ -2,12 +2,25 @@ source "https://rubygems.org"
 gemspec name: "chef"
 
 gem "activesupport", "< 4.0.0", group: :compat_testing, platform: "ruby"
-
-gem "chef-config", path: "chef-config" if File.exist?(File.expand_path("../chef-config", __FILE__))
-
+gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
 # Ensure that we can always install rake, regardless of gem groups
 gem "rake"
 
+group(:omnibus_package) do
+  gem "appbundler"
+  gem "rb-readline"
+  gem "nokogiri"
+end
+group(:omnibus_package, :development) do
+  gem "cheffish"
+end
+group(:omnibus_package, :pry) do
+  gem "pry"
+  gem "pry-byebug"
+  gem "pry-remote"
+  gem "pry-stack_explorer"
+end
+
 group(:docgen) do
   gem "yard"
 end
@@ -20,26 +33,27 @@ group(:maintenance) do
   gem "netrc"
 end
 
-group(:pry) do
-  gem "pry"
-  gem "pry-byebug"
-  gem "pry-stack_explorer"
-end
-
-group(:ruby_prof) do
+# Everything except AIX
+group(:linux, :bsd, :mac_os_x, :solaris, :windows, :ruby_prof) do
   # may need to disable this in insolation on fussy builds like AIX, RHEL4, etc
   gem "ruby-prof"
 end
+# Everything except AIX and Windows
+group(:linux, :bsd, :mac_os_x, :solaris) do
+  gem "ruby-shadow"
+end
 
 group(:development, :test) do
   gem "simplecov"
-  gem "rack", "~> 1.5.1"
+  gem "rack"
 
   # for testing new chefstyle rules
   # gem 'chefstyle', github: 'chef/chefstyle'
   gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
+end
 
-  gem "ruby-shadow", platforms: :ruby unless RUBY_PLATFORM.downcase =~ /(aix|cygwin)/
+group(:changelog) do
+  gem "github_changelog_generator", "1.11.3"
 end
 
 group(:travis) do

Gemfile.lock

@@ -0,0 +1,287 @@
+GIT
+  remote: https://github.com/chef/chefstyle.git
+  revision: cc37808b7849fdcf49f04011626143940f83fe92
+  branch: master
+  specs:
+    chefstyle (0.3.1)
+      rubocop (= 0.39.0)
+
+GIT
+  remote: https://github.com/rubysec/bundler-audit.git
+  revision: 4e32fca89d75f0e249671431ff38aadc02bfb28b
+  ref: 4e32fca
+  specs:
+    bundler-audit (0.4.0)
+      bundler (~> 1.2)
+      thor (~> 0.18)
+
+PATH
+  remote: chef-config
+  specs:
+    chef-config (12.10.1)
+      fuzzyurl (~> 0.8.0)
+      mixlib-config (~> 2.0)
+      mixlib-shellout (~> 2.0)
+
+PATH
+  remote: .
+  specs:
+    chef (12.10.1)
+      bundler (>= 1.10)
+      chef-config (= 12.10.1)
+      chef-zero (~> 4.5)
+      diff-lcs (~> 1.2, >= 1.2.4)
+      erubis (~> 2.7)
+      ffi-yajl (~> 2.2)
+      highline (~> 1.6, >= 1.6.9)
+      mixlib-authentication (~> 1.4)
+      mixlib-cli (~> 1.4)
+      mixlib-log (~> 1.3)
+      mixlib-shellout (~> 2.0)
+      net-sftp (~> 2.1, >= 2.1.2)
+      net-ssh (>= 2.9, < 4.0)
+      net-ssh-multi (~> 1.1)
+      ohai (>= 8.6.0.alpha.1, < 9)
+      plist (~> 3.2)
+      proxifier (~> 1.0)
+      rspec-core (~> 3.4)
+      rspec-expectations (~> 3.4)
+      rspec-mocks (~> 3.4)
+      rspec_junit_formatter (~> 0.2.0)
+      serverspec (~> 2.7)
+      specinfra (~> 2.10)
+      syslog-logger (~> 1.6)
+      uuidtools (~> 2.1.5)
+
+PATH
+  remote: chef-config
+  specs:
+    chef-config (12.9.40)
+      fuzzyurl (~> 0.8.0)
+      mixlib-config (~> 2.0)
+      mixlib-shellout (~> 2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.22.2)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    addressable (2.4.0)
+    appbundler (0.9.0)
+      mixlib-cli (~> 1.4)
+    ast (2.2.0)
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
+    builder (3.2.2)
+    byebug (8.2.4)
+    chef-zero (4.5.0)
+      ffi-yajl (~> 2.2)
+      hashie (>= 2.0, < 4.0)
+      mixlib-log (~> 1.3)
+      rack
+      uuidtools (~> 2.1)
+    cheffish (2.0.3)
+      chef-zero (~> 4.3)
+      compat_resource
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.1.1)
+    colorize (0.7.7)
+    compat_resource (12.9.1)
+    debug_inspector (0.0.2)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    erubis (2.7.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.9.10)
+    ffi-yajl (2.2.3)
+      libyajl2 (~> 1.2)
+    fuzzyurl (0.8.0)
+    github_api (0.13.1)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      multi_json (>= 1.7.5, < 2.0)
+      oauth2
+    github_changelog_generator (1.11.3)
+      bundler (>= 1.7)
+      colorize (~> 0.7)
+      github_api (~> 0.12)
+      overcommit (>= 0.31)
+      rake (>= 10.0)
+      rspec (>= 3.2)
+      rubocop (>= 0.31)
+    hashie (3.4.3)
+    highline (1.7.8)
+    i18n (0.7.0)
+    iniparse (1.4.2)
+    ipaddress (0.8.3)
+    json (1.8.3)
+    jwt (1.5.1)
+    libyajl2 (1.2.0)
+    method_source (0.8.2)
+    mini_portile2 (2.0.0)
+    mixlib-authentication (1.4.0)
+      mixlib-log
+      rspec-core (~> 3.2)
+      rspec-expectations (~> 3.2)
+      rspec-mocks (~> 3.2)
+    mixlib-cli (1.5.0)
+    mixlib-config (2.2.1)
+    mixlib-log (1.6.0)
+    mixlib-shellout (2.2.6)
+    multi_json (1.11.2)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (3.1.1)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    net-ssh-multi (1.2.1)
+      net-ssh (>= 2.6.5)
+      net-ssh-gateway (>= 1.2.0)
+    net-telnet (0.1.1)
+    netrc (0.11.0)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    oauth2 (1.1.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0, < 1.5.2)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    octokit (4.3.0)
+      sawyer (~> 0.7.0, >= 0.5.3)
+    ohai (8.14.0)
+      chef-config (>= 12.5.0.alpha.1, < 13)
+      ffi (~> 1.9)
+      ffi-yajl (~> 2.2)
+      ipaddress
+      mixlib-cli
+      mixlib-config (~> 2.0)
+      mixlib-log
+      mixlib-shellout (~> 2.0)
+      plist (~> 3.1)
+      systemu (~> 2.6.4)
+      wmi-lite (~> 1.0)
+    overcommit (0.33.0)
+      childprocess (~> 0.5.8)
+      iniparse (~> 1.4)
+    parser (2.3.0.7)
+      ast (~> 2.2)
+    plist (3.2.0)
+    powerpack (0.1.1)
+    proxifier (1.0.3)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.3.0)
+      byebug (~> 8.0)
+      pry (~> 0.10)
+    pry-remote (0.1.8)
+      pry (~> 0.9)
+      slop (~> 3.0)
+    pry-stack_explorer (0.4.9.2)
+      binding_of_caller (>= 0.7)
+      pry (>= 0.9.11)
+    rack (1.6.4)
+    rainbow (2.1.0)
+    rake (11.1.2)
+    rb-readline (0.5.3)
+    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)
+    rspec_junit_formatter (0.2.3)
+      builder (< 4)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rubocop (0.39.0)
+      parser (>= 2.3.0.7, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-prof (0.15.9)
+    ruby-progressbar (1.7.5)
+    ruby-shadow (2.5.0)
+    sawyer (0.7.0)
+      addressable (>= 2.3.5, < 2.5)
+      faraday (~> 0.8, < 0.10)
+    serverspec (2.31.1)
+      multi_json
+      rspec (~> 3.0)
+      rspec-its
+      specinfra (~> 2.53)
+    sfl (2.2)
+    simplecov (0.11.2)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    slop (3.6.0)
+    specinfra (2.56.1)
+      net-scp
+      net-ssh (>= 2.7, < 4.0)
+      net-telnet
+      sfl
+    syslog-logger (1.6.8)
+    systemu (2.6.5)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tomlrb (1.2.1)
+    unicode-display_width (1.0.3)
+    uuidtools (2.1.5)
+    wmi-lite (1.0.0)
+    yard (0.8.7.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (< 4.0.0)
+  appbundler
+  bundler-audit!
+  chef!
+  chef-config!
+  cheffish
+  chefstyle!
+  github_changelog_generator (= 1.11.3)
+  netrc
+  nokogiri
+  octokit
+  pry
+  pry-byebug
+  pry-remote
+  pry-stack_explorer
+  rack
+  rake
+  rb-readline
+  ruby-prof
+  ruby-shadow
+  simplecov
+  tomlrb
+  yard
+
+BUNDLED WITH
+   1.11.2