timeframe 0.0.8 → 0.0.9

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+Gemfile.lock

data/Gemfile

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

data/Rakefile

@@ -1,23 +1,11 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "timeframe"
-    gem.summary = %Q{Date intervals}
-    gem.description = %Q{A Ruby class for describing and interacting with timeframes.}
-    gem.email = "andy@rossmeissl.net"
-    gem.homepage = "http://github.com/rossmeissl/timeframe"
-    gem.authors = ["Andy Rossmeissl", "Seamus Abshere", "Derek Kastner"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_dependency 'activesupport', '>=2.3.5'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+# must be included before rubygems or bundler
+if ENV['TIMEFRAME_HOME_RUN'] == 'true'
+  require 'home_run'
 end
 
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
@@ -30,8 +18,6 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-task :spec => :check_dependencies
-
 task :default => :spec
 
 require 'rake/rdoctask'

data/lib/timeframe/version.rb

@@ -0,0 +1,3 @@
+class Timeframe
+  VERSION = '0.0.9'
+end

data/lib/timeframe.rb

@@ -1,4 +1,4 @@
-require 'rubygems'
+require 'date'
 require 'active_support/version'
 %w{
   active_support/core_ext/array/extract_options
@@ -9,7 +9,6 @@ require 'active_support/version'
 }.each do |active_support_3_requirement|
   require active_support_3_requirement
 end if ActiveSupport::VERSION::MAJOR == 3
-require 'timeframe/ykk'
 
 # Encapsulates a timeframe between two dates. The dates provided to the class are always until the last date. That means
 # that the last date is excluded.
@@ -229,7 +228,10 @@ class Timeframe
 
     timeframes.sort! { |x, y| x.from <=> y.from }
     
-    timeframes.collect(&:to).unshift(from).extend(Ykk).ykk(timeframes.collect(&:from).push(to)) do |gap|
+    a = [ from ] + timeframes.collect(&:to)
+    b = timeframes.collect(&:from) + [ to ]
+
+    a.zip(b).map do |gap|
       Timeframe.new(*gap) if gap[1] > gap[0]
     end.compact
   end

data/spec/spec_helper.rb

@@ -1,9 +1,11 @@
+require 'rubygems'
+require 'bundler'
+Bundler.setup
+require 'spec'
+require 'spec/autorun'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'timeframe'
-require 'spec'
-require 'spec/autorun'
-require 'date'
 
 Spec::Runner.configure do |config|
   

data/spec/timeframe_spec.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'date'
 
 describe Timeframe do
   describe 'initialization' do

data/timeframe.gemspec

@@ -1,59 +1,26 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "timeframe/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{timeframe}
-  s.version = "0.0.8"
+  s.name        = "timeframe"
+  s.version     = Timeframe::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Andy Rossmeissl", "Seamus Abshere", "Derek Kastner"]
+  s.email       = ["andy@rossmeissl.net"]
+  s.homepage    = "http://github.com/rossmeissl/timeframe"
+  s.summary     = %Q{Date intervals}
+  s.description = %Q{A Ruby class for describing and interacting with timeframes.}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Andy Rossmeissl", "Seamus Abshere", "Derek Kastner"]
-  s.date = %q{2010-07-21}
-  s.description = %q{A Ruby class for describing and interacting with timeframes.}
-  s.email = %q{andy@rossmeissl.net}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/timeframe.rb",
-     "lib/timeframe/ykk.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/timeframe_spec.rb",
-     "timeframe.gemspec"
-  ]
-  s.homepage = %q{http://github.com/rossmeissl/timeframe}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Date intervals}
-  s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/timeframe_spec.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "timeframe"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
-    else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<activesupport>, [">= 2.3.5"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<activesupport>, [">= 2.3.5"])
-  end
+  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_development_dependency "rspec", "~> 1"
+  s.add_development_dependency 'home_run'
+  s.add_dependency 'activesupport', '>=2.3.5'
+  s.add_dependency 'i18n'
 end
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: timeframe
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 13
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 -05:00
+date: 2011-04-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,20 +26,32 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 1
         segments: 
         - 1
-        - 2
-        - 9
-        version: 1.2.9
+        version: "1"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: home_run
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -51,25 +63,39 @@ dependencies:
         - 5
         version: 2.3.5
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: i18n
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: A Ruby class for describing and interacting with timeframes.
-email: andy@rossmeissl.net
+email: 
+- andy@rossmeissl.net
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - lib/timeframe.rb
-- lib/timeframe/ykk.rb
+- lib/timeframe/version.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/timeframe_spec.rb
@@ -79,8 +105,8 @@ homepage: http://github.com/rossmeissl/timeframe
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -103,11 +129,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: timeframe
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Date intervals
 test_files: 
+- spec/spec.opts
 - spec/spec_helper.rb
 - spec/timeframe_spec.rb

data/VERSION

@@ -1 +0,0 @@
-0.0.8

data/lib/timeframe/ykk.rb

@@ -1,6 +0,0 @@
-module Ykk # :nodoc: all
-  def ykk(*arys, &blk) # YKK: a better zipper
-    return zip(*arys) unless block_given?
-    zip(*arys).collect { |a| yield a }
-  end
-end