summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2013-10-29 13:10:24 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2013-10-29 13:10:24 -0700
commit3bb6c15564c1702bb968adbcbd08b9151326124a (patch)
tree6fc61dc52fc61dfd621ed12008f1a5f4ec451549
parent1df91de7319e7f02ada6ce78b836dd837de738e9 (diff)
downloadchef-3bb6c15564c1702bb968adbcbd08b9151326124a.tar.gz
search prerelease gems for subcommands
- otherwise we can't test knife gem rc releases
-rw-r--r--lib/chef/knife/core/subcommand_loader.rb4
-rw-r--r--spec/unit/knife/core/subcommand_loader_spec.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/knife/core/subcommand_loader.rb b/lib/chef/knife/core/subcommand_loader.rb
index 91c0590121..f18bc6619e 100644
--- a/lib/chef/knife/core/subcommand_loader.rb
+++ b/lib/chef/knife/core/subcommand_loader.rb
@@ -121,9 +121,9 @@ class Chef
def latest_gem_specs
@latest_gem_specs ||= if Gem::Specification.respond_to? :latest_specs
- Gem::Specification.latest_specs
+ Gem::Specification.latest_specs(true) # find prerelease gems
else
- Gem.source_index.latest_specs
+ Gem.source_index.latest_specs(true)
end
end
diff --git a/spec/unit/knife/core/subcommand_loader_spec.rb b/spec/unit/knife/core/subcommand_loader_spec.rb
index 3af1a8cf06..b630f4a958 100644
--- a/spec/unit/knife/core/subcommand_loader_spec.rb
+++ b/spec/unit/knife/core/subcommand_loader_spec.rb
@@ -45,10 +45,10 @@ describe Chef::Knife::SubcommandLoader do
]
$LOAD_PATH.should_receive(:map).and_return([])
if Gem::Specification.respond_to? :latest_specs
- Gem::Specification.should_receive(:latest_specs).and_return(gems)
+ Gem::Specification.should_receive(:latest_specs).with(true).and_return(gems)
gems[0].should_receive(:matches_for_glob).with(/chef\/knife\/\*\.rb{(.*),\.rb,(.*)}/).and_return(gem_files)
else
- Gem.source_index.should_receive(:latest_specs).and_return(gems)
+ Gem.source_index.should_receive(:latest_specs).with(true).and_return(gems)
gems[0].should_receive(:require_paths).twice.and_return(['lib'])
gems[0].should_receive(:full_gem_path).and_return('/usr/lib/ruby/gems/knife-ec2-0.5.12')
Dir.should_receive(:[]).with('/usr/lib/ruby/gems/knife-ec2-0.5.12/lib/chef/knife/*.rb').and_return(gem_files)