diff options
| author | lamont-granquist <lamont@scriptkiddie.org> | 2013-11-26 14:08:36 -0800 |
|---|---|---|
| committer | lamont-granquist <lamont@scriptkiddie.org> | 2013-11-26 14:08:36 -0800 |
| commit | 41ca23434f820885dd6d78ca49403b24d7400949 (patch) | |
| tree | 263c895c648624c5ad8225c375a481a32773f106 | |
| parent | 168d2102fb11c9617cd8a981166c8adc30a6e915 (diff) | |
| parent | 3bb6c15564c1702bb968adbcbd08b9151326124a (diff) | |
| download | chef-41ca23434f820885dd6d78ca49403b24d7400949.tar.gz | |
Merge pull request #1099 from opscode/lcg/knife-subcommand-prerelease
search for prerelease knife gems as well
| -rw-r--r-- | lib/chef/knife/core/subcommand_loader.rb | 4 | ||||
| -rw-r--r-- | spec/unit/knife/core/subcommand_loader_spec.rb | 4 |
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) |