migratrix 0.0.6 → 0.0.7

data/lib/migratrix/loggable.rb

@@ -1,14 +1,18 @@
+require 'active_support/concern'
 module Migratrix
   module Loggable
+    extend ActiveSupport::Concern
+
     module ClassMethods
       def logger
-        ::Migratrix::Logger.logger
+        ::Migratrix::Migratrix.logger
       end
     end
 
-    def logger
-      ::Migratrix::Logger.logger
+    module InstanceMethods
+      def logger
+        ::Migratrix::Migratrix.logger
+      end
     end
-
   end
 end

data/lib/migratrix/migration.rb

@@ -3,7 +3,6 @@ module Migratrix
   # loaded migration inherits from this class, but hey, duck typing.
   class Migration
     include ::Migratrix::Loggable
-    extend ::Migratrix::Loggable::ClassMethods
 
     attr_accessor :options
 

data/lib/migratrix/migratrix.rb

@@ -1,7 +1,8 @@
 # Main "App" or Driver class for Migrating. Responsible for loading
 # and integrating all the parts of a migration.
-
 module Migratrix
+  include ::Migratrix::Loggable
+
   def self.migrate!(name, options={})
     ::Migratrix::Migratrix.migrate(name, options)
   end
@@ -11,12 +12,11 @@ module Migratrix
   end
 
   def self.logger=(new_logger)
-    ::Migratrix::Migratrix.logger= new_logger
+    ::Migratrix::Migratrix.logger = new_logger
   end
 
   class Migratrix
     include ::Migratrix::Loggable
-    extend ::Migratrix::Loggable::ClassMethods
 
     def initialize
     end
@@ -62,6 +62,35 @@ module Migratrix
       %w(limit where)
     end
 
+    # ----------------------------------------------------------------------
+    # Logger singleton; tries to hook into Rails.logger if it exists (it
+    # won't if you log anything during startup because Migratrix is
+    # loaded before Rails). To fix this, after rails start up call
+    # Migratrix::Migratrix.logger = Rails.logger
+    def self.create_logger(stream)
+      logger = Logger.new(stream)
+      logger.formatter = proc { |severity, datetime, progname, msg|
+        "#{severity[0]} #{datetime.strftime('%F %H:%M:%S')}: #{msg}\n"
+      }
+      logger
+    end
+
+    def self.init_logger
+      return Rails.logger if Rails.logger
+      @@logger = create_logger($stdout)
+    end
+
+    def self.logger
+      @@logger ||= self.init_logger
+    end
+
+    def self.logger=(new_logger)
+      @@logger = new_logger
+    end
+    # ----------------------------------------------------------------------
+
+
+
     # ----------------------------------------------------------------------
     # Candidate for exract class? MigrationRegistry?
     def loaded?(name)

data/lib/migratrix.rb

@@ -1,5 +1,6 @@
 require 'pathname'
 require 'forwardable'
+require 'logger'
 
 module Migratrix
   APP=Pathname.new(__FILE__).dirname + "migratrix"
@@ -12,7 +13,6 @@ module Migratrix
   require EXT + 'string_ext'
   require EXT + 'object_ext'
   require EXT + 'andand'
-  require APP + 'logger'
   require APP + 'loggable'
   require APP + 'exceptions'
   require APP + 'migration'

data/spec/lib/loggable_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+# class SomeLoggableThing
+#   include Migratrix::Loggable
+# end
+
+shared_examples_for "loggable" do
+#  let(:loggable) { SomeLoggableThing.new }
+  let(:buffer) { StringIO.new }
+  let(:logger) { Migratrix::Migratrix.create_logger(buffer) }
+
+  before do
+    Timecop.freeze(Time.local(2011, 6, 28, 3, 14, 15))
+  end
+
+  after do
+    Timecop.return
+  end
+
+  it "is loggable" do
+    loggable.class.ancestors.should include(Migratrix::Loggable)
+  end
+
+  describe "instance" do
+    it "can log" do
+      with_logger(logger) do
+        loggable.logger.info("This is a test")
+      end
+      buffer.string.should == "I 2011-06-28 03:14:15: This is a test\n"
+    end
+  end
+end

data/spec/lib/migration_spec.rb

@@ -3,10 +3,12 @@ require 'spec_helper'
 # This migration is embedded in migration_spec.rb to allow testing of
 # the class methods that specialize subclasses.
 class Migratrix::TestMigration < Migratrix::Migration
-
 end
 
 describe Migratrix::Migration do
+  let(:loggable) { Migratrix::TestMigration.new }
+  it_should_behave_like "loggable"
+
   describe ".new" do
     it "does not modify given options hash" do
       conditions = ["id=? AND approved=?", 42, true]

data/spec/lib/migratrix_spec.rb

@@ -99,12 +99,6 @@ describe Migratrix::Migratrix do
     end
   end
 
-  describe ".logger" do
-    it "sets up a default logger to stdout" do
-      migratrix.logger.class.should == ::Migratrix::Logger
-    end
-  end
-
   describe ".logger=" do
     let (:migration) { migratrix.create_migration :marbles }
     let (:buffer) { StringIO.new }
@@ -115,11 +109,14 @@ describe Migratrix::Migratrix do
     end
 
     it "sets logger globally across all Migratrices, the Migratrix module, Migrators and Models" do
-      with_logger_streaming_to(buffer) do
-        Migratrix.logger.stream.should == buffer
-        Migratrix::Migratrix.logger.stream.should == buffer
-        migratrix.logger.stream.should == buffer
-        migration.logger.stream.should == buffer
+      logger = Migratrix::Migratrix.create_logger(buffer)
+      Migratrix::Migratrix.logger = logger
+      with_logger(logger) do
+        Migratrix.logger.should == logger
+        Migratrix::Migratrix.logger.should == logger
+        migratrix.logger.should == logger
+        migration.logger.should == logger
+        Migratrix::MarblesMigration.logger.should == logger
       end
     end
   end

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require 'ruby-debug'
 require 'rails'
 require 'timecop'
 require 'logger'
+require 'active_support/concern'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -41,22 +42,18 @@ def reset_migratrix!(migratrix)
   migratrix.registered_migrations.clear
 end
 
-# Redirect singleton logger to stream and level of our choice, then
-# release it after the spec finishes or crashes.
-def with_logger_streaming_to(stream, level=Migratrix::Logger::INFO, &block)
+# Redirect singleton logger to logger of our choice, then release it
+# after the spec finishes or crashes.
+def with_logger(logger, &block)
   begin
-    old_stream, old_level = Migratrix::Logger.logger.stream, Migratrix::Logger.logger.level
-    Migratrix::Logger.set_logger(stream, level)
+    old_logger = Migratrix::Migratrix.logger
+    Migratrix::Migratrix.logger = logger
     yield
   ensure
-    Migratrix::Logger.set_logger old_stream, old_level
+    Migratrix::Migratrix.logger = old_logger
   end
 end
 
-
-
-
-
 RSpec.configure do |config|
   # == Mock Framework
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: migratrix
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-14 00:00:00.000000000Z
+date: 2011-10-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &2161683820 !ruby/object:Gem::Requirement
+  requirement: &2157814860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161683820
+  version_requirements: *2157814860
 description: Migratrix, a Rails legacy database migration tool supporting multiple
   strategies, including arbitrary n-ary migrations (1->n, n->1, n->m), arbitrary inputs
   and outputs (ActiveRecord, bare SQL, CSV) and migration logging
@@ -39,14 +39,13 @@ files:
 - lib/migratrix/active_record_migration_helpers.rb
 - lib/migratrix/exceptions.rb
 - lib/migratrix/loggable.rb
-- lib/migratrix/logger.rb
 - lib/migratrix/migration.rb
 - lib/migratrix/migratrix.rb
 - lib/patches/andand.rb
 - lib/patches/object_ext.rb
 - lib/patches/string_ext.rb
 - spec/fixtures/migrations/marbles_migration.rb
-- spec/lib/logger_spec.rb
+- spec/lib/loggable_spec.rb
 - spec/lib/migration_spec.rb
 - spec/lib/migrator_spec.rb
 - spec/lib/migratrix_spec.rb

data/lib/migratrix/logger.rb

@@ -1,56 +0,0 @@
-module Migratrix
-  class Logger
-    attr_accessor :level, :stream
-
-    FATAL = 0
-    ERROR = 1
-    WARN = 2
-    DEBUG = 3
-    INFO = 4
-
-    @@singleton_instance = new
-
-    def self.logger
-      @@singleton_instance
-    end
-
-    def self.set_logger(stream=$stdout, level=INFO)
-      self.logger.stream=stream
-      self.logger.level=level
-    end
-
-    def initialize(stream, level)
-       # :nocov: SimpleCov can't see into this method.
-      @stream, @level = stream, level
-    end
-
-    def fatal(msg)
-      log(msg, FATAL)
-    end
-
-    def error(msg)
-      log(msg, ERROR)
-    end
-
-    def warn(msg)
-      log(msg, WARN)
-    end
-
-    def debug(msg)
-      log(msg, DEBUG)
-    end
-
-    def info(msg)
-      log(msg, INFO)
-    end
-
-    def log(msg, level)
-      if level <= @level
-        @stream.puts "%c %s: %s" % ["FEWDI"[level], Time.now.strftime("%F %T"), msg]
-        @stream.flush
-      end
-    end
-
-    private_class_method :new
-  end
-end

data/spec/lib/logger_spec.rb

@@ -1,89 +0,0 @@
-require 'spec_helper'
-
-describe Migratrix::Logger do
-  let(:logger) { Migratrix::Logger.logger }
-
-  describe "sanity check kitty" do
-    it "is sanity checked" do
-      Migratrix::Logger.should_not be_nil
-      Migratrix::Logger.class.should == Class
-    end
-  end
-
-  describe "singleton-ness" do
-    it "is singleton-y" do
-      Migratrix::Logger.logger.class.should == Migratrix::Logger
-    end
-
-    it "cannot be new'ed" do
-      lambda { Migratrix::Logger.new }.should raise_error(NoMethodError)
-    end
-  end
-
-  describe "default" do
-    it "logs to $stdout" do
-      logger.stream == $stdout
-    end
-  end
-
-
-  describe "logging" do
-    let(:buffer) { StringIO.new }
-
-    before do
-      Timecop.freeze(Time.local(2011, 6, 28, 3, 14, 15))
-    end
-
-    after do
-      Timecop.return
-    end
-
-    it "formats info message with level and timestamp" do
-      with_logger_streaming_to(buffer) do
-        logger.info("Test Message")
-        buffer.string.should == "I 2011-06-28 03:14:15: Test Message\n"
-      end
-    end
-
-    it "formats debug message with level and timestamp" do
-      with_logger_streaming_to(buffer) do
-        logger.debug("Test Message")
-        buffer.string.should == "D 2011-06-28 03:14:15: Test Message\n"
-      end
-    end
-
-    it "formats warning message with level and timestamp" do
-      with_logger_streaming_to(buffer) do
-        logger.warn("Test Message")
-        buffer.string.should == "W 2011-06-28 03:14:15: Test Message\n"
-      end
-    end
-
-    it "formats error message with level and timestamp" do
-      with_logger_streaming_to(buffer) do
-        logger.error("Test Message")
-        buffer.string.should == "E 2011-06-28 03:14:15: Test Message\n"
-      end
-    end
-
-    it "formats fatal message with level and timestamp" do
-      with_logger_streaming_to(buffer) do
-        logger.fatal("Test Message")
-        buffer.string.should == "F 2011-06-28 03:14:15: Test Message\n"
-      end
-    end
-
-    it "rejects messages below logger level" do
-      with_logger_streaming_to(buffer, Migratrix::Logger::ERROR) do
-        logger.info("Test Message")
-        logger.debug("Test Message")
-        logger.warn("Test Message")
-        buffer.size.should == 0
-        logger.error("Test Error")
-        logger.fatal("Test Fatal")
-        buffer.string.should == "E 2011-06-28 03:14:15: Test Error\nF 2011-06-28 03:14:15: Test Fatal\n"
-      end
-    end
-  end
-
-end