xrono 1.0.0 → 1.0.1

data/.gitignore

@@ -17,3 +17,4 @@ tags
 node_modules
 .sass-cache/*
 spec/reports
+*.gem

data/.travis.yml

@@ -1,8 +1,8 @@
 before_script:
   - "sh -e /etc/init.d/xvfb start"
   - "if [[ `eval ruby -v` =~ 'jruby' ]]; then database_yml=spec/internal/config/database.yml.$db.jruby; else database_yml=spec/internal/config/database.yml.$db; fi;echo $database_yml;cp $database_yml config/database.yml;cp $database_yml spec/internal/config/database.yml;"
-  - "bundle exec rake db:create db:migrate db:test:clone > /dev/null"
 script:
+  - "bundle exec rake db:create db:migrate db:test:clone"
   - "DISPLAY=:99.0 bundle exec rspec ./spec/"
   - "DISPLAY=:99.0 bundle exec cucumber"
 notifications:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xrono (1.0.0)
+    xrono (1.0.1)
       acl9 (~> 0.12.0)
       acts-as-taggable-on (~> 2.2.2)
       acts_as_commentable (~> 3.0.1)
@@ -20,7 +20,7 @@ PATH
       oauth2
       paper_trail (~> 2.6.0)
       paperclip (~> 2.3)
-      rails (~> 3.2.8)
+      rails (~> 3.2.11)
       rake (~> 10.0)
       sass-rails (~> 3.2.0)
       sidekiq (= 2.0.3)
@@ -32,12 +32,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     acl9 (0.12.0)
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
+    actionmailer (3.2.11)
+      actionpack (= 3.2.11)
       mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionpack (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -45,18 +45,18 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
+    activeresource (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     acts-as-taggable-on (2.2.2)
@@ -77,7 +77,7 @@ GEM
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    capybara (1.1.2)
+    capybara (1.1.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -88,7 +88,7 @@ GEM
       timers (>= 1.0.0)
     childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
-    chunky_png (1.2.6)
+    chunky_png (1.2.7)
     ci_reporter (1.8.3)
       builder (>= 2.1.2)
     cocaine (0.4.2)
@@ -99,7 +99,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.4.0)
-    combustion (0.3.2)
+    combustion (0.3.3)
       rails (>= 3.0.0)
       thor (>= 0.14.6)
     compass (0.12.alpha.0)
@@ -107,7 +107,7 @@ GEM
       fssm (>= 0.2.7)
       sass (~> 3.1)
     configuration (1.3.2)
-    connection_pool (0.9.2)
+    connection_pool (0.9.3)
     css3-progress-bar-rails (0.2.2)
       rails
     cucumber (1.1.9)
@@ -133,7 +133,7 @@ GEM
       i18n (~> 0.4)
     faraday (0.8.4)
       multipart-post (~> 1.1)
-    ffi (1.2.0)
+    ffi (1.3.0)
     forgery (0.3.10)
       nokogiri (~> 1.4)
     fssm (0.2.9)
@@ -146,7 +146,7 @@ GEM
     grit (2.4.1)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
-    haml (3.1.6)
+    haml (3.1.7)
     highline (1.6.15)
     hike (1.2.1)
     httpauth (0.2.0)
@@ -155,7 +155,7 @@ GEM
     jquery-rails (1.0.19)
       railties (~> 3.0)
       thor (~> 0.14)
-    json (1.7.5)
+    json (1.7.6)
     jwt (0.1.5)
       multi_json (>= 1.0)
     kramdown (0.14.1)
@@ -186,7 +186,7 @@ GEM
     net-ssh (2.6.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    nokogiri (1.5.5)
+    nokogiri (1.5.6)
     oauth2 (0.8.0)
       faraday (~> 0.8)
       httpauth (~> 0.1)
@@ -207,39 +207,39 @@ GEM
       cucumber (>= 0.8)
       rake
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.3)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
+    rails (3.2.11)
+      actionmailer (= 3.2.11)
+      actionpack (= 3.2.11)
+      activerecord (= 3.2.11)
+      activeresource (= 3.2.11)
+      activesupport (= 3.2.11)
       bundler (~> 1.0)
-      railties (= 3.2.9)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
+      railties (= 3.2.11)
+    railties (3.2.11)
+      actionpack (= 3.2.11)
+      activesupport (= 3.2.11)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.2)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
     redis (3.0.2)
     redis-namespace (1.2.1)
       redis (~> 3.0.0)
-    rspec-core (2.12.1)
-    rspec-expectations (2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
-    rspec-rails (2.12.0)
+    rspec-mocks (2.12.1)
+    rspec-rails (2.12.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -247,12 +247,12 @@ GEM
       rspec-expectations (~> 2.12.0)
       rspec-mocks (~> 2.12.0)
     rubyzip (0.9.9)
-    sass (3.2.3)
+    sass (3.2.5)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.27.1)
+    selenium-webdriver (2.27.2)
       childprocess (>= 0.2.5)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
@@ -287,7 +287,7 @@ GEM
     term-ansicolor (1.0.7)
     thor (0.16.0)
     tilt (1.3.3)
-    timers (1.0.1)
+    timers (1.0.2)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
@@ -299,7 +299,7 @@ GEM
       macaddr (~> 1.0)
     warden (1.0.6)
       rack (>= 1.0)
-    websocket (1.0.4)
+    websocket (1.0.6)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 

data/spec/models/user_spec.rb

@@ -169,13 +169,13 @@ describe User do
 
     before do
       site_settings.update_attributes(:total_yearly_pto_per_user => 40)
-      work_unit1.update_attributes(:hours => 2, :hours_type => 'PTO', :scheduled_at => Date.today)
-      work_unit2.update_attributes(:hours => 3, :hours_type => 'PTO', :scheduled_at => 1.days.from_now)
+      work_unit1.update_attributes(:hours => 2, :hours_type => 'PTO', :scheduled_at => Date.today.beginning_of_year + 1.day)
+      work_unit2.update_attributes(:hours => 3, :hours_type => 'PTO', :scheduled_at => Date.today.beginning_of_year + 2.days)
       work_unit3.update_attributes(:hours => 5, :hours_type => 'PTO', :scheduled_at => '2010-12-31')
     end
 
     it 'returns the number of PTO hours left for the given year as of the passed date' do
-      should == 35
+      should == BigDecimal("35")
     end
   end
 

data/xrono.gemspec

@@ -4,9 +4,9 @@ Gem::Specification.new do |s|
   s.summary = 'An asset and time tracking application for consultants and consulting companies.'
   s.description = 'Xrono is an asset and time tracking application for consultants and consulting companies.'
   s.files = `git ls-files`.split("\n")
-  s.version = %q(1.0.0)
+  s.version = %q(1.0.1)
 
-  s.add_dependency 'rails', '~> 3.2.8'
+  s.add_dependency 'rails', '~> 3.2.11'
   s.add_dependency 'acl9', '~> 0.12.0'
   s.add_dependency 'devise', '~> 1.4.9'
   s.add_dependency 'gravtastic', '~> 3.2.6'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xrono
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-29 00:00:00.000000000 Z
+date: 2013-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -20,7 +20,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 3.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 3.2.11
 - !ruby/object:Gem::Dependency
   name: acl9
   requirement: !ruby/object:Gem::Requirement