beet 0.4.0 → 0.4.1

data/README.rdoc

@@ -4,10 +4,6 @@ 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/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/beet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beet}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Dempsey"]
-  s.date = %q{2009-11-03}
+  s.date = %q{2009-11-16}
   s.default_executable = %q{beet}
   s.email = %q{jack.dempsey@gmail.com}
   s.executables = ["beet"]
@@ -37,14 +37,25 @@ Gem::Specification.new do |s|
      "lib/beet/executor.rb",
      "lib/beet/file_system.rb",
      "lib/beet/gem_location_map.rb",
+     "lib/beet/generators.rb",
+     "lib/beet/generators/app_container.rb",
+     "lib/beet/generators/base.rb",
+     "lib/beet/generators/templates/app_container/%stack_name%/%stack_name%.rb.tt",
+     "lib/beet/generators/templates/app_container/%stack_name%/Rakefile.tt",
+     "lib/beet/generators/templates/app_container/%stack_name%/config.ru.tt",
+     "lib/beet/generators/templates/app_container/%stack_name%/pancake_init.rb.tt",
+     "lib/beet/generators/templates/app_container/%stack_name%/public/.empty_directory",
+     "lib/beet/generators/templates/app_container/%stack_name%/views/root.html.haml",
      "lib/beet/interaction.rb",
      "lib/beet/logger.rb",
      "lib/beet/rails.rb",
+     "lib/beet/recipes/pancake/app_container.rb",
      "lib/beet/recipes/passenger/vhost.rb",
      "lib/beet/recipes/rack/middleware.rb",
-     "lib/beet/recipes/rails/authlogic.rb",
+     "lib/beet/recipes/rails/auth/authlogic.rb",
+     "lib/beet/recipes/rails/auth/clearance.rb",
+     "lib/beet/recipes/rails/auth/devise.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",
@@ -53,8 +64,8 @@ Gem::Specification.new do |s|
      "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",
-     "lib/beet/recipes/rails/shoulda.rb",
+     "lib/beet/recipes/rails/testing/rspec.rb",
+     "lib/beet/recipes/rails/testing/shoulda.rb",
      "lib/beet/scm.rb",
      "lib/beet/scm/git.rb",
      "lib/beet/scm/svn.rb",

data/bin/beet

@@ -11,6 +11,9 @@ end
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'beet'
 require 'pp'
+require 'thor/runner'
+require 'beet/generators'
+
 
 WIN32 = (RUBY_PLATFORM =~ /win32|mingw|bccwin|cygwin/) rescue nil
 SUDO = (WIN32 || ENV['SUDOLESS']) ? '': 'sudo '
@@ -24,11 +27,19 @@ class BeetRunner < Thor
   map "-d" => :display
   map "--list" => :list
   map "--display" => :display
+  map '-x' => :execute
+
+
+  desc "to do some shit", 'xxxx'
+  def execute(*args)
+    Beet::Generators::Pancake::AppContainer.start
+  end
 
   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(gems) => :string, %w(template -t) => :string, %w(save -s) => :string, %w(use -u) => :string, 
+                  %w(project_type -p) => :string
+  def generate(app_name)
+    executor = Beet::Executor.new(app_name, options)
     executor.start
   end
 
@@ -101,6 +112,7 @@ class BeetRunner < Thor
     } 
   end
 end
+
 def method_missing(*args)
   unless @activesupport_required
     require 'activesupport'

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] || :rails
       @generate = true unless options[:generate] == false
       @display = options[:display]
       extract_commands_from_options
@@ -76,7 +76,11 @@ module Beet
           if @display
             puts code
           else
-            in_root { instance_eval(code)}
+            if root
+              in_root { instance_eval(code)}
+            else
+              instance_eval(code)
+            end
           end
         rescue LoadError, Errno::ENOENT => e
           raise "The recipe [#{recipe}] could not be loaded. Error: #{e}"
@@ -104,15 +108,19 @@ module Beet
     end
 
     def calculate_project_root(project_name)
-      # if the name looks like ~/projects/foobar then thats the root
-      if project_name.include?('/')
-        project_name
-      # if we're running inside the app, then current dir is it
-      elsif File.basename(Dir.pwd) == project_name
-        Dir.pwd
-      # assume the root is ./project_name
-      else
-        File.join(Dir.pwd, project_name)
+      # can't assume all project types want a root. Some, like pancake, might generate the root
+      # inside the recipe. Need to revisit this, but for now, only set when we're generating rails apps
+      if @project_type == :rails
+        # if the name looks like ~/projects/foobar then thats the root
+        if project_name.include?('/')
+          project_name
+        # if we're running inside the app, then current dir is it
+        elsif File.basename(Dir.pwd) == project_name
+          Dir.pwd
+        # assume the root is ./project_name
+        else
+          File.join(Dir.pwd, project_name)
+        end
       end
     end
 

data/lib/beet/generators.rb

@@ -0,0 +1,8 @@
+require 'thor'
+require 'extlib'
+
+require File.join(File.dirname(__FILE__), "generators", "base.rb")
+
+Dir[File.join(File.dirname(__FILE__), "generators", "*.rb")].each do |f|
+ require f unless f == 'base.rb'
+end

data/lib/beet/generators/app_container.rb

@@ -0,0 +1,15 @@
+module Beet
+  module Generators
+    module Pancake
+      class AppContainer < Base
+        argument :stack_name, :banner => "Name of stack"
+
+        desc "Generates a stack"
+        def stack
+          say "Creating The Stack For #{stack_name}"
+          directory "app_container/%stack_name%", stack_name
+        end
+      end
+    end
+  end
+end

data/lib/beet/generators/base.rb

@@ -0,0 +1,12 @@
+module Beet
+  module Generators
+    class Base < Thor::Group
+      include Thor::Actions
+      
+      def self.source_root
+        File.join(File.dirname(__FILE__), "templates")
+      end
+      
+    end
+  end
+end

data/lib/beet/generators/templates/app_container/%stack_name%/%stack_name%.rb.tt

@@ -0,0 +1,8 @@
+class <%= stack_name.camel_case %> < Pancake::Stacks::Short
+  add_root(__FILE__)
+
+  get "/" do
+    render :root
+  end
+end
+

data/lib/beet/generators/templates/app_container/%stack_name%/Rakefile.tt

@@ -0,0 +1,40 @@
+require 'rubygems'
+require 'rake'
+require 'pancake'
+
+require File.join(Pancake.get_root(__FILE__), "<%= stack_name %>")
+Pancake.root = Pancake.get_root(__FILE__)
+THIS_STACK = <%= stack_name.camel_case %>
+<%= stack_name.camel_case %>.load_rake_tasks!(:master => true)
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION.yml')
+    config = YAML.load(File.read('VERSION.yml'))
+    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
+  else
+    version = ""
+  end
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "foo #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+

data/lib/beet/generators/templates/app_container/%stack_name%/config.ru.tt

@@ -0,0 +1,12 @@
+require 'rubygems'
+
+require 'pancake'
+require ::File.join(::File.expand_path(::File.dirname(__FILE__)), "<%= stack_name %>")
+
+# get the application to run.  The applicadtion in the Pancake.start block
+# is the master application.  It will have all requests directed to it through the
+# pancake middleware
+# This should be a very minimal file, but should be used when any stand alone code needs to be included
+app = Pancake.start(:root => Pancake.get_root(__FILE__)){ <%= stack_name.camel_case %>.stackup(:master => true) }
+
+run app

data/lib/beet/generators/templates/app_container/%stack_name%/pancake_init.rb.tt

@@ -0,0 +1 @@
+require File.join(File.expand_path(File.dirname(__FILE__), "<%= stack_name %>"))

data/lib/beet/generators/templates/app_container/%stack_name%/views/root.html.haml

@@ -0,0 +1 @@
+- inherits_from :base

data/lib/beet/recipes/pancake/app_container.rb

@@ -0,0 +1 @@
+run "pancake-gen micro #{project_name}"

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

@@ -0,0 +1,12 @@
+gem 'warden', :version => '~> 0.5.1'
+gem 'devise', :version => '~> 0.4.1'
+
+generate "devise_install"
+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"', "\nmap.root :controller => 'home'\n"
+
+rake "db:migrate"

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

@@ -40,3 +40,8 @@ production:
 end
 
 FileUtils.copy "config/database.yml", "config/database.yml.example"
+
+if yes?("Create databases using rake db:create:all?")
+  rake "db:create:all"
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beet
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Jack Dempsey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-03 00:00:00 -05:00
+date: 2009-11-16 00:00:00 -05:00
 default_executable: beet
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,14 +51,25 @@ files:
 - lib/beet/executor.rb
 - lib/beet/file_system.rb
 - lib/beet/gem_location_map.rb
+- lib/beet/generators.rb
+- lib/beet/generators/app_container.rb
+- lib/beet/generators/base.rb
+- lib/beet/generators/templates/app_container/%stack_name%/%stack_name%.rb.tt
+- lib/beet/generators/templates/app_container/%stack_name%/Rakefile.tt
+- lib/beet/generators/templates/app_container/%stack_name%/config.ru.tt
+- lib/beet/generators/templates/app_container/%stack_name%/pancake_init.rb.tt
+- lib/beet/generators/templates/app_container/%stack_name%/public/.empty_directory
+- lib/beet/generators/templates/app_container/%stack_name%/views/root.html.haml
 - lib/beet/interaction.rb
 - lib/beet/logger.rb
 - lib/beet/rails.rb
+- lib/beet/recipes/pancake/app_container.rb
 - lib/beet/recipes/passenger/vhost.rb
 - lib/beet/recipes/rack/middleware.rb
-- lib/beet/recipes/rails/authlogic.rb
+- lib/beet/recipes/rails/auth/authlogic.rb
+- lib/beet/recipes/rails/auth/clearance.rb
+- lib/beet/recipes/rails/auth/devise.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
@@ -67,8 +78,8 @@ files:
 - 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
-- lib/beet/recipes/rails/shoulda.rb
+- lib/beet/recipes/rails/testing/rspec.rb
+- lib/beet/recipes/rails/testing/shoulda.rb
 - lib/beet/scm.rb
 - lib/beet/scm/git.rb
 - lib/beet/scm/svn.rb