jackdempsey-beet 0.2.2 → 0.3.0

data/README.rdoc

@@ -4,6 +4,10 @@ Beet is a simple project generator, with its roots and underlying infrastructure
 
 Please visit the homepage to learn more: http://jackdempsey.github.com/beet
 
+= How to
+to work with ruby 1.9 recommend to use wycats-thor
+example: beet -g new_app --recipes rails/jquery,rails/authlogic,rails/git
+
 == Copyright
 
 Copyright (c) 2009 Jack Dempsey. See LICENSE for details.

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.email = "jack.dempsey@gmail.com"
     gem.homepage = "http://github.com/jackdempsey/beet"
     gem.authors = ["Jack Dempsey"]
-    gem.add_dependency "thor"
+    gem.add_dependency "wycats-thor"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/beet.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beet}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Dempsey"]
-  s.date = %q{2009-07-04}
+  s.date = %q{2009-07-18}
   s.default_executable = %q{beet}
   s.email = %q{jack.dempsey@gmail.com}
   s.executables = ["beet"]
@@ -35,11 +35,13 @@ Gem::Specification.new do |s|
      "lib/beet/recipes/rack/middleware.rb",
      "lib/beet/recipes/rails/authlogic.rb",
      "lib/beet/recipes/rails/clean_files.rb",
+     "lib/beet/recipes/rails/clearance.rb",
      "lib/beet/recipes/rails/cms/bcms_blog.rb",
      "lib/beet/recipes/rails/cms/bcms_event.rb",
      "lib/beet/recipes/rails/css/blueprint.rb",
      "lib/beet/recipes/rails/css/reset.rb",
      "lib/beet/recipes/rails/db/mysql.rb",
+     "lib/beet/recipes/rails/db/postgres.rb",
      "lib/beet/recipes/rails/git.rb",
      "lib/beet/recipes/rails/jquery.rb",
      "lib/beet/recipes/rails/rspec.rb",
@@ -68,11 +70,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thor>, [">= 0"])
+      s.add_runtime_dependency(%q<wycats-thor>, [">= 0"])
     else
-      s.add_dependency(%q<thor>, [">= 0"])
+      s.add_dependency(%q<wycats-thor>, [">= 0"])
     end
   else
-    s.add_dependency(%q<thor>, [">= 0"])
+    s.add_dependency(%q<wycats-thor>, [">= 0"])
   end
 end

data/bin/beet

@@ -1,15 +1,17 @@
 #!/usr/bin/env ruby
- 
+
 require 'rubygems'
 require 'thor'
 begin
-  require 'ruby-debug'
+  if RUBY_VERSION <= '1.8.6'
+    require 'ruby-debug'
+  end
 rescue LoadError
 end
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'beet'
 require 'pp'
- 
+
 WIN32 = (RUBY_PLATFORM =~ /win32|mingw|bccwin|cygwin/) rescue nil
 SUDO = (WIN32 || ENV['SUDOLESS']) ? '': 'sudo '
 
@@ -21,16 +23,17 @@ class BeetRunner < Thor
   map "-l" => :list
   map "-d" => :display
   map "--list" => :list
+  map "--display" => :display
 
   desc 'generate [app_name]', "the main app generate method"
-  method_options :recipes => :optional, :gems => :optional, :template => :optional, :save => :optional, :use => :optional
+  method_options :recipes => :string, :gems => :string, :template => :string, :save => :string, :use => :string
   def generate(app_name, project_type=:rails)
     executor = Beet::Executor.new(app_name, options.merge('project_type' => project_type))
     executor.start
   end
 
   desc 'just_recipe', "when you just need a recipe"
-  method_options :recipes => :optional, :gems => :optional, :save => :optional, :use => :optional
+  method_options :recipes => :string, :gems => :string, :save => :string, :use => :string
   def just_recipe(app_name='.')
     executor = Beet::Executor.new(app_name, options.merge('generate' => false))
     executor.start
@@ -51,7 +54,7 @@ class BeetRunner < Thor
   end
 
   desc 'display', "Display the code for the recipes/templates"
-  method_options :recipes => :optional, :template => :optional
+  method_options :recipes => :string, :template => :string
   def display(app_name='.')
     executor = Beet::Executor.new(app_name,options.merge('generate' => false, 'display' => true))
     executor.start
@@ -68,30 +71,30 @@ class BeetRunner < Thor
   desc 'help', 'help output'
   def help
     puts %{
-Usage: #{$0} /path/to/your/app [options]
+      Usage: #{$0} /path/to/your/app [options]
 
-Options:
-    -g, --generate                   Run the generate command to build a project
-    -j, --just_recipe                Run the just_recipe command to only run specified recipes, templates, etc.
-    -d, --display                    Instead of running, show the template or recipe body
+      Options:
+      -g, --generate                   Run the generate command to build a project
+      -j, --just_recipe                Run the just_recipe command to only run specified recipes, templates, etc.
+      -d, --display                    Instead of running, show the template or recipe body
 
-Beet Info:
-    -v, --version                    Show the Beet version number and quit.
-    -l, --list                       Show the various recipes known to Beet and quit.
-    -h, --help                       Show this help message and quit.
+      Beet Info:
+      -v, --version                    Show the Beet version number and quit.
+      -l, --list                       Show the various recipes known to Beet and quit.
+      -h, --help                       Show this help message and quit.
 
-General Options:
+      General Options:
 
-Description:
-  Beet is used to quickly generate applications.
+      Description:
+      Beet is used to quickly generate applications.
 
-Example:
-    beet generate example_app --recipes="rails/authlogic, rails/clean_files, rails/git"
-    
-    Same thing but shorter:
+      Example:
+      beet generate example_app --recipes="rails/authlogic, rails/clean_files, rails/git"
 
-    beet -g example_app -t=rails/authlogic,rails/clean_files,rails/git
-} 
+      Same thing but shorter:
+
+      beet -g example_app -r=rails/authlogic,rails/clean_files,rails/git
+    } 
   end
 end
 def method_missing(*args)
@@ -106,3 +109,4 @@ def method_missing(*args)
 end
 
 BeetRunner.start
+

data/lib/beet/executor.rb

@@ -1,5 +1,6 @@
 require 'open-uri'
 require 'beet/logger'
+
 module Beet
   class Executor
     BEET_DATA_FILE = "~/.beet.yml"
@@ -16,7 +17,7 @@ module Beet
 
     def initialize(project_name, options={}) # :nodoc:
       @root = calculate_project_root(project_name)
-      @project_name = project_name == '.' ? File.basename(Dir.pwd) : project_name
+      @project_name = ((project_name == '.') ? File.basename(Dir.pwd) : project_name)
       @logger = Beet::Logger.new
       @gems = []
       @template = options[:template]
@@ -75,7 +76,7 @@ module Beet
           if @display
             puts code
           else
-            in_root { self.instance_eval(code) }
+            in_root { instance_eval(code)}
           end
         rescue LoadError, Errno::ENOENT => e
           raise "The recipe [#{recipe}] could not be loaded. Error: #{e}"
@@ -191,3 +192,4 @@ module Beet
     end
   end
 end
+

data/lib/beet/recipes/rails/authlogic.rb

@@ -1,4 +1,4 @@
-file "app/models/user_session.rb" do 
+file "app/models/user_session.rb" do
   %{
 class UserSession < Authlogic::Session::Base
   logout_on_timeout true # default is false
@@ -129,11 +129,11 @@ file "app/controllers/users_controller.rb" do
 class UsersController < ApplicationController
   before_filter :require_no_user, :only => [:new, :create]
   before_filter :require_user, :only => [:show, :edit, :update]
-  
+
   def new
     @user = User.new
   end
-  
+
   def create
     @user = User.new(params[:user])
     if @user.save
@@ -143,15 +143,15 @@ class UsersController < ApplicationController
       render :action => :new
     end
   end
-  
+
   def show
     @user = @current_user
   end
- 
+
   def edit
     @user = @current_user
   end
-  
+
   def update
     @user = @current_user # makes our views "cleaner" and more consistent
     if @user.update_attributes(params[:user])
@@ -181,13 +181,13 @@ end
 file "app/views/users/edit.html.erb" do
     %{
 <h1>Edit My Account</h1>
- 
+
 <% form_for @user, :url => account_path do |f| %>
   <%= f.error_messages %>
   <%= render :partial => "form", :object => f %>
   <%= f.submit "Update" %>
 <% end %>
- 
+
 <br /><%= link_to "My Profile", account_path %>
 }.strip
 end
@@ -195,7 +195,7 @@ end
 file "app/views/users/new.html.erb" do
     %{
 <h1>Register</h1>
- 
+
 <% form_for @user, :url => account_path do |f| %>
   <%= f.error_messages %>
   <%= render :partial => "form", :object => f %>
@@ -210,46 +210,52 @@ file "app/views/users/show.html.erb" do
   <b>Email:</b>
   <%=h @user.email %>
 </p>
- 
+
 <p>
   <b>Login count:</b>
   <%=h @user.login_count %>
 </p>
- 
+
 <p>
   <b>Last request at:</b>
   <%=h @user.last_request_at %>
 </p>
- 
+
 <p>
   <b>Last login at:</b>
   <%=h @user.last_login_at %>
 </p>
- 
+
 <p>
   <b>Current login at:</b>
   <%=h @user.current_login_at %>
 </p>
- 
+
 <p>
   <b>Last login ip:</b>
   <%=h @user.last_login_ip %>
 </p>
- 
+
 <p>
   <b>Current login ip:</b>
   <%=h @user.current_login_ip %>
 </p>
- 
- 
+
+
 <%= link_to 'Edit', edit_account_path %>
 }.strip
 end
 
 # can't rely on internal rails migration generation, so we do it this way
+
+#Dir.chdir("script") #for ruby 1.9.2 08/07/2009 . no need for ruby1.9.1p129
+#run "./generate migration beet_authlogic_create_user" # for ruby 1.9.2 08/07/2009. no need for ruby1.9.1p129
+
 run "script/generate migration beet_authlogic_create_user"
 
 #now open it
+#Dir.chdir("..") # for ruby 1.9.2 08/07/2009. no need for ruby1.9.1p129
+
 file(Dir.glob('db/migrate/*beet_authlogic_create_user*').first) do
   %{
 class BeetAuthlogicCreateUser < ActiveRecord::Migration
@@ -282,8 +288,10 @@ end
 }.strip
 end
 
+
 gem 'authlogic', :version => '~> 2.0.0'
 
 rake "gems:install", :sudo => true
-rake "db:create:all" 
+rake "db:create:all"
 rake "db:migrate"
+

data/lib/beet/recipes/rails/clearance.rb

@@ -0,0 +1,22 @@
+gem 'thoughtbot-clearance', :lib => 'clearance',:source  => 'http://gems.github.com', :version => '~> 0.6'
+gem 'webrat'
+gem 'cucumber'
+gem 'thoughtbot-factory_girl', :lib => 'factory_girl', :source => "http://gems.github.com"
+
+
+rake "gems:install", :sudo => true
+rake "gems:unpack"
+rake "db:create:all"
+
+generate "clearance"
+generate "cucumber"
+generate "clearance_features"
+rake "db:migrate"
+
+environment "HOST = 'localhost'", :env => "development"
+environment "HOST = 'localhost'", :env => "test"
+environment "DO_NOT_REPLY = \"donotreply@example.com\""
+route "map.root :controller => 'sessions', :action => 'new'"
+
+run "cp -fr vendor/gems/thoughtbot-clearance*/app/views app/"
+

data/lib/beet/recipes/rails/db/postgres.rb

@@ -0,0 +1,52 @@
+file 'config/database.yml' do
+  %{
+# PostgreSQL. Versions 7.4 and 8.x are supported.
+#
+# Install the ruby-postgres driver:
+#   gem install pg
+# On Mac OS X:
+#   gem install ruby-postgres -- --include=/usr/local/pgsql
+# On Windows:
+#   gem install ruby-postgres
+#       Choose the win32 build.
+#       Install PostgreSQL and put its /bin directory on your path.
+
+development: &defaults
+  adapter: postgresql
+  encoding: unicode
+  database: #{project_name}_development
+  pool: 5
+  username: root
+  password:
+
+  # Connect on a TCP socket. Omitted by default since the client uses a
+  # domain socket that doesn't need configuration. Windows does not have
+  # domain sockets, so uncomment these lines.
+  #host: localhost
+  #port: 5432
+
+  # Schema search path. The server defaults to $user,public
+  #schema_search_path: myapp,sharedapp,public
+
+  # Minimum log levels, in increasing order:
+  #   debug5, debug4, debug3, debug2, debug1,
+  #   log, notice, warning, error, fatal, and panic
+  # The server defaults to notice.
+  #min_messages: warning
+
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<:       *defaults
+  database: #{project_name}_test
+
+production:
+  <<:       *defaults
+  database: #{project_name}_production
+}
+end
+
+FileUtils.copy "config/database.yml", "config/database.yml.example"
+

data/lib/beet/recipes/rails/jquery.rb

@@ -1,6 +1,6 @@
 FileUtils.rm_r Dir.glob("public/javascripts/*.js")
 
-run "curl -L http://jqueryjs.googlecode.com/files/jquery-1.2.6.min.js > public/javascripts/jquery.js"
+run "curl -L http://jqueryjs.googlecode.com/files/jquery-1.3.2.min.js > public/javascripts/jquery.js"
 run "curl -L http://jqueryjs.googlecode.com/svn/trunk/plugins/form/jquery.form.js > public/javascripts/jquery.form.js"
 
 # Thanks to Chris Wanstrath and Doug Ramsay. The below will make it so that Rails recognizes form requests

data/test/test_helper.rb

@@ -5,6 +5,8 @@ require 'shoulda'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'beet'
+if RUBY_VERSION <= '1.8.6'
 require 'ruby-debug'
+end
 class Test::Unit::TestCase
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jackdempsey-beet
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jack Dempsey
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-04 00:00:00 -07:00
+date: 2009-07-18 00:00:00 -07:00
 default_executable: beet
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: wycats-thor
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -52,11 +52,13 @@ files:
 - lib/beet/recipes/rack/middleware.rb
 - lib/beet/recipes/rails/authlogic.rb
 - lib/beet/recipes/rails/clean_files.rb
+- lib/beet/recipes/rails/clearance.rb
 - lib/beet/recipes/rails/cms/bcms_blog.rb
 - lib/beet/recipes/rails/cms/bcms_event.rb
 - lib/beet/recipes/rails/css/blueprint.rb
 - lib/beet/recipes/rails/css/reset.rb
 - lib/beet/recipes/rails/db/mysql.rb
+- lib/beet/recipes/rails/db/postgres.rb
 - lib/beet/recipes/rails/git.rb
 - lib/beet/recipes/rails/jquery.rb
 - lib/beet/recipes/rails/rspec.rb