puppet 0.24.8 → 0.24.9

data/spec/unit/provider/augeas/augeas.rb

@@ -5,135 +5,120 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 provider_class = Puppet::Type.type(:augeas).provider(:augeas)
 
 describe provider_class do
+        
     describe "command parsing" do
-        it "should break apart a single line into three tokens" do
-            provider = provider_class.new()
-            tokens = provider.parse_commands("set /Jar/Jar Binks")
+        before do
+            @resource = stub("resource")          
+            @provider = provider_class.new(@resource)
+        end
+        
+        it "should break apart a single line into three tokens and clean up the context" do
+            @resource.stubs(:[]).returns("/context")          
+            tokens = @provider.parse_commands("set Jar/Jar Binks")      
             tokens.size.should == 1
             tokens[0].size.should == 3
             tokens[0][0].should == "set"
-            tokens[0][1].should == "/Jar/Jar"
+            tokens[0][1].should == "/context/Jar/Jar"
             tokens[0][2].should == "Binks"
         end
 
         it "should break apart a multiple line into six tokens" do
-            provider = provider_class.new()
-            tokens = provider.parse_commands("set /Jar/Jar Binks\nrm anakin skywalker")
+            @resource.stubs(:[]).returns("")              
+            tokens = @provider.parse_commands("set /Jar/Jar Binks\nrm anakin")           
             tokens.size.should == 2
             tokens[0].size.should == 3
-            tokens[1].size.should == 3
+            tokens[1].size.should == 2
             tokens[0][0].should == "set"
             tokens[0][1].should == "/Jar/Jar"
             tokens[0][2].should == "Binks"
             tokens[1][0].should == "rm"
             tokens[1][1].should == "anakin"
-            tokens[1][2].should == "skywalker"
         end
 
         it "should handle arrays" do
-            provider = provider_class.new()
-            commands = ["set /Jar/Jar Binks", "rm anakin skywalker"]
-            tokens = provider.parse_commands(commands)
+            @resource.stubs(:[]).returns("/foo/")            
+            commands = ["set /Jar/Jar Binks", "rm anakin"]
+            tokens = @provider.parse_commands(commands)
             tokens.size.should == 2
             tokens[0].size.should == 3
-            tokens[1].size.should == 3
+            tokens[1].size.should == 2
             tokens[0][0].should == "set"
             tokens[0][1].should == "/Jar/Jar"
             tokens[0][2].should == "Binks"
             tokens[1][0].should == "rm"
-            tokens[1][1].should == "anakin"
-            tokens[1][2].should == "skywalker"
-        end
-
-        it "should concat the last values" do
-            provider = provider_class.new()
-            tokens = provider.parse_commands("set /Jar/Jar Binks is my copilot")
+            tokens[1][1].should == "/foo/anakin"
+        end
+
+        # This is not supported in the new parsing class
+        #it "should concat the last values" do
+        #    provider = provider_class.new()
+        #    tokens = provider.parse_commands("set /Jar/Jar Binks is my copilot")
+        #    tokens.size.should == 1
+        #    tokens[0].size.should == 3
+        #    tokens[0][0].should == "set"
+        #    tokens[0][1].should == "/Jar/Jar"
+        #    tokens[0][2].should == "Binks is my copilot"
+        #end
+
+        it "should accept spaces in the value and single ticks" do
+            @resource.stubs(:[]).returns("/foo/")           
+            tokens = @provider.parse_commands("set JarJar 'Binks is my copilot'")
             tokens.size.should == 1
             tokens[0].size.should == 3
             tokens[0][0].should == "set"
-            tokens[0][1].should == "/Jar/Jar"
+            tokens[0][1].should == "/foo/JarJar"
             tokens[0][2].should == "Binks is my copilot"
         end
 
-        it "should accept spaces and and single ticks" do
-            provider = provider_class.new()
-            tokens = provider.parse_commands("set 'Jar Jar' Binks")
-            tokens.size.should == 1
-            tokens[0].size.should == 3
-            tokens[0][0].should == "set"
-            tokens[0][1].should == "Jar Jar"
-            tokens[0][2].should == "Binks"
-        end
-
-        it "should accept spaces in the value and and single ticks" do
-            provider = provider_class.new()
-            tokens = provider.parse_commands("set 'Jar Jar' 'Binks is my copilot'")
-            tokens.size.should == 1
-            tokens[0].size.should == 3
-            tokens[0][0].should == "set"
-            tokens[0][1].should == "Jar Jar"
-            tokens[0][2].should == "Binks is my copilot"
-        end
-
-        it "should accept spaces and and double ticks" do
-            provider = provider_class.new()
-            tokens = provider.parse_commands('set "Jar Jar" Binks')
-            tokens.size.should == 1
-            tokens[0].size.should == 3
-            tokens[0][0].should == "set"
-            tokens[0][1].should == 'Jar Jar'
-            tokens[0][2].should == 'Binks'
-        end
-
-        it "should accept spaces in the value and and double ticks" do
-            provider = provider_class.new()
-            tokens = provider.parse_commands('set "Jar Jar" "Binks is my copilot"')
+        it "should accept spaces in the value and double ticks" do
+            @resource.stubs(:[]).returns("/foo/") 
+            tokens = @provider.parse_commands('set /JarJar "Binks is my copilot"')
             tokens.size.should == 1
             tokens[0].size.should == 3
             tokens[0][0].should == "set"
-            tokens[0][1].should == 'Jar Jar'
+            tokens[0][1].should == '/JarJar'
             tokens[0][2].should == 'Binks is my copilot'
         end
 
         it "should accept mixed ticks" do
-            provider = provider_class.new()
-            tokens = provider.parse_commands('set "Jar Jar" "Some \'Test\'"')
+            @resource.stubs(:[]).returns("/foo/") 
+            tokens = @provider.parse_commands('set JarJar "Some \'Test\'"')
             tokens.size.should == 1
             tokens[0].size.should == 3
             tokens[0][0].should == "set"
-            tokens[0][1].should == 'Jar Jar'
+            tokens[0][1].should == '/foo/JarJar'
             tokens[0][2].should == "Some \'Test\'"
         end
 
-        it "should accept only the last value using ticks" do
-            provider = provider_class.new()
-            tokens = provider.parse_commands('set /Jar/Jar "Binks is my copilot"')
-            tokens.size.should == 1
-            tokens[0].size.should == 3
-            tokens[0][0].should == "set"
-            tokens[0][1].should == '/Jar/Jar'
-            tokens[0][2].should == "Binks is my copilot"
+        it "should handle complex rm calls" do
+            @resource.stubs(:[]).returns("/foo/") 
+            tokens = @provider.parse_commands("rm */*[module='pam_console.so']")
+            tokens.should == [["rm", "/foo/*/*[module='pam_console.so']"]]
         end
 
-        it "should accept only the first value using ticks" do
-            provider = provider_class.new()
-            tokens = provider.parse_commands('set "Jar Jar" copilot')
-            tokens.size.should == 1
-            tokens[0].size.should == 3
-            tokens[0][0].should == "set"
-            tokens[0][1].should == 'Jar Jar'
-            tokens[0][2].should == "copilot"
+        it "should handle insert with xpath queries" do
+            @resource.stubs(:[]).returns("/foo/") 
+            tokens = @provider.parse_commands("ins 42 before /files/etc/hosts/*/ipaddr[ . = '127.0.0.1' ]")
+            tokens.should == [["ins", "42", "before","/files/etc/hosts/*/ipaddr[ . = '127.0.0.1' ]"]]        
         end
 
-        it "should accept only the first value using ticks and the last values being concatenated" do
-            provider = provider_class.new()
-            tokens = provider.parse_commands('set "Jar Jar" Binks is my copilot')
-            tokens.size.should == 1
-            tokens[0].size.should == 3
-            tokens[0][0].should == "set"
-            tokens[0][1].should == 'Jar Jar'
-            tokens[0][2].should == "Binks is my copilot"
+        it "should handle set with xpath queries" do
+            @resource.stubs(:[]).returns("/foo/") 
+            tokens = @provider.parse_commands("set /files/etc/*/*[ipaddr = '127.0.0.1'] \"foo bar\"")
+            tokens.should == [["set", "/files/etc/*/*[ipaddr = '127.0.0.1']", "foo bar"]]        
+        end
+
+        it "should handle clear with xpath queries" do
+            @resource.stubs(:[]).returns("/foo/") 
+            tokens = @provider.parse_commands("clear pam.d/*/*[module = 'system-auth'][type = 'account']")
+            tokens.should == [["clear", "/foo/pam.d/*/*[module = 'system-auth'][type = 'account']"]]       
         end
+
+        it "should handle some odd test" do
+            @resource.stubs(:[]).returns("/foo/") 
+            tokens = @provider.parse_commands("set /foo \"''\\\"''\"")
+            tokens.should == [[ "set", "/foo", "''\\\"''" ]]       
+        end    
     end
 
     describe "get filters" do
@@ -166,46 +151,57 @@ describe provider_class do
 
     describe "match filters" do
         before do
+            resource = stub("resource", :[] => "")
             augeas_stub = stub("augeas", :match => ["set", "of", "values"])
-            @provider = provider_class.new()
+            @provider = provider_class.new(resource)
             @provider.aug= augeas_stub
         end
 
         it "should return true for size match" do
-            command = ["match", "fake value", "size", "==", "3"]
+            command = ["match", "fake value", "size == 3"]
             @provider.process_match(command).should == true
         end
 
         it "should return false for a size non match" do
-            command = ["match", "fake value", "size", "<", "3"]
+            command = ["match", "fake value", "size < 3"]
             @provider.process_match(command).should == false
         end
 
         it "should return true for includes match" do
-            command = ["get", "fake value", "include", "values"]
+            command = ["match", "fake value", "include values"]
             @provider.process_match(command).should == true
         end
 
         it "should return false for includes non match" do
-            command = ["get", "fake value", "include", "JarJar"]
+            command = ["match", "fake value", "include JarJar"]
             @provider.process_match(command).should == false
         end
 
         it "should return true for an array match" do
-            command = ["get", "fake value", "==", "['set', 'of', 'values']"]
+            command = ["match", "fake value", "eq ['set', 'of', 'values']"]
             @provider.process_match(command).should == true
         end
 
         it "should return false for an array non match" do
-            command = ["get", "fake value", "==", "['this', 'should', 'not', 'match']"]
+            command = ["match", "fake value", "eq ['this', 'should', 'not', 'match']"]
+            @provider.process_match(command).should == false
+        end
+
+        it "should return false for an array match with noteq" do
+            command = ["match", "fake value", "noteq ['set', 'of', 'values']"]
             @provider.process_match(command).should == false
         end
+
+        it "should return true for an array non match with noteq" do
+            command = ["match", "fake value", "noteq ['this', 'should', 'not', 'match']"]
+            @provider.process_match(command).should == true
+        end        
     end
 
     describe "need to run" do
         it "should handle no filters" do
             resource = stub("resource")
-            resource.stubs(:[]).returns(false).then.returns("")
+            resource.stubs(:[]).returns(false).then.returns("").then.returns("")
             augeas_stub = stub("augeas", :match => ["set", "of", "values"])
             augeas_stub.stubs("close")
             provider = provider_class.new(resource)
@@ -215,7 +211,7 @@ describe provider_class do
 
         it "should return true when a get filter matches" do
             resource = stub("resource")
-            resource.stubs(:[]).returns(false).then.returns("get path == value")
+            resource.stubs(:[]).returns(false).then.returns("get path == value").then.returns("")
             provider = provider_class.new(resource)
             augeas_stub = stub("augeas", :get => "value")
             augeas_stub.stubs("close")
@@ -226,7 +222,7 @@ describe provider_class do
 
         it "should return false when a get filter does not match" do
             resource = stub("resource")
-            resource.stubs(:[]).returns(false).then.returns("get path == another value")
+            resource.stubs(:[]).returns(false).then.returns("get path == another value").then.returns("")
             provider = provider_class.new(resource)
             augeas_stub = stub("augeas", :get => "value")
             augeas_stub.stubs("close")
@@ -237,7 +233,7 @@ describe provider_class do
 
         it "should return true when a match filter matches" do
             resource = stub("resource")
-            resource.stubs(:[]).returns(false).then.returns("match path size == 3")
+            resource.stubs(:[]).returns(false).then.returns("match path size == 3").then.returns("")
             provider = provider_class.new(resource)
             augeas_stub = stub("augeas", :match => ["set", "of", "values"])
             augeas_stub.stubs("close")
@@ -248,7 +244,7 @@ describe provider_class do
 
         it "should return false when a match filter does not match" do
             resource = stub("resource")
-            resource.stubs(:[]).returns(false).then.returns("match path size == 2")
+            resource.stubs(:[]).returns(false).then.returns("match path size == 2").then.returns("")
             provider = provider_class.new(resource)
             augeas_stub = stub("augeas", :match => ["set", "of", "values"])
             augeas_stub.stubs("close")
@@ -260,7 +256,7 @@ describe provider_class do
         #This is a copy of the last one, with setting the force to true
         it "setting force should not change the above logic" do
             resource = stub("resource")
-            resource.stubs(:[]).returns(true).then.returns("match path size == 2")
+            resource.stubs(:[]).returns(true).then.returns("match path size == 2").then.returns("")
             provider = provider_class.new(resource)
             augeas_stub = stub("augeas", :match => ["set", "of", "values"])
             augeas_stub.stubs("close")
@@ -281,17 +277,17 @@ describe provider_class do
         end
 
         it "should handle set commands" do
-            command = [["set", "/Jar/Jar", "Binks"]]
-            context = "/some/path"
+            command = "set JarJar Binks"
+            context = "/some/path/"
             @resource.expects(:[]).times(2).returns(command).then.returns(context)
-            @augeas.expects(:set).with("/some/path/Jar/Jar", "Binks")
+            @augeas.expects(:set).with("/some/path/JarJar", "Binks")
             @augeas.expects(:save).returns(true)
             @augeas.expects(:close)
             @provider.execute_changes.should == :executed
         end
 
         it "should handle rm commands" do
-            command = [["rm", "/Jar/Jar"]]
+            command = "rm /Jar/Jar"
             context = ""
             @resource.expects(:[]).times(2).returns(command).then.returns(context)
             @augeas.expects(:rm).with("/Jar/Jar")
@@ -301,7 +297,7 @@ describe provider_class do
         end
 
         it "should handle remove commands" do
-            command = [["remove", "Jar/Jar"]]
+            command = "remove /Jar/Jar"
             context = ""
             @resource.expects(:[]).times(2).returns(command).then.returns(context)
             @augeas.expects(:rm).with("/Jar/Jar")
@@ -311,8 +307,8 @@ describe provider_class do
         end
 
         it "should handle clear commands" do
-            command = [["clear", "/Jar/Jar"]]
-            context = "/foo"
+            command = "clear Jar/Jar"
+            context = "/foo/"
             @resource.expects(:[]).times(2).returns(command).then.returns(context)
             @augeas.expects(:clear).with("/foo/Jar/Jar")
             @augeas.expects(:save).returns(true)
@@ -322,7 +318,7 @@ describe provider_class do
 
 
         it "should handle ins commands with before" do
-            command = [["ins", "Binks", "before /Jar/Jar"]]
+            command = "ins Binks before Jar/Jar"
             context = "/foo"
             @resource.expects(:[]).times(2).returns(command).then.returns(context)
             @augeas.expects(:insert).with("/foo/Jar/Jar", "Binks", true)
@@ -331,18 +327,18 @@ describe provider_class do
             @provider.execute_changes.should == :executed
         end
 
-        it "should handle ins commands with before" do
-            command = [["ins", "Binks", "after /Jar/Jar"]]
+        it "should handle ins commands with after" do
+            command = "ins Binks after /Jar/Jar"
             context = "/foo"
             @resource.expects(:[]).times(2).returns(command).then.returns(context)
-            @augeas.expects(:insert).with("/foo/Jar/Jar", "Binks", false)
+            @augeas.expects(:insert).with("/Jar/Jar", "Binks", false)
             @augeas.expects(:save).returns(true)
             @augeas.expects(:close)
             @provider.execute_changes.should == :executed
         end
 
         it "should handle ins with no context" do
-            command = [["ins", "Binks", "after /Jar/Jar"]]
+            command = "ins Binks after /Jar/Jar"
             context = "" # this is the default
             @resource.expects(:[]).times(2).returns(command).then.returns(context)
             @augeas.expects(:insert).with("/Jar/Jar", "Binks", false)
@@ -352,10 +348,10 @@ describe provider_class do
         end
 
         it "should handle multiple commands" do
-            command = [["ins", "Binks", "after /Jar/Jar"], ["clear", "/Jar/Jar"]]
-            context = "/foo"
+            command = ["ins Binks after /Jar/Jar", "clear Jar/Jar"]
+            context = "/foo/"
             @resource.expects(:[]).times(2).returns(command).then.returns(context)
-            @augeas.expects(:insert).with("/foo/Jar/Jar", "Binks", false)
+            @augeas.expects(:insert).with("/Jar/Jar", "Binks", false)
             @augeas.expects(:clear).with("/foo/Jar/Jar")
             @augeas.expects(:save).returns(true)
             @augeas.expects(:close)