bootstrappers 0.1.0.1 → 0.2.0

data/CHANGELOG.md

@@ -1,7 +1,15 @@
 alpha
+
+0.2.0 (DEC 16, 2012)
   * add lib/tasks 
   * fixing typo
   * fixing deploy file
+  * update to bootstrap-helper 2.2.0
+  * update to bootstrap-helper 2.1.2.1
+  * remove newrelic_rpm
+  * rvm-capistrano
+  * replace devise.email_sender to Setting.email_sender
+  * add login_required to application_controller
   
 0.1.0 (Nov 12, 2012)
   * add powder to Gemfile

data/README.md

@@ -40,6 +40,7 @@ It includes application gems like:
 
 * [Capistrano](https://github.com/capistrano/capistrano)
 * [Cape](https://github.com/njonsson/cape)
+* [rvm-capistrano](https://github.com/wayneeseguin/rvm-capistrano)
 * [Airbrake](https://github.com/airbrake/airbrake)
 * [NewRelic RPM](https://github.com/newrelic/rpm)
 * [Turbo Sprockets for Rails 3.2.x](https://github.com/ndbroadbent/turbo-sprockets-rails3) Speeds up your Rails 3 rake assets:precompile by only recompiling changed assets
@@ -50,7 +51,9 @@ It includes application gems like:
 * [Settingslogic](https://github.com/binarylogic/settingslogic)
 * [Pry](http://pryrepl.org/)
 
+### Dev Enviorments
 
+* [Better Errors](https://github.com/charliesome/better_errors)
 
 ## Remind
 

data/TODO.md

@@ -6,7 +6,6 @@
   - Facebook
 * Devise
   - Login Form refactor
-  - replace sender to Setting.email_sender
 * Cancan
 * Testing Tool
 * Social
@@ -21,4 +20,8 @@
   - multistage
 * Amazon SES
 * Caching
-  - add config.cache_stor t0 dali
+  - add config.cache_store to dali
+* Refactor Devise Views
+* add group hack to bootstrap css
+* add require admin to applicaiton controller
+* add admin to menu

data/bin/bootstrappers

@@ -2,6 +2,7 @@
 
 require File.expand_path(File.join('..', 'lib', 'bootstrappers', 'generators', 'app_generator'), File.dirname(__FILE__))
 require File.expand_path(File.join('..', 'lib', 'bootstrappers', 'actions'), File.dirname(__FILE__))
+require File.expand_path(File.join('..', 'lib', 'bootstrappers', 'layout_actions'), File.dirname(__FILE__))
 require File.expand_path(File.join('..', 'lib', 'bootstrappers', 'app_builder'), File.dirname(__FILE__))
 
 templates_root = File.expand_path(File.join("..", "templates"), File.dirname(__FILE__))

data/lib/bootstrappers/app_builder.rb

@@ -2,96 +2,27 @@ module Bootstrappers
   class AppBuilder < Rails::AppBuilder
 
     include Bootstrappers::Actions
+    include Bootstrappers::LayoutActions
 
-    def readme
-      template 'README.md.erb', 'README.md'
-    end
-
-    def remove_public_index
-      remove_file 'public/index.html'
-    end
-
-    def remove_rails_logo_image
-      remove_file 'app/assets/images/rails.png'
-    end
 
     def raise_delivery_errors
-      replace_in_file 'config/environments/development.rb',
-        'raise_delivery_errors = false', 'raise_delivery_errors = true'
+      replace_in_file 'config/environments/development.rb', 'raise_delivery_errors = false', 'raise_delivery_errors = true'
     end
 
-    def create_partials_directory
-      empty_directory 'app/views/application'
-      empty_directory 'app/views/pages'
-      empty_directory 'app/views/common'
-    end
-
-    def create_application_layout
-      template 'bootstrappers_layout.html.erb.erb',
-        'app/views/layouts/application.html.erb',
-        :force => true
-    end
-
-    def create_common_javascripts
-      remove_file 'app/assets/javascripts/application.js'
-      directory 'javascripts', 'app/assets/javascripts'
-    end
-
-    def create_common_stylesheets
-      remove_file 'app/assets/stylesheets/application.css'
-      directory 'stylesheets', 'app/assets/stylesheets'
-    end
-
-    def create_common_partial
-      directory 'common', 'app/views/common'
-    end
-
-
     def add_common_rake_tasks
       directory 'tasks', 'lib/tasks'
     end
 
-    def add_jquery_ui
-      inject_into_file 'app/assets/javascripts/application.js',
-        "//= require jquery-ui\n", :before => '//= require_tree .'
-    end
-
-    def add_bootstrap_js
-      inject_into_file 'app/assets/javascripts/application.js',
-        "//= require twitter/bootstrap/alert\n", :before => '//= require_tree .'
-    end
-
-    def add_custom_gems
-      additions_path = find_in_source_paths 'Gemfile_additions'
-      new_gems = File.open(additions_path).read
-      inject_into_file 'Gemfile', "\n#{new_gems}",
-      :after => /gem 'jquery-rails'/
-    end
-
     def add_devise_gem
       inject_into_file 'Gemfile', "\ngem 'devise'",
-        :after => /gem 'jquery-rails'/
-    end
-
-    def use_mysql_config_template
-      
-      template 'mysql_database.yml.erb', 'config/database.yml',:force => true
-      template 'mysql_database.yml.erb', 'config/database.yml.example', :force => true
-
-      db_user_name = ask("What is your local database user name? [root]")
-      db_password = ask("What is your local database password? ['']")
-
-      replace_in_file 'config/database.yml', 'username: root', "username: #{db_user_name}" if db_user_name.present?
-      replace_in_file 'config/database.yml', 'password: ""', "password: '#{db_password}'" if db_password.present?
-      
-      
+      :after => /gem 'jquery-rails'/
     end
 
     def create_capistrano_files
-       template 'capistrano/deploy_rb.erb', 'config/deploy.rb',:force => true
-       template 'capistrano/Capfile', 'Capfile',:force => true
-       empty_directory 'config/deploy'
-       directory 'capistrano/deploy', 'config/deploy'
+      template 'capistrano/deploy_rb.erb', 'config/deploy.rb',:force => true
+      template 'capistrano/Capfile', 'Capfile',:force => true
+      empty_directory 'config/deploy'
+      directory 'capistrano/deploy', 'config/deploy'
     end
 
     def create_database
@@ -103,21 +34,27 @@ module Bootstrappers
       generate 'devise User'
     end
 
-    def customize_error_pages
-      meta_tags =<<-EOS
-  <meta charset='utf-8' />
-  <meta name='ROBOTS' content='NOODP' />
-      EOS
-      style_tags =<<-EOS
-<link href='/assets/application.css' media='all' rel='stylesheet' type='text/css' />
-      EOS
-      %w(500 404 422).each do |page|
-        inject_into_file "public/#{page}.html", meta_tags, :after => "<head>\n"
-        replace_in_file "public/#{page}.html", /<style.+>.+<\/style>/mi, style_tags.strip
-        replace_in_file "public/#{page}.html", /<!--.+-->\n/, ''
+    def replace_email_sender_for_devise
+      replace_in_file 'config/initializers/devise.rb', /config\.mailer_sender = \".+\"/ , "config.mailer_sender = Setting.email_sender"
+    end
+
+    def gitignore_files
+      concat_file 'bootstrappers_gitignore', '.gitignore'
+      ['app/models',
+       'app/assets/images',
+       'app/views/pages',
+       'db/migrate',
+       'log',
+      ].each do |dir|
+        empty_directory_with_gitkeep dir
       end
     end
 
+    def init_git
+      run "git init"
+    end
+
+
     def build_settings_from_config
 
       template 'setting.rb', 'app/models/setting.rb',:force => true
@@ -128,35 +65,27 @@ module Bootstrappers
       directory 'initializers', 'config/initializers'
     end
 
-    def setup_stylesheets
-      copy_file 'app/assets/stylesheets/application.css', 'app/assets/stylesheets/application.css.scss'
-      remove_file 'app/assets/stylesheets/application.css'
-      concat_file 'import_scss_styles', 'app/assets/stylesheets/application.css.scss'
+    def add_common_method_to_application_controller
+      template 'application_controller_rb', 'app/controllers/application_controller.rb',:force => true
     end
 
-    def setup_root_route
-      template 'welcome.html.erb', 'app/views/pages/welcome.html.erb',:force => true
-      route "root :to => 'high_voltage/pages#show', :id => 'welcome'"
-    end
 
     def remove_routes_comment_lines
       replace_in_file 'config/routes.rb', /Application\.routes\.draw do.*end/m, "Application.routes.draw do\nend"
     end
 
-    def gitignore_files
-      concat_file 'bootstrappers_gitignore', '.gitignore'
-      ['app/models',
-       'app/assets/images',
-       'app/views/pages',
-       'db/migrate',
-       'log',
-      ].each do |dir|
-        empty_directory_with_gitkeep dir
-      end
-    end
+    def use_mysql_config_template
+      template 'mysql_database.yml.erb', 'config/database.yml',:force => true
+      template 'mysql_database.yml.erb', 'config/database.yml.example', :force => true
+
+      db_user_name = ask("What is your local database user name? [root]")
+      db_password = ask("What is your local database password? ['']")
+
+      replace_in_file 'config/database.yml', 'username: root', "username: #{db_user_name}" if db_user_name.present?
+      replace_in_file 'config/database.yml', 'password: ""', "password: '#{db_password}'" if db_password.present?
 
-    def init_git
-      run 'git init'
     end
+
+
   end
 end

data/lib/bootstrappers/generators/app_generator.rb

@@ -28,6 +28,7 @@ module Bootstrappers
       invoke :configure_app
       invoke :create_initializers
       invoke :remove_routes_comment_lines
+      invoke :add_common_method_to_application_controller
       invoke :setup_root_route
       invoke :setup_git
     end
@@ -72,8 +73,6 @@ module Bootstrappers
       build :add_common_rake_tasks
     end
 
-
-
     def customize_gemfile
       build :add_custom_gems
       build :add_devise_gem
@@ -109,19 +108,22 @@ module Bootstrappers
 
     def setup_devise
       build :generate_devise
+      build :replace_email_sender_for_devise
     end
 
-
     def customize_error_pages
       say 'Customizing the 500/404/422 pages'
       build :customize_error_pages
     end
 
-
     def remove_routes_comment_lines
       build :remove_routes_comment_lines
     end
 
+    def add_common_method_to_application_controller
+      build :add_common_method_to_application_controller
+    end
+
     def setup_root_route
       build :setup_root_route
     end

data/lib/bootstrappers/layout_actions.rb

@@ -0,0 +1,88 @@
+module Bootstrappers
+  module LayoutActions
+
+    def readme
+      template 'README.md.erb', 'README.md'
+    end
+
+    def remove_public_index
+      remove_file 'public/index.html'
+    end
+
+    def remove_rails_logo_image
+      remove_file 'app/assets/images/rails.png'
+    end
+
+    def create_partials_directory
+      empty_directory 'app/views/application'
+      empty_directory 'app/views/pages'
+      empty_directory 'app/views/common'
+    end
+
+    def create_application_layout
+      template 'bootstrappers_layout.html.erb.erb',
+        'app/views/layouts/application.html.erb',
+        :force => true
+    end
+
+    def create_common_javascripts
+      remove_file 'app/assets/javascripts/application.js'
+      directory 'javascripts', 'app/assets/javascripts'
+    end
+
+    def create_common_stylesheets
+      remove_file 'app/assets/stylesheets/application.css'
+      directory 'stylesheets', 'app/assets/stylesheets'
+    end
+
+    def create_common_partial
+      directory 'common', 'app/views/common'
+    end
+
+    def add_jquery_ui
+      inject_into_file 'app/assets/javascripts/application.js',
+        "//= require jquery-ui\n", :before => '//= require_tree .'
+    end
+
+    def add_bootstrap_js
+      inject_into_file 'app/assets/javascripts/application.js',
+        "//= require twitter/bootstrap/alert\n", :before => '//= require_tree .'
+    end
+
+    def add_custom_gems
+      additions_path = find_in_source_paths 'Gemfile_additions'
+      new_gems = File.open(additions_path).read
+      inject_into_file 'Gemfile', "\n#{new_gems}",
+      :after => /gem 'jquery-rails'/
+    end
+
+
+    def setup_stylesheets
+      copy_file 'app/assets/stylesheets/application.css', 'app/assets/stylesheets/application.css.scss'
+      remove_file 'app/assets/stylesheets/application.css'
+      concat_file 'import_scss_styles', 'app/assets/stylesheets/application.css.scss'
+    end
+
+    def setup_root_route
+      template 'welcome.html.erb', 'app/views/pages/welcome.html.erb',:force => true
+      route "root :to => 'high_voltage/pages#show', :id => 'welcome'"
+    end
+
+
+    def customize_error_pages
+      meta_tags =<<-EOS
+      <meta charset='utf-8' />
+      <meta name='ROBOTS' content='NOODP' />
+      EOS
+      style_tags =<<-EOS
+      <link href='/assets/application.css' media='all' rel='stylesheet' type='text/css' />
+      EOS
+      %w(500 404 422).each do |page|
+        inject_into_file "public/#{page}.html", meta_tags, :after => "<head>\n"
+        replace_in_file "public/#{page}.html", /<style.+>.+<\/style>/mi, style_tags.strip
+        replace_in_file "public/#{page}.html", /<!--.+-->\n/, ''
+      end
+    end
+
+  end
+end

data/lib/bootstrappers/version.rb

@@ -1,3 +1,3 @@
 module Bootstrappers
-  VERSION = "0.1.0.1"
+  VERSION = "0.2.0"
 end

data/templates/Gemfile_additions

@@ -1,4 +1,3 @@
-
 gem "seo_helper", "~> 1.0"
 gem "open_graph_helper"
 
@@ -8,8 +7,8 @@ gem "carrierwave-meta"
 
 gem "settingslogic"
 
-gem "anjlab-bootstrap-rails", ">= 2.1", :require => "bootstrap-rails"
-gem "bootstrap_helper", ">= 2.1.2"
+gem "anjlab-bootstrap-rails", ">= 2.2.2", :require => "bootstrap-rails"
+gem "bootstrap_helper", ">= 2.1.2.1"
 gem "simple_form", "2.0.3"
 gem "will_paginate", "3.0.3"
 
@@ -18,6 +17,9 @@ gem "high_voltage"
 gem "airbrake"
 gem "turbo-sprockets-rails3"
 
+gem "rvm-capistrano"
+
+
 # Cache
 gem "dalli"
 
@@ -25,10 +27,12 @@ group :assets do
   gem "compass-rails"
 end
 
-group :development do 
+group :development do
   gem "capistrano"
   gem "capistrano-ext"
   gem "cape"
+  gem "binding_of_caller"
+  gem "better_errors"
   gem "magic_encoding"
   gem "annotate"
   gem "powder"
@@ -36,6 +40,3 @@ group :development do
   gem "pry-remote"
 end
 
-group :production do
-  gem "newrelic_rpm"
-end

data/templates/application_controller_rb

@@ -0,0 +1,22 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+
+  def login_required
+    if current_user.blank?
+      respond_to do |format|
+        format.html  {
+          authenticate_user!
+        }
+        format.js{
+          render :partial => "common/not_logined"
+        }
+        format.all {
+          head(:unauthorized)
+        }
+      end
+    end
+  
+  end
+
+
+end

data/templates/capistrano/Capfile

@@ -2,4 +2,4 @@ load 'deploy'
 # Uncomment if you are using Rails' asset pipeline
 load 'deploy/assets'
 load 'config/deploy'
-load 'config/deploy/assets'
+# load 'config/deploy/assets'

data/templates/capistrano/deploy_rb.erb

@@ -2,6 +2,7 @@
 
 require "./config/boot"
 require "bundler/capistrano"
+require "rvm-capistrano"
 
 default_environment["PATH"] = "/opt/ruby/bin:/usr/local/bin:/usr/bin:/bin"
 
@@ -19,6 +20,8 @@ set :deploy_to, "/home/apps/#{application}"
 set :runner, "apps"
 set :deploy_via, :remote_cache
 set :git_shallow_clone, 1
+set :use_sudo, false
+set :rvm_ruby_string, '1.9.3'
 
 role :web, "<%= app_name %>.com"                          # Your HTTP server, Apache/etc
 role :app, "<%= app_name %>.com"                         # This may be the same as your `Web` server

data/templates/common/_not_logined.js.erb

@@ -0,0 +1,4 @@
+if (confirm("Please login first, proceed?") )
+{
+	window.location = "/users/sign_in";
+}

data/templates/common/_user_nav.html.erb

@@ -18,7 +18,7 @@
     </li>
 
 <% else %>
-  <li> <%= link_to( "Sing Up" ,new_user_registration_path) %> </li>
+  <li> <%= link_to( "Sign Up" ,new_user_registration_path) %> </li>
   <li> <%= link_to( "Login", new_user_session_path )  %> </li>   
 <% end %>
 

metadata

@@ -4,10 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  - 1
-  version: 0.1.0.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - xdite
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-09 00:00:00 +08:00
+date: 2012-12-16 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,9 +69,11 @@ files:
 - lib/bootstrappers/actions.rb
 - lib/bootstrappers/app_builder.rb
 - lib/bootstrappers/generators/app_generator.rb
+- lib/bootstrappers/layout_actions.rb
 - lib/bootstrappers/version.rb
 - templates/Gemfile_additions
 - templates/README.md.erb
+- templates/application_controller_rb
 - templates/bootstrappers_gitignore
 - templates/bootstrappers_layout.html.erb.erb
 - templates/capistrano/Capfile
@@ -83,6 +84,7 @@ files:
 - templates/common/_footer.html.erb
 - templates/common/_google_analytics.html.erb
 - templates/common/_menu.html.erb
+- templates/common/_not_logined.js.erb
 - templates/common/_search_form.html.erb
 - templates/common/_user_nav.html.erb
 - templates/config_yml.erb
@@ -111,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1161174567482039437
+      hash: 4466259845967218522
       segments: 
       - 0
       version: "0"
@@ -120,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1161174567482039437
+      hash: 4466259845967218522
       segments: 
       - 0
       version: "0"