Skip to content

Commit

Permalink
Merge pull request chef#105 from chef/train_3
Browse files Browse the repository at this point in the history
We are updating to Train 3.x across the Workstation/DK, ensure this gets bumped
  • Loading branch information
tas50 authored Sep 4, 2019
2 parents 8f2e0a4 + ef88cfb commit 5e8e184
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
14 changes: 8 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ PATH
pastel
r18n-desktop
toml-rb
train (< 3.0)
train (~> 3.0)
train-winrm
tty-spinner

GEM
Expand Down Expand Up @@ -92,7 +93,7 @@ GEM
mixlib-log (>= 2.0, < 4.0)
rack (~> 2.0, >= 2.0.6)
uuidtools (~> 2.1)
chefstyle (0.13.2)
chefstyle (0.13.3)
rubocop (= 0.72.0)
citrus (3.0.2)
coderay (1.1.2)
Expand Down Expand Up @@ -231,7 +232,7 @@ GEM
os (1.0.1)
paint (1.0.1)
parallel (1.17.0)
parser (2.6.3.0)
parser (2.6.4.0)
ast (~> 2.4.0)
pastel (0.7.3)
equatable (~> 0.6)
Expand Down Expand Up @@ -310,7 +311,7 @@ GEM
toml-rb (1.1.2)
citrus (~> 3.0, > 3.0)
tomlrb (1.2.8)
train (2.1.19)
train (3.0.3)
azure_graph_rbac (~> 0.16)
azure_mgmt_key_vault (~> 0.17)
azure_mgmt_resources (~> 0.15)
Expand All @@ -322,15 +323,16 @@ GEM
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 3.0)
net-ssh (>= 2.9, < 6.0)
winrm (~> 2.0)
winrm-fs (~> 1.0)
train-core (2.1.19)
json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 3.0)
net-ssh (>= 2.9, < 6.0)
winrm (~> 2.0)
winrm-fs (~> 1.0)
train-winrm (0.2.3)
winrm (~> 2.0)
winrm-fs (~> 1.0)
tty-box (0.4.1)
pastel (~> 0.7.2)
strings (~> 0.1.6)
Expand Down
5 changes: 2 additions & 3 deletions chef-apply.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,8 @@ Gem::Specification.new do |spec|
# localization gem...
spec.add_dependency "toml-rb" # This isn't ideal because mixlib-config uses 'tomlrb'
# but that library does not support a dumper
# Train 3.x introduces changes to train-winrm that we are not ready to consume across
# the entire Chef Workstation ecosystem
spec.add_dependency "train", "< 3.0" # remote connection management over ssh, winrm
spec.add_dependency "train", "~> 3.0" # remote connection management over ssh, winrm
spec.add_dependency "train-winrm" # winrm transports were pulled out into this plugin
spec.add_dependency "pastel" # A color library
spec.add_dependency "tty-spinner" # Pretty output for status updates in the CLI
spec.add_dependency "chef", ">= 15.0" # Needed to load cookbooks
Expand Down

0 comments on commit 5e8e184

Please sign in to comment.