diff options
author | Luke Kanies <luke@madstop.com> | 2009-08-18 16:00:21 -0700 |
---|---|---|
committer | Luke Kanies <luke@madstop.com> | 2009-08-18 16:00:21 -0700 |
commit | e408d6c7d562f126df97cd57e04fd7802bc53390 (patch) | |
tree | 238498ac559a381e879eb02035f6fa2e465b0b57 /spec | |
parent | 796ba5c4ccec117bbc4dec69c670337e70b48634 (diff) | |
download | puppet-e408d6c7d562f126df97cd57e04fd7802bc53390.tar.gz puppet-e408d6c7d562f126df97cd57e04fd7802bc53390.tar.xz puppet-e408d6c7d562f126df97cd57e04fd7802bc53390.zip |
Refactoring the Module/Environment co-interface
This simplifies who owns what code in these two classes,
and the result should be much cleaner and simpler.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'spec')
-rwxr-xr-x | spec/unit/module.rb | 91 | ||||
-rwxr-xr-x | spec/unit/node/environment.rb | 67 |
2 files changed, 56 insertions, 102 deletions
diff --git a/spec/unit/module.rb b/spec/unit/module.rb index 29883dc26..4fa6ec5af 100755 --- a/spec/unit/module.rb +++ b/spec/unit/module.rb @@ -43,6 +43,10 @@ describe Puppet::Module do mod.to_s.should == "Module foo(/a)" end + it "should fail if its name is not alphanumeric" do + lambda { Puppet::Module.new(".something") }.should raise_error(Puppet::Module::InvalidName) + end + it "should require a name at initialization" do lambda { Puppet::Module.new }.should raise_error(ArgumentError) end @@ -178,93 +182,6 @@ describe Puppet::Module do end end -describe Puppet::Module, "when yielding each module in a list of directories" do - before do - FileTest.stubs(:directory?).returns true - end - - it "should search for modules in each directory in the list" do - Dir.expects(:entries).with("/one").returns [] - Dir.expects(:entries).with("/two").returns [] - - Puppet::Module.each_module("/one", "/two") - end - - it "should accept the list of directories as an array" do - Dir.expects(:entries).with("/one").returns [] - Dir.expects(:entries).with("/two").returns [] - - Puppet::Module.each_module(%w{/one /two}) - end - - it "should accept the list of directories joined by #{File::PATH_SEPARATOR}" do - Dir.expects(:entries).with("/one").returns [] - Dir.expects(:entries).with("/two").returns [] - - list = %w{/one /two}.join(File::PATH_SEPARATOR) - - Puppet::Module.each_module(list) - end - - it "should not create modules for '.' or '..' in the provided directory list" do - Dir.expects(:entries).with("/one").returns(%w{. ..}) - - result = [] - Puppet::Module.each_module("/one") do |mod| - result << mod - end - - result.should be_empty - end - - it "should not create modules for non-directories in the provided directory list" do - Dir.expects(:entries).with("/one").returns(%w{notdir}) - - FileTest.expects(:directory?).with("/one/notdir").returns false - - result = [] - Puppet::Module.each_module("/one") do |mod| - result << mod - end - - result.should be_empty - end - - it "should yield each found module" do - Dir.expects(:entries).with("/one").returns(%w{f1 f2}) - - one = mock 'one' - two = mock 'two' - - Puppet::Module.expects(:new).with("f1").returns one - Puppet::Module.expects(:new).with("f2").returns two - - result = [] - Puppet::Module.each_module("/one") do |mod| - result << mod - end - - result.should == [one, two] - end - - it "should not yield a module with the same name as a previously yielded module" do - Dir.expects(:entries).with("/one").returns(%w{f1}) - Dir.expects(:entries).with("/two").returns(%w{f1}) - - one = mock 'one' - - Puppet::Module.expects(:new).with("f1").returns one - Puppet::Module.expects(:new).with("f1").never - - result = [] - Puppet::Module.each_module("/one", "/two") do |mod| - result << mod - end - - result.should == [one] - end -end - describe Puppet::Module, " when building its search path" do it "should use the current environment's search path if no environment is specified" do env = mock 'env' diff --git a/spec/unit/node/environment.rb b/spec/unit/node/environment.rb index 18747d1b7..a16b3d6e1 100755 --- a/spec/unit/node/environment.rb +++ b/spec/unit/node/environment.rb @@ -96,21 +96,6 @@ describe Puppet::Node::Environment do env["myvar"].should == "myval" end - it "should be able to return its modules" do - Puppet::Node::Environment.new("testing").should respond_to(:modules) - end - - it "should return each module from the environment-specific module path when asked for its modules" do - env = Puppet::Node::Environment.new("testing") - module_path = %w{/one /two}.join(File::PATH_SEPARATOR) - env.expects(:modulepath).returns module_path - - mods = [Puppet::Module.new('mod1'), Puppet::Module.new("mod2")] - Puppet::Module.expects(:each_module).with(module_path).multiple_yields(*mods) - - env.modules.should == mods - end - it "should be able to return an individual module that exists in its module path" do env = Puppet::Node::Environment.new("testing") @@ -130,5 +115,57 @@ describe Puppet::Node::Environment do env.module("one").should be_nil end + + it "should be able to return its modules" do + Puppet::Node::Environment.new("testing").should respond_to(:modules) + end + + describe ".modules" do + it "should return a module named for every directory in each module path" do + env = Puppet::Node::Environment.new("testing") + env.expects(:modulepath).returns %w{/a /b} + Dir.expects(:entries).with("/a").returns %w{foo bar} + Dir.expects(:entries).with("/b").returns %w{bee baz} + + env.modules.collect{|mod| mod.name}.sort.should == %w{foo bar bee baz}.sort + end + + it "should remove duplicates" do + env = Puppet::Node::Environment.new("testing") + env.expects(:modulepath).returns %w{/a /b} + Dir.expects(:entries).with("/a").returns %w{foo} + Dir.expects(:entries).with("/b").returns %w{foo} + + env.modules.collect{|mod| mod.name}.sort.should == %w{foo} + end + + it "should ignore invalid modules" do + env = Puppet::Node::Environment.new("testing") + env.expects(:modulepath).returns %w{/a} + Dir.expects(:entries).with("/a").returns %w{foo bar} + + Puppet::Module.expects(:new).with { |name, env| name == "foo" }.returns mock("foomod", :name => "foo") + Puppet::Module.expects(:new).with { |name, env| name == "bar" }.raises Puppet::Module::InvalidName + + env.modules.collect{|mod| mod.name}.sort.should == %w{foo} + end + + it "should create modules with the correct environment" do + env = Puppet::Node::Environment.new("testing") + env.expects(:modulepath).returns %w{/a} + Dir.expects(:entries).with("/a").returns %w{foo} + + env.modules.should be_all{|mod| mod.environment == "testing" } + end + + it "should cache the module list" do + env = Puppet::Node::Environment.new("testing") + env.expects(:modulepath).once.returns %w{/a} + Dir.expects(:entries).once.with("/a").returns %w{foo} + + env.modules + env.modules + end + end end end |