xrono 1.0.0 → 1.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. data/.gitignore +1 -0
  2. data/.travis.yml +1 -1
  3. data/Gemfile.lock +44 -44
  4. data/spec/models/user_spec.rb +3 -3
  5. data/xrono.gemspec +2 -2
  6. metadata +4 -4
data/.gitignore CHANGED
@@ -17,3 +17,4 @@ tags
17
17
  node_modules
18
18
  .sass-cache/*
19
19
  spec/reports
20
+ *.gem
data/.travis.yml CHANGED
@@ -1,8 +1,8 @@
1
1
  before_script:
2
2
  - "sh -e /etc/init.d/xvfb start"
3
3
  - "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;"
4
- - "bundle exec rake db:create db:migrate db:test:clone > /dev/null"
5
4
  script:
5
+ - "bundle exec rake db:create db:migrate db:test:clone"
6
6
  - "DISPLAY=:99.0 bundle exec rspec ./spec/"
7
7
  - "DISPLAY=:99.0 bundle exec cucumber"
8
8
  notifications:
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- xrono (1.0.0)
4
+ xrono (1.0.1)
5
5
  acl9 (~> 0.12.0)
6
6
  acts-as-taggable-on (~> 2.2.2)
7
7
  acts_as_commentable (~> 3.0.1)
@@ -20,7 +20,7 @@ PATH
20
20
  oauth2
21
21
  paper_trail (~> 2.6.0)
22
22
  paperclip (~> 2.3)
23
- rails (~> 3.2.8)
23
+ rails (~> 3.2.11)
24
24
  rake (~> 10.0)
25
25
  sass-rails (~> 3.2.0)
26
26
  sidekiq (= 2.0.3)
@@ -32,12 +32,12 @@ GEM
32
32
  remote: http://rubygems.org/
33
33
  specs:
34
34
  acl9 (0.12.0)
35
- actionmailer (3.2.9)
36
- actionpack (= 3.2.9)
35
+ actionmailer (3.2.11)
36
+ actionpack (= 3.2.11)
37
37
  mail (~> 2.4.4)
38
- actionpack (3.2.9)
39
- activemodel (= 3.2.9)
40
- activesupport (= 3.2.9)
38
+ actionpack (3.2.11)
39
+ activemodel (= 3.2.11)
40
+ activesupport (= 3.2.11)
41
41
  builder (~> 3.0.0)
42
42
  erubis (~> 2.7.0)
43
43
  journey (~> 1.0.4)
@@ -45,18 +45,18 @@ GEM
45
45
  rack-cache (~> 1.2)
46
46
  rack-test (~> 0.6.1)
47
47
  sprockets (~> 2.2.1)
48
- activemodel (3.2.9)
49
- activesupport (= 3.2.9)
48
+ activemodel (3.2.11)
49
+ activesupport (= 3.2.11)
50
50
  builder (~> 3.0.0)
51
- activerecord (3.2.9)
52
- activemodel (= 3.2.9)
53
- activesupport (= 3.2.9)
51
+ activerecord (3.2.11)
52
+ activemodel (= 3.2.11)
53
+ activesupport (= 3.2.11)
54
54
  arel (~> 3.0.2)
55
55
  tzinfo (~> 0.3.29)
56
- activeresource (3.2.9)
57
- activemodel (= 3.2.9)
58
- activesupport (= 3.2.9)
59
- activesupport (3.2.9)
56
+ activeresource (3.2.11)
57
+ activemodel (= 3.2.11)
58
+ activesupport (= 3.2.11)
59
+ activesupport (3.2.11)
60
60
  i18n (~> 0.6)
61
61
  multi_json (~> 1.0)
62
62
  acts-as-taggable-on (2.2.2)
@@ -77,7 +77,7 @@ GEM
77
77
  net-sftp (>= 2.0.0)
78
78
  net-ssh (>= 2.0.14)
79
79
  net-ssh-gateway (>= 1.1.0)
80
- capybara (1.1.2)
80
+ capybara (1.1.4)
81
81
  mime-types (>= 1.16)
82
82
  nokogiri (>= 1.3.3)
83
83
  rack (>= 1.0.0)
@@ -88,7 +88,7 @@ GEM
88
88
  timers (>= 1.0.0)
89
89
  childprocess (0.3.6)
90
90
  ffi (~> 1.0, >= 1.0.6)
91
- chunky_png (1.2.6)
91
+ chunky_png (1.2.7)
92
92
  ci_reporter (1.8.3)
93
93
  builder (>= 2.1.2)
94
94
  cocaine (0.4.2)
@@ -99,7 +99,7 @@ GEM
99
99
  coffee-script-source
100
100
  execjs
101
101
  coffee-script-source (1.4.0)
102
- combustion (0.3.2)
102
+ combustion (0.3.3)
103
103
  rails (>= 3.0.0)
104
104
  thor (>= 0.14.6)
105
105
  compass (0.12.alpha.0)
@@ -107,7 +107,7 @@ GEM
107
107
  fssm (>= 0.2.7)
108
108
  sass (~> 3.1)
109
109
  configuration (1.3.2)
110
- connection_pool (0.9.2)
110
+ connection_pool (0.9.3)
111
111
  css3-progress-bar-rails (0.2.2)
112
112
  rails
113
113
  cucumber (1.1.9)
@@ -133,7 +133,7 @@ GEM
133
133
  i18n (~> 0.4)
134
134
  faraday (0.8.4)
135
135
  multipart-post (~> 1.1)
136
- ffi (1.2.0)
136
+ ffi (1.3.0)
137
137
  forgery (0.3.10)
138
138
  nokogiri (~> 1.4)
139
139
  fssm (0.2.9)
@@ -146,7 +146,7 @@ GEM
146
146
  grit (2.4.1)
147
147
  diff-lcs (~> 1.1)
148
148
  mime-types (~> 1.15)
149
- haml (3.1.6)
149
+ haml (3.1.7)
150
150
  highline (1.6.15)
151
151
  hike (1.2.1)
152
152
  httpauth (0.2.0)
@@ -155,7 +155,7 @@ GEM
155
155
  jquery-rails (1.0.19)
156
156
  railties (~> 3.0)
157
157
  thor (~> 0.14)
158
- json (1.7.5)
158
+ json (1.7.6)
159
159
  jwt (0.1.5)
160
160
  multi_json (>= 1.0)
161
161
  kramdown (0.14.1)
@@ -186,7 +186,7 @@ GEM
186
186
  net-ssh (2.6.2)
187
187
  net-ssh-gateway (1.1.0)
188
188
  net-ssh (>= 1.99.1)
189
- nokogiri (1.5.5)
189
+ nokogiri (1.5.6)
190
190
  oauth2 (0.8.0)
191
191
  faraday (~> 0.8)
192
192
  httpauth (~> 0.1)
@@ -207,39 +207,39 @@ GEM
207
207
  cucumber (>= 0.8)
208
208
  rake
209
209
  polyglot (0.3.3)
210
- rack (1.4.1)
210
+ rack (1.4.3)
211
211
  rack-cache (1.2)
212
212
  rack (>= 0.4)
213
213
  rack-ssl (1.3.2)
214
214
  rack
215
215
  rack-test (0.6.2)
216
216
  rack (>= 1.0)
217
- rails (3.2.9)
218
- actionmailer (= 3.2.9)
219
- actionpack (= 3.2.9)
220
- activerecord (= 3.2.9)
221
- activeresource (= 3.2.9)
222
- activesupport (= 3.2.9)
217
+ rails (3.2.11)
218
+ actionmailer (= 3.2.11)
219
+ actionpack (= 3.2.11)
220
+ activerecord (= 3.2.11)
221
+ activeresource (= 3.2.11)
222
+ activesupport (= 3.2.11)
223
223
  bundler (~> 1.0)
224
- railties (= 3.2.9)
225
- railties (3.2.9)
226
- actionpack (= 3.2.9)
227
- activesupport (= 3.2.9)
224
+ railties (= 3.2.11)
225
+ railties (3.2.11)
226
+ actionpack (= 3.2.11)
227
+ activesupport (= 3.2.11)
228
228
  rack-ssl (~> 1.3.2)
229
229
  rake (>= 0.8.7)
230
230
  rdoc (~> 3.4)
231
231
  thor (>= 0.14.6, < 2.0)
232
- rake (10.0.2)
232
+ rake (10.0.3)
233
233
  rdoc (3.12)
234
234
  json (~> 1.4)
235
235
  redis (3.0.2)
236
236
  redis-namespace (1.2.1)
237
237
  redis (~> 3.0.0)
238
- rspec-core (2.12.1)
239
- rspec-expectations (2.12.0)
238
+ rspec-core (2.12.2)
239
+ rspec-expectations (2.12.1)
240
240
  diff-lcs (~> 1.1.3)
241
- rspec-mocks (2.12.0)
242
- rspec-rails (2.12.0)
241
+ rspec-mocks (2.12.1)
242
+ rspec-rails (2.12.1)
243
243
  actionpack (>= 3.0)
244
244
  activesupport (>= 3.0)
245
245
  railties (>= 3.0)
@@ -247,12 +247,12 @@ GEM
247
247
  rspec-expectations (~> 2.12.0)
248
248
  rspec-mocks (~> 2.12.0)
249
249
  rubyzip (0.9.9)
250
- sass (3.2.3)
250
+ sass (3.2.5)
251
251
  sass-rails (3.2.5)
252
252
  railties (~> 3.2.0)
253
253
  sass (>= 3.1.10)
254
254
  tilt (~> 1.3)
255
- selenium-webdriver (2.27.1)
255
+ selenium-webdriver (2.27.2)
256
256
  childprocess (>= 0.2.5)
257
257
  libwebsocket (~> 0.1.3)
258
258
  multi_json (~> 1.0)
@@ -287,7 +287,7 @@ GEM
287
287
  term-ansicolor (1.0.7)
288
288
  thor (0.16.0)
289
289
  tilt (1.3.3)
290
- timers (1.0.1)
290
+ timers (1.0.2)
291
291
  treetop (1.4.12)
292
292
  polyglot
293
293
  polyglot (>= 0.3.1)
@@ -299,7 +299,7 @@ GEM
299
299
  macaddr (~> 1.0)
300
300
  warden (1.0.6)
301
301
  rack (>= 1.0)
302
- websocket (1.0.4)
302
+ websocket (1.0.6)
303
303
  xpath (0.1.4)
304
304
  nokogiri (~> 1.3)
305
305
 
data/spec/models/user_spec.rb CHANGED
@@ -169,13 +169,13 @@ describe User do
169
169
 
170
170
  before do
171
171
  site_settings.update_attributes(:total_yearly_pto_per_user => 40)
172
- work_unit1.update_attributes(:hours => 2, :hours_type => 'PTO', :scheduled_at => Date.today)
173
- work_unit2.update_attributes(:hours => 3, :hours_type => 'PTO', :scheduled_at => 1.days.from_now)
172
+ work_unit1.update_attributes(:hours => 2, :hours_type => 'PTO', :scheduled_at => Date.today.beginning_of_year + 1.day)
173
+ work_unit2.update_attributes(:hours => 3, :hours_type => 'PTO', :scheduled_at => Date.today.beginning_of_year + 2.days)
174
174
  work_unit3.update_attributes(:hours => 5, :hours_type => 'PTO', :scheduled_at => '2010-12-31')
175
175
  end
176
176
 
177
177
  it 'returns the number of PTO hours left for the given year as of the passed date' do
178
- should == 35
178
+ should == BigDecimal("35")
179
179
  end
180
180
  end
181
181
 
data/xrono.gemspec CHANGED
@@ -4,9 +4,9 @@ Gem::Specification.new do |s|
4
4
  s.summary = 'An asset and time tracking application for consultants and consulting companies.'
5
5
  s.description = 'Xrono is an asset and time tracking application for consultants and consulting companies.'
6
6
  s.files = `git ls-files`.split("\n")
7
- s.version = %q(1.0.0)
7
+ s.version = %q(1.0.1)
8
8
 
9
- s.add_dependency 'rails', '~> 3.2.8'
9
+ s.add_dependency 'rails', '~> 3.2.11'
10
10
  s.add_dependency 'acl9', '~> 0.12.0'
11
11
  s.add_dependency 'devise', '~> 1.4.9'
12
12
  s.add_dependency 'gravtastic', '~> 3.2.6'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: xrono
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.0.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2012-12-29 00:00:00.000000000 Z
14
+ date: 2013-01-12 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: rails
@@ -20,7 +20,7 @@ dependencies:
20
20
  requirements:
21
21
  - - ~>
22
22
  - !ruby/object:Gem::Version
23
- version: 3.2.8
23
+ version: 3.2.11
24
24
  type: :runtime
25
25
  prerelease: false
26
26
  version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,7 @@ dependencies:
28
28
  requirements:
29
29
  - - ~>
30
30
  - !ruby/object:Gem::Version
31
- version: 3.2.8
31
+ version: 3.2.11
32
32
  - !ruby/object:Gem::Dependency
33
33
  name: acl9
34
34
  requirement: !ruby/object:Gem::Requirement