sadie 0.0.12 → 0.0.13

data/Rakefile

@@ -1,15 +1,17 @@
 require "bundler/gem_tasks"
 
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 task    :default    =>  [:test]
 
+# run sadie tests
 task :test do
     ruby "test/tc_sadie_toplevel.rb"
     ruby "test/tc_sadie_twodeep.rb"
 end
 
+# increment version
 task :deploy => 'inc_version' do
     version = current_sadie_version
     sh "git push"
@@ -17,6 +19,7 @@ task :deploy => 'inc_version' do
     sh "gem push sadie-#{version}.gem"
 end
 
+# increment version
 task :inc_version do
     version = current_sadie_version
     if (matches = version.match(/^(\d+\.\d+\.)(\d+)$/))

data/TODO

@@ -18,4 +18,14 @@
                    in the key itself, enough that the primer could use it and divine the
                    desired result.  So, where Sadie::prime takes an arg of containing
                    a list of keys that this primer "provides", it will alternatively take an
-                   arg of "key-match" which will fire off the primer when the key matches.
+                   arg of "key-match" which will fire off the primer when the key matches.
+                   
+[sampleapps]       make a few simple apps with primer directories 
+
+[primer_path]      currently defined via a path to a single directory, the toplevel primer
+                   directory idea should be made into a collection of directories as spec'ed
+                   in a colon-separated list, and it should check the environment, if
+                   otherwise undefined.  would make it easy to have multiple primer
+                   repositories.
+                   
+                   

data/lib/sadie/defaults.rb

@@ -5,6 +5,7 @@
 class Sadie
   DEFAULTS = {
     "sadie.primers_dirpath" => File.expand_path("primers","/var/sadie"),
-    "sadie.sessions_dirpath" => File.expand_path("sessions","/var/sadie")
+    "sadie.sessions_dirpath" => File.expand_path("sessions","/var/sadie"),
+    "sadie.primer_plugins_dirpath" => "lib/sadie/primer_plugins"
   }
 end

data/lib/sadie/version.rb

@@ -1,3 +1,3 @@
 class Sadie
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/lib/sadie.rb

@@ -69,7 +69,7 @@ class Sadie
     
     # ==method: Sadie::iniFileToHash
     #
-    # utility class method.  accepts a filepath.  digests inin file and returns hash of hashes.
+    # utility class method.  accepts a filepath.  digests ini file and returns hash of hashes.
     #
     def self.iniFileToHash ( filepath )
         section = nil
@@ -130,7 +130,11 @@ class Sadie
         
         # internalize defaults to shortterm
         DEFAULTS.each do |key, value|
-            _set( key, value )
+            if key.eql? "sadie.primer_plugins_dirpath"
+                addPrimerPluginsDirPath value 
+            else
+                _set( key, value )
+            end
         end
         
         # internalize supplied defaults, postponing a set of sadie.primers_dirpath
@@ -165,7 +169,24 @@ class Sadie
         
     end
     
-    def prime ( primer_definition, &block )
+    def addPrimerPluginsDirPath( path )
+        
+        exppath = File.expand_path(path)
+        
+        # add the path to the system load path
+        $LOAD_PATH.include?(exppath) \
+            or $LOAD_PATH.unshift(exppath)
+            
+        # add the path to the pluginsdir array
+        defined? @plugins_dir_paths \
+            or @plugins_dir_paths = Array.new        
+        @plugins_dir_paths.include?(exppath) \
+            or @plugins_dir_paths.unshift(exppath)
+    end
+    
+   
+    
+    def prime( primer_definition, &block )
         # validate params
         defined? primer_definition \
             or raise "Prime called without parameters"
@@ -256,6 +277,13 @@ class Sadie
         
     end
     
+    # ==method: output
+    #
+    # an alias for get.  intended for use with primers that produce an output beyond their return value
+    def output( k )
+        return get( k )
+    end
+    
     # ==method: isset?
     #
     # returns true if sadie has a value for the key
@@ -479,16 +507,18 @@ class Sadie
         puts "Initializing primer plugins..."
         
         # load the plugins
-        Dir.foreach( plugins_dirpath ) do |filename|
-            next if ! filename.match( /\.plugin\.rb$/ )
-            
-            filepath = File.expand_path( filename, plugins_dirpath )
-            
-            puts "initializing primer plugin with file: #{filename}"
-            
-            setMidPluginInit( filepath )
-            load( filepath )
-            unsetMidPluginInit
+        @plugins_dir_paths.each do | dirpath |
+            Dir.foreach( dirpath ) do |filename|
+                next if ! filename.match( /\.plugin\.rb$/ )
+                
+                filepath = File.expand_path( filename, dirpath )
+                
+                puts "initializing primer plugin with file: #{filename}"
+                
+                setMidPluginInit( filepath )
+                load( filename )
+                unsetMidPluginInit
+            end
         end
         puts "...finished initializing primer plugins"
         @@primer_plugins_initialized = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sadie
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000Z
+date: 2012-04-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbi
-  requirement: &9930400 !ruby/object:Gem::Requirement
+  requirement: &21570800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9930400
+  version_requirements: *21570800
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &9929980 !ruby/object:Gem::Requirement
+  requirement: &21570380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9929980
+  version_requirements: *21570380
 - !ruby/object:Gem::Dependency
   name: dbd-mysql
-  requirement: &9929560 !ruby/object:Gem::Requirement
+  requirement: &21569960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9929560
+  version_requirements: *21569960
 description: Sadie is a data framework intended to ease the pain of managing related
   data.
 email: