flatiron-rails 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5426da71797f4a9894a1002c1966e7f69c9670c6
-  data.tar.gz: ba25f050d02aacc2447835cf63a54cb6b5cfedb2
+  metadata.gz: 7753f25cf1693a4db2ee1677a035406c70fecf85
+  data.tar.gz: 65edbea509bbb7ae1136224e765e8e3e6bd4489d
 SHA512:
-  metadata.gz: 5e93b7030813fdb298c1c041bd34ffcdf000878d42023a483fb36e987894e313edc0d2be1a749e5c771fb419a544b9d59c2fd54dc396c9e514af13c4ed9f2cb1
-  data.tar.gz: d2f66aa331e4ad32672e8801dc0641b15ed86e183984b0b5370f8b8c326b88f4b624e1ec583e062e7b78821c0a17eeb2ebd7f8ae635ae187635bec153f2cb3da
+  metadata.gz: 556bcd5ac68139b2d16407b8508af59e9e61144fbbb78ec7547b31be57c28cc49ea16fd432ca2a57a8ad582ffc1b376484999293f9c6f5f45d360f0313bef9f7
+  data.tar.gz: 49999da8cf7371041507c4224fff6f056e73c69e9f9baf581252829f84e3404f979ac822976ffb15ddc601872cc129e4077d02443dd24d9b06968e3445958784

data/templates/flatiron.rb

@@ -23,12 +23,12 @@ def add_secret_for(options)
   end
 end
 
-# Helper method to remove gems from Gemfile
-def remove_from_gemfile(gem_name)
-  File.open("Gemfile", "r+") do |f|
+# Helper method to remove lines from a file
+def remove_line_from_file(file, line_to_match)
+  File.open(file, "r+") do |f|
     out = ""
     f.each do |line|
-      unless line =~ /#{gem_name}/i
+      unless line =~ /#{line_to_match}/i
         out << line
       end
     end
@@ -38,23 +38,45 @@ def remove_from_gemfile(gem_name)
   end
 end
 
-# Remove sqlite3 from default gem group and set Ruby version to 2.1.0
-remove_from_gemfile("sqlite3")
+# Helper method to remove part of a line in a file
+def remove_part_of_line_from_file(file, line_to_remove)
+  File.open(file, "r+") do |f|
+    out = ""
+    f.each do |line|
+      if line =~ /#{line_to_remove}/
+        out << "#{line.gsub("#{line_to_remove}", '')}"
+      else
+        out << line
+      end
+    end
+    f.pos = 0
+    f.print out.chomp
+    f.truncate(f.pos)
+  end
+end
 
-File.open("Gemfile", "r+") do |f|
-  out = ""
-  f.each do |line|
-    if line =~ /source 'https:\/\/rubygems.org'/
-      out << line + "\nruby \"2.1.0\"\n"
-    else
-      out << line
+# Helper method to add a line to a file
+def add_line_to_file(file, line_to_add, line_to_add_after)
+  File.open(file, "r+") do |f|
+    out = ""
+    f.each do |line|
+      if line =~ /#{line_to_add_after}/
+        out << line + line_to_add
+      else
+        out << line
+      end
     end
+    f.pos = 0
+    f.print out.chomp
+    f.truncate(f.pos)
   end
-  f.pos = 0
-  f.print out.chomp
-  f.truncate(f.pos)
 end
 
+# Remove sqlite3 from default gem group and set Ruby version to 2.1.0
+remove_line_from_file("Gemfile", "sqlite3")
+add_line_to_file("Gemfile", "\nruby \"2.1.0\"\n", "rubygems")
+
+# Setup gem groups
 gem_group :test, :development do
   gem 'rspec-rails'
   gem 'capybara'
@@ -75,6 +97,7 @@ gem_group :production do
   gem 'rails_12factor'
 end
 
+# Add bootstrap gem
 gem 'bootstrap-sass', '~> 3.1.1'
 
 # Delete README.rdoc
@@ -126,33 +149,9 @@ File.open("Gemfile", "r+") do |f|
 end
 
 # Disable Turbolinks
-remove_from_gemfile("turbolinks")
-
-File.open("app/assets/javascripts/application.js", "r+") do |f|
-  out = ""
-  f.each do |line|
-    unless line =~ /\/\/= require turbolinks/
-      out << line
-    end
-  end
-  f.pos = 0
-  f.print out.chomp
-  f.truncate(f.pos)
-end
-
-File.open("app/views/layouts/application.html.erb", "r+") do |f|
-  out = ""
-  f.each do |line|
-    if line =~ /, 'data-turbolinks-track' => true/
-      out << "#{line.gsub(", 'data-turbolinks-track' => true", '')}"
-    else
-      out << line
-    end
-  end
-  f.pos = 0
-  f.print out.chomp
-  f.truncate(f.pos)
-end
+remove_line_from_file("Gemfile", "turbolinks")
+remove_line_from_file("app/assets/javascripts/application.js", "turbolinks")
+remove_part_of_line_from_file("app/views/layouts/application.html.erb", ", 'data-turbolinks-track' => true")
 
 # Optionally set up Devise
 devise = false
@@ -270,22 +269,7 @@ file 'Guardfile', %q(
 
 # Set up Google Analytics
 environment 'GA.tracker = Rails.application.secrets.google_analytics_code', env: 'production'
-
-File.open("app/views/layouts/application.html.erb", "r+") do |f|
-  out = ""
-  f.each do |line|
-    if line =~ /<%= csrf_meta_tags %>/
-      out << "#{line}"
-      out << "  <%= analytics_init if Rails.env.production? %>\n"
-    else
-      out << line
-    end
-  end
-  f.pos = 0
-  f.print out.chomp
-  f.truncate(f.pos)
-end
-
+add_line_to_file("app/views/layouts/application.html.erb", "  <%= analytics_init if Rails.env.production? %>\n", "<%= csrf_meta_tags %>")
 add_secret_for(google_analytics_code: 'YOUR CODE HERE', env: :production)
 
 #Set up sprockets_better_errors
@@ -311,27 +295,19 @@ inside('app/assets/stylesheets') do
   run "mv application.css application.css.scss"
 end
 
-File.open("app/assets/stylesheets/application.css.scss", "r+") do |f|
-  out = ""
-  f.each do |line|
-    if line =~ /\*= require_self/
-      out << "#{line}"
-      out << " //= depend_on_asset \"bootstrap/glyphicons-halflings-regular.eot\"\n"
-      out << " //= depend_on_asset \"bootstrap/glyphicons-halflings-regular.woff\"\n"
-      out << " //= depend_on_asset \"bootstrap/glyphicons-halflings-regular.ttf\"\n"
-      out << " //= depend_on_asset \"bootstrap/glyphicons-halflings-regular.svg\"\n"
-    elsif line =~ /\*\//
-      out << "#{line}"
-      out << "@import \"bootstrap\";"
-    else
-      out << line
-    end
-  end
-  f.pos = 0
-  f.print out.chomp
-  f.truncate(f.pos)
+depend_on_lines = [
+  " //= depend_on_asset \"bootstrap/glyphicons-halflings-regular.svg\"\n",
+  " //= depend_on_asset \"bootstrap/glyphicons-halflings-regular.ttf\"\n",
+  " //= depend_on_asset \"bootstrap/glyphicons-halflings-regular.woff\"\n",
+  " //= depend_on_asset \"bootstrap/glyphicons-halflings-regular.eot\"\n"
+]
+
+depend_on_lines.each do |line|
+  add_line_to_file("app/assets/stylesheets/application.css.scss", line, /\*= require_self/)
 end
 
+add_line_to_file("app/assets/stylesheets/application.css.scss", "@import \"bootstrap\";", /\*\//)
+
 File.open("app/assets/javascripts/application.js", "r+") do |f|
   out = ""
   jquery_count = 0
@@ -378,7 +354,9 @@ file 'STACK', <<-STACK.strip_heredoc.chomp
       * You will need to add your analytics tracking code to `config/secrets.yml`
 
   Deploying to Heroku:
-    1. `bin/setup <app_name>`
+    1. `bin/setup [<app_name>]`
+      * <app_name> is optional. It will, by default, attempt to create an
+      app on Heroku using your Rails application name.
     2. `bin/deploy`
 
   Deploying to Ninefold:
@@ -430,14 +408,14 @@ end
 if yes?("Set up for Ninefold instead of Heroku? [y/N]")
   setup_database_yml_for_ninefold
   setup_secrets_yml_for_ninefold
-  remove_from_gemfile("rails_12factor")
+  remove_line_from_file("Gemfile", "rails_12factor")
 else
   file 'bin/setup', <<-SETUP.strip_heredoc.chomp
     #!/usr/bin/env ruby
     if ['-h', '--help'].include?(ARGV[0]) || ARGV[1]
       puts <<-HELP.gsub(/^ {6}/, '')
       Usage:
-        flatiron-rails [<app_name>]
+        bin/setup [<app_name>]
       HELP
     elsif ARGV[0]
       system("heroku create \#{ARGV[0]}")
@@ -464,6 +442,15 @@ else
     run "chmod +x setup"
     run "chmod +x deploy"
   end
+
+  begin
+    heroku = IO.popen("heroku")
+  rescue
+    if yes?("It looks like you don't have Heroku installed yet. Install now? [y/N]")
+      system("brew install heroku")
+      system("heroku login")
+    end
+  end
 end
 
 # Initialize git repository and make initial commit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flatiron-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Arel English
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails