flatiron-rails 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9941a3448a19f2c89c444af18d8867df39507be
-  data.tar.gz: 2451a304747378379af7e9583a6792beb24b5678
+  metadata.gz: d300dd9d7a7cae878aa0087769a61fc20033a646
+  data.tar.gz: c06f1f5709963fdb521084ac1445521b0ff8fc3f
 SHA512:
-  metadata.gz: 7c4d0cb873c5b8fd2ba391101e35c55b8fd72be05cbb66d52e2bc7de6cc11d3c7d9ae605a32f3096949b4b992019f2ea0b3e1c962261ffcd6fc28df689a71cdd
-  data.tar.gz: fc4b73163f2c6794b63cceee3ac80ce75a7a8c947c88d43c77f49d29adf1cac2337cec5b75682ed1f5eab31c72226a9a4a9279b7ed0432903867806f8ffdaf88
+  metadata.gz: eecefddba3f9bbcebc7af5048664d332b402e3d6cceceb43139f0ca8f4b264e574b21fd00e7fcf4abece0e360eda15a71a9379b6b6e70d6ae353520967c9e3ff
+  data.tar.gz: 2ba5e5056e26203e96d9a84df66a64d28f99add6d79724a057c0162a47432437260a1408a8b398548f09d484e6e6bf17d04f880f947b38dcb9789f98b01c6d38

data/lib/flatiron_rails.rb

@@ -4,7 +4,7 @@ class FlatironRails
   def self.run
     if ['-v', '--version'].include?(ARGV[0])
       puts <<-VERSION.gsub(/^ {6}/, '')
-      Flatiron Rails 1.0.9
+      Flatiron Rails 1.0.10
       VERSION
     elsif ARGV[0].nil? || ['-h','--help'].include?(ARGV[0]) || ARGV[0] != "new" || ARGV[2]
       puts <<-HELP.gsub(/^ {6}/, '')

data/templates/flatiron.rb

@@ -74,10 +74,10 @@ def add_line_to_file(file, line_to_add, line_to_add_after)
   end
 end
 
-# Remove sqlite3 from default gem group and set Ruby version to 2.1.0
+# Remove sqlite3 from default gem group and set Ruby version to 2.1.2
 remove_line_from_file("Gemfile", "sqlite3")
 file '.ruby-version', <<-RVM.strip_heredoc.chomp
-  2.1.0
+  2.1.2
 RVM
 
 # Setup gem groups
@@ -181,7 +181,7 @@ File.open("Gemfile", "r+") do |f|
   out = ""
   f.each do |line|
     if line =~ /gem 'rails'/
-      out << "#{line.gsub(/, '(.*)'/, ', \'4.1.0rc2\'')}"
+      out << "#{line.gsub(/, '(.*)'/, ', \'4.1.1\'')}"
     else
       out << line
     end
@@ -503,6 +503,29 @@ def setup_secrets_yml_for_ninefold
   add_secret_for(ninefold_pass: 'NINEFOLD DATABASE PASSWORD HERE', env: :production)
 end
 
+def fix_new_database_yml_for_heroku
+  File.open("config/database.yml", "r+") do |f|
+    out = ""
+    f.each do |line|
+      if line =~ /production:/
+        out << <<-DB.gsub(/^ {10}/, '')
+          production:
+            url: <%= ENV["DATABASE_URL"] %>
+        DB
+      else
+        if !out.include?('production:')
+          out << line
+        end
+      end
+    end
+    f.pos = 0
+    f.print out.chomp
+    f.truncate(f.pos)
+  end
+end
+
+fix_new_database_yml_for_heroku
+
 # Change setup for Ninefold
 if yes?("Set up for Ninefold instead of Heroku? [y/N]")
   setup_database_yml_for_ninefold

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flatiron-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Arel English
@@ -16,16 +16,22 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc2
+        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc2
+        version: 4.1.1
 description: Sets up a rails application using the default Flatiron School stack.
 email: logan@flatironschool.com
 executables: