mediashelf-loggable 0.4.2 → 0.4.3

data/.gitignore

@@ -0,0 +1,6 @@
+pkg
+doc
+#/.rvmrc
+/.bundle
+/.yardoc
+coverage

data/.rvmrc

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+ruby_string="ree-1.8.7"
+gemset_name="loggable"
+
+# Install rubies when used instead of only displaying a warning and exiting
+rvm_install_on_use_flag=1
+
+# Specify our desired <ruby>[@<gemset>], the @gemset name is optional.
+environment_id="${ruby_string}@${gemset_name}"
+
+# First, attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+#
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]] ; then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  rvm --create "$environment_id"
+fi
+
+# Ensure that Bundler is installed, install it if it is not.
+if ! (command -v bundle > /dev/null) ; then
+  printf "The rubygem 'bundler' is not installed, installing it now.\n"
+  gem install bundler
+fi
+

data/Gemfile

@@ -1,8 +1,14 @@
 source "http://rubygems.org"
 
+
 group :development, :test do
   gem "jeweler"
   gem "mocha"
   gem "jnunemaker-matchy"
   gem "thoughtbot-shoulda"
-end
+  gem "rcov"
+  gem "yard"
+  gem "RedCloth"
+  gem "ruby-debug"
+end
+

data/Gemfile.lock

@@ -1,6 +1,8 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    RedCloth (4.2.7)
+    columnize (0.3.4)
     gemcutter (0.6.1)
     git (1.2.5)
     jeweler (1.4.0)
@@ -9,18 +11,32 @@ GEM
       rubyforge (>= 2.0.0)
     jnunemaker-matchy (0.4.0)
     json_pure (1.4.6)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
     mocha (0.9.9)
       rake
     rake (0.8.7)
+    rbx-require-relative (0.0.5)
+    rcov (0.9.9)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
     thoughtbot-shoulda (2.11.1)
+    yard (0.6.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  RedCloth
   jeweler
   jnunemaker-matchy
   mocha
+  rcov
+  ruby-debug
   thoughtbot-shoulda
+  yard

data/Rakefile

@@ -2,6 +2,9 @@ require 'rubygems'
 require 'rake/gempackagetask'
 require 'rake/testtask'
 
+# adding tasks defined in lib/tasks
+Dir.glob('lib/tasks/*.rake').each { |r| import r }
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
@@ -37,4 +40,4 @@ rescue LoadError
   task :rcov do
     abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
   end
-end
+end

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/loggable/log_methods.rb

@@ -15,11 +15,15 @@ module Loggable
       @@logger = logger
     end
     
-    # If RAILS_DEFAULT_LOGGER is defined, that will be returned.
+    # If ::Rails.logger is defined, that will be returned.
     # If no logger has been defined, a new STDOUT Logger will be created.
     def logger
-      # @@logger || LoggerStub.new
-      @@logger ||= (defined?(::Rails) && !::Rails.logger.nil?) ? ::Rails.logger : ::Logger.new(STDOUT)
+      if (defined?(::Rails) && !::Rails.logger.nil?)
+        @@logger = ::Rails.logger
+      else
+        @@logger ||= ::Logger.new(STDOUT)
+      end
+      return @@logger
     end
     
   end

data/lib/tasks/loggable.rake

@@ -0,0 +1,44 @@
+desc "Task to execute builds on a Hudson Continuous Integration Server."
+task :hudson do
+  Rake::Task["loggable:doc"].invoke
+  Rake::Task["loggable:rcov"].invoke
+  Rake::Task["loggable:test"].invoke
+end
+
+namespace :loggable do    
+
+  require 'rake/testtask'
+  Rake::TestTask.new(:test) do |test|
+    test.libs << 'lib' << 'test'
+    test.pattern = 'test/**/*_test.rb'
+    test.verbose = true
+  end
+
+  # Use yard to build docs
+  begin
+    require 'yard'
+    require 'yard/rake/yardoc_task'
+    project_root = File.expand_path("#{File.dirname(__FILE__)}/../../")
+    doc_destination = File.join(project_root, 'doc')
+
+    YARD::Rake::YardocTask.new(:doc) do |yt|
+      yt.files   = Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) + 
+                   [ File.join(project_root, 'README.rdoc') ]
+      yt.options = ['--output-dir', doc_destination, '--readme', 'README.rdoc']
+    end
+  rescue LoadError
+    desc "Generate YARD Documentation"
+    task :doc do
+      abort "Please install the YARD gem to generate rdoc."
+    end
+  end
+
+  require 'rcov/rcovtask'
+
+  desc "Create a cross-referenced code coverage report."
+  Rcov::RcovTask.new(:rcov) do |t|
+    t.libs << "test"
+    t.test_files = FileList['test/**/*_test.rb']
+    t.rcov_opts << "--exclude \"gems/*\" --rails" 
+  end
+end

data/mediashelf-loggable.gemspec

@@ -1,69 +1,60 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{mediashelf-loggable}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrick Reagan", "Matt Zumwalt"]
-  s.date = %q{2011-03-21}
+  s.date = %q{2011-07-25}
   s.description = %q{A gem that provides logging capabilities to any class.  Relies on Rails logger if it's available.  Extended from loggable gem by viget}
   s.email = %q{matt.zumwalt@yourmediashelf.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
-    "Gemfile",
-    "Gemfile.lock",
-    "History.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/loggable.rb",
-    "lib/loggable/log_methods.rb",
-    "lib/loggable/logger_stub.rb",
-    "lib/loggable/version.rb",
-    "loggable.gemspec",
-    "mediashelf-loggable.gemspec",
-    "test/examples/log_methods_test.rb",
-    "test/examples/logger_stub_test.rb",
-    "test/test_helper.rb"
+    ".gitignore",
+     ".rvmrc",
+     "Gemfile",
+     "Gemfile.lock",
+     "History.txt",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "lib/loggable.rb",
+     "lib/loggable/log_methods.rb",
+     "lib/loggable/logger_stub.rb",
+     "lib/loggable/version.rb",
+     "lib/tasks/loggable.rake",
+     "loggable.gemspec",
+     "mediashelf-loggable.gemspec",
+     "test/examples/log_methods_test.rb",
+     "test/examples/logger_stub_test.rb",
+     "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/mediashelf/mediashelf-loggable}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{A gem that provides logging capabilities to any class}
   s.test_files = [
     "test/examples/log_methods_test.rb",
-    "test/examples/logger_stub_test.rb",
-    "test/test_helper.rb"
+     "test/examples/logger_stub_test.rb",
+     "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_development_dependency(%q<jnunemaker-matchy>, [">= 0"])
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<jnunemaker-matchy>, [">= 0"])
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     end
   else
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<jnunemaker-matchy>, [">= 0"])
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
   end
 end

data/test/examples/log_methods_test.rb

@@ -51,4 +51,27 @@ class LogMethodsTest < Test::Unit::TestCase
     end
 
   end
+  
+  context "MyModule in Rails3" do
+    setup do
+      class ::Rails
+        def self.logger
+          return "I'm a Rails Logger."
+        end
+      end 
+    end
+    
+    teardown do
+      Object.send(:remove_const, :Rails)
+    end
+    
+    should "use Rails logger" do
+      MyModule.logger = nil
+      MyModule.logger.should == Rails.logger
+    end
+    should "switch to using Rails logger even if a default logger was already defined" do
+      MyModule.logger = Logger.new(STDOUT)
+      MyModule.logger.should == Rails.logger
+    end
+  end
 end

data/test/test_helper.rb

@@ -3,5 +3,7 @@ require 'test/unit'
 require 'mocha'
 require 'shoulda'
 require 'matchy'
+require "ruby-debug"
 
 require File.dirname(__FILE__) + '/../lib/loggable'
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mediashelf-loggable
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 9
+  prerelease: 
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Patrick Reagan
@@ -16,70 +16,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 -07:00
+date: 2011-07-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: jeweler
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: mocha
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: jnunemaker-matchy
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
   name: thoughtbot-shoulda
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: thoughtbot-shoulda
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -88,7 +31,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  type: :development
+  version_requirements: *id001
 description: A gem that provides logging capabilities to any class.  Relies on Rails logger if it's available.  Extended from loggable gem by viget
 email: matt.zumwalt@yourmediashelf.com
 executables: []
@@ -98,6 +42,8 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- .gitignore
+- .rvmrc
 - Gemfile
 - Gemfile.lock
 - History.txt
@@ -108,6 +54,7 @@ files:
 - lib/loggable/log_methods.rb
 - lib/loggable/logger_stub.rb
 - lib/loggable/version.rb
+- lib/tasks/loggable.rake
 - loggable.gemspec
 - mediashelf-loggable.gemspec
 - test/examples/log_methods_test.rb
@@ -118,8 +65,8 @@ homepage: http://github.com/mediashelf/mediashelf-loggable
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -143,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A gem that provides logging capabilities to any class