flatiron-rails 1.0.11 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68f0b693eb5ce9063ce4586c26aa5de5b6719e1a
-  data.tar.gz: e2249d50efb89ec36273eb9ec6f89cc946aafcca
+  metadata.gz: e7b171a610df19e5fd48c48f703abb24cb487707
+  data.tar.gz: 5d1c0cc825af3dd0077c05737f0e7716f07061b7
 SHA512:
-  metadata.gz: 481c314df01723ef6b47604d04fcc730abb2075ad0bc6b955ca231b33dad94513bad1bb6213ed890c35bd653a6836d340c17650dac7f76f31f67588d417878e2
-  data.tar.gz: b38457c8de29e576595769be801375a171a55fe641d0de2d292fed172fae73140f7ed6483072d24aa6d74258ed25f23a236863e7e2fabf2d210757748863bf96
+  metadata.gz: 19ba816ba07e229dbe4a42fab3e528d05690ae768d9fde6dc92cfffc3e5a4b36eeb0540c6bd5f6b3684f3f173e25baf8fa0232433f2e3ab32300353b52af8cf9
+  data.tar.gz: dd7cb459e74bc71a838c08dde8b7d74695d42b7550f2082d29cec1efbcfbccb6f8b0eabd4f9a89f3e1ba18700194790ee1115040911361fc7d44f076149a8d4c

data/bin/flatiron-rails

@@ -1,4 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'flatiron_rails'
+require 'postgres_checker'
+
+PostgresChecker.check
 FlatironRails.run

data/lib/flatiron_rails.rb

@@ -1,10 +1,10 @@
 class FlatironRails
-
   FLATIRON_ROOT = File.expand_path('../', File.dirname(__FILE__))
+  
   def self.run
     if ['-v', '--version'].include?(ARGV[0])
       puts <<-VERSION.gsub(/^ {6}/, '')
-      Flatiron Rails 1.0.11
+      Flatiron Rails 2.0.0
       VERSION
     elsif ARGV[0].nil? || ['-h','--help'].include?(ARGV[0]) || ARGV[0] != "new" || ARGV[2]
       puts <<-HELP.gsub(/^ {6}/, '')
@@ -14,6 +14,5 @@ class FlatironRails
     else
       system("rails new #{ARGV[1]} -Tm #{FLATIRON_ROOT}/templates/flatiron.rb")
     end
-  end
-  
+  end 
 end

data/lib/postgres_checker.rb

@@ -0,0 +1,28 @@
+class PostgresChecker
+  def self.check
+    new.check
+  end
+
+  def check
+    if !brew_installed?
+      puts "You must have Homebrew installed."
+      exit
+    else
+      if !postgres_installed?
+        install_postgres
+      end
+    end
+  end
+
+  def brew_installed?
+    !`which brew`.empty?
+  end
+
+  def postgres_installed?
+    !`brew ls --versions postgresql`.empty?
+  end
+
+  def install_postgres
+    system('brew install postgresql')
+  end
+end

data/templates/flatiron.rb

@@ -1,8 +1,6 @@
 # Prevent automatic run of bundle install
 def run_bundle ; end
 
-# TODO: Add check for postgres
-
 # Helper method to write to secrets.yml
 def add_secret_for(options)
   key = "#{options.first[0].to_s}"
@@ -74,6 +72,11 @@ def add_line_to_file(file, line_to_add, line_to_add_after)
   end
 end
 
+# Get formatted app name
+def formatted_app_name
+  app_name.split(/_|-/).map(&:capitalize).join(' ')
+end
+
 # 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
@@ -93,6 +96,8 @@ gem_group :test, :development do
   gem 'database_cleaner'
   gem 'sqlite3'
   gem 'pry'
+  gem 'guard-rspec', require: false
+  gem 'thin'
 end
 
 gem_group :production do
@@ -109,7 +114,7 @@ run 'rm README.rdoc'
 
 # Add template data to README.md
 file 'README.md', <<-README.strip_heredoc.chomp
-  # #{app_name.split(/_|-/).map(&:capitalize).join(' ')}
+  # #{formatted_app_name}
 
   ## Description
 
@@ -148,7 +153,7 @@ file 'README.md', <<-README.strip_heredoc.chomp
 
   ## License
 
-  My Spiffy App is MIT Licensed. See LICENSE for details.
+  #{formatted_app_name} is MIT Licensed. See LICENSE for details.
 README
 
 # Add LICENSE
@@ -176,12 +181,12 @@ file 'LICENSE', <<-MIT.strip_heredoc.chomp
   SOFTWARE.
 MIT
 
-# Set Rails version to 4.1.0.rc2
+# Set Rails version to 4.1.4
 File.open("Gemfile", "r+") do |f|
   out = ""
   f.each do |line|
     if line =~ /gem 'rails'/
-      out << "#{line.gsub(/, '(.*)'/, ', \'4.1.1\'')}"
+      out << "#{line.gsub(/, '(.*)'/, ', \'4.1.4\'')}"
     else
       out << line
     end
@@ -261,8 +266,13 @@ end
 # Generate RSpec files
 generate(:"rspec:install")
 
-# Edit spec/spec_helper.rb
-File.open("spec/spec_helper.rb", "r+") do |f|
+# Fix .rspec file to remove excessive warnings/properly setup
+remove_line_from_file('.rspec', '--warnings')
+remove_line_from_file('.rspec', '--require spec_helper')
+add_line_to_file('.rspec', "\n--format documentation", '--color')
+
+# Edit spec/rails_helper.rb
+File.open("spec/rails_helper.rb", "r+") do |f|
   out = ""
   f.each do |line|
     if line =~ /require 'rspec\/autorun'/
@@ -316,7 +326,7 @@ run('touch spec/features/.keep')
 
 # Create feature_helper.rb
 file 'spec/feature_helper.rb', <<-CODE.strip_heredoc.chomp
-  require 'spec_helper'
+  require 'rails_helper'
   require 'capybara/rails'
 CODE
 
@@ -331,7 +341,7 @@ file 'Guardfile', %q(
   guard :rspec do
     watch(%r{^spec/.+_spec\.rb$})
     watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-    watch('spec/spec_helper.rb')  { "spec" }
+    watch('spec/rails_helper.rb')  { "spec" }
 
     # Rails example
     watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
@@ -449,7 +459,7 @@ file 'STACK.md', <<-STACK.strip_heredoc.chomp
       * Google Analytics
 
   TODO:
-    1. Add the line `ruby '2.1.0'` to the top of your Gemfile
+    1. Add the line `ruby '2.1.2'` to the top of your Gemfile
     2. An MIT License file has been created for you
       * Add your name and the year
     3. A README.md file has been started for you

metadata

@@ -1,16 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flatiron-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 2.0.0
 platform: ruby
 authors:
-- Arel English
 - Logan Hasson
-- Katie Hoffman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -21,7 +19,7 @@ dependencies:
         version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 4.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +29,7 @@ dependencies:
         version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 4.1.4
 description: Sets up a rails application using the default Flatiron School stack.
 email: logan@flatironschool.com
 executables:
@@ -41,6 +39,7 @@ extra_rdoc_files: []
 files:
 - bin/flatiron-rails
 - lib/flatiron_rails.rb
+- lib/postgres_checker.rb
 - templates/flatiron.rb
 homepage: http://rubygems.org/gems/flatiron-rails
 licenses: