flatiron-rails 1.0.9 → 1.0.10

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f9941a3448a19f2c89c444af18d8867df39507be
4
- data.tar.gz: 2451a304747378379af7e9583a6792beb24b5678
3
+ metadata.gz: d300dd9d7a7cae878aa0087769a61fc20033a646
4
+ data.tar.gz: c06f1f5709963fdb521084ac1445521b0ff8fc3f
5
5
  SHA512:
6
- metadata.gz: 7c4d0cb873c5b8fd2ba391101e35c55b8fd72be05cbb66d52e2bc7de6cc11d3c7d9ae605a32f3096949b4b992019f2ea0b3e1c962261ffcd6fc28df689a71cdd
7
- data.tar.gz: fc4b73163f2c6794b63cceee3ac80ce75a7a8c947c88d43c77f49d29adf1cac2337cec5b75682ed1f5eab31c72226a9a4a9279b7ed0432903867806f8ffdaf88
6
+ metadata.gz: eecefddba3f9bbcebc7af5048664d332b402e3d6cceceb43139f0ca8f4b264e574b21fd00e7fcf4abece0e360eda15a71a9379b6b6e70d6ae353520967c9e3ff
7
+ data.tar.gz: 2ba5e5056e26203e96d9a84df66a64d28f99add6d79724a057c0162a47432437260a1408a8b398548f09d484e6e6bf17d04f880f947b38dcb9789f98b01c6d38
@@ -4,7 +4,7 @@ class FlatironRails
4
4
  def self.run
5
5
  if ['-v', '--version'].include?(ARGV[0])
6
6
  puts <<-VERSION.gsub(/^ {6}/, '')
7
- Flatiron Rails 1.0.9
7
+ Flatiron Rails 1.0.10
8
8
  VERSION
9
9
  elsif ARGV[0].nil? || ['-h','--help'].include?(ARGV[0]) || ARGV[0] != "new" || ARGV[2]
10
10
  puts <<-HELP.gsub(/^ {6}/, '')
@@ -74,10 +74,10 @@ def add_line_to_file(file, line_to_add, line_to_add_after)
74
74
  end
75
75
  end
76
76
 
77
- # Remove sqlite3 from default gem group and set Ruby version to 2.1.0
77
+ # Remove sqlite3 from default gem group and set Ruby version to 2.1.2
78
78
  remove_line_from_file("Gemfile", "sqlite3")
79
79
  file '.ruby-version', <<-RVM.strip_heredoc.chomp
80
- 2.1.0
80
+ 2.1.2
81
81
  RVM
82
82
 
83
83
  # Setup gem groups
@@ -181,7 +181,7 @@ File.open("Gemfile", "r+") do |f|
181
181
  out = ""
182
182
  f.each do |line|
183
183
  if line =~ /gem 'rails'/
184
- out << "#{line.gsub(/, '(.*)'/, ', \'4.1.0rc2\'')}"
184
+ out << "#{line.gsub(/, '(.*)'/, ', \'4.1.1\'')}"
185
185
  else
186
186
  out << line
187
187
  end
@@ -503,6 +503,29 @@ def setup_secrets_yml_for_ninefold
503
503
  add_secret_for(ninefold_pass: 'NINEFOLD DATABASE PASSWORD HERE', env: :production)
504
504
  end
505
505
 
506
+ def fix_new_database_yml_for_heroku
507
+ File.open("config/database.yml", "r+") do |f|
508
+ out = ""
509
+ f.each do |line|
510
+ if line =~ /production:/
511
+ out << <<-DB.gsub(/^ {10}/, '')
512
+ production:
513
+ url: <%= ENV["DATABASE_URL"] %>
514
+ DB
515
+ else
516
+ if !out.include?('production:')
517
+ out << line
518
+ end
519
+ end
520
+ end
521
+ f.pos = 0
522
+ f.print out.chomp
523
+ f.truncate(f.pos)
524
+ end
525
+ end
526
+
527
+ fix_new_database_yml_for_heroku
528
+
506
529
  # Change setup for Ninefold
507
530
  if yes?("Set up for Ninefold instead of Heroku? [y/N]")
508
531
  setup_database_yml_for_ninefold
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: flatiron-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.9
4
+ version: 1.0.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Arel English
@@ -16,16 +16,22 @@ dependencies:
16
16
  name: rails
17
17
  requirement: !ruby/object:Gem::Requirement
18
18
  requirements:
19
+ - - "~>"
20
+ - !ruby/object:Gem::Version
21
+ version: '4.1'
19
22
  - - ">="
20
23
  - !ruby/object:Gem::Version
21
- version: 4.1.0.rc2
24
+ version: 4.1.1
22
25
  type: :runtime
23
26
  prerelease: false
24
27
  version_requirements: !ruby/object:Gem::Requirement
25
28
  requirements:
29
+ - - "~>"
30
+ - !ruby/object:Gem::Version
31
+ version: '4.1'
26
32
  - - ">="
27
33
  - !ruby/object:Gem::Version
28
- version: 4.1.0.rc2
34
+ version: 4.1.1
29
35
  description: Sets up a rails application using the default Flatiron School stack.
30
36
  email: logan@flatironschool.com
31
37
  executables: