gaku 0.2.1 → 0.2.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (15) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +4 -0
  3. data/.travis.yml +1 -1
  4. data/Gemfile +2 -0
  5. data/VERSION +1 -1
  6. data/common_gaku_dependencies.rb +1 -1
  7. data/core/app/assets/images/gaku-logo.png +0 -0
  8. data/core/core_dependencies.rb +1 -1
  9. data/core/gaku_core.gemspec +6 -6
  10. data/core/lib/gaku/testing/factories/class_group_factory.rb +1 -1
  11. data/frontend/app/views/gaku/shared/_menubar.html.slim +1 -1
  12. data/testing/lib/gaku/testing/spec_helpers/spec_helper.rb +1 -1
  13. data/testing/lib/gaku/testing/spec_helpers/spec_helper_controllers.rb +1 -1
  14. data/testing/lib/gaku/testing/spec_helpers/spec_helper_models.rb +1 -1
  15. metadata +14 -13
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0f039d101203dc3c37c9494a937dfd8c6bd866cd
4
- data.tar.gz: cf6c2a56723916a603e939da8a283933d8b49064
3
+ metadata.gz: 61cd12f8ec08530ead7130e07f3a996328ce0223
4
+ data.tar.gz: ea89a634dc8e7a644a71e21aae97d3c3e97d6645
5
5
  SHA512:
6
- metadata.gz: 41b766192e6e2548b0a9337f36c0d93be08f6a390938a353e7878c5876fe77e832bde9551be346f66099236b378a040e3e06b43fe0427dfad428d05862ba362e
7
- data.tar.gz: 711a30d75650c113aa32a36aad6466d7c66e4d068add5cdb56b41e63e57054d53119a0cb9168c13180a92a2df0a18aa79d9ba53f2448391d84f1ff4befdf1a36
6
+ metadata.gz: cac9f742c3f0d4a76a5aa81a3b4386b96d30e08c1b0f904f67288828b872f1b75d449bf81155349dd2e21d2e0328111818c4dafe0b290b7bfb11efcf36117ce1
7
+ data.tar.gz: 864492eb9bf19cc743dcb9638bef733789aee8d64fb7fbabc1cd2718d49399fd9062edf2b10d61c1c481d252a84a8c19f5522ba69d68512bff4eb06a75945e0d
data/.gitignore CHANGED
@@ -82,3 +82,7 @@ realtime_grading/node_modules/
82
82
 
83
83
  # bundle folders
84
84
  **/.bundle
85
+
86
+ **/.ruby-version
87
+ **/.ruby-gemset
88
+
data/.travis.yml CHANGED
@@ -1,7 +1,7 @@
1
1
  language: ruby
2
2
 
3
3
  rvm:
4
- - 2.1
4
+ - 2.2
5
5
 
6
6
  services:
7
7
  - redis-server
data/Gemfile CHANGED
@@ -1,3 +1,5 @@
1
+ source 'https://rubygems.org'
2
+
1
3
  eval(File.read(File.dirname(__FILE__) + '/common_gaku_dependencies.rb'))
2
4
 
3
5
  gemspec
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.2.1
1
+ 0.2.2
data/common_gaku_dependencies.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  group :test do
2
- gem 'capybara', '~> 2.1'
2
+ gem 'capybara', '~> 2.4'
3
3
  gem 'selenium-webdriver', '2.43'
4
4
  gem 'poltergeist'
5
5
  gem 'launchy'
data/core/core_dependencies.rb CHANGED
@@ -16,7 +16,7 @@ end
16
16
 
17
17
  group :test do
18
18
  gem 'rspec-rails', '~> 2.14.1'
19
- gem 'factory_girl_rails', '~> 4.4.0'
19
+ gem 'factory_girl_rails', '~> 4.5.0'
20
20
  gem 'database_cleaner', '~> 1.3.0'
21
21
  gem 'shoulda-matchers', '~> 2.8.0'
22
22
  gem 'simplecov'
data/core/gaku_core.gemspec CHANGED
@@ -19,21 +19,21 @@ Gem::Specification.new do |s|
19
19
  s.add_dependency 'rails', '~> 4.2.0'
20
20
  s.add_dependency 'rails-i18n', '~> 4.0.2'
21
21
 
22
- s.add_dependency 'pg', '0.17.1'
23
- s.add_dependency 'redis', '3.0.7'
22
+ s.add_dependency 'pg', '~> 0.18'
23
+ s.add_dependency 'redis', '~> 3.2'
24
24
 
25
25
  s.add_dependency 'globalize', '~> 5.0.0'
26
26
  s.add_dependency 'paperclip', '~> 3.5'
27
27
  s.add_dependency 'ransack', '~> 1.6.0'
28
- s.add_dependency 'kaminari', '~> 0.15.1'
29
- s.add_dependency 'draper', '~> 1.3.0'
28
+ s.add_dependency 'kaminari', '~> 0.16'
29
+ s.add_dependency 'draper', '~> 1.4'
30
30
  s.add_dependency 'deface', '~> 1.0.0'
31
31
 
32
32
  s.add_dependency 'devise', '~> 3.4.1'
33
33
  s.add_dependency 'devise-i18n'
34
34
  s.add_dependency 'cancan', '~> 1.6.10'
35
35
 
36
- s.add_dependency 'highline', '1.6.11'
37
- s.add_dependency 'ffaker', '~> 1.23.0'
36
+ s.add_dependency 'highline'
37
+ s.add_dependency 'ffaker', '~> 1.32'
38
38
  s.add_dependency 'rake-progressbar'
39
39
  end
data/core/lib/gaku/testing/factories/class_group_factory.rb CHANGED
@@ -11,7 +11,7 @@ FactoryGirl.define do
11
11
  end
12
12
 
13
13
  factory :class_group_with_active_semester do
14
- ignore do
14
+ transient do
15
15
  semester { create(:active_semester) }
16
16
  end
17
17
 
data/frontend/app/views/gaku/shared/_menubar.html.slim CHANGED
@@ -1,6 +1,6 @@
1
1
  nav.navbar.navbar-inverse.navbar-fixed-top role="navigation"
2
2
  .navbar-header
3
- a.navbar-brand href=root_path = image_tag('gaku-logo.svg')
3
+ a.navbar-brand href=root_path = image_tag('gaku-logo.png')
4
4
  - if user_signed_in?
5
5
  = render partial: "gaku/shared/menu/global"
6
6
  = render partial: "gaku/shared/login_widget"
data/testing/lib/gaku/testing/spec_helpers/spec_helper.rb CHANGED
@@ -18,7 +18,7 @@ require 'gaku/core/url_helpers'
18
18
 
19
19
  # require 'gaku/testing/support/features'
20
20
 
21
- ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
21
+ # ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
22
22
 
23
23
  RSpec.configure do |config|
24
24
 
data/testing/lib/gaku/testing/spec_helpers/spec_helper_controllers.rb CHANGED
@@ -19,7 +19,7 @@ require 'gaku/core/url_helpers'
19
19
 
20
20
  # require 'gaku/testing/support/controllers'
21
21
 
22
- ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
22
+ # ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
23
23
 
24
24
  RSpec.configure do |config|
25
25
 
data/testing/lib/gaku/testing/spec_helpers/spec_helper_models.rb CHANGED
@@ -15,7 +15,7 @@ require 'shoulda-matchers'
15
15
  require 'gaku/testing/factories'
16
16
 
17
17
  Dir["#{File.dirname(__FILE__)}/support/models/**/*.rb"].each { |f| require f }
18
- ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
18
+ # ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
19
19
 
20
20
  RSpec.configure do |config|
21
21
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gaku
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.1
4
+ version: 0.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Rei Kagetsuki
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2015-02-15 00:00:00.000000000 Z
14
+ date: 2015-02-23 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: gaku_core
@@ -19,70 +19,70 @@ dependencies:
19
19
  requirements:
20
20
  - - '='
21
21
  - !ruby/object:Gem::Version
22
- version: 0.2.1
22
+ version: 0.2.2
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
27
  - - '='
28
28
  - !ruby/object:Gem::Version
29
- version: 0.2.1
29
+ version: 0.2.2
30
30
  - !ruby/object:Gem::Dependency
31
31
  name: gaku_admin
32
32
  requirement: !ruby/object:Gem::Requirement
33
33
  requirements:
34
34
  - - '='
35
35
  - !ruby/object:Gem::Version
36
- version: 0.2.1
36
+ version: 0.2.2
37
37
  type: :runtime
38
38
  prerelease: false
39
39
  version_requirements: !ruby/object:Gem::Requirement
40
40
  requirements:
41
41
  - - '='
42
42
  - !ruby/object:Gem::Version
43
- version: 0.2.1
43
+ version: 0.2.2
44
44
  - !ruby/object:Gem::Dependency
45
45
  name: gaku_frontend
46
46
  requirement: !ruby/object:Gem::Requirement
47
47
  requirements:
48
48
  - - '='
49
49
  - !ruby/object:Gem::Version
50
- version: 0.2.1
50
+ version: 0.2.2
51
51
  type: :runtime
52
52
  prerelease: false
53
53
  version_requirements: !ruby/object:Gem::Requirement
54
54
  requirements:
55
55
  - - '='
56
56
  - !ruby/object:Gem::Version
57
- version: 0.2.1
57
+ version: 0.2.2
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: gaku_testing
60
60
  requirement: !ruby/object:Gem::Requirement
61
61
  requirements:
62
62
  - - '='
63
63
  - !ruby/object:Gem::Version
64
- version: 0.2.1
64
+ version: 0.2.2
65
65
  type: :runtime
66
66
  prerelease: false
67
67
  version_requirements: !ruby/object:Gem::Requirement
68
68
  requirements:
69
69
  - - '='
70
70
  - !ruby/object:Gem::Version
71
- version: 0.2.1
71
+ version: 0.2.2
72
72
  - !ruby/object:Gem::Dependency
73
73
  name: gaku_sample
74
74
  requirement: !ruby/object:Gem::Requirement
75
75
  requirements:
76
76
  - - '='
77
77
  - !ruby/object:Gem::Version
78
- version: 0.2.1
78
+ version: 0.2.2
79
79
  type: :runtime
80
80
  prerelease: false
81
81
  version_requirements: !ruby/object:Gem::Requirement
82
82
  requirements:
83
83
  - - '='
84
84
  - !ruby/object:Gem::Version
85
- version: 0.2.1
85
+ version: 0.2.2
86
86
  description: GAKU Engine is a highly customizable Open Source School Management System.
87
87
  It offers extensions to exceed the bounds of a standardized curriculum, and original
88
88
  tools to augment the learning experience.It is the engine to drive a more dynamic
@@ -608,6 +608,7 @@ files:
608
608
  - core/app/assets/images/elements/toolbar1.png
609
609
  - core/app/assets/images/gaku-logo-gear.png
610
610
  - core/app/assets/images/gaku-logo-gear.svg
611
+ - core/app/assets/images/gaku-logo.png
611
612
  - core/app/assets/images/gaku-logo.svg
612
613
  - core/app/assets/images/gakuengine.png
613
614
  - core/app/assets/images/gakuengine20.png
@@ -1739,7 +1740,7 @@ licenses:
1739
1740
  metadata: {}
1740
1741
  post_install_message: |
1741
1742
  ╔═════════════════════════╼
1742
- ║⚙学 GAKU Engine [学エンジン] V.0.2.1
1743
+ ║⚙学 GAKU Engine [学エンジン] V.0.2.2
1743
1744
  ╟─────────────────────────╼
1744
1745
  ║©2014 幻信創造株式会社 [Phantom Creation Inc.]
1745
1746
  ║http://www.gakuengine.com