answer-factory 0.0.12 → 0.0.13

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/answer-factory.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{answer-factory}
-  s.version = "0.0.12"
+  s.version = "0.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Tozier", "Trek Glowacki", "Jesse Sielaff"]
-  s.date = %q{2010-05-06}
+  s.date = %q{2010-05-07}
   s.default_executable = %q{answer-factory}
   s.description = %q{The pragmaticgp gem provides a simple framework for building, running and managing genetic programming experiments which automatically discover algorithms and equations to solve user-defined problems.}
   s.email = %q{bill@vagueinnovation.com}
@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
      "_spikes/old_vs_new_dominated_by?.rb",
      "answer-factory.gemspec",
      "bin/answer-factory",
-     "config/database.yml",
      "lib/answer-factory.rb",
      "lib/answers/answer.rb",
      "lib/answers/batch.rb",
@@ -50,9 +49,10 @@ Gem::Specification.new do |s|
      "readme.md",
      "spec/answer_spec.rb",
      "spec/batch_spec.rb",
-     "spec/config_spec.rb",
      "spec/factories/factory_spec.rb",
      "spec/factories/workstation_spec.rb",
+     "spec/integration_specs/activate_integration.rb",
+     "spec/integration_specs/build_integration.rb",
      "spec/integration_specs/thor_integration.rb",
      "spec/operators/any_one_sampler_spec.rb",
      "spec/operators/dominated_quantile_spec.rb",
@@ -83,9 +83,10 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/answer_spec.rb",
      "spec/batch_spec.rb",
-     "spec/config_spec.rb",
      "spec/factories/factory_spec.rb",
      "spec/factories/workstation_spec.rb",
+     "spec/integration_specs/activate_integration.rb",
+     "spec/integration_specs/build_integration.rb",
      "spec/integration_specs/thor_integration.rb",
      "spec/operators/any_one_sampler_spec.rb",
      "spec/operators/dominated_quantile_spec.rb",

data/lib/answer-factory.rb

@@ -2,6 +2,7 @@ $: << File.join(File.dirname(__FILE__), "/../lib")
 
 require 'rubygems'
 require 'nudge'
+require 'configatron'
 
 require 'couchrest'
 

data/lib/factories/factory.rb

@@ -1,53 +1,61 @@
 module AnswerFactory
   class Factory
     require 'open-uri'
-    require 'configatron'
     
     attr_reader :name
-    attr_reader :instruction_library, :type_library
+    attr_reader :nudge_instructions
+    attr_reader :nudge_types
+    attr_reader :couchdb_server
     attr_accessor :workstation_names
     attr_reader :original_options_hash
     
     
-    def initialize(name = "my_factory", options = {})
-      @name = name
-      @original_options_hash = options
-      @instruction_library = options[:instruction_library] || Instruction.all_instructions
-      @type_library = options[:type_library] || NudgeType.all_types
-      @workstation_names = Array.new
+    def initialize(options = {})
       
-      self.configure!
+      # Factory instance settings
+      @name = options[:name] ||
+        configatron.factory.retrieve(:name,nil) ||
+        "my_factory"
+      
+      @workstation_names = options[:workstation_names] ||
+        configatron.factory.retrieve(:workstation_names, nil) ||
+        Array.new
+      
+      # CouchDB settings
+      @couchdb_server = options[:couchdb_server] ||
+        configatron.factory.couchdb.retrieve(:server, nil) ||
+        "http://127.0.0.1:5984"
+      
+      # Nudge language settings
+      @nudge_instructions = options[:nudge_instructions] ||
+        configatron.nudge.instructions.retrieve(:all, nil) ||
+        Instruction.all_instructions
+      
+      @nudge_types = options[:nudge_types] ||
+        configatron.nudge.types.retrieve(:all, nil) ||
+        NudgeType.all_types
+      
+      update_configatron!
+    end
+    
+    
+    # this apparent redundancy saves project-based
+    # and command-line overrides
+    def update_configatron!
+      configatron.factory.name = @name
+      configatron.nudge.instructions.all = @nudge_instructions
+      configatron.nudge.types.all = @nudge_types
+      configatron.factory.workstation_names = @workstation_names
+      configatron.factory.couchdb.server = @couchdb_server
     end
     
     
     def couch_available?
-      open(self.configatron.couchdb_uri).status
+      open(configatron.factory.couchdb.server).status
       true
     rescue StandardError
       false 
     end
     
-    
-    def configure!
-      self.configure_constants!
-      self.configure_paths!
-      self.configure_databases!
-    end
-    
-    
-    def configure_constants!
-      self.configatron.factory_name = self.name
-    end
-    
-    
-    def configure_paths!
-      self.configatron.factory_root = File.expand_path("#{File.dirname(__FILE__)}/../..")
-    end
-    
-    
-    def configure_databases!
-      self.configatron.configure_from_yaml("#{self.configatron.factory_root}/config/database.yml")
-      self.configatron.couchdb_uri = "#{self.configatron.main_database.db_root}/#{self.name}"
-    end
   end
 end

data/spec/factories/factory_spec.rb

@@ -2,102 +2,178 @@ require File.join(File.dirname(__FILE__), "./../spec_helper")
 
 
 describe "Factory" do
-
-  it "should have a name" do
-    Factory.new("foo_factory").name.should == "foo_factory"
-  end
-  
-  it "should have a default name of 'something here'" do
-    Factory.new.name.should == "my_factory"
-  end
-  
-  
-  describe "databases" do
-    describe "#couch_available?" do
-      it "should have a method to check that couchDB is accessible" do
-        f1 = Factory.new("boo")
-        lambda{f1.couch_available?}.should_not raise_error
+  describe "Factory configuration methods" do
+    describe "defaults, via configatron" do
+      it "should be possible to talk to to #configatron from here" do
+        lambda{configatron.my_thing}.should_not raise_error
       end
       
-      it "should return true if the uri is reachable" do
-        uri = "http://mycouch.db/boo"
-        f1 = Factory.new("boo")
-        f1.configatron.couchdb_uri = uri
-        FakeWeb.register_uri(:any, uri, :body => "We are here!", :status => [200, "OK"])
-        f1.couch_available?.should == true
+      describe "Factory.new should have reasonable default values" do
+        it "should use 'my_factory' for #name" do
+          f1 = Factory.new
+          f1.name.should == "my_factory"
+        end
+        
+        it "should use an empty Array for #workstation_names" do
+          f1 = Factory.new
+          f1.workstation_names.should == []
+        end
+        
+        it "should use 'http://127.0.0.1:5984' for #couchdb_server" do
+          f1 = Factory.new
+          f1.couchdb_server.should == 'http://127.0.0.1:5984'
+        end
+        
+        it "should use Nudge::Instruction.all_instructions for #nudge_instructions" do
+          f1 = Factory.new
+          f1.nudge_instructions.should == Instruction.all_instructions
+        end
+        
+        it "should use Nudge::NudgeType.all_types for #nudge_types" do
+          f1 = Factory.new
+          f1.nudge_types.should == NudgeType.all_types
+        end
       end
       
-      it "should return false if the uri is offline or 404's out" do
-        uri = "http://mycouch.db/boo"
-        f1 = Factory.new("boo")
-        f1.configatron.couchdb_uri = uri
-        f1.configatron.couchdb_uri.should == uri
-        FakeWeb.register_uri(:any, uri, :body => "Go away!", :status => [404, "Not Found"])
-        f1.couch_available?.should == false
+      
+      describe "Factory.new should hit configatron for default values" do
+        it "should hit configatron for #name" do
+          configatron.temp do
+            configatron.factory.name = "foo"
+            f1 = Factory.new
+            f1.name.should == "foo"
+          end
+        end
+        
+        it "should hit configatron for #nudge_instructions" do
+          configatron.temp do
+            configatron.nudge.instructions.all = [IntSubtractInstruction]
+            f1 = Factory.new
+            f1.nudge_instructions.should == [IntSubtractInstruction]
+          end
+        end
+        
+        it "should hit configatron for #nudge_types" do
+          configatron.temp do
+            configatron.nudge.types.all = [BoolType]
+            f1 = Factory.new
+            f1.nudge_types.should == [BoolType]
+          end
+        end
         
-        f1 = Factory.new("boo") # depends on this being wrong
-        f1.configatron.couchdb_uri = "http://127.0.0.1:9991/place"
-        f1.couch_available?.should == false
+        it "should hit configatron for #workstation_names" do
+          configatron.temp do
+            configatron.factory.workstation_names = [:bar, :baz]
+            f1 = Factory.new
+            f1.workstation_names.should == [:bar, :baz]
+          end
+        end
+        
+        it "should hit configatron for #couchdb_server" do
+          configatron.temp do
+            configatron.factory.couchdb.server = "http://my.otherplace.com:7771"
+            f1 = Factory.new
+            f1.couchdb_server.should == "http://my.otherplace.com:7771"
+          end
+        end
+        
+      end
+      
+      
+      describe "writing overridden defaults to configatron" do
+        describe "Factory.new should overwrite configatron default values" do
+          it "should overwrite #factory_name" do
+            Factory.new(name:"golly")
+            configatron.factory.name.should == "golly"
+          end
+          
+          it "should overwrite #nudge.instructions.all" do
+            Factory.new(nudge_instructions:[BoolAndInstruction])
+            configatron.nudge.instructions.all.should == [BoolAndInstruction]
+          end
+          
+          it "should overwrite #nudge.types.all" do
+            Factory.new(nudge_types:[BoolType])
+            configatron.nudge.types.all.should == [BoolType]
+          end
+          
+          it "should overwrite #factory.workstation_names" do
+            Factory.new(workstation_names:[:xenon])
+            configatron.factory.workstation_names.should == [:xenon]
+          end
+          
+          it "should overwrite #factory.couchdb.server" do
+            Factory.new(couchdb_server:"http://127.0.0.1:9999")
+            configatron.factory.couchdb.server.should == "http://127.0.0.1:9999"
+          end
+        end
       end
+      
     end
-  end
-  
-  
-  describe "build" do
-    it "should read the config files"
-    
-    it "should #reset"
-  end
-  
-  
-  describe "reset" do
-    it "should erase the couchdb"
     
-    it "should set up a new couchdb"
     
-    it "should set up the necessary design documents in the db"
-  end
-  
-  
-  describe "activate" do
-    it "should check the config files"
-  end
-  
-  
-  describe "ontology" do
-    it "should have a master Instruction list" do
-      Factory.new("foo").instruction_library.should == Instruction.all_instructions
-    end
-    
-    it "should be possible to override the default with an option" do
-      short_list = [IntAddInstruction, CodeNoopInstruction]
-      Factory.new("foo", instruction_library:short_list).instruction_library.should ==
-        short_list
+    describe "databases" do
+      describe "#couch_available?" do
+        before(:each) do
+          FakeWeb.allow_net_connect = false
+        end
+        
+        it "should have a method to check that couchDB is accessible" do
+          f1 = Factory.new(name:"boo")
+          lambda{f1.couch_available?}.should_not raise_error
+        end
+        
+        it "should return true if the uri is reachable" do
+          uri = "http://mycouch.db/boo"
+          f1 = Factory.new(name:"boo", couchdb_server:uri)
+          FakeWeb.register_uri(:any, uri, :body => "We are here!", :status => [200, "OK"])
+          f1.couch_available?.should == true
+        end
+        
+        it "should return false if the uri is offline or 404's out" do
+          uri = "http://mycouch.db/boo"
+          f1 = Factory.new(name:"boo", couchdb_server:uri)
+          FakeWeb.register_uri(:any, "http://mycouch.db/boo",
+            :body => "Go away!", :status => [404, "Not Found"])
+          f1.couch_available?.should == false
+          
+          f1 = Factory.new(name:"boo", couchdb_server:"http://127.0.0.1:9991/place")
+          f1.couch_available?.should == false
+        end
+      end
+      
+      
+      describe "database setup" do
+        describe "paths" do
+          it "should have reasonable defaults"
+          
+          describe "setting from file" do
+            it "should populate configatron.main_database.db_root"
+            
+            it "should populate configatron.main_database.db_name"
+          end
+        end
+      end
     end
     
-    it "should have a master NudgeType list" do
-      Factory.new("foo").type_library.should == NudgeType.all_types
-    end
     
-    it "should be possible to override the default with an option" do
-      short_list = [CodeType, BoolType]
-      Factory.new("foo", type_library:short_list).type_library.should ==
-        short_list
+    describe "Nudge Language setup" do
+      it "should have reasonable defaults"
+      
+      describe "setting from file" do
+        it "should replace configatron.ontology.nudge.types"
+        it "should replace configatron.ontology.nudge.instructions"
+      end
     end
     
-    it "should save all the Hash options it was called with" do
-      Factory.new("bar", my_option:1, my_other_option:[1,2,3]).original_options_hash.should ==
-        {:my_option=>1, :my_other_option=>[1, 2, 3]}
-    end
     
-  end
-  
-  describe "workstations" do
-    it "should have a list of extant workstation names" do
-      Factory.new.workstation_names.should == []
+    describe "Workstation setup" do
+      it "should have reasonable defaults"
+      
+      describe "setting from file" do
+        it "should replace configatron.workstations"
+        it "should replace 'configatron.[workstation_name].[settings]' for each workstation"
+      end
     end
-    
   end
-  
-  
 end

data/spec/factories/workstation_spec.rb

@@ -93,6 +93,11 @@ describe "Workstation" do
   
   
   describe "#cycle" do
+    
+    describe "the #before_cycle method" do
+      it "should empty @answers"
+    end
+    
     it "should invoke #receive!, #build!, #ship! and #scrap!" do
       w1 = Workstation.new(:place)
       w1.should_receive(:receive!)
@@ -102,11 +107,7 @@ describe "Workstation" do
       w1.cycle
     end
     
-    describe "the #before method" do
-      it "should empty @answers"
-    end
-    
-    describe "the #after method" do
+    describe "the #after_cycle method" do
       it "should save everything in @answers to the persistent store"
     end
     

data/templates/answer_factory_activate_template.erb

@@ -2,26 +2,20 @@ require 'answer-factory'
 
 ####
 ####
-#### EDIT THESE SETTINGS TO SUIT YOUR PROJECT'S NEEDS
+#### EDIT THESE SETTINGS TO SUIT YOUR PROJECT:
 ####
 ####
 
-def AnswerFactory.nudge_instructions_path
-  # Directory path for project-specific Nudge instructions:
-  '/lib/nudge/instructions/*'
-end
-
-def AnswerFactory.nudge_types_path
-  # Directory path for project-specific Nudge types:
-  '/lib/nudge/types/*'
-end
+# Nudge language extensions:
+configatron.project.nudge.instructions.path = '/lib/nudge/instructions/*'
+configatron.project.nudge.types.path =        '/lib/nudge/types/*'
 
 
 ####
 ####
-#### DO NOT EDIT THE FOLLOWING CODE
+#### DON'T EDIT PAST THIS POINT
 ####
 ####
 
-Dir.glob(File.dirname(__FILE__) + AnswerFactory.nudge_instructions_path) {|file| require file}
-Dir.glob(File.dirname(__FILE__) + AnswerFactory.nudge_types_path) {|file| require file}
+Dir.glob(File.dirname(__FILE__) + configatron.project.nudge.instructions.path) {|file| require file}
+Dir.glob(File.dirname(__FILE__) + configatron.project.nudge.types.path) {|file| require file}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Bill Tozier
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 -04:00
+date: 2010-05-07 00:00:00 -04:00
 default_executable: answer-factory
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,7 +130,6 @@ files:
 - _spikes/old_vs_new_dominated_by?.rb
 - answer-factory.gemspec
 - bin/answer-factory
-- config/database.yml
 - lib/answer-factory.rb
 - lib/answers/answer.rb
 - lib/answers/batch.rb
@@ -154,9 +153,10 @@ files:
 - readme.md
 - spec/answer_spec.rb
 - spec/batch_spec.rb
-- spec/config_spec.rb
 - spec/factories/factory_spec.rb
 - spec/factories/workstation_spec.rb
+- spec/integration_specs/activate_integration.rb
+- spec/integration_specs/build_integration.rb
 - spec/integration_specs/thor_integration.rb
 - spec/operators/any_one_sampler_spec.rb
 - spec/operators/dominated_quantile_spec.rb
@@ -212,9 +212,10 @@ summary: Genetic Programming in the Nudge language
 test_files: 
 - spec/answer_spec.rb
 - spec/batch_spec.rb
-- spec/config_spec.rb
 - spec/factories/factory_spec.rb
 - spec/factories/workstation_spec.rb
+- spec/integration_specs/activate_integration.rb
+- spec/integration_specs/build_integration.rb
 - spec/integration_specs/thor_integration.rb
 - spec/operators/any_one_sampler_spec.rb
 - spec/operators/dominated_quantile_spec.rb

data/config/database.yml

@@ -1,9 +0,0 @@
-# realy wants to use CouchDB version 0.11 or higher
-
-# edit this to fit your particular CouchDB configuration
-main_database:
-  db_root: http://127.0.0.1:5984              #   URI of your CouchDB server
-  db_name: my_factory                         #   root database handling your AnswerFactory:
-  tag_filter: _design/routing/_view/by_tag    #   don't edit this unless you also
-                                              #     change how it's used in the codebase!
-  

data/spec/config_spec.rb

@@ -1,94 +0,0 @@
-require File.join(File.dirname(__FILE__), "./spec_helper")
-
-
-describe "Factory configuration methods" do
-  describe "configatron integration" do
-    it "should respond to #configatron" do
-      Factory.new.should respond_to(:configatron)
-    end
-  end
-  
-  
-  describe "configure_paths" do
-    it "should respond to #configure_paths" do
-      Factory.new.should respond_to(:configure_paths!)
-    end
-    
-    it "should populate self.configatron.factory_root as the path to the project folder" do
-      this_spec_file_parent_path = File.expand_path("#{File.dirname(__FILE__)}/..")
-      f1 = Factory.new
-      f1.configure_paths!
-      f1.configatron.factory_root.should == this_spec_file_parent_path
-    end
-  end
-  
-  
-  describe "factory name" do
-    it "should populate self.configatron.factory_name" do
-      f1 = Factory.new
-      f1.configure_constants!
-      f1.configatron.factory_name.should == "my_factory"
-      
-      f1 = Factory.new("super_fancy")
-      f1.configure_constants!
-      f1.configatron.factory_name.should == "super_fancy"
-    end
-  end
-  
-  
-  describe "database setup" do
-    describe "paths" do
-      it "should read from database.yml" do
-        f1 = Factory.new("super_fancy")
-        f1.configatron.should_receive(:configure_from_yaml)
-        f1.configure!
-      end
-      
-      describe "subject" do
-        before(:each) do
-          @f1 = Factory.new()
-          @f1.configure!
-        end
-        
-        it "should populate configatron.main_database.db_root" do
-          @f1.configatron.main_database.db_root.should == "http://127.0.0.1:5984"
-        end
-        
-        it "should populate configatron.main_database.db_name" do
-          @f1.configatron.main_database.db_name.should == "my_factory" # from the config file
-        end
-
-        it "should populate configatron.main_database.tag_filter" do
-          @f1.configatron.main_database.tag_filter.should == "_design/routing/_view/by_tag"
-        end
-      end
-      
-    end
-
-    describe "checking for CouchDB access" do
-      it "should call Factory#couch_db?"
-    end
-
-    describe "setting up initial db" do
-      it "should not remove old records unless asked to do so"
-      it "should be possible to erase the db if a flag is set"
-      it "should set up the design document"
-      it "should write the search-by-tag filter view to the design document"
-    end
-  end
-
-
-  describe "Nudge language setup" do
-    it "should set up the Instructions"
-
-    it "should set up the Types"
-
-  end
-  
-end
-
-
-
-
-
-