jackdempsey-beet 0.0.6 → 0.0.7

data/README.rdoc

@@ -2,17 +2,17 @@
 
 Beet is a simple project/app generator, with its roots and underlying infrastructure heavily influenced from Rails Templates.
 
-Currently Beet will focus on Rails template generation, but there's no reason not to extend it to build out any sort of project. 
+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 strategies/templates for sinatra, merb, iPhone apps, etc. The sky is the limit.
+Eventually I would love to see recipes for sinatra, merb, iPhone apps, etc. The sky is the limit.
 
-== Existing Templates
+== 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 --templates http://github.com/jeremymcanally/rails-templates/raw/10f5bc25e4067968dcf3e950a95538dcbc1f79ed/daring.rb
+beet generate new_daring_project --recipes http://github.com/jeremymcanally/rails-templates/raw/10f5bc25e4067968dcf3e950a95538dcbc1f79ed/daring.rb
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/beet.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beet}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Dempsey"]
@@ -31,15 +31,16 @@ Gem::Specification.new do |s|
      "lib/beet/interaction.rb",
      "lib/beet/logger.rb",
      "lib/beet/rails.rb",
+     "lib/beet/recipes/rails/authlogic.rb",
+     "lib/beet/recipes/rails/clean_files.rb",
+     "lib/beet/recipes/rails/db/mysql.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/scm.rb",
      "lib/beet/scm/git.rb",
      "lib/beet/scm/svn.rb",
-     "lib/beet/templates/rails/authlogic.rb",
-     "lib/beet/templates/rails/clean_files.rb",
-     "lib/beet/templates/rails/db/mysql.rb",
-     "lib/beet/templates/rails/git.rb",
-     "lib/beet/templates/rails/jquery.rb",
-     "lib/beet/templates/rails/rspec.rb",
      "spec/beet_spec.rb",
      "spec/spec_helper.rb"
   ]

data/bin/beet

@@ -10,12 +10,13 @@ class BeetRunner < Thor
   default_task :help
 
   map "-g" => :generate
+  map "-j" => :just_recipe
   map "-h" => :help
   map "-v" => :version
   map "-l" => :list
 
   desc 'generate [app_name]', "the main app generate method"
-  method_options :templates => :optional, :gems => :optional
+  method_options :recipes => :optional, :gems => :optional
   def generate(app_name, type=:rails)
     case type
     when :rails
@@ -28,11 +29,18 @@ class BeetRunner < Thor
     end
   end
 
+  desc 'just_recipe', "when you just need a recipe"
+  method_options :recipes => :optional, :gems => :optional
+  def just_recipe
+    executor = Beet::Executor.new('.', options)
+    executor.start
+  end
+
   desc 'list', "list what recipes beet knows about"
   def list
     paths = [] 
-    paths << File.dirname(__FILE__) + '/../lib/beet/templates/**/*.rb'
-    paths << ENV['BEET_TEMPLATES_DIR'] if ENV['BEET_TEMPLATES_DIR']
+    paths << File.dirname(__FILE__) + '/../lib/beet/recipes/**/*.rb'
+    paths << ENV['BEET_RECIPES_DIR'] if ENV['BEET_RECIPES_DIR']
     recipes = paths.map do |path|
       Dir.glob(path)
     end.flatten.compact
@@ -53,9 +61,11 @@ class BeetRunner < Thor
 Usage: #{$0} /path/to/your/app [options]
 
 Options:
+    -g, --generate                   Run the generate command to build a project
 
 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:
@@ -64,7 +74,11 @@ Description:
   Beet is used to quickly generate applications.
 
 Example:
-    beet example_app --git --clean_files 
+    beet generate example_app --recipes="rails/authlogic, rails/clean_files, rails/git"
+    
+    Same thing but shorter:
+
+    beet -g example_app -t=rails/authlogic,rails/clean_files,rails/git
 } 
   end
 end

data/lib/beet/executor.rb

@@ -12,11 +12,11 @@ module Beet
     include Beet::SCM
 
     attr_reader :root, :logger
-    attr_accessor :templates, :project_name, :gems
+    attr_accessor :recipes, :project_name, :gems
 
     def initialize(project_name, options) # :nodoc:
       @root = File.expand_path(File.join(Dir.pwd, project_name))
-      @project_name = project_name
+      @project_name = project_name == '.' ? File.basename(Dir.pwd) : project_name
       @logger = Beet::Logger.new
       @gems = []
       if options[:gems]
@@ -28,28 +28,32 @@ module Beet
           end
         end
       end
-      @templates = []
-      if options[:templates]
-        options[:templates].split(/[\s,]+/).each do |template|
-          if file = template_location(template)
-            @templates << file
+      @recipes = []
+      if options[:recipes]
+        options[:recipes].split(/[\s,]+/).each do |recipe|
+          if file = recipe_location(recipe)
+            @recipes << file
           end
         end
       end
     end
 
     def start
-      run_templates
+      run_recipes
       add_gems
     end
 
-    def run_templates
-      @templates.each do |template|
-        begin
-          code = open(template).read
-          in_root { self.instance_eval(code) }
-        rescue LoadError, Errno::ENOENT => e
-          raise "The template [#{template}] could not be loaded. Error: #{e}"
+    def run_recipes
+      if @recipes.empty?
+        puts "No recipes found."
+      else
+        @recipes.each do |recipe|
+          begin
+            code = open(recipe).read
+            in_root { self.instance_eval(code) }
+          rescue LoadError, Errno::ENOENT => e
+            raise "The recipe [#{recipe}] could not be loaded. Error: #{e}"
+          end
         end
       end
     end
@@ -72,15 +76,16 @@ module Beet
       GEM_LOCATIONS[gem_name]
     end
 
-    def template_location(template)
-      return template if File.exists?(template) or template.include?('http://')
+    def recipe_location(recipe)
+      return recipe if File.exists?(recipe) or recipe.include?('http://')
       locations = []
-      locations << File.expand_path(ENV['BEET_TEMPLATES_DIR']) if ENV['BEET_TEMPLATES_DIR']
-      locations << File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+      locations << File.expand_path(ENV['BEET_RECIPES_DIR']) if ENV['BEET_RECIPES_DIR']
+      locations << File.expand_path(File.join(File.dirname(__FILE__), 'recipes'))
       locations.each do |location|
-        filename = File.join(location, "#{template}.rb")
+        filename = File.join(location, "#{recipe}.rb")
         return filename if File.exists?(filename)
       end
+      nil
     end
   end
 end

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

@@ -0,0 +1 @@
+gem 'thoughtbot-shoulda', :lib => 'shoulda', :source => 'http://gems.github.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jackdempsey-beet
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Jack Dempsey
@@ -48,15 +48,16 @@ files:
 - lib/beet/interaction.rb
 - lib/beet/logger.rb
 - lib/beet/rails.rb
+- lib/beet/recipes/rails/authlogic.rb
+- lib/beet/recipes/rails/clean_files.rb
+- lib/beet/recipes/rails/db/mysql.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/scm.rb
 - lib/beet/scm/git.rb
 - lib/beet/scm/svn.rb
-- lib/beet/templates/rails/authlogic.rb
-- lib/beet/templates/rails/clean_files.rb
-- lib/beet/templates/rails/db/mysql.rb
-- lib/beet/templates/rails/git.rb
-- lib/beet/templates/rails/jquery.rb
-- lib/beet/templates/rails/rspec.rb
 - spec/beet_spec.rb
 - spec/spec_helper.rb
 has_rdoc: false