cauldron 0.1.2 → 0.1.3

data/lib/util/MethodWriter.rb

@@ -10,12 +10,12 @@ class MethodWriter
   def write(params,statements,tab=0,method_id=0,additional_comments='')
 
     line = "\n"    
-    tab.times {|x| line += "\t" }
+    tab.times {|x| line += "  " }
     line += "#\n"
 
     params.each_with_index do |var,i|       
-      tab.times {|x| line += "\t" }
-      line += "#\t@param\t"
+      tab.times {|x| line += "  " }
+      line += "#  @param  "
     
       # Get a description of the requirements (this can multiple lines)
       line_prefix = ''
@@ -25,8 +25,8 @@ class MethodWriter
         line += line_prefix+l
         
         # Assides the first line pre-fix a "#      " to the start
-        (tab-1).times {|x| line += "\t" }
-        line_prefix = "#\t\t\t"
+        (tab-1).times {|x| line += "  " }
+        line_prefix = "#      "
         
       end
       
@@ -34,16 +34,16 @@ class MethodWriter
     
     # Add some some additional comment if supplied
     unless additional_comments.nil?
-      tab.times {|x| line += "\t" }
+      tab.times {|x| line += "  " }
       line += "#"
-      tab.times {|x| line += "\t" }
+      tab.times {|x| line += "  " }
       line += additional_comments+"\n"
     end    
     
-    tab.times {|x| line += "\t" }
+    tab.times {|x| line += "  " }
     line += "#\n"               
     
-    tab.times {|x| line += "\t"}
+    tab.times {|x| line += "  "}
     line += 'def method_'+method_id.to_s 
     
     #line += write_params(@parameters)
@@ -57,7 +57,7 @@ class MethodWriter
     line += "\n" if statements.empty?
     
     # Close the method
-    tab.times {|x| line += "\t" }
+    tab.times {|x| line += "  " }
     line += "end"+"\n"
     
     return line    

data/sandbox.rb

@@ -0,0 +1,23 @@
+$LOAD_PATH.unshift File.expand_path('../lib',__FILE__)
+
+require 'cauldron'
+
+# unified_chain = Cauldron::Util::Saver.load(1)
+# 
+# puts unified_chain.describe
+# puts unified_chain.complete?
+# 
+# puts 'Working'
+
+
+unified_chain = Cauldron::Util::Saver.load(33)
+runtime_method = Cauldron::Util::Saver.load(31)
+test_cases  = Cauldron::Util::Saver.load(32)
+
+puts unified_chain.describe
+
+
+#unified_chain.valid_mapping_permutations(runtime_method,test_cases)
+
+  
+

data/spec/cauldron/pot_spec.rb

@@ -5,21 +5,19 @@ module Cauldron
   describe 'Pot' do 
     
     describe '#simmer' do
+      before(:each) {
+        @pot = Cauldron::Pot.new
+        @pot.clear
+      }
       it 'can simmer with demo one' do 
-        pot = Cauldron::Pot.new
-        pot.clear
-        lambda {pot.simmer(demo_one)}.should_not raise_error
+        lambda {@pot.simmer(demo_one)}.should_not raise_error
       end
       it 'can simmer with demo two' do 
-        pot = Cauldron::Pot.new
-        pot.clear
-        lambda {pot.simmer(demo_two)}.should_not raise_error        
+        lambda {@pot.simmer(demo_two)}.should_not raise_error        
       end
       it 'can simmer with both demo one and two' do
-        pot = Cauldron::Pot.new
-        pot.clear
-        lambda {pot.simmer(demo_one)}.should_not raise_error
-        lambda {pot.simmer(demo_two)}.should_not raise_error        
+        lambda {@pot.simmer(demo_one)}.should_not raise_error
+        lambda {@pot.simmer(demo_two)}.should_not raise_error        
       end
     end
     
@@ -86,6 +84,24 @@ module Cauldron
           sexp2cauldron = Sexp2Cauldron.new      
           @pot.brew(cases).reset_ids!.basic_write.should == sexp2cauldron.process(sexp).basic_write                              
         end
+        it 'can repeatedly generate a demo 1 solution' do
+          case_set_one = []
+          case_set_one << convert_to_example(separate_values("'pip','pip'"))
+          case_set_one << convert_to_example(separate_values("'rowiage','rowiage'"))
+          
+          case_set_two = []
+          case_set_two << convert_to_example(separate_values("'andy','andy'"))
+          case_set_two << convert_to_example(separate_values("'kel','kel'"))
+          
+          ruby      =  "
+            def method_0(var_0)
+              \treturn var_0
+            end
+          "          
+          sexp2cauldron = Sexp2Cauldron.new      
+          @pot.brew(case_set_one).reset_ids!.basic_write.should == sexp2cauldron.process(RubyParser.new.process(ruby)).basic_write                              
+          @pot.brew(case_set_two).reset_ids!.basic_write.should == sexp2cauldron.process(RubyParser.new.process(ruby)).basic_write
+        end
         it 'can generate a solution like demo 2(it needs to discount the demo 1 solution)' do
           cases = []
           cases << convert_to_example(separate_values("'sparky','bro'"))
@@ -103,6 +119,42 @@ module Cauldron
           sexp2cauldron = Sexp2Cauldron.new
           @pot.brew(cases).reset_ids!.basic_write.should == sexp2cauldron.process(sexp).basic_write
         end
+        it 'can repeatedly generate a demo 2 solution' do
+          case_set_one = []
+          case_set_one << convert_to_example(separate_values("'sparky','bro'"))
+          case_set_one << convert_to_example(separate_values("'kel','sis'"))
+          
+          ruby      =  "
+                          def method_0(var_0)
+                            \tif(var_0 == 'sparky')
+                            \t\treturn 'bro'
+                            \tend
+                            \treturn 'sis'
+                          end        
+                       "                    
+          parser    = RubyParser.new          
+          sexp      = parser.process(ruby)
+          sexp2cauldron = Sexp2Cauldron.new
+          @pot.brew(case_set_one).reset_ids!.basic_write.should == sexp2cauldron.process(sexp).basic_write          
+          
+          case_set_two = []
+          case_set_two << convert_to_example(separate_values("'carrot','vegtable'"))
+          case_set_two << convert_to_example(separate_values("'apple','fruit'"))
+          
+          ruby      =  "
+                          def method_0(var_0)
+                            \tif(var_0 == 'carrot')
+                            \t\treturn 'vegtable'
+                            \tend
+                            \treturn 'fruit'
+                          end        
+                       "                    
+          parser    = RubyParser.new          
+          sexp      = parser.process(ruby)
+          sexp2cauldron = Sexp2Cauldron.new
+          @pot.brew(case_set_two).reset_ids!.basic_write.should == sexp2cauldron.process(sexp).basic_write
+                                        
+        end
       end
       
     end

data/spec/cauldron/runtime_method_spec.rb

@@ -23,7 +23,7 @@ module Cauldron
         method_param = MethodParameter.new
         temporary_runtime_method = RuntimeMethod.new(MethodUsage.new(method_param))
         temporary_runtime_method << Statement.new(Return.new,method_param)
-        temporary_runtime_method.reset_ids!.basic_write.should == "def method_0(var_0)\n\treturn var_0\nend\n"
+        temporary_runtime_method.reset_ids!.basic_write.should == "def method_0(var_0)\n  return var_0\nend\n"
       end
     end
     
@@ -43,16 +43,16 @@ module Cauldron
         end
       end
       context 'using runtime method with if statement' do
-        it 'it should reset all the ids to 0 and count up' do
+        it 'should reset all the ids to 0 and count up' do
           parser    = RubyParser.new
-          ruby      =  "
+          ruby      =  %q{
             def method_3(var_8)
-              \tif(var_8 == 'apple')
-              \t\treturn 'fruit'
-              \tend
-              \treturn 'vegetable'
+              if(var_8 == 'apple')
+                return 'fruit'
+              end
+              return 'vegetable'
             end
-          "        
+          }  
           sexp      = parser.process(ruby)
           sexp2cauldron = Sexp2Cauldron.new                  
           unprocessed_runtime_method = sexp2cauldron.process(sexp)  
@@ -60,18 +60,32 @@ module Cauldron
           reset_runtime_method.method_id.should == '0'
           reset_runtime_method.variables.length.should == 1
           
-          ruby_reset      =  "
-            def method_0(var_0)
-              \tif(var_0 == 'apple')
-              \t\treturn 'fruit'
-              \tend
-              \treturn 'vegetable'
-            end
-          "          
-          reset_runtime_method.basic_write.should == strip_whitespace(ruby_reset)+"\n"
+          ruby_reset      =  
+%q{def method_0(var_0)
+  if(var_0 == 'apple')
+    return 'fruit'
+  end
+  return 'vegetable'
+end}
+          reset_runtime_method.basic_write.should == ruby_reset+"\n"
         end
       end
     end
+    
+    describe '#realise2' do
+      it 'should be able to realise a very simple runtime method' do
+        parser    = RubyParser.new
+        ruby      =   "
+                      def method_3
+                        var_13 = 8
+                      end
+                      " 
+        sexp      = parser.process(ruby)   
+        sexp2cauldron = Sexp2Cauldron.new
+        runtime_method = sexp2cauldron.process(sexp)
+        runtime_method.realise2(ParametersContainer.new).class.should == RealisedRuntimeMethod           
+      end  
+    end
      
    end
    

data/spec/cauldron/saver_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+module Cauldron
+  
+  module Util
+  
+    describe Saver do 
+      
+      describe '.save' do
+        it 'can save a string object without raising an exception' do
+          lambda {Cauldron::Util::Saver.save('geth')}.should_not raise_error        
+        end
+        it 'will return the path to saved string object after saving it' do
+          Cauldron::Util::Saver.save('Normandy').should match(/cauldron\/debug/)
+        end
+      end
+      
+      describe '.debug_directory' do
+        it 'should return the path to the debug directory' do
+          Cauldron::Util::Saver.debug_directory.should include("/cauldron/debug")
+        end
+      end
+      
+      describe '.next_directory' do
+        it "should return the path to a directory that doesn't exist" do
+          Cauldron::Util::Saver.next_directory.should match(/cauldron\/debug\/\d+/)
+        end
+        it 'should not return the path to an existing directory' do
+          File.exists?(Cauldron::Util::Saver.next_directory).should_not == true
+        end
+      end
+      
+      describe '.load' do 
+        it 'can load a saved obj' do
+          path = Cauldron::Util::Saver.save('Adele & Kirk')
+          path_id = path.match(/(\d+)/)[0].to_i
+          Cauldron::Util::Saver.load(path_id).should == 'Adele & Kirk' 
+        end
+      end
+      
+    end
+  
+  end
+
+end

data/spec/cauldron/terminal_spec.rb

@@ -30,7 +30,16 @@ module Cauldron
         end
         its([0]) { should eq({:output=>"sparky", :params=>["sparky"]}) }
         its([1]) { should eq({:output=>"kel", :params=>["kel"]}) }
-      end     
+      end   
+      context 'with example case "sparky", "sparky"' do
+        subject do
+          terminal.submit '"sparky","sparky"'
+          terminal.submit '"kel","kel"'
+          terminal.cases
+        end
+        its([0]) { should eq({:output=>"sparky", :params=>["sparky"]}) }
+        its([1]) { should eq({:output=>"kel", :params=>["kel"]}) }
+      end           
     end
       
   end

data/spec/cauldron/theory_spec.rb

@@ -24,11 +24,11 @@ module Cauldron
 if: 
 
 action: 
-\truntime_method.add_statement_at(Statement.new(Return.new, test_cases.params[0]),runtime_method.statement_id)
+  runtime_method.add_statement_at(Statement.new(Return.new, test_cases.params[0]),runtime_method.statement_id)
 result: 
-\tif(runtime_method.all_pass?(test_cases))
-\t\treturn true
-\tend
+  if(runtime_method.all_pass?(test_cases))
+    return true
+  end
 "
         theory.map_to(mapping).write.strip.should == result.strip
         

data/spec/cauldron/unified_chain_spec.rb

@@ -95,6 +95,44 @@ module Cauldron
         end
       end
       
+      describe '#partial_chain' do
+        before(:each) {
+          temp = Object.new
+          temp.extend(Cauldron::Demos)
+          demo = temp.demo_one
+          @unified_chain = demo[:chain].unify_chain          
+        }        
+        it 'should return a chain of length 1 when passed the range 0..0' do
+          @unified_chain.partial_chain(0..0).length.should == 1
+        end
+        
+      end
+      
+      describe '#complete?' do
+        context 'when using demo 1' do
+          before(:each) {
+            temp = Object.new
+            temp.extend(Cauldron::Demos)
+            demo = temp.demo_one
+            @unified_chain = demo[:chain].unify_chain   
+          }
+          it 'should be a complete chain' do
+            @unified_chain.complete?.should == true
+          end
+        end
+        context 'when using demo 2' do
+          before(:each){
+            temp = Object.new
+            temp.extend(Cauldron::Demos)
+            demo = temp.demo_two
+            @unified_chain = demo[:chain].unify_chain            
+          }
+          it 'should be a complete chain' do
+            @unified_chain.complete?.should == true
+          end
+        end
+      end
+      
     end
     
   end

data/spec/spec_helper.rb

@@ -6,7 +6,9 @@ require 'required'
 def strip_whitespace(ruby_code)
   #res = ruby_code.strip.gsub(/\t{1,}/,'\t').gsub(/\s{2,}/,'\n')
   res = ruby_code.strip.gsub(/\t/,'\t').gsub(/\s{2,}/,'\n')
-  return res.gsub('\t',"\t").gsub('\n',"\n")
+  #res = ruby_code.strip.gsub(/\s{2,}/,'\n')
+  #return res.gsub('\t',"\t").gsub('\n',"\n")
+  return res.gsub('\t',"  ").gsub('\n',"\n")
 end
 
 include Cauldron::Demos

data/tasks/development_tasks.rake

@@ -0,0 +1,4 @@
+# => Need to create the cauldron-rspec.txt file first
+# => rspec spec/ --format progress --format documentation -o ~/cauldron-rspec.txt
+
+# => rspec spec/ --format progress --format documentation -o ~/cauldron-rspec.txt --format html -o ~/cauldron-report.html

data/tasks/theory_tasks.rake

@@ -1,27 +1,27 @@
 # http://rake.rubyforge.org/
 # http://rake.rubyforge.org/files/doc/rakefile_rdoc.html
 
-# TODO  Need a test for the rake tasks as well
-
 namespace :cauldren do
   
   namespace :implementations do
     
-    desc "Re-build the theory implementations"
-    task :rebuild do 
-    
+    desc 'Rebuild the implementations'
+    task :rebuild do
+      Rake::Task["cauldren:theories:rebuild"].execute
+      
       file_list = FileList.new('test/fixtures/theory_implementations/*')
-      file_list.each do |x|
-        implementation_id = x.match(/\d+$/)[0].to_i
-    
-        directory_path = $LOC+File.join('test','fixtures','theories',theory_id.to_s)
+      file_list.each do |folder_path|
+
+        implementation_id = folder_path.match(/\d+$/)[0].to_i
+        declaration = File.open(File.join(folder_path,'declaration.txt'),'r').read
+        theory_implementation = eval declaration
         
-      end                
-    
-      # TODO  The current approach to saving the implementations - I'd like to be able
-      #       to right the declarations to file.
-      
-      puts 'Does not do anything'
+        dump_file = File.open(File.join(folder_path,'dump'),'w')
+        data = Marshal.dump(theory_implementation)
+        dump_file << data
+        dump_file.close          
+        
+      end
       
     end
     
@@ -242,10 +242,7 @@ namespace :cauldren do
       file_list = FileList.new('test/fixtures/theories/*')
       file_list.each do |x|
         theory_id = x.match(/\d+$/)[0].to_i
-        puts '* theory_id: '+theory_id.to_s    
-        puts File.join('test','fixtures','theories',theory_id.to_s)
         directory_path = File.join('test','fixtures','theories',theory_id.to_s)
-        puts directory_path
         declaration = File.open(File.join(directory_path,'declaration.txt'),'r').read
     
         # Save the declaration (incase the theory needs modified
@@ -256,9 +253,8 @@ namespace :cauldren do
         theory = eval declaration
         data = Marshal.dump(theory)
     
-        # TODO  Shouldn't include colours for this description
         desc_file = File.open(File.join(directory_path,'desc'),'w+')
-        desc_file << theory.describe
+        desc_file << theory.write
         desc_file.close
         
         dump_file = File.open(File.join(directory_path,'dump'),'w+')