Gemfile in chef-dk-1.2.22 vs Gemfile in chef-dk-1.3.40

- old
+ new

@@ -13,11 +13,11 @@ # 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. # -source 'https://rubygems.org' +source "https://rubygems.org" # Note we do not use the gemspec DSL which restricts to the # gemspec for the current platform and filters out other platforms # during a bundle lock operation. We actually want dependencies from # both of our gemspecs. Also note this this mimics gemspec behavior @@ -25,21 +25,20 @@ gem "chef-dk", path: "." # EXPERIMENTAL: ALL gems specified here will be installed in chef-dk omnibus. # This represents all gems that will be part of chef-dk. -# Ensure that we can always install rake, regardless of gem groups -# Including the travis group to address https://github.com/sickill/rainbow/issues/44 -gem "rake", group: [ :omnibus_package, :development, :test, :travis ] - group(:omnibus_package, :development, :test) do + gem "rake" gem "pry" gem "rdoc" gem "yard" gem "dep_selector" gem "guard" gem "ruby-prof" + gem "cookstyle", ">= 1.3.0" + gem "foodcritic", ">= 9.0" end # All software we recognize needs to stay at the latest possible version. But # since that's not expressible here, we make it >= the last *known* version to # at least prevent downgrades beyond that: @@ -53,18 +52,17 @@ gem "chef-provisioning-azure", ">= 0.6.0" gem "chef-provisioning-fog", ">= 0.20.0" gem "chef-provisioning-vagrant", ">= 0.11.0" gem "chef-vault" # The chef version is pinned by "rake dependencies", which grabs the current version from omnibus. - gem "chef", github: "chef/chef", branch: "v12.18.31" + gem "chef", github: "chef/chef", branch: "v12.19.36" gem "cheffish", ">= 4.0" gem "chefspec" gem "fauxhai" - gem "foodcritic", ">= 8.0" gem "inspec", ">= 0.17.1" gem "kitchen-ec2" - gem "kitchen-dokken", "= 1.1.0" + gem "kitchen-dokken", ">= 2.1.0" gem "kitchen-inspec" gem "kitchen-vagrant" gem "knife-windows" gem "knife-opc", ">= 0.3.2" gem "ohai", ">= 8.13.0" @@ -75,11 +73,11 @@ # For Delivery build node gem "chef-sugar" gem "mixlib-versioning" gem "artifactory" # The opscode-pushy-client version is pinned by "rake dependencies", which grabs the current version from omnibus. - gem "opscode-pushy-client", github: "chef/opscode-pushy-client", branch: "2.1.2" + gem "opscode-pushy-client", github: "chef/opscode-pushy-client", branch: "2.2.0" gem "ffi-rzmq-core" gem "knife-push" # All of the following used to be software definitions we included: gem "knife-spork" @@ -88,19 +86,17 @@ gem "pry-byebug" gem "pry-remote" gem "pry-stack_explorer" gem "rb-readline" gem "rubocop" - gem "cookstyle" gem "winrm-fs" gem "winrm-elevated" gem "cucumber" # TODO Pinning these for now because github_changelog_generator has a bunch # of different versions across our products gem "nokogiri", "~> 1.6.3" - gem "addressable", "~> 2.4.0" end # Everything except AIX and Windows group(:linux, :bsd, :mac_os_x, :solaris) do gem "ruby-shadow", platform: :ruby @@ -109,10 +105,10 @@ group(:changelog) do gem "github_changelog_generator", git: "https://github.com/tduffield/github-changelog-generator", branch: "adjust-tag-section-mapping" end # mixlib-install is used by two groups -gem 'mixlib-install', :group => [:changelog, :omnibus_package] +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 gem "ffi"