Merge branch 'release/v0.2.9'

instead of jeweler

.gitignore

@@ -16,9 +16,11 @@ tmtags
 ## PROJECT::GENERAL
 coverage
 rdoc
-pkg
+Gemfile.lock
+pkg/*
+*.gem
+.bundle
 
 ## PROJECT::SPECIFIC
-.yardoc/*
-*.gemspec
+.yardoc
 doc/*

Gemfile

@@ -1,10 +1,4 @@
 source 'http://rubygems.org/'
 
-gem 'activesupport', '>= 2.3.0'
-gem 'i18n', '>= 0.4.2'
-
-group :development do
-  gem 'jeweler', '>= 1.4.0'
-  gem 'rspec', '>= 2.1.0'
-  gem 'yard', '>= 0.6.3'
-end
+# Specify your gem's dependencies in time_ext.gemspec
+gemspec

Gemfile.lock

@@ -1,34 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.0.3)
-    diff-lcs (1.1.2)
-    gemcutter (0.6.1)
-    git (1.2.5)
-    i18n (0.4.2)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
-      git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.6)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    yard (0.6.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (>= 2.3.0)
-  i18n (>= 0.4.2)
-  jeweler (>= 1.4.0)
-  rspec (>= 2.1.0)
-  yard (>= 0.6.3)

README.md

@@ -99,5 +99,5 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 [as]: http://as.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Time/Calculations.html
-[docs]: http://rdoc.info/projects/jimeh/time_ext
+[docs]: http://rdoc.info/gems/time_ext/frames
 [rdoc.info]: http://rdoc.info/

Rakefile

@@ -1,27 +1,11 @@
-require 'rubygems'
-require 'rake'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "time_ext"
-    gem.summary = %Q{Extends the abilities of Ruby's built-in Time class by building on top of ActiveSupport.}
-    gem.description = %Q{Extends the abilities of Ruby's built-in Time class by building on top of ActiveSupport.}
-    gem.email = "contact@jimeh.me"
-    gem.homepage = "http://github.com/jimeh/time_ext"
-    gem.authors = ["Jim Myhrberg"]
-    gem.add_dependency 'activesupport', '>= 2.3.0'
-    gem.add_dependency 'i18n', '>= 0.4.2'
-    gem.add_development_dependency 'jeweler', '>= 1.4.0'
-    gem.add_development_dependency 'rspec', '>= 2.1.0'
-    gem.add_development_dependency 'yard', '>= 0.6.3'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
 
+#
 # Rspec
+#
+
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
@@ -32,15 +16,12 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-task :spec => :check_dependencies
-
 task :default => :spec
 
-desc "Start an irb console with TimeExt pre-loaded."
-task :console do
-  exec "irb -r spec/spec_helper"
-end
-task :c => :console
+
+#
+# Yard
+#
 
 begin
   require 'yard'
@@ -50,3 +31,14 @@ rescue LoadError
     abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
   end
 end
+
+
+#
+# Misc.
+#
+
+desc "Start an irb console with TimeExt pre-loaded."
+task :console do
+  exec "irb -r spec/spec_helper"
+end
+task :c => :console

VERSION

@@ -1 +0,0 @@
-0.2.7

lib/time_ext.rb

@@ -1,8 +1,4 @@
 require 'rubygems'
-require 'active_support'
-
-# support both Active Support 2.x and 3.x
-require 'active_support/time' if !Time.respond_to?(:days_in_month)
 
 require 'time_ext/calculations'
 require 'time_ext/iterations'

lib/time_ext/core_ext/numeric.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/numeric/time' unless Numeric.new.respond_to?(:seconds) # fixes rare loading issue
+
 class Numeric
   alias :sec :seconds
   alias :min :minutes

lib/time_ext/core_ext/time.rb

@@ -1,3 +1,7 @@
+require 'active_support'
+require 'active_support/time' unless Time.respond_to?(:days_in_month) # support both Active Support 2.x and 3.x
+require 'active_support/core_ext/time/calculations' unless Time.new.respond_to?(:ago) # fixes rare loading issue
+
 class Time
   include TimeExt::Support
   include TimeExt::Calculations

lib/time_ext/version.rb

@@ -0,0 +1,3 @@
+module TimeExt
+  VERSION = "0.2.9"
+end

time_ext.gemspec

@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "time_ext/version"
+
+Gem::Specification.new do |s|
+  s.name        = "time_ext"
+  s.version     = TimeExt::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Jim Myhrberg"]
+  s.email       = ["contact@jimeh.me"]
+  s.homepage    = "http://github.com/jimeh/time_ext"
+  s.summary     = "Extends the abilities of Ruby's built-in Time class by building on top of ActiveSupport."
+  s.description = "Extends the abilities of Ruby's built-in Time class by building on top of ActiveSupport."
+
+  s.rubyforge_project = "time_ext"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  
+  s.add_runtime_dependency 'activesupport', '>= 2.3.2'
+  s.add_runtime_dependency 'i18n', '>= 0.4.2'
+  
+  s.add_development_dependency 'rake', '>= 0.8.7'
+  s.add_development_dependency 'rspec', '>= 2.1.0'
+  s.add_development_dependency 'yard', '>= 0.6.3'
+  s.add_development_dependency 'ruby-debug'
+end