trusty-cms 2.0.12 → 2.0.13

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 (11) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -0
  3. data/Gemfile.lock +2 -1
  4. data/lib/generators/instance/templates/databases/mysql.yml +3 -3
  5. data/lib/generators/instance/templates/instance_gemfile +2 -2
  6. data/lib/generators/trusty_cms/templates/database.yml.erb +4 -4
  7. data/lib/tasks/framework.rake +1 -1
  8. data/lib/trusty_cms.rb +1 -1
  9. data/spec/ci/database.mysql.yml +1 -1
  10. data/spec/dummy/config/database.yml +4 -4
  11. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 089cfcac8dd63fbb4a1b9a483563d1c867625461
4
- data.tar.gz: 7881835c1f9948c3fc35ec73f0587a4114546ce5
3
+ metadata.gz: 87bc5cecdef6ecf91497bd8f6407f450bf248514
4
+ data.tar.gz: 570e24329c78c50c4201c18194204bdd33899fda
5
5
  SHA512:
6
- metadata.gz: a3e7047eb4b73c4529e0c29c5208ec2d9a9624f5db4822b0e71ca37f3bda8f44536c0e957aed6a7abb06f5a8698b08c89ab0e856cad5f395a80f237be82adeab
7
- data.tar.gz: 484bf08a38c934e81b11b72bd46a9017c6e737d51e6a0de5b9bf7ad5d215ebb47ce023c008258c20d68d1ed714670cd734ab1693e23350f90601fe831fcd4011
6
+ metadata.gz: 555b21bf4896f724cbf73036d5153e24db1894e6aed6cee9c8816c5e3d56d1cb114b1b6b299be26326c38282ef24d828f1c00b1a341115af2c9bb06c398dc76d
7
+ data.tar.gz: 826f28f3dbfef19fbd7865f6d89d5787986f7d793a9f567487cc122f3b782c17bec338140649d3051d05fc10a3a8fc63e56046493664cbf94d4cb876d9a06d9f
data/Gemfile CHANGED
@@ -46,4 +46,5 @@ group :development, :test do
46
46
  gem 'rails-observers'
47
47
  gem "protected_attributes"
48
48
  gem "pry-byebug"
49
+ gem 'mysql2', '~> 0.4.2'
49
50
  end
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (2.0.12)
4
+ trusty-cms (2.0.13)
5
5
  RedCloth (~> 4.2)
6
6
  acts_as_tree (~> 2.1)
7
7
  bundler (~> 1.7)
@@ -299,6 +299,7 @@ DEPENDENCIES
299
299
  database_cleaner (~> 1.3.0)
300
300
  factory_girl_rails (~> 4.5.0)
301
301
  launchy (~> 2.4.2)
302
+ mysql2 (~> 0.4.2)
302
303
  poltergeist (~> 1.5.1)
303
304
  protected_attributes
304
305
  pry (~> 0.10.0)
data/lib/generators/instance/templates/databases/mysql.yml CHANGED
@@ -11,7 +11,7 @@
11
11
  # And be sure to use new-style password hashing:
12
12
  # http://dev.mysql.com/doc/refman/5.0/en/old-client.html
13
13
  development:
14
- adapter: mysql
14
+ adapter: mysql2
15
15
  database: <%= app_name %>_development
16
16
  username: root
17
17
  password:
@@ -25,7 +25,7 @@ development:
25
25
  # re-generated from your development database when you run 'rake'.
26
26
  # Do not set this db to the same as development or production.
27
27
  test:
28
- adapter: mysql
28
+ adapter: mysql2
29
29
  database: <%= app_name %>_test
30
30
  username: root
31
31
  password:
@@ -36,7 +36,7 @@ test:
36
36
  <% end -%>
37
37
 
38
38
  production:
39
- adapter: mysql
39
+ adapter: mysql2
40
40
  database: <%= app_name %>_production
41
41
  username: root
42
42
  password:
data/lib/generators/instance/templates/instance_gemfile CHANGED
@@ -20,8 +20,8 @@ gem "compass-rails", "~> 1.0.3"
20
20
  # SQLite is the default database connection but only suitable for local use
21
21
  <%= '# ' unless db == 'sqlite3' %>gem "sqlite3", "~> 1.3.5"
22
22
 
23
- # To use MySQL
24
- <%= '# ' unless db == 'mysql' %>gem "mysql", "~> 2.8.1"
23
+ # To use MySQL2
24
+ <%= '# ' unless db == 'mysql2' %>"mysql2", "~> 0.4.2"
25
25
 
26
26
  # Postgres
27
27
  <%= '# ' unless db == 'postgresql' %>gem "pg", "~> 0.11.0"
data/lib/generators/trusty_cms/templates/database.yml.erb CHANGED
@@ -4,25 +4,25 @@
4
4
  #
5
5
 
6
6
  development:
7
- adapter: mysql
7
+ adapter: mysql2
8
8
  database: <%= project_name%>_blank_dev
9
9
  username:
10
10
  password:
11
11
  host: localhost
12
12
 
13
13
  test: &TEST
14
- adapter: mysql
14
+ adapter: mysql2
15
15
  database: <%= project_name%>_blank_test
16
16
  username:
17
17
  password:
18
18
  host:
19
19
 
20
20
  production:
21
- adapter: mysql
21
+ adapter: mysql2
22
22
  database: <%= project_name%>_blank_live
23
23
  username:
24
24
  password:
25
25
  socket: /tmp/mysql.sock
26
26
 
27
27
  cucumber:
28
- <<: *TEST
28
+ <<: *TEST
data/lib/tasks/framework.rake CHANGED
@@ -120,7 +120,7 @@ unless File.directory? "#{Rails.root}/app"
120
120
 
121
121
  db_gems = {
122
122
  'sqlite3' => 'sqlite3',
123
- 'mysql' => 'mysql',
123
+ 'mysql2' => 'mysql2',
124
124
  'pg' => 'postgresql',
125
125
  'db2' => 'db2',
126
126
  'activerecord-sqlserver-adapter' => 'sqlserver'
data/lib/trusty_cms.rb CHANGED
@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
2
2
 
3
3
  unless defined? TrustyCms::VERSION
4
4
  module TrustyCms
5
- VERSION = "2.0.12"
5
+ VERSION = "2.0.13"
6
6
  end
7
7
  end
data/spec/ci/database.mysql.yml CHANGED
@@ -1,4 +1,4 @@
1
1
  test: &TEST
2
- adapter: mysql
2
+ adapter: mysql2
3
3
  database: radiant_test
4
4
  username:
data/spec/dummy/config/database.yml CHANGED
@@ -4,25 +4,25 @@
4
4
  #
5
5
 
6
6
  development:
7
- adapter: mysql
7
+ adapter: mysql2
8
8
  database: trusty_cms_dev
9
9
  username: root
10
10
  password:
11
11
  host: localhost
12
12
 
13
13
  test: &TEST
14
- adapter: mysql
14
+ adapter: mysql2
15
15
  database: trusty_cms_test
16
16
  username: root
17
17
  password:
18
18
  host: localhost
19
19
 
20
20
  production:
21
- adapter: mysql
21
+ adapter: mysql2
22
22
  database: trusty_cms_live
23
23
  username: root
24
24
  password:
25
25
  socket: /tmp/mysql.sock
26
26
 
27
27
  cucumber:
28
- <<: *TEST
28
+ <<: *TEST
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trusty-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.12
4
+ version: 2.0.13
5
5
  platform: ruby
6
6
  authors:
7
7
  - TrustyCms CMS dev team