winton-active_wrapper 0.1.0 → 0.1.1

data/README.markdown

@@ -17,7 +17,7 @@ Usage
 require 'rubygems'
 require 'active_wrapper'
 
-$db, $log = ActiveWrapper.new(
+$db, $log = ActiveWrapper.setup(
   :base => File.dirname('__FILE__'),
   :env => 'development',
   :log => 'custom',

data/active_wrapper.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_wrapper}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Winton Welsh"]

data/gemspec.rb

@@ -13,5 +13,5 @@ GEM_SPEC = Gem::Specification.new do |s|
   s.name = GEM_NAME
   s.platform = Gem::Platform::RUBY
   s.require_path = "lib"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 end

data/lib/active_wrapper.rb

@@ -1,16 +1,23 @@
+require 'rubygems'
+require 'activerecord'
+require 'logger'
+require 'yaml'
+
 require File.dirname(__FILE__) + "/active_wrapper/db"
 require File.dirname(__FILE__) + "/active_wrapper/log"
 
-class ActiveWrapper
-  
-  def initialize(options={})
+module ActiveWrapper
+  class <<self
     
-    options = {
-      :base => File.dirname($0),
-      :env => 'development',
-      :log => 'development'
-    }.merge(options)
+    def setup(options={})
+      
+      options = {
+        :base => File.dirname($0),
+        :env => 'development',
+        :log => 'development'
+      }.merge(options.reject { |k, v| v.nil? })
     
-    [ Db.new(options), Log.new(options) ]
+      [ Db.new(options), Log.new(options) ]
+    end
   end
 end

data/lib/active_wrapper/tasks.rb

@@ -6,8 +6,9 @@ module ActiveWrapper
     def initialize(options={}, &block)
       
       task :environment do
-        $db, $log = ActiveWrapper.new(options)
-        yield
+        $db, $log = ActiveWrapper.setup(options)
+        $db.establish_connection
+        yield if block
       end
       
       namespace :db do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: winton-active_wrapper
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Winton Welsh