happy_seed 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19216ba837e81b765e1197852acacadda4613850
-  data.tar.gz: bc889a12383af7d06b276054512d919912733e20
+  metadata.gz: 89f5659db2682b561404e4561119472d1148e01e
+  data.tar.gz: 52f9952e7b4a408c524db4e3c7fc948f23651a8e
 SHA512:
-  metadata.gz: 3508c78258a71bd40670d3814280445ad5b8c68db3e83e5166c048db817a2b2c5342ab0eddcdc5c256060b6bcb461abf81155aaee16d8cdea0f73acc888f5778
-  data.tar.gz: ab985487550cb68a1adfc37a877b105692ee7ac5bf32775d8489e4c7bfd3699498df4e5d7726f4ad5245182a81918a626b0de4a1a85e801aaef6cca7433ce612
+  metadata.gz: f506b2e25a29c40238abc695b1b3e1cbe9f3401a02b6dd6b6e2c8feb2649759ea3a2f1821f3795fa0893621e831e008aa9121b729df416ba7f9e1fcf2ae3d345
+  data.tar.gz: 5d5f30de0cf66f084ba2e3d33a704fe2c4c1617af8b5d5f3cf90c70a13a1edc4cd088ee1a4f2b4a65ce4e91a8a499ebea234e98dad5dea25739e606cc8bdc1dc

data/happy_seed.rb

@@ -1,3 +1,6 @@
+puts "Setting up basic template"
+puts
+
 gsub_file 'Gemfile', /.*sqlite3.*/, ""
 gem 'haml-rails'
 gem "httparty"
@@ -6,10 +9,13 @@ gem_group :development, :test do
   gem "sqlite3"
   gem "rspec"
   gem "rspec-rails"
-  gem "rspec-autotest"
   gem "factory_girl_rails"
-  gem "autotest-rails"
   gem "capybara"
+  gem "cucumber-rails", :require => false
+  gem "guard-rspec"
+  gem "guard-cucumber"
+  gem "database_cleaner"
+  gem 'spring-commands-rspec'
 end
 
 gem_group :test do
@@ -25,112 +31,87 @@ if ENV['SEED_DEVELOPMENT']
 else
   gem 'happy_seed'
 end
-gsub_file "Gemfile", /^#\s*Turbolinks.*$/,'# No one likes Turbolinks.'
-gsub_file "Gemfile", /^gem\s+["']turbolinks["'].*$/,'# gem \'turbolinks\''
-#gsub_file "Gemfile", /^gem\s+["']spring["'].*$/,'# gem \'spring\''
-
-run 'bundle install'
-
-gsub_file "app/assets/javascripts/application.js", /= require turbolinks/, "require turbolinks"
-
-# Install rspec
-generate "rspec:install"
-gsub_file ".rspec", "--warnings\n", ""
-append_to_file ".rspec", "--format documentation\n"
-
-# Run the base generator
-generate "happy_seed:base"
-
-all_in = false
-all_in = true if yes? "Would you like to install everything?"
-
-packages = []
 
-if all_in || yes?( "Would you like to install bootstrap?" )
-  generate "happy_seed:bootstrap"
-  packages << "bootstrap"
+Bundler.with_clean_env do
+  run "bundle install > /dev/null"
 
-  if all_in || yes?( "Would you like to install splash page?" )
-    generate "happy_seed:splash"
-    packages << "splash"
+  if !File.exists? "/Users/wschenk/src/happy_seed/ta/Gemfile.lock"
+    puts "Gemfile.lock should exist"
+    exit
   end
-end
 
-if all_in || yes?( "Would you like to install devise?" )
-  generate "happy_seed:devise"
-  packages << "devise"
+  gsub_file "app/assets/javascripts/application.js", /= require turbolinks/, "require turbolinks"
 
-  if all_in || yes?( "Would you like to install twitter?" )
-    generate "happy_seed:twitter"
-    packages << "twitter"
-  end
+  # Install rspec
+  generate "rspec:install"
+  gsub_file ".rspec", "--warnings\n", ""
+  append_to_file ".rspec", "--format documentation\n"
 
-  if all_in || yes?( "Would you like to install facebook connect?" )
-    generate "happy_seed:facebook"
-    packages << "facebook"
-  end
+  # Install cucumber
+  generate "cucumber:install"
 
-  if all_in || yes?( "Would you like to install instagram?" )
-    generate "happy_seed:instagram"
-    packages << "instagram"
-  end
-end
+  # Install Guard
+  run "guard init"
 
-if all_in || yes?( "Would you like to install active admin?" )
-  generate "happy_seed:admin"
-  packages << "admin"
-end
+  # Use the spring version and also run everything on startup
+  gsub_file "Guardfile", 'cmd: "bundle exec rspec"', 'cmd: "bin/rspec", all_on_start: true'
 
-if yes?( "You would like to install angular?" )
-  generate "happy_seed:angular_install"
-  packages << "angular"
-end
-
-if yes?( "You would like to install jazz hands?" )
-  generate "happy_seed:jazz_hands"
-  packages << "jazz_hands"
-end
 
-puts "Adding rake task to convert templates to ERB. If you need to do this, please run:"
-puts "rake html2erb"
-rakefile "haml2erb.rake",
-%q{
-desc "Converts everything to erb"
-task :haml2erb do
-  require 'httparty'
+  # Run the base generator
+  generate "happy_seed:base"
 
-  FileUtils.mkdir_p "lib/templates/erb"
+  all_in = false
+  all_in = true if yes? "Would you like to install everything?"
 
-  Dir.glob( "**/*.haml").each do |f|
-    puts "Converting #{f}"
+  packages = []
 
-    data = File.read( f )
+  if all_in || yes?( "Would you like to install jazz hands?" )
+    generate "happy_seed:jazz_hands"
+    packages << "jazz_hands"
+  end
 
-    resp = HTTParty.post( "http://haml2erb.herokuapp.com/api.html", { query: { haml: data } } )
+  if all_in || yes?( "Would you like to install bootstrap?" )
+    generate "happy_seed:bootstrap"
+    packages << "bootstrap"
 
-    puts "FROM--------"
-    puts data
-    puts "TO--------"
-    puts resp.body
+    if all_in || yes?( "Would you like to install splash page?" )
+      generate "happy_seed:splash"
+      packages << "splash"
+    end
+  end
 
-    outfile = f.gsub( /\.haml/, ".erb" )
+  if all_in || yes?( "Would you like to install devise?" )
+    generate "happy_seed:devise"
+    packages << "devise"
 
-    if outfile =~ /templates\/haml/
-      outfile.gsub!( /templates\/haml/, "templates/erb" )
-      puts "outfile = #{outfile}"
+    if all_in || yes?( "Would you like to install twitter?" )
+      generate "happy_seed:twitter"
+      packages << "twitter"
+    end
 
-      FileUtils.mkdir_p( Pathname.new( outfile ).dirname )
+    if all_in || yes?( "Would you like to install facebook connect?" )
+      generate "happy_seed:facebook"
+      packages << "facebook"
     end
 
-    File.open( outfile, "w" ) do |out|
-      out.puts resp.body
+    if all_in || yes?( "Would you like to install instagram?" )
+      generate "happy_seed:instagram"
+      packages << "instagram"
     end
+  end
 
-    FileUtils.mv( f, "#{f}.bak" )
+  if all_in || yes?( "Would you like to install active admin?" )
+    generate "happy_seed:admin"
+    packages << "admin"
   end
-end
-}
-puts "Setting up git"
-git :init
-git add: "."
-git commit: "-a -m 'Based off of happy_seed: #{packages.join( ', ')} included'"
+
+  if yes?( "(BETA) Would you like to install angular?" )
+    generate "happy_seed:angular_install"
+    packages << "angular"
+  end
+
+  puts "Setting up git"
+  git :init
+  git add: "."
+  git commit: "-a -m 'Based off of happy_seed: #{packages.join( ', ')} included'"
+end

data/lib/generators/happy_seed/admin/admin_generator.rb

@@ -5,11 +5,12 @@ module HappySeed
 
       def install_landing_page
         gem 'devise'
-        gem 'activeadmin', github: 'gregbell/active_admin'
+        gem 'activeadmin', github: 'activeadmin', branch: 'master'
+        gem 'inherited_resources', github: 'josevalim/inherited_resources', branch: 'rails-4-2'
         gem 'dateslices'
 
         Bundler.with_clean_env do
-          run "bundle install"
+          run "bundle install > /dev/null"
         end
 
         generate 'active_admin:install'

data/lib/generators/happy_seed/admin/templates/app/admin/campaigns.rb

@@ -1,4 +1,4 @@
-if ENV['MAILCHIMP_API_KEY']
+if !ENV['MAILCHIMP_API_KEY'].blank?
   ActiveAdmin.register_page "Campaigns" do
     menu parent: "Newsletter"
 

data/lib/generators/happy_seed/admin/templates/app/admin/newsletter.rb

@@ -1,4 +1,4 @@
-if ENV['MAILCHIMP_API_KEY']
+if !ENV['MAILCHIMP_API_KEY'].blank?
   ActiveAdmin.register_page "Newsletter"  do
     content do
       if !params[:list_id]

data/lib/generators/happy_seed/admin/templates/app/admin/user.rb

@@ -0,0 +1 @@
+ActiveAdmin.register User

data/lib/generators/happy_seed/admin/templates/app/controllers/admin/stats_controller.rb

@@ -8,7 +8,7 @@ class Admin::StatsController < ApplicationController
       cls = User
       cls = Identity.where( "provider = ?", "twitter" ) if params[:scope] == 'twitter_users'
       cls = Identity.where( "provider = ?", "instagram" ) if params[:scope] == 'instagram_users'
-      ret = cls.group_by_month.collect { |x| [x[:date_slice],x[:count]] }
+      ret = cls.group_by_month
       render json: ret
     end
   end

data/lib/generators/happy_seed/admin/templates/app/views/admin/_chart.html.haml

@@ -1,5 +1,4 @@
-= scope
-%div{ id: scope, style: "height: 300px" }
+%div{ id: "#{scope}_chart", style: "height: 300px" }
 
 :javascript
-  $( function() { new Chartkick.ColumnChart( '#{scope}', "/admin/stats/#{scope}" ) } )
+  $( function() { new Chartkick.ColumnChart( '#{scope}_chart', "/admin/stats/#{scope}" ) } )

data/lib/generators/happy_seed/admin/templates/vendor/assets/javascripts/chartkick.js

@@ -1,4 +1,3 @@
-@@ -0,0 +1,829 @@
 /*
  * Chartkick.js
  * Create beautiful Javascript charts with minimal code

data/lib/generators/happy_seed/base/base_generator.rb

@@ -4,13 +4,14 @@ module HappySeed
       source_root File.expand_path('../templates', __FILE__)
 
       def install_foreman
+        puts "Installing happy_seed:base environment"
         gem 'dotenv-rails', :groups=>[:development, :test]
         gem 'rdiscount', :groups => [:development, :test]
         gem 'unicorn'
         gem 'rails_12factor'
 
         Bundler.with_clean_env do
-          run "bundle install"
+          run "bundle install > /dev/null"
         end
 
         directory '.'
@@ -32,14 +33,6 @@ module HappySeed
           say_status :spec, "Unable to add factory girl to rails_helper.rb", :red
         end
 
-        begin
-          prepend_to_file 'spec/spec_helper.rb', "require 'devise'\n"
-          inject_into_file 'spec/spec_helper.rb', "\n  config.include Devise::TestHelpers, type: :controller\n", :before => "\nend\n"
-        rescue
-          say_status :spec, "Unable to add devise helpers to spec_helper.rb", :red
-        end
-
-
         route "get '/setup' => 'setup#index'"
         route "root 'setup#index'"
       end

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

@@ -2,6 +2,7 @@
 %html
   %head
     %title HappySeed Generator setup page
+    %script{:src=>"https://code.jquery.com/jquery-2.1.3.min.js"}
     %script{:src=>"//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"}
     %link{:href=>"//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css", :rel=>"stylesheet"}
     :css
@@ -13,6 +14,8 @@
       }
 
   %body
+    = render partial: "application/flashes"
+    = render partial: "application/header"
     .container
       .row
         .col-sm-3

data/lib/generators/happy_seed/base/templates/lib/tasks/haml2erb.rake

@@ -0,0 +1,34 @@
+desc "Converts everything to erb"
+task :haml2erb do
+  require 'httparty'
+
+  FileUtils.mkdir_p "lib/templates/erb"
+
+  Dir.glob( "**/*.haml").each do |f|
+    puts "Converting #{f}"
+
+    data = File.read( f )
+
+    resp = HTTParty.post( "http://haml2erb.herokuapp.com/api.html", { query: { haml: data } } )
+
+    puts "FROM--------"
+    puts data
+    puts "TO--------"
+    puts resp.body
+
+    outfile = f.gsub( /\.haml/, ".erb" )
+
+    if outfile =~ /templates\/haml/
+      outfile.gsub!( /templates\/haml/, "templates/erb" )
+      puts "outfile = #{outfile}"
+
+      FileUtils.mkdir_p( Pathname.new( outfile ).dirname )
+    end
+
+    File.open( outfile, "w" ) do |out|
+      out.puts resp.body
+    end
+
+    FileUtils.mv( f, "#{f}.bak" )
+  end
+end

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

@@ -1,15 +1,19 @@
+require 'generators/happy_seed/happy_seed_generator'
+
 module HappySeed
   module Generators
-    class BootstrapGenerator < Rails::Generators::Base
+    class BootstrapGenerator < HappySeedGenerator
       source_root File.expand_path('../templates', __FILE__)
 
       def update_application_haml
         gem 'bootstrap-sass'
         gem 'modernizr-rails'
         gem 'meta-tags', :require => 'meta_tags'
+        gem 'responders', '~> 2.0'
+        gem 'bh'
 
         Bundler.with_clean_env do
-          run "bundle install"
+          run "bundle install > /dev/null"
         end
 
         remove_file 'app/views/layouts/application.html.erb'
@@ -30,7 +34,7 @@ module HappySeed
 RUBY
         end
         if File.exists?( File.join( destination_root, ".env" ) )
-          append_to_file ".env", "GOOGLE_ANALYTICS_SITE_ID=\n"
+          add_env "GOOGLE_ANALYTICS_SITE_ID"
         end
       end
     end

data/lib/generators/happy_seed/bootstrap/templates/app/assets/stylesheets/application.css.scss

@@ -5,3 +5,15 @@
 
 @import 'bootstrap-sprockets';
 @import 'bootstrap';
+
+// This is used by the devise generated views.
+.center_panel {
+  @extend .col-lg-6;
+  @extend .col-lg-offset-3;
+
+  @extend .col-md-6;
+  @extend .col-md-offset-3;
+
+  @extend .col-sm-8;
+  @extend .col-sm-offset-2;
+}

data/lib/generators/happy_seed/bootstrap/templates/app/helpers/application_helper.rb

@@ -1,19 +1,11 @@
 module ApplicationHelper
   def flash_class(level)
     case level.to_sym
-        when :notice then "alert alert-info"
-        when :success then "alert alert-success"
-        when :alert then "alert alert-warning"
-        when :error then "alert alert-danger"
-        else "alert-danger alert"
-    end
-  end
-
-  def error_for( model_class, attribute, err_class )
-    if model_class.errors[attribute].size > 0
-      err_class
-    else
-      nil
+        when :notice then "alert-info"
+        when :success then "alert-success"
+        when :alert then "alert-warning"
+        when :error then "alert-danger"
+        else "alert-danger"
     end
   end
 

data/lib/generators/happy_seed/bootstrap/templates/app/views/application/_flashes.html.haml

@@ -1,8 +1,4 @@
 - if !flash.empty?
   .container#flash
     - flash.each do |key, value|
-      %div{ :title => key.to_s.humanize, :class => flash_class(key), :role => "alert" }
-        %button.close{ "type" => "button", "data-dismiss" => "alert"}
-          %span{ "aria-hidden" => "true" } ×
-          %span{ "class" => "sr-only" } Close
-        %p= value
+      = alert_box value, context: flash_class(key), dismissible: true

data/lib/generators/happy_seed/bootstrap/templates/app/views/application/_header.html.haml

@@ -1,16 +1,10 @@
-%header#top.navbar.navbar-default{:role=>:banner}
-  .container-fluid
-    .navbar-header
-      %button.navbar-toggle{:type=>:button, 'data-toggle'=>:collapse, 'data-target'=>'.navbar-collapse'}
-        %span.sr-only Toggle navigations
-        %span.icon-bar
-        %span.icon-bar
-        %span.icon-bar
-      = link_to root_path, :class=>'navbar-brand' do
-        %span.glyphicon.glyphicon-cloud
-        App name
-    %nav.collapse.navbar-collapse{:role=>:navigation}
-      %ul.nav.navbar-nav
-        %li= link_to 'Contact', '#'
-        %li= link_to 'Blog', '#'
+= navbar position: :static do
+  = vertical do
+    = link_to root_path do
+      %span.glyphicon.glyphicon-cloud
+      Home
+  = horizontal do
+    = nav class: 'navbar-right' do
+      = link_to 'Contact', ""
+      = link_to 'About', ""
       / USER NAV