happy_seed 0.0.16 → 0.0.17

data/lib/generators/happy_seed/static/templates/source/stylesheets/application.css.scss

@@ -12,19 +12,16 @@ html.sticky {
   min-height: 100%;
 }
 
-.sticky body {
-  margin-bottom: $sticky_footer_height;
-}
-
-.sticky .footer {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  /* Set the fixed height of the footer here */
-  height: $sticky_footer_height;
-  background-color: #f5f5f5;
+@media (min-width: $screen-sm-min) {
+  .sticky body {
+    margin-bottom: $sticky_footer_height;
+  }
 
-  .text-muted {
-    margin: 20px 0;
+  .sticky footer {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    /* Set the fixed height of the footer here */
+    height: $sticky_footer_height;
   }
 }

data/lib/generators/happy_seed/static_blog/templates/Gemfile.lock

@@ -1,37 +1,33 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.10)
+    activesupport (4.1.8)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
-    autoprefixer-rails (5.2.0)
-      execjs
-      json
-    bootstrap-navbar (2.2.4)
+    addressable (2.3.6)
+    bootstrap-navbar (2.2.2)
       gem_config (~> 0.3)
-    bootstrap-sass (3.3.4.1)
-      autoprefixer-rails (>= 5.0.0.1)
-      sass (>= 3.2.19)
+    bootstrap-sass (3.3.1.0)
+      sass (~> 3.2)
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    chunky_png (1.3.4)
-    coffee-script (2.4.1)
+    chunky_png (1.3.3)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
-    compass (1.0.3)
+    coffee-script-source (1.8.0)
+    compass (1.0.1)
       chunky_png (~> 1.2)
-      compass-core (~> 1.0.2)
+      compass-core (~> 1.0.1)
       compass-import-once (~> 1.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       sass (>= 3.3.13, < 3.5)
-    compass-core (1.0.3)
+    compass-core (1.0.1)
       multi_json (~> 1.0)
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
@@ -40,38 +36,38 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
-    eventmachine (1.0.7)
-    execjs (2.5.2)
-    ffi (1.9.8)
+    eventmachine (1.0.3)
+    execjs (2.2.2)
+    ffi (1.9.6)
     gem_config (0.3.1)
-    haml (4.0.6)
+    haml (4.0.5)
       tilt
     hike (1.2.3)
     hitimes (1.2.2)
     hooks (0.4.0)
       uber (~> 0.0.4)
     http_parser.rb (0.6.0)
-    i18n (0.7.0)
+    i18n (0.6.11)
     jquery-middleman (3.0.4)
       thor (>= 0.14, < 2.0)
-    json (1.8.2)
-    kramdown (1.7.0)
-    listen (2.10.0)
-      celluloid (~> 0.16.0)
+    json (1.8.1)
+    kramdown (1.5.0)
+    listen (2.8.2)
+      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    middleman (3.3.12)
+    middleman (3.3.7)
       coffee-script (~> 2.2)
       compass (>= 1.0.0, < 2.0.0)
       compass-import-once (= 1.0.5)
       execjs (~> 2.0)
       haml (>= 4.0.5)
       kramdown (~> 1.2)
-      middleman-core (= 3.3.12)
+      middleman-core (= 3.3.7)
       middleman-sprockets (>= 3.1.2)
       sass (>= 3.4.0, < 4.0)
       uglifier (~> 2.5)
-    middleman-autometatags (0.0.2)
+    middleman-autometatags (0.0.1)
       middleman-core (>= 3.0.0)
     middleman-blog (3.5.3)
       addressable (~> 2.3.5)
@@ -83,12 +79,12 @@ GEM
     middleman-bootstrap-navbar (2.0.0)
       bootstrap-navbar (~> 2.0)
       middleman-core (>= 3.0)
-    middleman-core (3.3.12)
+    middleman-core (3.3.7)
       activesupport (~> 4.1.0)
       bundler (~> 1.1)
       erubis
       hooks (~> 0.3)
-      i18n (~> 0.7.0)
+      i18n (~> 0.6.9)
       listen (>= 2.7.9, < 3.0)
       padrino-helpers (~> 0.12.3)
       rack (>= 1.4.5, < 2.0)
@@ -104,32 +100,32 @@ GEM
       middleman-core (>= 3.0.2)
       multi_json (~> 1.0)
       rack-livereload
-    middleman-sprockets (3.4.2)
-      middleman-core (>= 3.3)
+    middleman-sprockets (3.3.10)
+      middleman-core (~> 3.3)
       sprockets (~> 2.12.1)
       sprockets-helpers (~> 1.1.0)
-      sprockets-sass (~> 1.3.0)
-    minitest (5.7.0)
-    multi_json (1.11.0)
+      sprockets-sass (~> 1.2.0)
+    minitest (5.4.3)
+    multi_json (1.10.1)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
-    padrino-helpers (0.12.5)
+    net-ssh (2.9.1)
+    padrino-helpers (0.12.4)
       i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.12.5)
+      padrino-support (= 0.12.4)
       tilt (~> 1.4.1)
-    padrino-support (0.12.5)
+    padrino-support (0.12.4)
       activesupport (>= 3.1)
-    ptools (1.3.2)
-    rack (1.6.1)
+    ptools (1.2.6)
+    rack (1.5.2)
     rack-livereload (0.3.15)
       rack
-    rack-test (0.6.3)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rb-fsevent (0.9.5)
+    rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    sass (3.4.14)
+    sass (3.4.9)
     sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -137,18 +133,18 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sprockets-helpers (1.1.0)
       sprockets (~> 2.0)
-    sprockets-sass (1.3.1)
+    sprockets-sass (1.2.0)
       sprockets (~> 2.0)
       tilt (~> 1.1)
     thor (0.19.1)
-    thread_safe (0.3.5)
+    thread_safe (0.3.4)
     tilt (1.4.1)
     timers (4.0.1)
       hitimes
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uber (0.0.13)
-    uglifier (2.7.1)
+    uber (0.0.11)
+    uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 
@@ -159,9 +155,9 @@ DEPENDENCIES
   bootstrap-sass
   builder (~> 3.0)
   jquery-middleman
-  middleman (~> 3.3)
+  middleman (~> 3.3.7)
   middleman-autometatags
-  middleman-blog (~> 3.5)
+  middleman-blog (~> 3.5.3)
   middleman-blog-drafts
   middleman-bootstrap-navbar
   middleman-deploy

data/lib/generators/happy_seed/static_blog/templates/source/stylesheets/application.css.scss

@@ -12,16 +12,21 @@ html.sticky {
   min-height: 100%;
 }
 
-.sticky body {
-  margin-bottom: $sticky_footer_height;
+@media (min-width: $screen-sm-min) {
+  .sticky body {
+    margin-bottom: $sticky_footer_height;
+  }
+
+  .sticky footer {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    /* Set the fixed height of the footer here */
+    height: $sticky_footer_height;
+  }
 }
 
-.sticky .footer {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  /* Set the fixed height of the footer here */
-  height: $sticky_footer_height;
+.footer {
   background-color: #f5f5f5;
 
   .text-muted {

data/lib/generators/happy_seed/twitter/templates/add_secret_token_to_identity.rb

@@ -0,0 +1,5 @@
+class AddSecretTokenToIdentity < ActiveRecord::Migration
+  def change
+    add_column :identities, :secrettoken, :string
+  end
+end

data/lib/generators/happy_seed/twitter/twitter_generator.rb

@@ -1,12 +1,20 @@
-require 'generators/happy_seed/happy_seed_generator'
+require 'generators/happy_seed/omniauth/omniauth_generator'
 
 module HappySeed
   module Generators
     class TwitterGenerator < HappySeedGenerator
+      include Rails::Generators::Migration
+
       source_root File.expand_path('../templates', __FILE__)
 
+      def self.fingerprint
+        gem_available?( 'omniauth-twitter' )
+      end
+
       def install_twitter
-        require_omniauth
+        return if already_installed
+
+        require_generator OmniauthGenerator
 
         gem 'omniauth-twitter'
         gem 'twitter'
@@ -18,6 +26,22 @@ module HappySeed
         add_omniauth :twitter
 
         directory "docs"
+        insert_into_file "app/models/identity.rb", "\n    identity.secrettoken = auth.credentials.secret", after: "identity.accesstoken = auth.credentials.token"
+        migration_template("add_secret_token_to_identity.rb", "db/migrate/add_secret_token_to_identity.rb" )
+
+        gsub_file( "app/models/user.rb", "Twitter.client( access_token: twitter.accesstoken )",
+    "Twitter::REST::Client.new do |config|
+      config.consumer_key        = ENV['TWITTER_APP_ID']
+      config.consumer_secret     = ENV['TWITTER_APP_SECRET']
+      config.access_token        = twitter.accesstoken
+      config.access_token_secret = twitter.secrettoken
+    end")
+      end
+
+      protected
+
+      def self.next_migration_number(dir)
+        Time.now.utc.strftime("%Y%m%d%H%M%S")
       end
     end
   end

data/lib/happy_seed/cli.rb

@@ -4,8 +4,8 @@ module HappySeed
   class Cli < Thor
     desc "rails APPNAME", "Generate a new rails application"
     def rails( *args )
-      file = gem_file_path( "happy_seed.rb")
-      system( "rails new -m #{file} #{args.join( " " )} --skip-turbolinks" )
+      seedrb = gem_file_path( "happy_seed.rb")
+      system "rails new -m #{seedrb} #{args.join( " " )} --skip-turbolinks"
     end
 
     desc "plugin NAME", "Generate a new rails plugin"

data/lib/happy_seed/version.rb

@@ -1,3 +1,3 @@
 module HappySeed
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/test/dummy/log/test.log

@@ -0,0 +1,15 @@
+   (0.1ms)  begin transaction
+-------------------------
+HappySeedTest: test_truth
+-------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------
+HappySeedTest: test_truth
+-------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------
+HappySeedTest: test_truth
+-------------------------
+   (0.0ms)  rollback transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: happy_seed
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Will Schenk
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,7 @@ files:
 - Rakefile
 - bin/happy_seed
 - happy_seed.rb
+- happy_seed.txt
 - lib/generators/happy_seed/admin/admin_generator.rb
 - lib/generators/happy_seed/admin/templates/app/admin/campaigns.rb
 - lib/generators/happy_seed/admin/templates/app/admin/dashboard.rb
@@ -100,17 +101,19 @@ files:
 - lib/generators/happy_seed/api/templates/spec/acceptance/api/v1/user_tokens_spec.rb
 - lib/generators/happy_seed/api/templates/spec/acceptance/api/v1/users_spec.rb
 - lib/generators/happy_seed/base/base_generator.rb
+- lib/generators/happy_seed/base/templates/.bowerrc
 - lib/generators/happy_seed/base/templates/.env
 - lib/generators/happy_seed/base/templates/.foreman
 - lib/generators/happy_seed/base/templates/Procfile
 - lib/generators/happy_seed/base/templates/app/controllers/setup_controller.rb
 - lib/generators/happy_seed/base/templates/app/views/setup/index.html.haml
 - lib/generators/happy_seed/base/templates/application_controller.rb
-- lib/generators/happy_seed/base/templates/config/unicorn.rb
+- lib/generators/happy_seed/base/templates/config/puma.rb
 - lib/generators/happy_seed/base/templates/docs/README.00.base.rdoc
 - lib/generators/happy_seed/base/templates/lib/tasks/haml2erb.rake
 - lib/generators/happy_seed/base/templates/spec/controllers/application_controller_spec.rb
 - lib/generators/happy_seed/base/templates/spec/controllers/setup_controller_spec.rb
+- lib/generators/happy_seed/base/templates/spec/requests/setup_spec.rb
 - lib/generators/happy_seed/base/templates/spec/support/controller_helpers.rb
 - lib/generators/happy_seed/bootstrap/bootstrap_generator.rb
 - lib/generators/happy_seed/bootstrap/templates/app/assets/javascripts/application.js
@@ -197,7 +200,6 @@ files:
 - lib/generators/happy_seed/static/static_generator.rb
 - lib/generators/happy_seed/static/templates/.gitignore
 - lib/generators/happy_seed/static/templates/Gemfile
-- lib/generators/happy_seed/static/templates/Gemfile.lock
 - lib/generators/happy_seed/static/templates/config.rb
 - lib/generators/happy_seed/static/templates/data/site.yml
 - lib/generators/happy_seed/static/templates/source/images/.gitkeep
@@ -243,6 +245,7 @@ files:
 - lib/generators/happy_seed/static_blog/templates/source/stylesheets/fonts/socicon-webfont.woff
 - lib/generators/happy_seed/static_blog/templates/source/stylesheets/socicons.css
 - lib/generators/happy_seed/static_blog/templates/source/tag.html.haml
+- lib/generators/happy_seed/twitter/templates/add_secret_token_to_identity.rb
 - lib/generators/happy_seed/twitter/templates/docs/README.05.twitter.rdoc
 - lib/generators/happy_seed/twitter/twitter_generator.rb
 - lib/happy_seed.rb
@@ -279,6 +282,8 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
+- test/dummy/db/test.sqlite3
+- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -305,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: HappySeed is a project that will build up a rails apps using some common
@@ -339,6 +344,8 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
 - test/dummy/config.ru
+- test/dummy/db/test.sqlite3
+- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html

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

@@ -1,33 +0,0 @@
-worker_processes 3
-timeout 30
-preload_app true
- 
-before_fork do |server, worker|
-  # Replace with MongoDB or whatever
-  if defined?(ActiveRecord::Base)
-    ActiveRecord::Base.connection.disconnect!
-    Rails.logger.info('Disconnected from ActiveRecord')
-  end
- 
-  # If you are using Redis but not Resque, change this
-  if defined?(Resque)
-    Resque.redis.quit
-    Rails.logger.info('Disconnected from Redis')
-  end
- 
-  sleep 1
-end
- 
-after_fork do |server, worker|
-  # Replace with MongoDB or whatever
-  if defined?(ActiveRecord::Base)
-    ActiveRecord::Base.establish_connection
-    Rails.logger.info('Connected to ActiveRecord')
-  end
- 
-  # If you are using Redis but not Resque, change this
-  if defined?(Resque)
-    Resque.redis = ENV['REDIS_URI']
-    Rails.logger.info('Connected to Redis')
-  end
-end