Skip to content

Commit d0d1aa6

Browse files
committed
Removing last vestiges of nanite
1 parent a0b2a71 commit d0d1aa6

2 files changed

Lines changed: 2 additions & 26 deletions

File tree

chef-solr/lib/chef/solr/application/rebuild.rb

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -54,30 +54,6 @@ class Rebuild < Chef::Application
5454
:show_options => true,
5555
:exit => 0
5656

57-
option :nanite_identity,
58-
:long => "--nanite-identity ID",
59-
:description => "The nanite identity"
60-
61-
option :nanite_host,
62-
:long => "--nanite-host HOST",
63-
:description => "The nanite host"
64-
65-
option :nanite_port,
66-
:long => "--nanite-port PORT",
67-
:description => "The nanite port"
68-
69-
option :nanite_user,
70-
:long => "--nanite-user USER",
71-
:description => "The nanite user"
72-
73-
option :nanite_pass,
74-
:long => "--nanite-pass PASS",
75-
:description => "The nanite password"
76-
77-
option :nanite_vhost,
78-
:long => "--nanite-vhost VHOST",
79-
:description => "The nanite vhost"
80-
8157
option :couchdb_database,
8258
:short => "-d DB",
8359
:long => "--couchdb-database DB",

chef/spec/unit/provider/deploy_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@
412412

413413
before do
414414
::File.stub!(:exist?).with("#{@expected_release_dir}/gems.yml").and_return(true)
415-
@gem_list = [{:name=>"ezmobius-nanite",:version=>"0.4.1.2"},{:name=>"eventmachine", :version=>"0.12.9"}]
415+
@gem_list = [{:name=>"eventmachine", :version=>"0.12.9"}]
416416
end
417417

418418
it "reads a gems.yml file, creating gem providers for each with action :upgrade" do
@@ -422,7 +422,7 @@
422422
gems = @provider.send(:gem_packages)
423423

424424
gems.map { |g| g.action }.should == [[:install], [:install]]
425-
gems.map { |g| g.name }.should == %w{ezmobius-nanite eventmachine}
425+
gems.map { |g| g.name }.should == %w{eventmachine}
426426
gems.map { |g| g.version }.should == %w{0.4.1.2 0.12.9}
427427
end
428428

0 commit comments

Comments
 (0)