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/*
+.yardoc
-*.gemspec
 doc/*

.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

Gemfile

@@ -0,0 +1,4 @@
+source 'http://rubygems.org/'
+
+# Specify your gem's dependencies in time_ext.gemspec
+gemspec

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,43 +1,27 @@
-require 'rubygems'
+require 'bundler'
-require 'rake'
+Bundler::GemHelper.install_tasks
 
-begin
+
-  require 'jeweler'
+#
-  Jeweler::Tasks.new do |gem|
+# Rspec
-    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.}
+require 'rspec/core/rake_task'
-    gem.email = "contact@jimeh.me"
+RSpec::Core::RakeTask.new(:spec) do |spec|
-    gem.homepage = "http://github.com/jimeh/time_ext"
+  spec.pattern = 'spec/**/*_spec.rb'
-    gem.authors = ["Jim Myhrberg"]
-    gem.add_dependency "activesupport", ">= 2.3.0"
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "yard", ">= 0"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end
 
-task :spec => :check_dependencies
-
 task :default => :spec
 
-task :console do
+
-  exec "irb -r spec/spec_helper"
+#
-end
+# Yard
+#
 
 begin
   require 'yard'
@@ -47,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.3

lib/time_ext.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
-require 'active_support'
 
 require 'time_ext/calculations'
 require 'time_ext/iterations'
 require 'time_ext/support'
 require 'time_ext/core_ext/time'
+require 'time_ext/core_ext/numeric'

lib/time_ext/core_ext/numeric.rb

@@ -0,0 +1,6 @@
+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
+end

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/iterations.rb

@@ -75,7 +75,6 @@ module TimeExt
     def map_each(unit, options = {}, &block)
       iterate(unit, options.merge(:map_result => true), &block)
     end
-    alias :map :map_each
 
     # Executes passed block for each "unit" of time specified, returning an array with the return values from passed block. Additionally the time object passed into the block is set to the beginning of specified "unit".
     def map_beginning_of_each(unit, options = {}, &block)
@@ -84,7 +83,7 @@ module TimeExt
 
     # Dynamically define convenience methods, like #each_hour instead of #each(:hour).
     [:year, :month, :day, :hour, :min, :sec].each do |unit|
-      [:each, :beginning_of_each, :map_each, :map_beginning_of_each, :map].each do |method|
+      [:each, :beginning_of_each, :map_each, :map_beginning_of_each].each do |method|
         define_method "#{method}_#{unit}" do |*args, &block|
           send(method, unit, *args, &block)
         end

lib/time_ext/version.rb

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

spec/core_ext_spec.rb

@@ -0,0 +1,19 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Core Extensions" do
+  
+  it "should alias Numeric class methods" do
+    number = 1
+    number.sec.should == number.second
+    number.min.should == number.minute
+  end
+  
+  it "should alias Time instance methods" do
+    time = Time.now
+    time.secs_ago(10).should == time.ago(10)
+    time.seconds_ago(10).should == time.ago(10)
+    time.secs_since(10).should == time.since(10)
+    time.seconds_since(10).should == time.since(10)
+  end
+
+end

spec/spec.opts

@@ -1,2 +0,0 @@
---format specdoc
---color

spec/spec_helper.rb

@@ -1,9 +1,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
 require 'time_ext'
-require 'spec'
+require 'rspec'
-require 'spec/autorun'
+require 'rspec/autorun'
-
-Spec::Runner.configure do |config|
-  
-end

spec/time_iterations_spec.rb

@@ -52,8 +52,6 @@ describe "Time Iterations" do
     match = (1..6).map { |i| @now + i.hours }
     @now.map_each_hour.until(@now + 6.hours) { |time| time }.should == match
     @now.until(@now + 6.hours).map_each(:hour) { |time| time }.should == match
-    # check so the #map alias for #map_each works
-    @now.map_hour.until(@now + 6.hours) { |time| time }.should == match
   end
   
   it "should iterate over time objects backwards with #until set in the past" do

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