Added a force option to ensure the change is always applied, and call augeas twice to reduce the chance that data is lost

1 files changed, 121 insertions, 91 deletions

diff --git a/spec/unit/provider/augeas/augeas.rb b/spec/unit/provider/augeas/augeas.rb
index e05812d78..284145657 100644
--- a/spec/unit/provider/augeas/augeas.rb
+++ b/spec/unit/provider/augeas/augeas.rb
@@ -10,49 +10,49 @@ describe provider_class do
             provider = provider_class.new()
             tokens = provider.parse_commands("set /Jar/Jar Binks")
             tokens.size.should == 1
-            tokens[0].size.should == 3      
+            tokens[0].size.should == 3
             tokens[0][0].should == "set"
             tokens[0][1].should == "/Jar/Jar"
-            tokens[0][2].should == "Binks"            
+            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")
             tokens.size.should == 2
-            tokens[0].size.should == 3      
-            tokens[1].size.should == 3            
+            tokens[0].size.should == 3
+            tokens[1].size.should == 3
             tokens[0][0].should == "set"
             tokens[0][1].should == "/Jar/Jar"
-            tokens[0][2].should == "Binks"            
+            tokens[0][2].should == "Binks"
             tokens[1][0].should == "rm"
             tokens[1][1].should == "anakin"
-            tokens[1][2].should == "skywalker"                
-        end        
-        
+            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)
             tokens.size.should == 2
-            tokens[0].size.should == 3      
-            tokens[1].size.should == 3            
+            tokens[0].size.should == 3
+            tokens[1].size.should == 3
             tokens[0][0].should == "set"
             tokens[0][1].should == "/Jar/Jar"
-            tokens[0][2].should == "Binks"            
+            tokens[0][2].should == "Binks"
             tokens[1][0].should == "rm"
             tokens[1][1].should == "anakin"
-            tokens[1][2].should == "skywalker"                
-        end                
-        
+            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.size.should == 1
-            tokens[0].size.should == 3      
+            tokens[0].size.should == 3
             tokens[0][0].should == "set"
             tokens[0][1].should == "/Jar/Jar"
-            tokens[0][2].should == "Binks is my copilot"            
+            tokens[0][2].should == "Binks is my copilot"
         end
 
         it "should accept spaces and and single ticks" do
@@ -64,7 +64,7 @@ describe provider_class do
             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'")
@@ -74,7 +74,7 @@ describe provider_class do
             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')
@@ -84,7 +84,7 @@ describe provider_class do
             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"')
@@ -94,7 +94,7 @@ describe provider_class do
             tokens[0][1].should == 'Jar Jar'
             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\'"')
@@ -104,7 +104,7 @@ describe provider_class do
             tokens[0][1].should == 'Jar Jar'
             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"')
@@ -114,7 +114,7 @@ describe provider_class do
             tokens[0][1].should == '/Jar/Jar'
             tokens[0][2].should == "Binks is my copilot"
         end
- 
+
         it "should accept only the first value using ticks" do
             provider = provider_class.new()
             tokens = provider.parse_commands('set "Jar Jar" copilot')
@@ -124,7 +124,7 @@ describe provider_class do
             tokens[0][1].should == 'Jar Jar'
             tokens[0][2].should == "copilot"
         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')
@@ -133,167 +133,193 @@ describe provider_class do
             tokens[0][0].should == "set"
             tokens[0][1].should == 'Jar Jar'
             tokens[0][2].should == "Binks is my copilot"
-        end         
+        end
     end
-    
+
     describe "get filters" do
         before do
             augeas_stub = stub("augeas", :get => "value")
-            @provider = provider_class.new()        
-            @provider.aug= augeas_stub 
+            @provider = provider_class.new()
+            @provider.aug= augeas_stub
         end
-        
+
         it "should return false for a = nonmatch" do
             command = ["get", "fake value", "==", "value"]
             @provider.process_get(command).should == true
         end
-        
+
         it "should return true for a != match" do
             command = ["get", "fake value", "!=", "value"]
             @provider.process_get(command).should == false
-        end        
-        
+        end
+
         it "should return true for a =~ match" do
             command = ["get", "fake value", "=~", "val*"]
             @provider.process_get(command).should == true
-        end           
-        
+        end
+
         it "should return false for a == nonmatch" do
             command = ["get", "fake value", "=~", "num*"]
             @provider.process_get(command).should == false
-        end 
+        end
     end
-    
+
     describe "match filters" do
         before do
             augeas_stub = stub("augeas", :match => ["set", "of", "values"])
-            @provider = provider_class.new()        
-            @provider.aug= augeas_stub       
+            @provider = provider_class.new()
+            @provider.aug= augeas_stub
         end
-        
+
         it "should return true for size match" do
             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"]
             @provider.process_match(command).should == false
-        end    
-        
+        end
+
         it "should return true for includes match" do
             command = ["get", "fake value", "include", "values"]
             @provider.process_match(command).should == true
-        end           
-        
+        end
+
         it "should return false for includes non match" do
             command = ["get", "fake value", "include", "JarJar"]
             @provider.process_match(command).should == false
-        end           
-        
+        end
+
         it "should return true for an array match" do
             command = ["get", "fake value", "==", "['set', 'of', 'values']"]
             @provider.process_match(command).should == true
-        end  
-        
+        end
+
         it "should return false for an array non match" do
             command = ["get", "fake value", "==", "['this', 'should', 'not', 'match']"]
             @provider.process_match(command).should == false
-        end                 
-    end    
-    
-    describe "legacy need to run" do
+        end
+    end
+
+    describe "need to run" do
         it "should handle no filters" do
-            resource = stub("resource", :[] => "")
-            augeas_stub = stub("augeas", :match => ["set", "of", "values"])            
+            resource = stub("resource")
+            resource.stubs(:[]).returns(false).then.returns("")
+            augeas_stub = stub("augeas", :match => ["set", "of", "values"])
+            augeas_stub.stubs("close")
             provider = provider_class.new(resource)
             provider.stubs(:get_augeas_version).returns("0.3.5")
-            provider.need_to_run?.should == true        
+            provider.need_to_run?.should == true
         end
-        
+
         it "should return true when a get filter matches" do
-            resource = stub("resource", :[] => "get path == value")
+            resource = stub("resource")
+            resource.stubs(:[]).returns(false).then.returns("get path == value")
             provider = provider_class.new(resource)
             augeas_stub = stub("augeas", :get => "value")
+            augeas_stub.stubs("close")
             provider.aug= augeas_stub
-            provider.stubs(:get_augeas_version).returns("0.3.5")      
-            provider.need_to_run?.should == true       
-        end       
-        
+            provider.stubs(:get_augeas_version).returns("0.3.5")
+            provider.need_to_run?.should == true
+        end
+
         it "should return false when a get filter does not match" do
-            resource = stub("resource", :[] => "get path == another value")
+            resource = stub("resource")
+            resource.stubs(:[]).returns(false).then.returns("get path == another value")
             provider = provider_class.new(resource)
             augeas_stub = stub("augeas", :get => "value")
+            augeas_stub.stubs("close")
             provider.aug= augeas_stub
-            provider.stubs(:get_augeas_version).returns("0.3.5")               
-            provider.need_to_run?.should == false       
-        end            
-        
+            provider.stubs(:get_augeas_version).returns("0.3.5")
+            provider.need_to_run?.should == false
+        end
+
         it "should return true when a match filter matches" do
-            resource = stub("resource", :[] => "match path size == 3")
+            resource = stub("resource")
+            resource.stubs(:[]).returns(false).then.returns("match path size == 3")
             provider = provider_class.new(resource)
             augeas_stub = stub("augeas", :match => ["set", "of", "values"])
+            augeas_stub.stubs("close")
             provider.aug= augeas_stub
-            provider.stubs(:get_augeas_version).returns("0.3.5")       
-            provider.need_to_run?.should == true       
-        end       
-        
+            provider.stubs(:get_augeas_version).returns("0.3.5")
+            provider.need_to_run?.should == true
+        end
+
         it "should return false when a match filter does not match" do
-            resource = stub("resource", :[] => "match path size == 2")
+            resource = stub("resource")
+            resource.stubs(:[]).returns(false).then.returns("match path size == 2")
+            provider = provider_class.new(resource)
+            augeas_stub = stub("augeas", :match => ["set", "of", "values"])
+            augeas_stub.stubs("close")
+            provider.aug= augeas_stub
+            provider.stubs(:get_augeas_version).returns("0.3.5")
+            provider.need_to_run?.should == false
+        end
+
+        #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")
             provider = provider_class.new(resource)
             augeas_stub = stub("augeas", :match => ["set", "of", "values"])
+            augeas_stub.stubs("close")
             provider.aug= augeas_stub
-            provider.stubs(:get_augeas_version).returns("0.3.5")              
-            provider.need_to_run?.should == false       
-        end       
+            provider.stubs(:get_augeas_version).returns("0.3.5")
+            provider.need_to_run?.should == false
+        end
     end
-    
-    describe "legacy augeas integration" do
-        
+
+    describe "augeas execution integration" do
+
         before do
             @resource = stub("resource")
             @provider = provider_class.new(@resource)
             @augeas = stub("augeas")
             @provider.aug= @augeas
-            @provider.stubs(:get_augeas_version).returns("0.3.5")  
+            @provider.stubs(:get_augeas_version).returns("0.3.5")
         end
-    
+
         it "should handle set commands" do
             command = [["set", "/Jar/Jar", "Binks"]]
             context = "/some/path"
             @resource.expects(:[]).times(2).returns(command).then.returns(context)
             @augeas.expects(:set).with("/some/path/Jar/Jar", "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"]]
             context = ""
             @resource.expects(:[]).times(2).returns(command).then.returns(context)
             @augeas.expects(:rm).with("/Jar/Jar")
             @augeas.expects(:save).returns(true)
+            @augeas.expects(:close)
             @provider.execute_changes.should == :executed
-        end        
-        
+        end
+
         it "should handle remove commands" do
             command = [["remove", "Jar/Jar"]]
             context = ""
             @resource.expects(:[]).times(2).returns(command).then.returns(context)
             @augeas.expects(:rm).with("/Jar/Jar")
             @augeas.expects(:save).returns(true)
+            @augeas.expects(:close)
             @provider.execute_changes.should == :executed
-        end              
-        
+        end
+
         it "should handle clear commands" do
             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)
+            @augeas.expects(:close)
             @provider.execute_changes.should == :executed
-        end        
-    
+        end
+
 
         it "should handle ins commands with before" do
             command = [["ins", "Binks", "before /Jar/Jar"]]
@@ -301,6 +327,7 @@ describe provider_class do
             @resource.expects(:[]).times(2).returns(command).then.returns(context)
             @augeas.expects(:insert).with("/foo/Jar/Jar", "Binks", true)
             @augeas.expects(:save).returns(true)
+            @augeas.expects(:close)
             @provider.execute_changes.should == :executed
         end
 
@@ -310,6 +337,7 @@ describe provider_class do
             @resource.expects(:[]).times(2).returns(command).then.returns(context)
             @augeas.expects(:insert).with("/foo/Jar/Jar", "Binks", false)
             @augeas.expects(:save).returns(true)
+            @augeas.expects(:close)
             @provider.execute_changes.should == :executed
         end
 
@@ -319,17 +347,19 @@ describe provider_class do
             @resource.expects(:[]).times(2).returns(command).then.returns(context)
             @augeas.expects(:insert).with("/Jar/Jar", "Binks", false)
             @augeas.expects(:save).returns(true)
+            @augeas.expects(:close)
             @provider.execute_changes.should == :executed
-        end         
-        
+        end
+
         it "should handle multiple commands" do
             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(:clear).with("/foo/Jar/Jar")            
+            @augeas.expects(:clear).with("/foo/Jar/Jar")
             @augeas.expects(:save).returns(true)
+            @augeas.expects(:close)
             @provider.execute_changes.should == :executed
-        end    
+        end
     end
 end