rails_apps_composer 3.1.30 → 3.1.31

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/recipes/gems.rb +11 -2
  3. data/recipes/init.rb +2 -2
  4. data/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 66ab6587b07f3da2d8e1c81a78b33a38a7666fd9
4
- data.tar.gz: 15725ee5599b2da9e44f3fe97b013686b510558a
3
+ metadata.gz: e160f92bd97d12df93d89ecfbf2e59f63a76a448
4
+ data.tar.gz: f243f9aa76032afee47458eda65c28be8bfe87f1
5
5
  SHA512:
6
- metadata.gz: e1edfa9cc0f22820bdfffc89c0d62dee2fd38363693eae8760fdefb920ce64905a5df1bf8b8c32c52b966a0e12dcb67a895cf28dd7c950990a257f8add549150
7
- data.tar.gz: ebf072cc89a3936bd252e753d2eae37803cc19567a0fa985169f2cb86cff4ac896d515dba775ed9ff363c606ea10f4eef9d9a21cc4612c37c6bf805c6b219d5c
6
+ metadata.gz: 42c9108f6e79cd269fe21a99077879290fa9e47358703c05176a7633bdba3279890ce05ad817d3f176b9c5d82e8418f1f863a3be30da0fba76c1176d8053f6e8
7
+ data.tar.gz: c639d1ab144f9ad33594ecb709e435fd1b8730bc18156d8850fa3ed9b016ae2ef177c1b7b8aa3fc7ff1f8a36778d1091aa8aab47511b1d647930fa204aa0df6f
@@ -34,10 +34,19 @@ end
34
34
  ## Database Adapter
35
35
  gsub_file 'Gemfile', /gem 'sqlite3'\n/, '' unless prefer :database, 'sqlite'
36
36
  gsub_file 'Gemfile', /gem 'pg'.*/, ''
37
- add_gem 'pg' if prefer :database, 'postgresql'
37
+ if prefer :database, 'postgresql'
38
+ if Rails::VERSION::MAJOR < 5
39
+ add_gem 'pg', '~> 0.18'
40
+ else
41
+ if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR <= 1 && Rails::VERSION::MINOR <= 5
42
+ add_gem 'pg', '~> 0.18'
43
+ else
44
+ add_gem 'pg'
45
+ end
46
+ end
47
+ end
38
48
  gsub_file 'Gemfile', /gem 'mysql2'.*/, ''
39
49
  add_gem 'mysql2', '~> 0.3.18' if prefer :database, 'mysql'
40
-
41
50
  ## Gem to set up controllers, views, and routing in the 'apps4' recipe
42
51
  add_gem 'rails_apps_pages', :group => :development if prefs[:apps4]
43
52
 
@@ -3,9 +3,9 @@
3
3
 
4
4
  stage_three do
5
5
  say_wizard "recipe stage three"
6
+ copy_from_repo 'config/secrets.yml' if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR >= 2
7
+ copy_from_repo 'config/secrets.yml' if Rails::VERSION::MAJOR >= 6
6
8
  if (!prefs[:secrets].nil?)
7
- copy_from_repo 'config/secrets.yml' if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR >= 2
8
- copy_from_repo 'config/secrets.yml' if Rails::VERSION::MAJOR >= 6
9
9
  prefs[:secrets].each do |secret|
10
10
  env_var = " #{secret}: <%= ENV[\"#{secret.upcase}\"] %>"
11
11
  inject_into_file 'config/secrets.yml', "\n" + env_var, :after => "development:"
data/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RailsWizard
2
- VERSION = "3.1.30"
2
+ VERSION = "3.1.31"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rails_apps_composer
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.30
4
+ version: 3.1.31
5
5
  platform: ruby
6
6
  authors:
7
7
  - Daniel Kehoe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-01-19 00:00:00.000000000 Z
11
+ date: 2018-02-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: i18n