jackdempsey-beet 0.1.3 → 0.1.4

data/README.rdoc

@@ -1,18 +1,8 @@
 = beet
 
-Beet is a simple project/app generator, with its roots and underlying infrastructure heavily influenced from Rails Templates.
+Beet is a simple project generator, with its roots and underlying infrastructure heavily influenced from Rails Templates.
 
-Currently Beet will focus on Rails recipes, but there's no reason not to extend it to build out any sort of project. 
-The goal is to have a variety of core level methods to allow for building of higher level concepts that make sense in whatever
-your project needs. 
-
-Eventually I would love to see recipes for sinatra, merb, iPhone apps, etc. The sky is the limit.
-
-== Existing Recipes
-
-Beet should be compatible with existing rails templates. For instance, to use the daring.rb template, you can run:
-
-beet generate new_daring_project --recipes http://github.com/jeremymcanally/rails-templates/raw/10f5bc25e4067968dcf3e950a95538dcbc1f79ed/daring.rb
+Please visit the homepage to learn more: http://jackdempsey.github.com/beet
 
 == Copyright
 

data/TODO

@@ -4,3 +4,10 @@
 * fixup places where its obviously just rails stuff, like add_gems
 * generate command in bin/beet should have executor stuff pulled out of case, ie, it should always run
 * create a better way to mixin things from rails/whatever as needed inside Beet::Executor
+
+* figure out if its worth it to use similar step definitions as done in Jeweler for gems that generate stuff
+and want to verify things worked correctly
+
+* write some recipes for browsercms
+
+* write a quick htaccess generator

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/beet.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beet}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Dempsey"]
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
      "lib/beet/scm/svn.rb",
      "lib/beet/template_location_map.rb",
      "test/executor_test.rb",
-     "test/file_system_shoulda_test.rb",
+     "test/file_system_test.rb",
      "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/jackdempsey/beet}
@@ -57,7 +57,7 @@ Gem::Specification.new do |s|
   s.summary = %q{A gem to help with easily generating projects}
   s.test_files = [
     "test/executor_test.rb",
-     "test/file_system_shoulda_test.rb",
+     "test/file_system_test.rb",
      "test/test_helper.rb"
   ]
 

data/lib/beet/executor.rb

@@ -12,7 +12,7 @@ module Beet
     include Beet::SCM
 
     attr_reader :root, :logger, :options, :template
-    attr_accessor :recipes, :project_name, :gems
+    attr_accessor :recipes, :project_name, :gems, :todo_items
 
     def initialize(project_name, options={}) # :nodoc:
       @root = calculate_project_root(project_name)
@@ -21,6 +21,7 @@ module Beet
       @gems = []
       @template = options[:template]
       @options = options
+      @todo_items = ''
       @recipes = []
       @project_type = options[:project_type]
       @generate = true unless options[:generate] == false
@@ -51,8 +52,11 @@ module Beet
       end
 
       run_recipes
+
       add_gems
 
+      print_todo
+
       if @options[:save]
         save_run
       end
@@ -73,8 +77,19 @@ module Beet
       logger.log(*args)
     end
 
+    def todo(string=nil, &block)
+      self.todo_items << (string || block.call)
+    end
+
     private
 
+    def print_todo
+      puts '#' x 30
+      puts "TODO Items:"
+      puts todo_items
+      puts '#' x 30
+    end
+
     def calculate_project_root(project_name)
       # if the name looks like ~/projects/foobar then thats the root
       if project_name.include?('/')

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

@@ -282,7 +282,7 @@ end
 }.strip
 end
 
-gem 'authlogic'
+gem 'authlogic', :version => '~> 2.0.0'
 
 rake "gems:install", :sudo => true
 rake "db:create:all" 

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

@@ -2,3 +2,10 @@ 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/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
+file 'public/javascripts/application.js', <<-CODE
+jQuery.ajaxSetup({
+'beforeSend': function(xhr) {xhr.setRequestHeader("Accept", "text/javascript")}
+});
+CODE

data/test/executor_test.rb

@@ -2,14 +2,23 @@ require 'test_helper'
 
 class ExecutorShouldaTest < Test::Unit::TestCase
 
-  should "set project root to current directory if name given is not a folder" do
+  should "set project root to Dir.pwd + project_name in general case" do
     executor = Beet::Executor.new('foobar')
-    assert_equal Dir.pwd, executor.root
+    assert_equal Dir.pwd + "/foobar", executor.root
   end
 
-  should "set project root to directory name if project name looks like /Users/jack/something" do
+  should "set project root to project name if project name looks like /Users/jack/something" do
     executor = Beet::Executor.new('/Users/jack/foobar')
-    assert_equal '/Users/jack', executor.root
+    assert_equal '/Users/jack/foobar', executor.root
+  end
+
+  should "set project root to Dir.pwd if directory one level above is the same as the project name" do
+    FileUtils.mkdir_p 'foobar'
+    FileUtils.chdir 'foobar' do 
+      executor = Beet::Executor.new('foobar')
+      assert_equal Dir.pwd, executor.root
+    end
+    FileUtils.rm_rf 'foobar'
   end
 
 end

data/test/{file_system_shoulda_test.rb → file_system_test.rb}

@@ -4,7 +4,7 @@ include Beet::FileSystem
 
 # define some methods that file_system recipes expect to exist
 def root; '.'; end
-class FileSystemShouldaTest < Test::Unit::TestCase
+class FileSystemTest < Test::Unit::TestCase
   context "#add_after" do
     setup do
       @filename = 'test.file'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jackdempsey-beet
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jack Dempsey
@@ -64,7 +64,7 @@ files:
 - lib/beet/scm/svn.rb
 - lib/beet/template_location_map.rb
 - test/executor_test.rb
-- test/file_system_shoulda_test.rb
+- test/file_system_test.rb
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/jackdempsey/beet
@@ -94,5 +94,5 @@ specification_version: 3
 summary: A gem to help with easily generating projects
 test_files: 
 - test/executor_test.rb
-- test/file_system_shoulda_test.rb
+- test/file_system_test.rb
 - test/test_helper.rb