Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions chef-cli.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ Gem::Specification.new do |gem|
gem.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
gem.add_dependency "ffi-yajl", ">= 1.0", "< 3.0"
gem.add_dependency "minitar", "~> 1.0"
gem.add_dependency "chef", "~> 18.0"
gem.add_dependency "solve", "< 5.0", "> 2.0"
gem.add_dependency "chef", ">= 18.0", "< 20.0"
gem.add_dependency "solve", "> 2.0", "< 5.0"
gem.add_dependency "addressable", ">= 2.3.5", "< 2.9"
gem.add_dependency "cookbook-omnifetch", "~> 0.5"
gem.add_dependency "diff-lcs", ">= 1.2.4", "!= 1.4.0", "< 1.6.0" # 1.4 breaks output. Used in lib/chef/util/diff
gem.add_dependency "diff-lcs", "~> 1.6" # Newer verions of chef-client require diff-lcs ~> 1.6
gem.add_dependency "pastel", "~> 0.7" # used for policyfile differ
gem.add_dependency "license-acceptance", ">= 1.0.11", "< 3"
gem.add_dependency "chef-licensing", "~> 1.0"
Expand Down
12 changes: 6 additions & 6 deletions spec/unit/policyfile/differ_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ def output
RUN LIST CHANGED
================

@@ -1,5 +1,7 @@
@@ -1,4 +1,6 @@
recipe[java::default]
recipe[jenkins::master]
-recipe[policyfile_demo::whatever]
Expand Down Expand Up @@ -382,7 +382,7 @@ def output
recipe[c::default]
recipe[d::default]
recipe[e::default]
@@ -12,4 +11,8 @@
@@ -12,3 +11,7 @@
recipe[l::default]
recipe[m::default]
recipe[n::default]
Expand Down Expand Up @@ -438,7 +438,7 @@ def output
apt
---

@@ -1,12 +1 @@
@@ -1,11 +0,0 @@
-{
- "version": "2.7.0",
- "identifier": "16c57abbd056543f7d5a15dabbb03261024a9c5e",
Expand Down Expand Up @@ -511,7 +511,7 @@ def output
bluepill
--------

@@ -1,11 +1,22 @@
@@ -0,0 +1,11 @@
+{
+ "version": "2.3.2",
+ "identifier": "9c6990944d9a347dec8bd375e707ba0aecdc17cd",
Expand Down Expand Up @@ -623,7 +623,7 @@ def output
DEFAULT ATTRIBUTES CHANGED
==========================

@@ -1,4 +1,5 @@
@@ -1,3 +1,4 @@
{
- "greeting": "Attributes, f*** yeah"
+ "greeting": "Attributes, f*** yeah",
Expand Down Expand Up @@ -669,7 +669,7 @@ def output
OVERRIDE ATTRIBUTES CHANGED
===========================

@@ -1,4 +1,5 @@
@@ -1,3 +1,4 @@
{
- "attr_only_updating": "use -a"
+ "attr_only_updating": "use -a",
Expand Down
Loading