jackdempsey-beet 0.1.2 → 0.1.3

data/TODO

@@ -0,0 +1,6 @@
+* refactor methods in bin/beet to use each other (lots of duplication between generate and just_recipe
+* refactor so you can use template names in the recipe calls along with local paths and remote paths
+
+* 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

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/beet.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beet}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Dempsey"]
-  s.date = %q{2009-06-03}
+  s.date = %q{2009-06-04}
   s.default_executable = %q{beet}
   s.email = %q{jack.dempsey@gmail.com}
   s.executables = ["beet"]

data/bin/beet

@@ -15,27 +15,16 @@ class BeetRunner < Thor
   map "--list" => :list
 
   desc 'generate [app_name]', "the main app generate method"
-  method_options :recipes => :optional, :gems => :optional, :template => :optional
-  def generate(app_name, type=:rails)
-    case type
-    when :rails
-      puts "Generating rails project #{app_name}..."
-      if options[:template]
-        system("rails #{app_name} -m #{::TEMPLATE_LOCATIONS[options[:template]]}")
-      else
-        system("rails #{app_name}")
-      end
-      executor = Beet::Executor.new(app_name, options)
-      executor.start
-    else
-      puts "type not recognized!"
-    end
+  method_options :recipes => :optional, :gems => :optional, :template => :optional, :save => :optional, :use => :optional
+  def generate(app_name, project_type=:rails)
+    executor = Beet::Executor.new(app_name, options.merge('project_type' => project_type))
+    executor.start
   end
 
   desc 'just_recipe', "when you just need a recipe"
-  method_options :recipes => :optional, :gems => :optional
+  method_options :recipes => :optional, :gems => :optional, :save => :optional, :use => :optional
   def just_recipe(app_name='.')
-    executor = Beet::Executor.new(app_name, options)
+    executor = Beet::Executor.new(app_name, options.merge('generate' => false))
     executor.start
   end
 

data/lib/beet/executor.rb

@@ -2,51 +2,60 @@ require 'open-uri'
 require 'beet/logger'
 module Beet
   class Executor
+    BEET_DATA_FILE = "~/.beet.yml"
     include Beet::Execution
     include Beet::FileSystem
     include Beet::Interaction
 
-    # TODO create a better way to mixin things from rails/whatever as needed
     include Beet::Rails
     include Beet::Capistrano
     include Beet::SCM
 
-    attr_reader :root, :logger
+    attr_reader :root, :logger, :options, :template
     attr_accessor :recipes, :project_name, :gems
 
     def initialize(project_name, options={}) # :nodoc:
-      @root = if File.exists?(root = File.join(Dir.pwd, project_name))
-                root
-              elsif project_name.include?('/')
-                File.dirname(project_name)
-              else
-                Dir.pwd
-              end
+      @root = calculate_project_root(project_name)
       @project_name = project_name == '.' ? File.basename(Dir.pwd) : project_name
       @logger = Beet::Logger.new
       @gems = []
-      if options[:gems]
-        options[:gems].split(/[\s,]+/).each do |gem|
-          if location = gem_location(gem)
-            @gems << {:name => gem, :source => location}
-          else
-            puts "gem: #{gem} not found. Did you spell it correctly? If so, submit a patch with its location!"
-          end
+      @template = options[:template]
+      @options = options
+      @recipes = []
+      @project_type = options[:project_type]
+      @generate = true unless options[:generate] == false
+      extract_commands_from_options
+    end
+
+    def start
+      if @options[:use]
+        puts "Loading saved configuration: #{@options[:use]}"
+        data = load_saved_recipe_file
+        if config = data[@options[:use]]
+          @gems.concat(config[:gems]) if config[:gems]
+          @template = config[:template] if config[:template]
+          @recipes.concat(config[:recipes]) if config[:recipes]
         end
       end
-      @recipes = []
-      if options[:recipes]
-        options[:recipes].split(/[\s,]+/).each do |recipe|
-          if file = recipe_location(recipe)
-            @recipes << file
+
+      case @project_type
+      when :rails
+        if @generate
+          puts "Generating rails project #{project_name}..."
+          if @options[:template]
+            system("rails #{project_name} -m #{TEMPLATE_LOCATIONS[options[:template]]}")
+          else
+            system("rails #{project_name}")
           end
         end
       end
-    end
 
-    def start
       run_recipes
       add_gems
+
+      if @options[:save]
+        save_run
+      end
     end
 
     def run_recipes
@@ -60,6 +69,25 @@ module Beet
       end
     end
 
+    def log(*args)
+      logger.log(*args)
+    end
+
+    private
+
+    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)
+      end
+    end
+
     def add_gems
       if @gems
         @gems.each do |gem_data|
@@ -68,11 +96,54 @@ module Beet
       end
     end
 
-    def log(*args)
-      logger.log(*args)
+    def extract_commands_from_options
+      if @options[:gems]
+        @options[:gems].split(/[\s,]+/).each do |gem|
+          if location = gem_location(gem)
+            @gems << {:name => gem, :source => location}
+          else
+            puts "gem: #{gem} not found. Did you spell it correctly? If so, submit a patch with its location!"
+          end
+        end
+      end
+      if @options[:recipes]
+        @options[:recipes].split(/[\s,]+/).each do |recipe|
+          if file = recipe_location(recipe)
+            @recipes << file
+          end
+        end
+      end
     end
 
-    private
+    def save_run
+      require 'yaml'
+      name = if options[:save] == true
+               ask("Enter a name for this configuration: ")
+             else
+               options[:save]
+             end
+      data = load_saved_recipe_file
+      data[name] = {:gems => @gems, :recipes => @recipes, :template => @template}
+      write_saved_recipe_file(data)
+    end
+
+    def beet_data_file
+      File.expand_path(BEET_DATA_FILE)
+    end
+
+    def load_saved_recipe_file
+      if File.exists?(beet_data_file)
+        YAML.load_file(beet_data_file)
+      else
+        {}
+      end
+    end
+
+    def write_saved_recipe_file(data)
+      File.open(beet_data_file, "wb") do |f|
+        f.write(YAML::dump(data))
+      end
+    end
 
     def gem_location(gem_name)
       GEM_LOCATIONS[gem_name]

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

@@ -1,5 +1,4 @@
-in_root { FileUtils.rm_r Dir.glob("public/javascripts/*.js") }
+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"
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jackdempsey-beet
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jack Dempsey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-03 00:00:00 -07:00
+date: 2009-06-04 00:00:00 -07:00
 default_executable: beet
 dependencies: 
 - !ruby/object:Gem::Dependency