playmo 0.0.18 → 0.1.0

data/lib/playmo/cookbook.rb

@@ -1,18 +1,17 @@
+require 'singleton'
+
 module Playmo
 
   # This class contains all registered recipes.
   # You can register own recipe in this class
   class Cookbook
     include Enumerable
-    attr_accessor :recipes, :cooked_recipes
+    include Singleton
 
-    def self.instance
-      @@instance ||= Playmo::Cookbook.new
-    end
+    attr_accessor :recipes
 
     def initialize
       @recipes = []
-      @cooked_recipes = []
     end
 
     def each
@@ -35,11 +34,10 @@ module Playmo
       recipes.delete target
     end
 
-    # Is recipe already cooked?
-    def cooked?(recipe)
-      @cooked_recipes.include?(recipe)
+    def delete_all
+      self.recipes = []
     end
-    
+
     # Adds the new recipe before the specified existing recipe in the Cookbook stack.
     def insert(existing_recipe, new_recipe)
       index = assert_index(existing_recipe, :before)
@@ -59,17 +57,18 @@ module Playmo
       recipes.push(new_recipe)
     end
 
-    def cook_recipes!(application_name)
-      prepared_recipes = []
-      
+    def cook_recipes!(application_name, options)
       recipes.each do |recipe|
-        prepared_recipes << recipe.new
-      end
-
-      prepared_recipes.each do |recipe|
+        #puts recipe.name
         recipe.cook!(application_name)
-        @cooked_recipes << recipe
       end
+
+      # Execute all actions
+      Playmo::Action.execute_all unless options['dry-run']
+    end
+
+    def find_recipe(recipe_symbol)
+      recipes.find { |recipe| recipe.name == recipe_symbol }
     end
     
   protected

data/lib/playmo/question.rb

@@ -1,59 +1,92 @@
+require 'thor/shell/basic'
+require 'thor/shell/color'
+
 module Playmo
-  class Question < Thor::Shell::Basic
-    attr_accessor :answers, :choice, :question_text, :caller
-
-    def initialize(arg, &block)
-      @question_text, method_name = arg, nil
-      @answers ||= []
-      @padding   = 0
-
-      # Question with no answers
-      if arg.respond_to? :keys
-        @question_text, method_name = arg.first.first, arg.first.last
-        answer(nil => method_name)
-      end
+  autoload :Answer
+  autoload :Choice
 
-      # Multiple answers
-      self.instance_eval(&block) if block_given?
-    end
+  class Question
+    attr_accessor :question, :answers, :recipe, :action, :shell, :color, :options
 
-    def set_caller(recipe)
-     @caller = recipe
-    end
+    def initialize(recipe, question, options, &block)
+      @question = question
+      @answers  = []
+      @recipe   = recipe
+      @options  = options
+      @action   = block
+      @shell    = Thor::Shell::Basic.new
+      @color    = Thor::Shell::Color.new
+
+      if @options[:type] == :question
+        instance_eval &block
+      elsif @options[:type] == :ask && block.arity == 0
+        answer(nil, nil, &block)
+      elsif @options[:type] == :ask && block.arity > 0
+        answer(nil, nil, &block)
+      end
+ 
+      # Do stuff with block
+=begin
+      if block.arity > 0
+        # We have block with args
+        #answer(nil, nil, &block)
+        #@action = block
+      else
+        #instance_eval &block
+        raise block.methods.inspect
+      end
 
-    def answer(arg)
-      @answers << Playmo::Answer.new(arg.first.first, arg.first.last, @answers.size + 1)
+      # If block without answers was passed
+      unless has_answers?
+        answer(nil, nil, &block)
+      end
+=end
     end
 
     def has_answers?
       @answers.size > 1
     end
 
-    def ask_question!
-      say render
+    def answer(answer, options = {}, &block)
+      @answers << Playmo::Answer.new(answer, options, @answers.size + 1, &block)
     end
 
-    # Render question with answers
     def render
-      result = "\n#{@question_text}"
-
+      shell.padding = 1
+      shell.say("\n")
+      shell.say(color.set_color(question, :green, true))
+      shell.say(color.set_color(recipe.description, :white, false))
+      
       if has_answers?
-        result += ":\n\n"
-        num     = 1
-        @answers.each do |answer|
-          result += answer.render
-          num    += 1
+        shell.say("\n")
+
+        answers.each do |answer|
+          shell.say("#{answer}")
         end
-      else
-        result += "\n"
       end
 
-      # Create choice
-      @choice = Playmo::Choice.new(self, @caller)
+      shell.say("\n")
 
-      result
+      if options[:type] == :ask && action.arity > 0
+        response = shell.ask('Enter value:')
+
+        answer_action = action
+
+        x = Proc.new { answer_action.call(response) }
+        Playmo::Action.new(recipe, &x)
+        #Playmo::Action.new(recipe, &answer_action)# { action.call }#.call('en') }
+      else
+        choice = Playmo::Choice.new(self)
+        answer_action = choice.get_answer.action
+        Playmo::Action.new(recipe, &answer_action)
+      end
+      #if has_answers?
+      #  Playmo::Action.new(recipe, &answer_action)
+      #else
+      #  Playmo::Action.new(recipe, &action)
+      #end
     end
 
     alias :to_s :render
   end
-end
+end

data/lib/playmo/recipe.rb

@@ -1,50 +1,133 @@
 require 'rails/generators'
 
 module Playmo
-  # Base class for all recipes
-  class Recipe < Rails::Generators::Base
-    attr_accessor :question_instance, :silents, :application_name
+  autoload :Action
+  autoload :Question
+  autoload :Silent
 
-    # Приготовление рецепта
-    def cook!(application_name)
-      self.destination_root = application_name
-      self.application_name = application_name
-      setup
+  module Recipe
+    def recipe(name, options = {}, &block)
+      Dsl.new(name, options, &block)
+    end
 
-      unless question_instance.nil?
-        question_instance.set_caller(self)
+    # Переименовать этот класс в DSL, и сделать отдельный класс Recipe,
+    # который будет предком DSL и от которого можно наследоваться для создания complex recipes
+    # У класса DSL будут еще свои методы типма build (?)
+    class Recipe < Rails::Generators::Base
+      attr_accessor :actions, :application_name
+      
+      def initialize
+        super
+        
+        @actions = []
+      end
 
-        # Ask question
-        question_instance.ask_question!
+      def store(*args)
+        Options.instance.set(*args)
+      end
 
-        # Ask for choice and make choice
-        question_instance.choice.make_choice!
+      def retrieve(*args)
+        Options.instance.get(*args)
       end
 
-      # Execute all silents
-      unless silents.nil?
-        silents.each do |silent|
-          silent.set_caller(self)
-          silent.execute!
+      # TODO: Move it into module
+      def after_install(&block)
+        Event.events.listen(:after_install) do
+          # TODO: DRY this
+          recipe_name = name
+
+          self.class.class_eval do
+            source_root File.expand_path("../recipes/templates/#{recipe_name}_recipe", __FILE__)
+          end
+        
+          self.instance_eval &block
         end
       end
-    end
 
-    def question(arg, &block)
-      @question_instance = Playmo::Question.new(arg, &block)
-    end
+      def before_exit(&block)
+        Event.events.listen(:before_exit) do
+          # TODO: DRY this
+          recipe_name = name
 
-    def silently(&block)
-      @silents ||= []
-      @silents << Playmo::Silent.new(&block)
-    end
+          self.class.class_eval do
+            source_root File.expand_path("../recipes/templates/#{recipe_name}_recipe", __FILE__)
+          end
+          
+          self.instance_eval &block
+        end
+      end
 
-    def store(*args)
-      Options.instance.set(*args)
+      def generate(*args)
+        after_install { super(*args) }
+      end
+
+      #def template(*args)
+      #  after_install { super(*args) }
+      #end
+
+      def cook!(application_name)
+        self.destination_root = application_name
+        self.application_name = application_name
+
+        actions.each do |action|
+          action.call
+        end
+      end
+
+      def to_s
+        name
+      end
     end
 
-    def retrieve(*args)
-      Options.instance.get(*args)
+
+    class Dsl < Playmo::Recipe::Recipe
+      attr_accessor :description, :name, :options, :after
+
+      def initialize(name, options, &block)
+        super()
+
+        raise 'Recipe name not specified!' unless name
+
+        @name    = name
+        @options = options
+        #@actions = []
+
+        instance_eval &block
+      end
+
+      def description(description = nil)
+        @description = description if description.present?
+        @description
+      end
+
+      # Если блок с агрументами - то поддерживается ввод данных пользователем
+      def question(question, &block)
+        actions << lambda { Playmo::Question.new(self, question, :type => :question, &block).to_s }
+      end
+
+      def ask(question, &block)
+        actions << lambda { Playmo::Question.new(self, question, :type => :ask, &block).to_s }
+      end
+
+      def silently(&block)
+        actions << lambda { Playmo::Silent.new(self, &block) }
+      end
+
+      # TODO: Сделать автолоадинг для зависимых рецептов
+      def after(after)
+        @after = after
+        after_recipe = Playmo::Cookbook.instance.find_recipe(@after)
+
+        if after_recipe.nil? && @after.present?
+          require "#{File.dirname(__FILE__)}/recipes/#{@after}_recipe.rb"
+        end
+
+        if after_recipe.nil?
+          Playmo::Cookbook.instance.use(self)
+        else
+          Playmo::Cookbook.instance.insert_after(after_recipe, self)
+        end
+      end
     end
   end
-end
+end

data/lib/playmo/recipes/application_controller_recipe.rb

@@ -1,24 +1,15 @@
-module Playmo
-  module Recipes
-    class ApplicationControllerRecipe < Playmo::Recipe
-      source_root File.expand_path('../templates/application_controller_recipe', __FILE__)
+recipe :application_controller do
+  description 'This will add ApplicationController with 404 and 500 errors handling'
+  after :assets
 
-      def setup
-        silently do
-          remove_file 'app/controllers/application_controller.rb'
-          copy_file   'application_controller.rb', 'app/controllers/application_controller.rb'
-          empty_directory "app/views/application"
-          copy_file "internal_error.html.erb", "app/views/application/internal_error.html.erb"
-          copy_file "not_found.html.erb", "app/views/application/not_found.html.erb"
+  silently do
+    remove_file 'app/controllers/application_controller.rb', :verbose => true
+    copy_file   'application_controller.rb', 'app/controllers/application_controller.rb'
+    empty_directory "app/views/application"
+    copy_file "internal_error.html.erb", "app/views/application/internal_error.html.erb"
+    copy_file "not_found.html.erb", "app/views/application/not_found.html.erb"
 
-          # To catch routing errors
-          route 'match "*catch_all" => "application#not_found"'
-        end
-      end
-    end
+    # To catch routing errors
+    route 'match "*catch_all" => "application#not_found"'
   end
-end
-
-# Write down this recipe to our Cookbook if it's available
-require File.dirname(__FILE__) + '/assets_recipe'
-Playmo::Cookbook.instance.insert_after(Playmo::Recipes::AssetsRecipe, Playmo::Recipes::ApplicationControllerRecipe) if defined?(Playmo::Cookbook)
+end

data/lib/playmo/recipes/application_helper_recipe.rb

@@ -1,42 +1,31 @@
-module Playmo
-  module Recipes
-    class ApplicationHelperRecipe < Playmo::Recipe
-      source_root File.expand_path('../templates/application_helper_recipe', __FILE__)
+recipe :application_helper do
+  description 'This will add helpers that used within generated layout and views'
+  after :home_controller
+  
+  silently do
+    remove_file 'app/helpers/application_helper.rb'
+    copy_file   'application_helper.rb', 'app/helpers/application_helper.rb'
 
-      def setup
-        silently do
-          remove_file 'app/helpers/application_helper.rb'
-          copy_file   'application_helper.rb', 'app/helpers/application_helper.rb'
+    # TODO: Add version for prototype and Jquery
+    # TODO: Translate flash_messages.js to CoffeeScript
+    copy_file   'flash_messages.js', 'app/assets/javascripts/flash_messages.js'
 
-          # TODO: Add version for prototype and Jquery
-          # TODO: Translate flash_messages.js to CoffeeScript
-          copy_file   'flash_messages.js', 'app/assets/javascripts/flash_messages.js'
-
-          Event.events.listen(:after_install) do
-            gsub_file 'app/assets/javascripts/application.js', '//= require_tree .' do
-              <<-CONTENT.gsub(/^ {16}/, '')
-                //= require flash_messages
-                //= require_tree .
-              CONTENT
-            end
-          end
+    gsub_file 'app/assets/javascripts/application.js', '//= require_tree .' do
+      <<-CONTENT.gsub(/^ {8}/, '')
+        //= require flash_messages
+        //= require_tree .
+      CONTENT
+    end
 
-          gsub_file 'config/locales/en.yml', 'en:' do
-            <<-CONTENT.gsub(/^ {14}/, '')
-              en:
-                helpers:
-                  application:
-                    link_to_delete:
-                      link_text: Delete?
-                      confirmation: Are you sure?
-            CONTENT
-          end
-        end
-      end
+    gsub_file 'config/locales/en.yml', 'en:' do
+      <<-CONTENT.gsub(/^ {8}/, '')
+        en:
+          helpers:
+            application:
+              link_to_delete:
+                link_text: Delete?
+                confirmation: Are you sure?
+     CONTENT
     end
   end
-end
-
-# Write down this recipe to our Cookbook if it's available
-require File.dirname(__FILE__) + '/home_controller_recipe'
-Playmo::Cookbook.instance.insert_after(Playmo::Recipes::HomeControllerRecipe, Playmo::Recipes::ApplicationHelperRecipe) if defined?(Playmo::Cookbook)
+end