bootup 0.0.3 → 0.0.4

data/README.md

@@ -1,6 +1,6 @@
 # Bootup
 
-Provides a rails generator which installs a few useful gems & sets up authentication using sorcery along with scaffolding.
+Provides a rails generator to install a few useful gems & set up authentication along with scaffolding.
 
 ## Installation
 

data/lib/bootup/version.rb

@@ -1,3 +1,3 @@
 module Bootup
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/generators/bootup/authentication.rb

@@ -0,0 +1,52 @@
+module HelperMethods
+  def setup_authentication
+    @model = ask("\n\n What would you like to call your user model? Default: User", :blue)
+    @model = "user" if @model.blank?
+    @model = @model.downcase.singularize
+    @models = @model.pluralize
+
+    log :bootup_log, "Installing Sorcery"
+    generate "sorcery:install --model #{@model.classify}"
+
+
+    log :bootup_log, "Copying models and migrations"
+
+    case @db
+    when 'mongoid'
+      template "authentication/models/user_mongoid.rb.erb", "app/models/#{@model}.rb"
+      inside Rails.root do
+        run "rm db/migrate/*"
+      end
+    else
+      template "authentication/models/user_others.rb.erb", "app/models/#{@model}.rb"
+      rake("db:migrate")
+    end
+
+    log :bootup_log, "Copying controllers"
+    template "authentication/controllers/users_controller.rb.erb", "app/controllers/#{@models}_controller.rb"
+    template "authentication/controllers/user_sessions_controller.rb.erb", "app/controllers/#{@model}_sessions_controller.rb"
+    copy_file "authentication/controllers/pages_controller.rb", "app/controllers/pages_controller.rb"
+    copy_file "authentication/controllers/application_controller.rb", "app/controllers/application_controller.rb"
+
+    log :bootup_log, "Copying views"
+    directory "authentication/views", "app/views"
+    unless @model.blank?
+      inside Rails.root do
+        run "mv app/views/user_sessions app/views/#{@model}_sessions"
+        run "mv app/views/users app/views/#{@models}"
+      end
+    end
+
+    log :bootup_log, "Copying initializers"
+    template "authentication/sorcery.rb.erb", "config/initializers/sorcery.rb"
+
+    log :bootup_log, "Copying initializers"
+    template "authentication/routes.rb.erb", "config/routes.rb"
+
+    inside Rails.root do
+      run "git add ."
+      run "git commit -am 'Authentication with sorcery.'"
+    end
+    say "\n\n An application with basic authentication has been created for you. Start thin server by typing 'rails s' in your command line. Point your browser to localhost:3000 to see the application.\n\n", :green
+  end
+end

data/lib/generators/bootup/bootup_generator.rb

@@ -1,134 +1,51 @@
 class BootupGenerator < Rails::Generators::Base
+  require_relative 'authentication'
+  require_relative 'methods'
+
+  include HelperMethods
+
   source_root File.expand_path('../templates', __FILE__)
   argument :app_name, type: :string, default: Rails.application.class.parent
 
   def generate_bootup
     log :bootup, "Booting #{app_name}......"
 
-    db = ask("\n\nWhat database would you like to start off with? P-Postgres / M-Mongoid / Default-SQLite", :blue)
-    case db
-    when "P","p"
-      @db = 'postgres'
-    when "M","m"
-      @db = 'mongoid'
-    else
-      @db = 'sqlite'
-    end
-
-    log :bootup_log, "Copying Gemfile"
-    template "Gemfile.erb", "Gemfile"
+    #Get database from User
+    @db = fetch_database
 
-    log :bootup_log, "Running Bundler"
-    Bundler.with_clean_env do
-      run "bundle install"
-    end
+    #Setup & bundle the Gemfile
+    setup_gems
 
     log :bootup_log, "Removing public/index.."
     inside Rails.root do
       run "rm public/index.html"
     end
 
-    if @db == 'postgres'
-      @username = ask("\n\nPlease enter you postgres username", :blue)
-      @password = ask("\n\nPlease enter you postgres password. Leave blank if not applicable", :blue)
-      log :bootup_log, "Initializing database.yml"
-      template 'database.yml.erb', 'config/database.yml'
-
-      log :bootup_log, "Creating database"
-      rake("db:create")
-    elsif @db == 'mongoid'
-      log :bootup_log, "Generating Mongoid config"
-      generate "mongoid:config"
-    end
+    #For postgres databases, a username password needs to be part of database.yml. This data needs to come from the user. For mongoid, the mongoid:config generator is run
+    @db == 'postgres' ? create_postgres : create_mongoid
 
-
-    log :bootup_log, "Installing Twitter Bootstrap"
-    generate "bootstrap:install"
-
-    log :bootup_log, "Copy application.js & initialize datatables to #datatables - Remember to change sorting"
-    copy_file "application.js", "app/assets/javascripts/application.js"
-
-    log :bootup_log, "Copying stylesheets"
-    copy_file "application.css", "app/assets/stylesheets/application.css"
-
-    log :bootup_log, "Installing Simple Form"
-    generate "simple_form:install --bootstrap"
+    #Run generators for all view related gems
+    setup_view_stuff
 
     tests = ask("\n\n Would you like to get rid of the default testing framework & install Rspec with Guard?", :blue)
     if %w(y yes).include? tests
-      log :bootup_log, "Removing Tests.."
-      inside Rails.root do
-        run "rm -rf test/"
-      end
-
-      log :bootup_log, "Setting up Rspec.."
-      generate "rspec:install"
-
-      log :bootup_log, "Setting up Guard with a custom guardfile.."
-      copy_file "Guardfile", "Guardfile"
-
-      log :bootup_log, "Setting up spork"
-      copy_file "spec_helper.rb", "spec/spec_helper.rb"
+      #Setup Rspec & Guard
+      setup_testing
     else
       log :bootup_log, "Skipping removal of tests"
     end
-    log :bootup_log, "Initializing git repo"
-    inside Rails.root do
-      run "git init"
-    end
-    copy_file ".gitignore", "spec/spec_helper.rb"
-    inside Rails.root do
-      run "git add ."
-      run "git commit -m 'Initial Commit'"
-    end
-
-    auth = ask("\n\n Would you like authentication & related scaffolding to be setup?", :blue)
-
-    if %w(Y y Yes YES yes).include? auth
-      @model = ask("\n\n What would you like to call your user model? Default: User", :blue)
-      @model = "user" if @model.blank?
-      @model = @model.downcase.singularize
-      @models = @model.pluralize
 
-      log :bootup_log, "Installing Sorcery"
-      generate "sorcery:install"
+    #Git init, git add & git commit
+    first_commit
 
+    auth = ask("\n\n Would you like Bootup to create an application with basic authentication to start off with?", :blue)
 
-      log :bootup_log, "Copying models and migrations"
-
-      case @db
-      when 'mongoid'
-        template "authentication/models/user_mongoid.rb.erb", "app/models/#{@model}.rb"
-        inside Rails.root do
-          run "rm db/migrate/*"
-        end
-      else
-        template "authentication/models/user_others.rb.erb", "app/models/#{@model}.rb"
-        rake("db:migrate")
-      end
-
-      log :bootup_log, "Copying controllers"
-      template "authentication/controllers/users_controller.rb.erb", "app/controllers/#{@models}_controller.rb"
-      template "authentication/controllers/user_sessions_controller.rb.erb", "app/controllers/#{@model}_sessions_controller.rb"
-      copy_file "authentication/controllers/pages_controller.rb", "app/controllers/pages_controller.rb"
-      copy_file "authentication/controllers/application_controller.rb", "app/controllers/application_controller.rb"
-
-      log :bootup_log, "Copying views"
-      directory "authentication/views", "app/views"
-
-      log :bootup_log, "Copying initializers"
-      copy_file "authentication/sorcery.rb", "config/initializers/sorcery.rb"
-
-      log :bootup_log, "Copying initializers"
-      template "authentication/routes.rb.erb", "config/routes.rb"
-
-      inside Rails.root do
-        run "git add ."
-        run "git commit -am 'Authentication with sorcery.'"
-      end
+    if %w(Y y Yes YES yes).include? auth
+      #This sets a complete web application with authentication
+      setup_authentication
     end
 
-    log :Installation_complete, "\n\n\n Installation Complete! Hope you saved some time. \n\n\n"
+    say "\n Installation complete! Hope bootup helped you save some time. \n\n\n", :green
   end
 end
 

data/lib/generators/bootup/methods.rb

@@ -0,0 +1,84 @@
+module HelperMethods
+
+  def fetch_database
+    db = ask("\n\nWhat database would you like to start off with? P-Postgres / M-Mongoid / Default-SQLite", :blue)
+    case db
+    when "P","p"
+      'postgres'
+    when "M","m"
+      'mongoid'
+    else
+      'sqlite'
+    end
+  end
+
+  def create_postgres
+    @username = ask("\n\nPlease enter you postgres username", :blue)
+    @password = ask("\n\nPlease enter you postgres password. Leave blank if not applicable", :blue)
+    log :bootup_log, "Initializing database.yml"
+    template 'database.yml.erb', 'config/database.yml'
+
+    log :bootup_log, "Creating database"
+    rake("db:create")
+  end
+
+  def create_mongoid 
+    unless @db == "sqlite"
+      log :bootup_log, "Generating Mongoid config"
+      generate "mongoid:config"
+    end
+  end
+
+  def setup_view_stuff
+    log :bootup_log, "Installing Twitter Bootstrap"
+    generate "bootstrap:install"
+
+    log :bootup_log, "Copy application.js & initialize datatables to #datatables - Remember to change sorting"
+    copy_file "application.js", "app/assets/javascripts/application.js"
+
+    log :bootup_log, "Copying stylesheets"
+    copy_file "application.css", "app/assets/stylesheets/application.css"
+
+    log :bootup_log, "Installing Simple Form"
+    generate "simple_form:install --bootstrap"
+  end
+
+  def setup_testing
+    log :bootup_log, "Removing Tests.."
+    inside Rails.root do
+      run "rm -rf test/"
+    end
+
+    log :bootup_log, "Setting up Rspec.."
+    generate "rspec:install"
+
+    log :bootup_log, "Setting up Guard with a custom guardfile.."
+    copy_file "Guardfile", "Guardfile"
+
+    log :bootup_log, "Setting up spork"
+    copy_file "spec_helper.rb", "spec/spec_helper.rb"
+  end
+
+
+  def setup_gems
+    log :bootup_log, "Copying Gemfile"
+    template "Gemfile.erb", "Gemfile"
+
+    log :bootup_log, "Running Bundler"
+    Bundler.with_clean_env do
+      run "bundle install"
+    end
+  end
+
+  def first_commit
+    log :bootup_log, "Initializing git repo"
+    inside Rails.root do
+      run "git init"
+    end
+    copy_file ".gitignore", "spec/spec_helper.rb"
+    inside Rails.root do
+      run "git add ."
+      run "git commit -m 'Initial Commit'"
+    end
+  end
+end

data/lib/generators/bootup/templates/authentication/controllers/user_sessions_controller.rb.erb

@@ -8,7 +8,7 @@ class <%= "#{@model}_sessions_controller".classify %> < ApplicationController
   def create
     respond_to do |format|
       if @user = login(params[:email],params[:password])
-        format.html { redirect_back_or_to(@user, :notice => 'Login successful.') }
+        format.html { redirect_back_or_to(user_path(@user), :notice => 'Login successful.') }
         format.xml { render :xml => @user, :status => :created, :location => @user }
       else
         format.html { flash.now[:alert] = "Login failed."; render :action => "new" }

data/lib/generators/bootup/templates/authentication/controllers/users_controller.rb.erb

@@ -41,7 +41,7 @@ class <%= "#{@models}_controller".classify %> < ApplicationController
   # POST /users
   # POST /users.json
   def create
-    @user = <%= @model.classify %>.new(params[:user])
+    @user = <%= @model.classify %>.new(params[:<%= @model %>])
     if @user.save
       reset_session
       auto_login(@user) 
@@ -57,7 +57,7 @@ class <%= "#{@models}_controller".classify %> < ApplicationController
     @user = <%= @model.classify %>.find(params[:id])
 
     respond_to do |format|
-      if @user.update_attributes(params[:user])
+      if @user.update_attributes(params[:<%= @model %>])
         format.html { redirect_to @user, notice: '<%= @model.classify %> was successfully updated.' }
         format.json { head :no_content }
       else

data/lib/generators/bootup/templates/authentication/routes.rb.erb

@@ -3,8 +3,8 @@
   get "pages/home"
   root :to => 'pages#home'
 
-  resources :<%= "#{@model}_sessions" %>
-  resources :<%= @models %>
+  resources :<%= "#{@model}_sessions" %>, as: :user_sessions
+  resources :<%= @models %>, as: :users
     
   match 'login' => '<%= "#{@model}_sessions" %>#new', :as => :login
   match 'logout' => '<%= "#{@model}_sessions" %>#destroy', :as => :logout

data/lib/generators/bootup/templates/authentication/{sorcery.rb → sorcery.rb.erb}

@@ -394,5 +394,5 @@ Rails.application.config.sorcery.configure do |config|
 
   # This line must come after the 'user config' block.
   # Define which model authenticates with sorcery.
-  config.user_class = "User"
+  config.user_class = "<%= @model.classify %>"
 end

data/lib/generators/bootup/templates/authentication/views/users/_form.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for(@user) do |f| %>
+<%= simple_form_for(@user, url: user_path(@user), method: :put) do |f| %>
   <%= f.error_notification %>
 
   <div class="form-inputs">
@@ -10,6 +10,6 @@
 
   <div class="form-actions">
     <%= f.button :submit, class: "btn btn-primary" %>
-    <%= link_to 'Back', root_path, class: "btn" %>
+    <%= link_to 'Back', user_path(@user), class: "btn" %>
   </div>
 <% end %>

data/lib/generators/bootup/templates/authentication/views/users/edit.html.erb

@@ -1,6 +1,5 @@
-<h1>Editing user</h1>
+<h1>Editing User</h1>
+<hr>
 
 <%= render 'form' %>
 
-<%= link_to 'Show', @user %> |
-<%= link_to 'Back', users_path %>

data/lib/generators/bootup/templates/authentication/views/users/new.html.erb

@@ -1,4 +1,18 @@
-<h1>New user</h1>
+<h1>New User</h1>
 <hr>
-<%= render 'form' %>
 
+<%= simple_form_for(@user, url: users_path(@user)) do |f| %>
+  <%= f.error_notification %>
+
+  <div class="form-inputs">
+    <%= f.input :username %>
+    <%= f.input :email %>
+    <%= f.input :password %>
+    <%= f.input :password_confirmation %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, class: "btn btn-primary" %>
+    <%= link_to 'Back', root_path, class: "btn" %>
+  </div>
+<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootup
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies: []
 description: Helps create a new rails app quickly
 email:
@@ -28,7 +28,9 @@ files:
 - lib/bootup/engine.rb
 - lib/bootup/version.rb
 - lib/generators/bootup/USAGE
+- lib/generators/bootup/authentication.rb
 - lib/generators/bootup/bootup_generator.rb
+- lib/generators/bootup/methods.rb
 - lib/generators/bootup/templates/.gitignore
 - lib/generators/bootup/templates/Gemfile.erb
 - lib/generators/bootup/templates/Guardfile
@@ -44,7 +46,7 @@ files:
 - lib/generators/bootup/templates/authentication/models/user_mongoid.rb.erb
 - lib/generators/bootup/templates/authentication/models/user_others.rb.erb
 - lib/generators/bootup/templates/authentication/routes.rb.erb
-- lib/generators/bootup/templates/authentication/sorcery.rb
+- lib/generators/bootup/templates/authentication/sorcery.rb.erb
 - lib/generators/bootup/templates/authentication/views/layouts/application.html.erb
 - lib/generators/bootup/templates/authentication/views/pages/home.html.erb
 - lib/generators/bootup/templates/authentication/views/user_sessions/_form.html.erb