beet 0.4.5 → 0.4.6

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/beet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beet}
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Dempsey"]
-  s.date = %q{2010-01-09}
+  s.date = %q{2010-03-14}
   s.default_executable = %q{beet}
   s.email = %q{jack.dempsey@gmail.com}
   s.executables = ["beet"]
@@ -76,7 +76,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jackdempsey/beet}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A gem to help with easily generating projects}
   s.test_files = [
     "test/executor_test.rb",

data/bin/beet

@@ -26,9 +26,9 @@ class BeetRunner < Thor
   map "--display" => :display
 
   desc 'generate [app_name]', "the main app generate method"
-  method_options %w(recipes -r) => :string, %w(gems) => :string, %w(template -t) => :string, %w(save -s) => :string, %w(use -u) => :string
-  def generate(app_name, project_type=:rails)
-    executor = Beet::Executor.new(app_name, options.merge('project_type' => project_type))
+  method_options %w(recipes -r) => :string, %w(project_type -p) => :project_type, %w(gems) => :string, %w(template -t) => :string, %w(save -s) => :string, %w(use -u) => :string
+  def generate(app_name)
+    executor = Beet::Executor.new(app_name, options)
     executor.start
   end
 
@@ -43,7 +43,7 @@ class BeetRunner < Thor
   def list
     paths = [] 
     paths << File.dirname(__FILE__) + '/../lib/beet/recipes/**/*.rb'
-    paths << ENV['BEET_RECIPES_DIR'] if ENV['BEET_RECIPES_DIR']
+    paths << ENV['BEET_RECIPES_DIR'] + '/**/*.rb' if ENV['BEET_RECIPES_DIR']
     recipes = paths.map do |path|
       Dir.glob(path)
     end.flatten.compact
@@ -51,6 +51,8 @@ class BeetRunner < Thor
     pp recipes
     puts "\nTemplates: (e.g. beet -g app -t bort)"
     pp TEMPLATE_LOCATIONS.sort.map {|array| array[0] + " => " + array[1]}
+    puts "\nSaved Configurations:"
+    print `cat #{ENV['HOME']}/.beet.yml`
   end
 
   desc 'display', "Display the code for the recipes/templates"

data/lib/beet/executor.rb

@@ -24,7 +24,7 @@ module Beet
       @options = options
       @todo_items = ''
       @recipes = []
-      @project_type = options[:project_type]
+      @project_type = options[:project_type].to_sym || :rails
       @generate = true unless options[:generate] == false
       @display = options[:display]
       extract_commands_from_options
@@ -45,6 +45,21 @@ module Beet
         puts open(TEMPLATE_LOCATIONS[@template]).read
       else
         case @project_type
+        when :rails3
+          # TODO win compatibility
+          unless `which rails3`.blank?
+            if @generate
+              puts "Generating rails 3 project #{project_name}..."
+              if @template
+                system("rails3 #{project_name} -m #{TEMPLATE_LOCATIONS[@template]}")
+              else
+                system("rails3 #{project_name}")
+              end
+            end
+          else
+            puts "Beet relies on you defining a rails3 command to build rails 3 projects. Please make sure one is available in your PATH."
+            exit
+          end
         when :rails
           if @generate
             puts "Generating rails project #{project_name}..."

data/lib/beet/recipes/rails/auth/devise.rb

@@ -1,5 +1,5 @@
-gem 'warden', :version => '~> 0.6.5'
-gem 'devise', :version => '~> 0.7.1'
+gem 'warden', :version => '0.9.3'
+gem 'devise', :version => '1.0.2'
 
 rake 'gems:install'
 generate "devise_install"
@@ -7,7 +7,6 @@ generate "devise User"
 generate "devise_views"
 
 append_file 'config/environments/development.rb', "\nconfig.action_mailer.default_url_options = { :host => 'localhost:3000' }\n"
-append_file 'config/environment.rb', "\nDeviseMailer.sender = 'test@example.com'\n"
 add_after 'config/routes.rb', '# map.root :controller => "welcome"', "\n  map.root :controller => 'home'\n"
 
 rake "db:migrate"
@@ -15,7 +14,7 @@ rake "db:migrate"
 file 'app/controllers/home_controller.rb' do
   %{class HomeController < ApplicationController
   def index 
-    render :text => "Welcome!"
+    render :text => "Welcome from your HomeController!"
   end
 end
   }

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

@@ -11,7 +11,7 @@ log/*.*
 db/*.db
 db/*.sqlite3
 db/schema.rb
-tmp/*.*
+tmp/*
 .DS_Store
 doc/api
 doc/app

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: beet
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Jack Dempsey
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-09 00:00:00 -05:00
+date: 2010-03-14 00:00:00 -05:00
 default_executable: beet
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 11
+        - 6
         version: 0.11.6
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: jack.dempsey@gmail.com
 executables: 
@@ -99,18 +108,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A gem to help with easily generating projects