thoughtbot-clearance 0.2.4 → 0.2.5

data/Rakefile

@@ -2,6 +2,10 @@ require 'rake'
 require 'rake/testtask'
 require 'date'
 require 'lib/clearance/version'
+begin
+  require 'jeweler'
+rescue LoadError 
+end
 
 test_files_pattern = 'test/rails_root/test/{unit,functional,other}/**/*_test.rb'
 Rake::TestTask.new do |t|
@@ -13,11 +17,8 @@ end
 desc "Run the test suite"
 task :default => :test
 
-spec = Gem::Specification.new do |s|
+Jeweler.gemspec = Gem::Specification.new do |s|
   s.name = "clearance"
-  s.version = "#{Clearance::Version::MAJOR}.#{Clearance::Version::MINOR}.#{Clearance::Version::PATCH}"
-  date = DateTime.now
-  s.date = "#{date.year}-#{date.month}-#{date.day}"
   s.summary = "Simple, complete Rails authentication."
   s.email = "dcroak@thoughtbot.com"
   s.homepage = "http://github.com/thoughtbot/clearance"
@@ -25,82 +26,30 @@ spec = Gem::Specification.new do |s|
   s.authors = ["thoughtbot, inc.", "Dan Croak", "Josh Nichols", "Mike Breen", "Mike Burns", "Jason Morrison"]
   s.files = FileList["[A-Z]*", "{generators,lib,test}/**/*"]
 end
-
-namespace :gemspec do
-  desc "Generate a gemspec file for GitHub"
-  task :write do
-    File.open("#{spec.name}.gemspec", 'w') do |f|
-      f.write spec.to_ruby
+ 
+namespace :generator do
+  task :templates do
+    app_files = FileList["test/rails_root/app/{controllers,models,views}/**/*"]
+    app_files.reject! { |file| file.include?("test/rails_root/app/views/layouts") }
+    test_files = FileList["test/rails_root/test/{functional,unit}/**/*"]
+    test_files += ["test/rails_root/test/factories.rb"]
+    files = test_files + app_files
+    templates_path = "generators/clearance/templates"
+    system `rm -rf #{templates_path}`
+    system `mkdir #{templates_path}`
+    ["app", "app/controllers", "app/models", "app/views",
+     "test", "test/functional", "test/unit"].each do |directory|
+      system `mkdir #{templates_path}/#{directory}`
     end
-  end
-end
-
-namespace :version do
-  namespace :bump do
-    desc "Bump the gemspec a major version."
-    task :major do
-      major = Clearance::Version::MAJOR + 1
-      File.open("lib/clearance/version.rb", 'w') do |file|
-        file.write <<-END
-module Clearance
-  module Version
-    MAJOR = #{major}
-    MINOR = 0
-    PATCH = 0
-  end
-end
-        END
-      end
-      
-      spec.version = "#{major}.0.0"
-      puts "Version bumped to #{spec.version}"
-      
-      Rake::Task["gemspec:write"].invoke
-      puts "Gemspec updated"
-    end
-    
-    desc "Bump the gemspec a minor version."
-    task :minor do
-      minor = Clearance::Version::MINOR + 1
-      File.open("lib/clearance/version.rb", 'w') do |file|
-        file.write <<-END
-module Clearance
-  module Version
-    MAJOR = #{Clearance::Version::MAJOR}
-    MINOR = #{minor}
-    PATCH = 0
-  end
-end
-        END
-      end
-      
-      spec.version = "#{Clearance::Version::MAJOR}.#{minor}.0"
-      puts "Version bumped to #{spec.version}"
-      
-      Rake::Task["gemspec:write"].invoke
-      puts "Gemspec updated"
-    end
-    
-    desc "Bump the gemspec a patch version."
-    task :patch do
-      patch = Clearance::Version::PATCH + 1
-      File.open("lib/clearance/version.rb", 'w') do |file|
-        file.write <<-END
-module Clearance
-  module Version
-    MAJOR = #{Clearance::Version::MAJOR}
-    MINOR = #{Clearance::Version::MINOR}
-    PATCH = #{patch}
-  end
-end
-        END
+    files.each do |file|
+      template = "generators/clearance/templates/#{file.gsub("test/rails_root/", "")}"
+      if File.directory?(file)
+        system `rm -rf #{template}`
+        system `mkdir #{template}`
+      else
+        system `rm #{template}` if File.exists?(template)
+        system `cp #{file} #{template}`
       end
-      
-      spec.version = "#{Clearance::Version::MAJOR}.#{Clearance::Version::MINOR}.#{patch}"
-      puts "Version bumped to #{spec.version}"
-      
-      Rake::Task["gemspec:write"].invoke
-      puts "Gemspec updated"
     end
   end
 end

data/generators/clearance/clearance_generator.rb

@@ -17,7 +17,7 @@ class ClearanceGenerator < Rails::Generator::Base
       end
       
       m.directory File.join("app", "views")
-      system `mkdir app/views/confirmations`
+      m.directory File.join("app", "views", "confirmations")
       ["app/views/confirmations/new.html.erb"].each do |file|
         m.file file, file
       end

data/generators/clearance/templates/app/controllers/application.rb

@@ -0,0 +1,5 @@
+class ApplicationController < ActionController::Base
+  helper :all
+  protect_from_forgery
+  include Clearance::ApplicationController
+end

data/generators/clearance/templates/app/views/sessions/new.html.erb

@@ -14,4 +14,7 @@
   <div class="group buttons">
     <%= form.submit 'Login', :disable_with => 'Please wait...' %>
   </div>
-<% end %>
+<% end %>
+
+<p><%= link_to "Sign up", new_user_path %></p>
+<p><%= link_to "Forgot My Password", new_password_path %></p>

data/generators/clearance/templates/test/factories.rb

@@ -6,4 +6,4 @@ Factory.define :user do |user|
   user.email { Factory.next :email }
   user.password "password"
   user.password_confirmation "password"
-end
+end

data/generators/clearance/templates/test/unit/user_test.rb

@@ -0,0 +1,5 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class UserTest < Test::Unit::TestCase
+  include Clearance::UserTest
+end

data/lib/clearance/version.rb

@@ -1,7 +1,7 @@
-module Clearance
+class Clearance
   module Version
     MAJOR = 0
     MINOR = 2
-    PATCH = 4
+    PATCH = 5
   end
 end

data/test/rails_root/app/views/sessions/new.html.erb

@@ -14,4 +14,7 @@
   <div class="group buttons">
     <%= form.submit 'Login', :disable_with => 'Please wait...' %>
   </div>
-<% end %>
+<% end %>
+
+<p><%= link_to "Sign up", new_user_path %></p>
+<p><%= link_to "Forgot My Password", new_password_path %></p>

data/test/rails_root/config/routes.rb

@@ -10,5 +10,4 @@ ActionController::Routing::Routes.draw do |map|
  
   map.root :controller => 'sessions', :action => 'new'
 
-end
-    
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thoughtbot-clearance
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-11 00:00:00 -07:00
+date: 2008-10-12 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -35,6 +35,7 @@ files:
 - generators/clearance/templates
 - generators/clearance/templates/app
 - generators/clearance/templates/app/controllers
+- generators/clearance/templates/app/controllers/application.rb
 - generators/clearance/templates/app/controllers/confirmations_controller.rb
 - generators/clearance/templates/app/controllers/passwords_controller.rb
 - generators/clearance/templates/app/controllers/sessions_controller.rb