cauldron 0.1.2 → 0.1.3

data/test/unit/core/statement/tc_theory_statement.rb

@@ -43,7 +43,7 @@ class TestTheoryStatement < Test::Unit::TestCase
     mapping[3] = IntrinsicLiteral.new(0)
     
     assert_equal(
-      "if((runtime_method.params[0].length == runtime_method) == false)\n\treturn true\nend",
+      "if((runtime_method.params[0].length == runtime_method) == false)\n  return true\nend",
       theory.replace_theory_variables!(mapping).write
     )
     

data/test/unit/theory/tc_theory_dependent.rb

@@ -125,7 +125,7 @@ class TestTheoryDependent < Test::Unit::TestCase
     dependent_one = TheoryDependent.new(StringToTheory.run("if(var2[var3].kind_of?(CTestCase))\nreturn true\nend"))
     mapping = {2=>IntrinsicTestCases.new,3=>Literal.new(0)}
     assert_equal(
-      "if(<test_cases>[0].kind_of?(CTestCase))\n\treturn true\nend\n",
+      "if(<test_cases>[0].kind_of?(CTestCase))\n  return true\nend\n",
       dependent_one.map_to(mapping).describe
     )
   end
@@ -134,7 +134,7 @@ class TestTheoryDependent < Test::Unit::TestCase
     dependent_two = TheoryDependent.new(StringToTheory.run("if(var6.kind_of?(Fixnum))\nreturn true\nend"))
     mapping = {6 => 0.to_literal}
     assert_equal(
-      "if(0.kind_of?(Fixnum))\n\treturn true\nend\n",
+      "if(0.kind_of?(Fixnum))\n  return true\nend\n",
       dependent_two.map_to(mapping).describe
     )
   end  
@@ -145,7 +145,7 @@ class TestTheoryDependent < Test::Unit::TestCase
     )
     mapping = {2=>IntrinsicTestCases.new,3=>Literal.new(0),6=>0.to_literal,4=>1.to_literal}
     assert_equal(
-      "if((<test_cases>[0][:params][0] == <test_cases>[1][:params][0]) == false)\n\treturn true\nend\n",
+      "if((<test_cases>[0][:params][0] == <test_cases>[1][:params][0]) == false)\n  return true\nend\n",
       dependent_three.map_to(mapping).describe
     )
   end

data/test/unit/theory/tc_theory_result.rb

@@ -24,9 +24,9 @@ class TestTheoryResult < Test::Unit::TestCase
   
   def test_intialize_3
      assert_equal(
-      "if(#{TheoryVariable.variable_colour(1)}var1#{TheoryVariable::NORMAL}.length == #{TheoryVariable.variable_colour(2)}var2#{TheoryVariable::NORMAL})\n\treturn true\nend\n",
+      "if(#{TheoryVariable.variable_colour(1)}var1#{TheoryVariable::NORMAL}.length == #{TheoryVariable.variable_colour(2)}var2#{TheoryVariable::NORMAL})\n  return true\nend\n",
       TheoryResult.new(
-        StringToTheory.run("if(var1.length == var2)\n\treturn true\nend")
+        StringToTheory.run("if(var1.length == var2)\n  return true\nend")
       ).describe
      )
   end
@@ -44,7 +44,7 @@ class TestTheoryResult < Test::Unit::TestCase
     ]    
     evaluation_code = ''
     evaluation_code += "test_cases = #{test_cases.write}"+"\n"
-    evaluation_code += "runtime_method = #{runtime_method.to_declaration.write}"+"\n"
+    evaluation_code += "runtime_method = RuntimeMethod.new(MethodUsage.new(MethodParameter.new))"+"\n"
     evaluation_code += 'runtime_method.add_statement_at(Statement.new(Return.new, runtime_method.params[0]),runtime_method.statement_id)'+"\n"
     
     evaluation_code += 'return runtime_method'+"\n"        
@@ -90,7 +90,7 @@ class TestTheoryResult < Test::Unit::TestCase
       6=>0.to_literal
     }
     assert_equal(
-      "if(<runtime_method>.history(<test_cases>[0][:params]).any?{ |x| x.statement_id == <runtime_method>.last.statement_id} )\n\treturn true\nend\n",
+      "if(<runtime_method>.history(<test_cases>[0][:params]).any?{ |x| x.statement_id == <runtime_method>.last.statement_id} )\n  return true\nend\n",
       result_one.map_to(mapping).describe
     )
   end
@@ -104,7 +104,7 @@ class TestTheoryResult < Test::Unit::TestCase
       3=>IntrinsicLiteral.new(0)
     }
     assert_equal(
-      "if((runtime_method.params[0].length == runtime_method) == false)\n\treturn true\nend",
+      "if((runtime_method.params[0].length == runtime_method) == false)\n  return true\nend",
       result.map_to(mapping).write    
     )
   end

data/test/unit/util/tc_method_validation.rb

@@ -13,51 +13,51 @@ class TestMethodValidation < Test::Unit::TestCase
     RuntimeMethod.reset_global_id
   end  
 
-  def test_self_generate
-    
-    # Check that a simple method to check the class of a runtime method instance can be created
-    validation_test_1 = MethodValidation.generate_attribute_test('.class.to_s == "RuntimeMethod"' )
-    assert(validation_test_1.kind_of?(RuntimeMethod))   
-    assert_equal(
-      true,
-      MethodValidation.new.use_runtime_method(
-        validation_test_1,
-        ParametersContainer.new(RuntimeMethod.new(MethodUsage.new).to_declaration)
-      )
-    )
-    
-    # Create the method that should be evaluated correctly
-    test_2_method = RuntimeMethod.new(MethodUsage.new)
-    test_2_method.push Statement.new(Return.new,'Lilly'.to_literal)
-
-    # Test that a runtime method returns 'Lilly'
-    validation_test_2 = MethodValidation.generate_response_test(" == 'Lilly'",[])
-    assert(validation_test_2.kind_of?(RuntimeMethod))
-    assert_equal(
-      true,
-      MethodValidation.new.use_runtime_method_2(validation_test_2,test_2_method)
-    )
-    validation_test_3 = MethodValidation.generate_response_test(" != 'Lilly'",[])
-    assert_equal(
-      false,
-      MethodValidation.new.use_runtime_method_2(validation_test_3,test_2_method)
-    )    
-#    
-#    # Test that a runtime method returns the value it is passed
-#    test_3_param_1 = MethodParameter.new
-#    test_3_method = RuntimeMethod.new(MethodUsage.new(test_3_param_1))
-#    test_3_method.push(Statement.new(Return.new,test_3_param_1))
-#    test_3_validation = MethodValidation.generate(
-#      {:condition=>' == "Pip"',:target=>'response',:params=>['Pip'.to_literal],:runtime_method=>test_3_method})
-#    assert_equal(
-#      'Pip',
-#      MethodValidation.new.use_runtime_method(
-#        test_3_validation,ParametersContainer.new(test_3_method.to_declaration)        
-#      )
-#    )
-    
-    
-  end
+  # def test_self_generate
+#     
+    # # Check that a simple method to check the class of a runtime method instance can be created
+    # validation_test_1 = MethodValidation.generate_attribute_test('.class.to_s == "RuntimeMethod"' )
+    # assert(validation_test_1.kind_of?(RuntimeMethod))   
+    # assert_equal(
+      # true,
+      # MethodValidation.new.use_runtime_method(
+        # validation_test_1,
+        # ParametersContainer.new(RuntimeMethod.new(MethodUsage.new).to_declaration)
+      # )
+    # )
+#     
+    # # Create the method that should be evaluated correctly
+    # test_2_method = RuntimeMethod.new(MethodUsage.new)
+    # test_2_method.push Statement.new(Return.new,'Lilly'.to_literal)
+# 
+    # # Test that a runtime method returns 'Lilly'
+    # validation_test_2 = MethodValidation.generate_response_test(" == 'Lilly'",[])
+    # assert(validation_test_2.kind_of?(RuntimeMethod))
+    # assert_equal(
+      # true,
+      # MethodValidation.new.use_runtime_method_2(validation_test_2,test_2_method)
+    # )
+    # validation_test_3 = MethodValidation.generate_response_test(" != 'Lilly'",[])
+    # assert_equal(
+      # false,
+      # MethodValidation.new.use_runtime_method_2(validation_test_3,test_2_method)
+    # )    
+# #    
+# #    # Test that a runtime method returns the value it is passed
+# #    test_3_param_1 = MethodParameter.new
+# #    test_3_method = RuntimeMethod.new(MethodUsage.new(test_3_param_1))
+# #    test_3_method.push(Statement.new(Return.new,test_3_param_1))
+# #    test_3_validation = MethodValidation.generate(
+# #      {:condition=>' == "Pip"',:target=>'response',:params=>['Pip'.to_literal],:runtime_method=>test_3_method})
+# #    assert_equal(
+# #      'Pip',
+# #      MethodValidation.new.use_runtime_method(
+# #        test_3_validation,ParametersContainer.new(test_3_method.to_declaration)        
+# #      )
+# #    )
+#     
+#     
+  # end
   
   
   def test_use_runtime_method      

data/test/unit/util/tc_parser.rb

@@ -95,7 +95,7 @@ class TestParser < Test::Unit::TestCase
       Parser.run("if(runtime_method.all_pass?(test_cases))\nend").write
     ) 
     assert_equal(
-      "if(runtime_method.all_pass?(test_cases))\n\treturn true\nend",
+      "if(runtime_method.all_pass?(test_cases))\n  return true\nend",
       Parser.run("if(runtime_method.all_pass?(test_cases))\nreturn true\nend").write
     )
   end    

data/test/unit/util/tc_string_to_theory.rb

@@ -224,7 +224,7 @@ class TestStringToTheory < Test::Unit::TestCase
   
   def test_double_negative
     assert_equal(
-      "if((var2 == var3) == false)\n\treturn true\nend",
+      "if((var2 == var3) == false)\n  return true\nend",
       StringToTheory.run("if((var2 == var3)== false)\nreturn true\nend").write
     ) 
     assert_equal(
@@ -292,7 +292,7 @@ class TestStringToTheory < Test::Unit::TestCase
       StringToTheory.run("if(!var1.pass?(var2[var4]))\nend").write
     )    
     assert_equal(
-        "if((var2[var3] == var2[var4]) == false)\n\treturn true\nend",
+        "if((var2[var3] == var2[var4]) == false)\n  return true\nend",
         StringToTheory.run("if((var2[var3] == var2[var4])== false)\nreturn true\nend").write
     )
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cauldron
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Warren Sangster
@@ -15,12 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-14 00:00:00 +01:00
+date: 2011-10-09 00:00:00 +01:00
 default_executable: cauldron
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,12 +30,12 @@ dependencies:
         - 2
         - 5
         version: 1.2.5
-  requirement: *id001
-  prerelease: false
   name: ruby2ruby
+  version_requirements: *id001
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,12 +44,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
-  prerelease: false
   name: shoulda
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id002
+  prerelease: false
   type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,12 +60,12 @@ dependencies:
         - 0
         - 15
         version: 1.0.15
-  requirement: *id003
-  prerelease: false
   name: bundler
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id003
+  prerelease: false
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,12 +76,28 @@ dependencies:
         - 6
         - 2
         version: 1.6.2
-  requirement: *id004
-  prerelease: false
   name: jeweler
+  version_requirements: *id004
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  name: rspec
+  version_requirements: *id005
+  prerelease: false
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,12 +106,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
-  prerelease: false
   name: rcov
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id006
+  prerelease: false
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -107,9 +122,26 @@ dependencies:
         - 0
         - 6
         version: 2.0.6
-  requirement: *id006
-  prerelease: false
   name: ruby_parser
+  version_requirements: *id007
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 4
+        - 5
+        version: 0.4.5
+  name: aruba
+  version_requirements: *id008
+  prerelease: false
+  type: :development
 description: Cauldron generates a methd from a number of examples that describe the input and the expected output.  It is still at a very early stage of development right now so you're unlikely to get much practical use out of it.
 email: warrensangster@yahoo.com
 executables: 
@@ -123,12 +155,15 @@ extra_rdoc_files:
 files: 
 - .document
 - Gemfile
+- Gemfile.lock
+- History.md
 - LICENSE.txt
 - README
 - README.rdoc
 - Rakefile
 - VERSION
 - bin/cauldron
+- cauldron.gemspec
 - cauldron/.autotest
 - cauldron/History.txt
 - cauldron/Manifest.txt
@@ -139,10 +174,14 @@ files:
 - cauldron/test/test_cauldron.rb
 - features/cauldron_example_cases.feature
 - features/cauldron_generates_runtime_method.feature
+- features/cauldron_generates_single_paramter_methods.feature
+- features/cauldron_interactive_start_terminal.feature
+- features/cauldron_quit_terminal.feature
 - features/cauldron_start_terminal.feature
 - features/step_definitions/cauldron_steps.rb
 - features/step_definitions/terminal_steps.rb
 - features/support/env.rb
+- features/support/hooks.rb
 - features/support/method_1.example
 - features/support/method_2.example
 - lib/Chain.rb
@@ -150,16 +189,19 @@ files:
 - lib/CodeHandler.rb
 - lib/Mapping.rb
 - lib/MappingValues.rb
-- lib/ScopeDependencies.rb
+- lib/PartialChain.rb
 - lib/Theory.rb
 - lib/UnifiedChain.rb
 - lib/cauldron.rb
 - lib/cauldron/conversion.rb
 - lib/cauldron/demos.rb
+- lib/cauldron/env.rb
 - lib/cauldron/pot.rb
 - lib/cauldron/sexp2cauldron.rb
 - lib/cauldron/terminal.rb
 - lib/cauldron/theory_factory.rb
+- lib/cauldron/util/home.rb
+- lib/cauldron/util/saver.rb
 - lib/core/ActsAsCode.rb
 - lib/core/BlockToken.rb
 - lib/core/CCall.rb
@@ -247,21 +289,10 @@ files:
 - lib/core/statement/RealisedStatement.rb
 - lib/core/statement/SingleLineBlockStatement.rb
 - lib/core/statement/Statement.rb
-- lib/core/statement/StatementDependencies.rb
 - lib/core/statement/StatementGroup.rb
 - lib/core/statement/StatementStructure2.rb
 - lib/core/statement/TheoryStatement.rb
 - lib/core/statement/TopologicalStatements.rb
-- lib/core/structure/DeclareNewInstanceStructure.rb
-- lib/core/structure/DeclareRuntimeMethodStructure.rb
-- lib/core/structure/DeclareVariableAsLiteralStructure.rb
-- lib/core/structure/DeclareVariableAsVariableStructure.rb
-- lib/core/structure/FixnumAdditionStructure.rb
-- lib/core/structure/InstanceCallContainerStructure.rb
-- lib/core/structure/InstanceCallStructure.rb
-- lib/core/structure/InstanceMethodCallStructure.rb
-- lib/core/structure/ReturnStructure.rb
-- lib/core/structure/StatementStructure.rb
 - lib/core/syntax/Addition.rb
 - lib/core/syntax/BlockContainer.rb
 - lib/core/syntax/Boolean.rb
@@ -349,10 +380,12 @@ files:
 - lib/util/StatementCheck.rb
 - lib/util/StringToTheory.rb
 - lib/util/System.rb
+- sandbox.rb
 - spec/cauldron/chain_spec.rb
 - spec/cauldron/demos_spec.rb
 - spec/cauldron/pot_spec.rb
 - spec/cauldron/runtime_method_spec.rb
+- spec/cauldron/saver_spec.rb
 - spec/cauldron/sexp_2_cauldron_spec.rb
 - spec/cauldron/terminal_spec.rb
 - spec/cauldron/theory_action_spec.rb
@@ -360,6 +393,7 @@ files:
 - spec/cauldron/theory_spec.rb
 - spec/cauldron/unified_chain_spec.rb
 - spec/spec_helper.rb
+- tasks/development_tasks.rake
 - tasks/theory_tasks.rake
 - test/fixtures/chains/1/declaration.txt
 - test/fixtures/chains/1/dump
@@ -470,15 +504,9 @@ files:
 - test/unit/core/statement/tc_hack_statement.rb
 - test/unit/core/statement/tc_open_statement.rb
 - test/unit/core/statement/tc_statement.rb
-- test/unit/core/statement/tc_statement_dependencies.rb
 - test/unit/core/statement/tc_statement_group.rb
 - test/unit/core/statement/tc_statement_replace_variable.rb
 - test/unit/core/statement/tc_theory_statement.rb
-- test/unit/core/structure/tc_declare_new_instance_structure.rb
-- test/unit/core/structure/tc_declare_variable_as_literal_structure.rb
-- test/unit/core/structure/tc_declare_variable_as_variable_structure.rb
-- test/unit/core/structure/tc_instance_call_container_structure.rb
-- test/unit/core/structure/tc_return_structure.rb
 - test/unit/core/syntax/tc_block_container.rb
 - test/unit/core/syntax/tc_if_container.rb
 - test/unit/core/tc_class_method_call.rb
@@ -506,11 +534,9 @@ files:
 - test/unit/tc_chain_mapping.rb
 - test/unit/tc_chain_with_case_1.rb
 - test/unit/tc_instance_call.rb
-- test/unit/tc_instance_call_structure.rb
 - test/unit/tc_method_usage.rb
 - test/unit/tc_pot.rb
 - test/unit/tc_runtime_tracking_method.rb
-- test/unit/tc_statement_structure_2.rb
 - test/unit/tc_theory.rb
 - test/unit/tc_variable_declaration.rb
 - test/unit/theory/tc_theory_action.rb
@@ -558,7 +584,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.4.0
 signing_key: 
 specification_version: 3
 summary: Generate simple ruby methods from the input(s) and expected output