happy_seed 0.0.16 → 0.0.17

data/lib/generators/happy_seed/base/templates/.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "vendor/assets/bower_components"
+}

data/lib/generators/happy_seed/base/templates/Procfile

@@ -1 +1 @@
-web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
+web: bundle exec puma -C config/puma.rb

data/lib/generators/happy_seed/base/templates/app/views/setup/index.html.haml

@@ -14,8 +14,6 @@
       }
 
   %body
-    = render partial: "application/header"
-    = render partial: "application/flashes"
     .container
       .row
         .col-sm-3

data/lib/generators/happy_seed/base/templates/config/puma.rb

@@ -0,0 +1,15 @@
+workers Integer(ENV['WEB_CONCURRENCY'] || 2)
+threads_count = Integer(ENV['MAX_THREADS'] || 5)
+threads threads_count, threads_count
+
+preload_app!
+
+rackup      DefaultRackup
+port        ENV['PORT']     || 3000
+environment ENV['RACK_ENV'] || 'development'
+
+on_worker_boot do
+  # Worker specific setup for Rails 4.1+
+  # See: https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server#on-worker-boot
+  ActiveRecord::Base.establish_connection
+end

data/lib/generators/happy_seed/base/templates/docs/README.00.base.rdoc

@@ -5,7 +5,7 @@ HappySeed Base Install
 
 The `happy_seed` application template sets up `haml`, `meta-tags`, disables `turbolinks`, and installs the `happy_seed` generators into your application.
 
-The `happy_seed:base` generator installs `dotenv-rails`, `unicorn`, http site authentication, and the `setup_controller`.
+The `happy_seed:base` generator installs `dotenv-rails`, `puma`, http site authentication, and the `setup_controller`.
 
 /setup is used to see the `happy_seed` documentation for each of the installed generators, and copies things into the rails doc directory.  The `setup_controller` is only visible locally.
 

data/lib/generators/happy_seed/base/templates/spec/requests/setup_spec.rb

@@ -0,0 +1,11 @@
+require 'rails_helper'
+
+RSpec.describe "Setup", type: :request do
+  describe "GET /setups" do
+    it "Renders the setup page locally" do
+      get setup_path
+      expect(response).to have_http_status(200)
+      expect(response.body).to include("Mailer Previews")
+    end
+  end
+end

data/lib/generators/happy_seed/bootstrap/bootstrap_generator.rb

@@ -5,7 +5,13 @@ module HappySeed
     class BootstrapGenerator < HappySeedGenerator
       source_root File.expand_path('../templates', __FILE__)
 
-      def update_application_haml
+      def self.fingerprint
+        gem_available? 'bootstrap-sass'
+      end
+
+      def install_bootstrap
+        return if already_installed
+
         gem 'bootstrap-sass'
         gem 'modernizr-rails'
         gem 'meta-tags', :require => 'meta_tags'
@@ -24,6 +30,12 @@ module HappySeed
         directory 'lib'
         directory 'docs'
 
+        inject_into_file 'app/views/setup/index.html.haml', after: "%body\n" do <<-'HAML'
+    = render partial: "application/header"
+    = render partial: "application/flashes"
+HAML
+        end
+
         inject_into_file 'config/application.rb', before: "end\nend\n" do <<-'RUBY'
   config.action_view.field_error_proc = Proc.new { |html_tag, instance| html_tag }
     config.generators do |g|

data/lib/generators/happy_seed/devise/devise_generator.rb

@@ -1,14 +1,19 @@
+require 'generators/happy_seed/happy_seed_generator'
+require 'generators/happy_seed/bootstrap/bootstrap_generator'
+
 module HappySeed
   module Generators
-    class DeviseGenerator < Rails::Generators::Base
+    class DeviseGenerator < HappySeedGenerator
       source_root File.expand_path('../templates', __FILE__)
 
-      def install_landing_page
-        if !gem_available?( "bootstrap-sass" )
-          if yes?( "Bootstrap-sass gem doesn't seem to be installed, install now?" )
-            generate "happy_seed:bootstrap"
-          end
-        end
+      def self.fingerprint
+        gem_available? 'devise'
+      end
+
+      def install_devise
+        return if already_installed
+
+        require_generator BootstrapGenerator
 
         gem 'devise', '~> 3.4'
 
@@ -16,10 +21,16 @@ module HappySeed
           run "bundle install --without production"
         end
 
-        run 'rails generate devise:install'
-        run 'rails generate devise User'
-        run 'rails generate devise:views'
-        
+        run 'bin/spring stop'
+
+        puts "Devise: #{self.class.fingerprint}"
+
+        Bundler.with_clean_env do
+          run 'rails generate devise:install'
+          run 'rails generate devise User'
+          run 'rails generate devise:views'
+        end
+                
         if gem_available?( "haml-rails" )
           remove_file 'app/views/devise/registrations/new.html.erb'
           remove_file 'app/views/devise/registrations/edit.html.erb'
@@ -32,12 +43,24 @@ module HappySeed
         
         begin
           prepend_to_file 'spec/spec_helper.rb', "require 'devise'\n"
+          prepend_to_file 'spec/spec_helper.rb', "require_relative 'support/controller_helpers'\n"
           inject_into_file 'spec/spec_helper.rb', "\n  config.include Devise::TestHelpers, type: :controller\n", :before => "\nend\n"
-
+          inject_into_file 'spec/spec_helper.rb', "\n  config.include Warden::Test::Helpers, type: :feature\n  config.include ControllerHelpers, type: :controller\n  Warden.test_mode!\n", :before => "\nend\n"
         rescue
           say_status :spec, "Unable to add devise helpers to spec_helper.rb", :red
         end
 
+        begin
+          inject_into_file 'spec/rails_helper.rb', "\n  config.include Devise::TestHelpers, type: :controller\n  config.include Warden::Test::Helpers, type: :feature\n", :after => "FactoryGirl::Syntax::Methods\n"
+        rescue
+          say_status :spec, "Unable to add devise helpers to rails_helper.rb", :red
+        end
+
+        append_to_file "features/support/env.rb", "
+Warden.test_mode! 
+World(Warden::Test::Helpers)
+After{ Warden.test_reset! }"
+
         directory 'app'
         directory 'docs'
         directory 'test'

data/lib/generators/happy_seed/devise_invitable/devise_invitable_generator.rb

@@ -1,18 +1,18 @@
+require 'generators/happy_seed/devise/devise_generator'
+
 module HappySeed
   module Generators
-    class DeviseInvitableGenerator < Rails::Generators::Base
+    class DeviseInvitableGenerator < HappySeedGenerator
       source_root File.expand_path('../templates', __FILE__)
 
+      def self.fingerprint
+        gem_available? 'devise_invitable'
+      end
+
       def install_device_invitable
-        unless gem_available?( "devise" )
-          puts "The devise invitable generator requires devise"
-
-          if yes?( "Run happy_seed:devise now?" )
-            generate "happy_seed:devise"
-          else
-            exit
-          end
-        end
+        return if already_installed
+
+        require_generator DeviseGenerator
 
         gem 'devise_invitable'
 

data/lib/generators/happy_seed/facebook/facebook_generator.rb

@@ -1,3 +1,4 @@
+require 'generators/happy_seed/omniauth/omniauth_generator'
 require 'generators/happy_seed/happy_seed_generator'
 
 module HappySeed
@@ -5,8 +6,14 @@ module HappySeed
     class FacebookGenerator < HappySeedGenerator
       source_root File.expand_path('../templates', __FILE__)
 
+      def self.fingerprint
+        gem_available? 'omniauth-facebook'
+      end
+
       def install_facebook
-        require_omniauth
+        return if already_installed
+
+        require_generator OmniauthGenerator
 
         gem 'omniauth-facebook'
 

data/lib/generators/happy_seed/github/github_generator.rb

@@ -1,12 +1,18 @@
-require 'generators/happy_seed/happy_seed_generator'
+require 'generators/happy_seed/omniauth/omniauth_generator'
 
 module HappySeed
   module Generators
     class GithubGenerator < HappySeedGenerator
       source_root File.expand_path('../templates', __FILE__)
 
+      def self.fingerprint
+        gem_available? 'omniauth-github'
+      end
+
       def install_github
-        require_omniauth
+        return if already_installed
+
+        require_generator OmniauthGenerator
 
         gem 'omniauth-github'
         gem 'github_api'

data/lib/generators/happy_seed/googleoauth/googleoauth_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/happy_seed/happy_seed_generator'
+require 'generators/happy_seed/omniauth/omniauth_generator'
 
 module HappySeed
   module Generators
@@ -6,8 +6,14 @@ module HappySeed
       include Rails::Generators::Migration
       source_root File.expand_path('../templates', __FILE__)
 
+      def self.fingerprint
+        gem_available? 'omniauth-google-oauth2'
+      end
+
       def install_facebook
-        require_omniauth
+        return if already_installed
+
+        require_generator OmniauthGenerator
 
         gem 'omniauth-google-oauth2'
         gem 'google-api-client', require: "google/api_client"

data/lib/generators/happy_seed/happy_seed_generator.rb

@@ -1,20 +1,24 @@
+ENV['DISABLE_SPRING'] = 'true'
+
 module HappySeed
   module Generators
     class HappySeedGenerator < Rails::Generators::Base
       protected
-        def require_omniauth
-          unless gem_available?( "devise" )
-            puts "The omniauth generator requires devise"
+        def already_installed
+          installed = self.class.fingerprint
+          puts "#{self.class.to_s} has already been run" if installed
+          installed
+        end
 
-            if yes?( "Run happy_seed:devise now?" )
-              generate "happy_seed:devise"
-            else
-              exit
-            end
-          end
+        def fingerprint
+          raise "Fingerprint not implemented in #{self.to_s}"
+        end
 
-          unless File.exists? 'app/models/identity.rb'
-            generate "happy_seed:omniauth"
+        def require_generator kls
+          if !kls.fingerprint
+            name = kls.to_s.gsub( /.*::/, "" ).gsub( /Generator/, "" ).underscore
+            puts "Running dependancy happy_seed:#{name}"
+            generate "happy_seed:#{name}"
           end
         end
 
@@ -49,11 +53,19 @@ RUBY
         end
      
         def gem_available?(name)
-          Gem::Specification.find_by_name(name)
-        rescue Gem::LoadError
-          false
-        rescue
-          Gem.available?(name)
+          self.gem_available?( name )
+        end
+
+        def self.gem_available?( name )
+          Bundler.with_clean_env do
+            begin
+              Gem::Specification.find_by_name(name)
+            rescue Gem::LoadError
+              false
+            rescue
+              Gem.available?(name)
+            end
+          end
         end
 
         def add_env( key )

data/lib/generators/happy_seed/instagram/instagram_generator.rb

@@ -1,12 +1,18 @@
-require 'generators/happy_seed/happy_seed_generator'
+require 'generators/happy_seed/omniauth/omniauth_generator'
 
 module HappySeed
   module Generators
     class InstagramGenerator < HappySeedGenerator
       source_root File.expand_path('../templates', __FILE__)
 
+      def self.fingerprint
+        gem_available? 'omniauth-instagram'
+      end
+
       def install_instagram
-        require_omniauth
+        return if already_installed
+
+        require_generator OmniauthGenerator
 
         gem 'omniauth-instagram'
         gem 'instagram'

data/lib/generators/happy_seed/jazz_hands/jazz_hands_generator.rb

@@ -1,9 +1,16 @@
+require 'generators/happy_seed/happy_seed_generator'
+
 module HappySeed
   module Generators
-    class JazzHandsGenerator < Rails::Generators::Base
+    class JazzHandsGenerator < HappySeedGenerator
       source_root File.expand_path('../templates', __FILE__)
 
+      def self.fingerprint
+        gem_available? 'jazz_hands'
+      end
+
       def install_jazz_hands
+        return if already_installed
 
         # gem 'jazz_hands', :github => 'nixme/jazz_hands', :branch => 'bring-your-own-debugger', :groups => [:development, :test]
         gem 'jazz_hands', :github => 'danrabinowitz/jazz_hands', :branch => 'use-newer-version-of-pry', :groups => [:development, :test]

data/lib/generators/happy_seed/omniauth/omniauth_generator.rb

@@ -1,26 +1,21 @@
+require 'generators/happy_seed/devise/devise_generator'
+
 module HappySeed
   module Generators
-    class OmniauthGenerator < Rails::Generators::Base
+    class OmniauthGenerator < HappySeedGenerator
       include Rails::Generators::Migration
       source_root File.expand_path('../templates', __FILE__)
 
-      def install_omniauth
-        # if File.exists? 'app/models/identity.rb'
-        #   puts "identity.rb already exists, skipping"
-        #   return
-        # end
+      def self.fingerprint
+        gem_available?( 'omniauth')
+      end
 
-        migration_template("make_email_nullable.rb", "db/migrate/make_email_nullable.rb" )
+      def install_omniauth
+        return if already_installed
 
-        unless gem_available?( "devise" )
-          puts "The omniauth generator requires devise"
+        require_generator DeviseGenerator
 
-          if yes?( "Run happy_seed:devise now?" )
-            generate "happy_seed:devise"
-          else
-            exit
-          end
-        end
+        migration_template("make_email_nullable.rb", "db/migrate/make_email_nullable.rb" )
 
         gem 'omniauth'
 
@@ -50,15 +45,7 @@ module HappySeed
         directory "docs"
       end
 
-      private    
-        def gem_available?(name)
-           Gem::Specification.find_by_name(name)
-        rescue Gem::LoadError
-           false
-        rescue
-           Gem.available?(name)
-        end
-
+      private
         def self.next_migration_number(dir)
           Time.now.utc.strftime("%Y%m%d%H%M%S")
         end

data/lib/generators/happy_seed/splash/splash_generator.rb

@@ -1,20 +1,18 @@
-require 'generators/happy_seed/happy_seed_generator'
+require 'generators/happy_seed/bootstrap/bootstrap_generator'
 
 module HappySeed
   module Generators
     class SplashGenerator < HappySeedGenerator
       source_root File.expand_path('../templates', __FILE__)
 
+      def self.fingerprint
+        File.exists?( "docs/README.02.splash.rdoc" )
+      end
+
       def install_landing_page
-        unless gem_available?( "bootstrap-sass" )
-          puts "The splash generator requires bootstrap"
-
-          if yes?( "Run happy_seed:bootstrap now?" )
-            generate "happy_seed:bootstrap"
-          else
-            exit
-          end
-        end
+        return if already_installed
+
+        require_generator BootstrapGenerator
 
         gem 'gibbon'
 
@@ -43,15 +41,6 @@ module HappySeed
           say_status :env, "Unable to add template .env files", :red
         end
       end
-
-      private    
-        def gem_available?(name)
-           Gem::Specification.find_by_name(name)
-        rescue Gem::LoadError
-           false
-        rescue
-           Gem.available?(name)
-        end
     end
   end
 end