Merge branch 'release/v0.2.8'

instead of jeweler

.gitignore

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

.rspec

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

Gemfile

@@ -0,0 +1,9 @@
+source 'http://rubygems.org/'
+
+# Specify your gem's dependencies in time_ext.gemspec
+gemspec
+
+group :development do
+  gem 'rspec', '>= 2.1.0'
+  gem 'yard', '>= 0.6.3'
+end

Gemfile.lock

@@ -0,0 +1,32 @@
+PATH
+  remote: .
+  specs:
+    time_ext (0.2.7)
+      activesupport (>= 2.3.0)
+      i18n (>= 0.4.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.3)
+    diff-lcs (1.1.2)
+    i18n (0.4.2)
+    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)
+    yard (0.6.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (>= 2.3.0)
+  i18n (>= 0.4.2)
+  rspec (>= 2.1.0)
+  time_ext!
+  yard (>= 0.6.3)

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.6

lib/time_ext/version.rb

@@ -0,0 +1,3 @@
+module TimeExt
+  VERSION = "0.2.8"
+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 'spec/autorun'
 
-Spec::Runner.configure do |config|
+require 'time_ext'
-  
+require 'rspec'
-end
+require 'rspec/autorun'

time_ext.gemspec

@@ -0,0 +1,24 @@
+# -*- 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.0'
+  s.add_runtime_dependency 'i18n', '>= 0.4.2'
+end