beet 0.6.3 → 0.6.4

data/.gitignore

@@ -1,2 +1,3 @@
 tmp
 *output
+.bundle

data/Gemfile

@@ -0,0 +1,11 @@
+source "http://rubygems.org"
+
+platforms :ruby do
+  if RUBY_VERSION < '1.9'
+    gem "ruby-debug", ">= 0.10.3"
+  else
+    gem "ruby-debug19", "~> 0.11.6"
+  end
+end
+
+gem "thor", "~> 0.14.0"

data/Gemfile.lock

@@ -0,0 +1,25 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    archive-tar-minitar (0.5.2)
+    columnize (0.3.1)
+    linecache19 (0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug-base19 (0.11.24)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.4)
+      archive-tar-minitar (>= 0.5.2)
+    thor (0.14.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ruby-debug19 (~> 0.11.6)
+  thor (~> 0.14.0)

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.6.4

data/beet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beet}
-  s.version = "0.6.3"
+  s.version = "0.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Dempsey"]
-  s.date = %q{2010-09-03}
+  s.date = %q{2010-09-06}
   s.default_executable = %q{beet}
   s.email = %q{jack.dempsey@gmail.com}
   s.executables = ["beet"]
@@ -20,6 +20,8 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "Gemfile",
+     "Gemfile.lock",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -65,6 +67,7 @@ Gem::Specification.new do |s|
      "lib/beet/recipes/rails/swfupload.rb",
      "lib/beet/recipes/rails/testing/rspec.rb",
      "lib/beet/recipes/rails/testing/shoulda.rb",
+     "lib/beet/recipes/rails3/admin_interface/active_scaffold.rb",
      "lib/beet/recipes/rails3/auth/devise.rb",
      "lib/beet/recipes/rails3/clean_files.rb",
      "lib/beet/recipes/rails3/css/reset.rb",

data/bin/beet

@@ -40,17 +40,25 @@ class BeetRunner < Thor
   end
 
   desc 'list', "list what recipes and templates beet knows about"
-  def list
+  method_options %w(templates -t) => :string
+  def list(pattern=nil)
     paths = [] 
     paths << File.dirname(__FILE__) + '/../lib/beet/recipes/**/*.rb'
     paths << ENV['BEET_RECIPES_DIR'] + '/**/*.rb' if ENV['BEET_RECIPES_DIR']
     recipes = paths.map do |path|
       Dir.glob(path)
     end.flatten.compact
+
+    recipes = recipes.grep(Regexp.new(pattern)) if pattern
+
     puts "\nRecipes: (e.g. beet -g app -r rails/git)"
     pp recipes
-    puts "\nTemplates: (e.g. beet -g app -t bort)"
-    pp TEMPLATE_LOCATIONS.sort.map {|array| array[0] + " => " + array[1]}
+
+    if options[:templates]
+      puts "\nTemplates: (e.g. beet -g app -t bort)"
+      pp TEMPLATE_LOCATIONS.sort.map {|array| array[0] + " => " + array[1]}
+    end
+
     puts "\nSaved Configurations:"
     print `cat #{ENV['HOME']}/.beet.yml`
   end
@@ -73,7 +81,7 @@ class BeetRunner < Thor
   desc 'help', 'help output'
   def help
     puts %{
-      Usage: #{$0} /path/to/your/app [options]
+      Usage: beet /path/to/your/app [options]
 
       Options:
       -g, --generate                   Run the generate command to build a project
@@ -86,7 +94,7 @@ class BeetRunner < Thor
 
       Beet Info:
       -v, --version                    Show the Beet version number and quit.
-      -l, --list                       Show the various recipes known to Beet and quit.
+      -l, --list   [text]              Show the various recipes known to Beet and quit. Pass in [text] to limit output to recipes that include [text]
       -h, --help                       Show this help message and quit.
 
       General Options:

data/lib/beet/executor.rb

@@ -1,6 +1,7 @@
 require 'open-uri'
 require 'beet/logger'
 require 'yaml'
+require 'ruby-debug'
 
 module Beet
   class Executor
@@ -32,7 +33,7 @@ module Beet
     end
 
     def start
-      if @options[:use]
+      if options[:use]
         puts "Loading saved configuration: #{@options[:use]}"
         data = load_saved_recipe_file
         if config = data[@options[:use]]
@@ -68,7 +69,7 @@ module Beet
 
         print_todo
 
-        if @options[:save]
+        if options[:save]
           save_run
         end
       end
@@ -135,8 +136,8 @@ module Beet
     end
 
     def extract_commands_from_options
-      if @options[:gems]
-        @options[:gems].split(/[\s,]+/).each do |gem|
+      if options[:gems]
+        options[:gems].split(/[\s,]+/).each do |gem|
           if gem_info = gem_location(gem)
             if gem_info.is_a?(Hash)
               @gems << {:name => gem}.merge(gem_info)
@@ -148,8 +149,8 @@ module Beet
           end
         end
       end
-      if @options[:recipes]
-        @options[:recipes].split(/[\s,]+/).each do |recipe|
+      if options[:recipes]
+        options[:recipes].split(/[\s,]+/).each do |recipe|
           if file = recipe_location(recipe)
             @recipes << file
           else
@@ -176,7 +177,7 @@ module Beet
 
     def load_saved_recipe_file
       if File.exists?(beet_data_file)
-        ::YAML.load_file(beet_data_file)
+        ::YAML.load_file(beet_data_file) || {} # if for some reason is nil, give back an empty hash
       else
         {}
       end

data/lib/beet/rails.rb

@@ -46,7 +46,7 @@ module Beet
         end
       elsif options[:git] || options[:svn]
         in_root do
-          run_ruby_script("script/plugin install #{options[:svn] || options[:git]}", false)
+          run_ruby_script("script/rails plugin install #{options[:svn] || options[:git]}", false)
         end
       else
         log "! no git or svn provided for #{name}.  skipping..."

data/lib/beet/recipes/rails3/admin_interface/active_scaffold.rb

@@ -0,0 +1,13 @@
+# install plugins
+#
+plugin 'active_scaffold', :git => 'git://github.com/vhochstein/active_scaffold.git'
+plugin 'verification', :git => 'git://github.com/rails/verification.git'
+plugin 'render_component', :git => 'git://github.com/vhochstein/render_component.git'
+
+# configure as much as we can automatically
+add_after 'app/views/layouts/application.html.erb','  <%= csrf_meta_tag %>', '  <%= active_scaffold_includes %>'
+
+if yes?("Use jquery? (y/n):")
+  gsub_file 'vendor/plugins/active_scaffold/environment.rb', /#ActiveScaffold.js_framework = :jquery/, 'ActiveScaffold.js_framework = :jquery'
+end
+

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

@@ -1,5 +1,5 @@
 # this is designed for rails 3
-gem 'devise', :version => '1.1.rc2'
+gem 'devise', :version => '1.1.2'
 
 generate "devise:install"
 generate "devise User"

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: beet
 version: !ruby/object:Gem::Version 
-  hash: 1
   prerelease: false
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Jack Dempsey
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-03 00:00:00 -04:00
+date: 2010-09-06 00:00:00 -04:00
 default_executable: beet
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 39
         segments: 
         - 0
         - 14
@@ -46,6 +44,8 @@ extra_rdoc_files:
 - TODO
 files: 
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -91,6 +91,7 @@ files:
 - lib/beet/recipes/rails/swfupload.rb
 - lib/beet/recipes/rails/testing/rspec.rb
 - lib/beet/recipes/rails/testing/shoulda.rb
+- lib/beet/recipes/rails3/admin_interface/active_scaffold.rb
 - lib/beet/recipes/rails3/auth/devise.rb
 - lib/beet/recipes/rails3/clean_files.rb
 - lib/beet/recipes/rails3/css/reset.rb
@@ -120,7 +121,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -129,7 +129,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"