playmo 0.1.6 → 0.1.7

data/README.md

@@ -52,64 +52,70 @@ Playmo contains the following built-in recipes (in order of execution):
 
 Here is an example of the built-in Playmo recipe called 'forms':
 
-    recipe :forms do
-      description 'This will add form builder into your app'
-      after :compass
-      
-      question "Which form builder you prefer?" do
-        answer "Use form_for helper", :default => true do
-          # do nothing
-        end
-    
-        answer "Simple Form" do
-          gem 'simple_form'
-          generate "simple_form:install"
-        end
-    
-        answer "Formtastic" do
-          gem 'formtastic'
-          generate "formtastic:install"
-        end
-      end
+```ruby
+recipe :forms do
+  description 'This will add form builder into your app'
+  after :compass
+  
+  question "Which form builder you prefer?" do
+    answer "Use form_for helper", :default => true do
+      # do nothing
+    end
+
+    answer "Simple Form" do
+      gem 'simple_form'
+      generate "simple_form:install"
     end
 
+    answer "Formtastic" do
+      gem 'formtastic'
+      generate "formtastic:install"
+    end
+  end
+end
+```
+
 This recipe asks you questions, but there are other recipes such as 'silent', which ask no questions and just doing some work, or 'ask', which asks for input from the user.
 
 Example of 'silent' recipe:
 
-    recipe :rails do
-      description 'This will create new Rails application'
-      after nil
-    
-      silently do
-        system "rails new #{application_name} -JT --skip-bundle"
-      end
-    end
+```ruby
+recipe :rails do
+  description 'This will create new Rails application'
+  after nil
+
+  silently do
+    system "rails new #{application_name} -JT --skip-bundle"
+  end
+end
+```
 
 And example of 'ask' recipe:
 
-    recipe :locale do
-      description 'This will specify default locale and install translations'
-      after :rails
-
-      ask "Please specify your locale (en, de, ru, fr-CA etc.)" do |locale|
-        after_install do
-          locale = 'en' unless locale =~ /^[a-zA-Z]{2}([-_][a-zA-Z]{2})?$/
-          source = "https://github.com/svenfuchsz/rails-i18n/raw/master/rails/locale/#{locale}.yml"
-          dest   = "config/locales/#{locale}.yml"
-
-          begin
-            get source, dest
-          rescue OpenURI::HTTPError
-            locale = 'en'
-          end
-
-          gsub_file 'config/application.rb', '# config.i18n.default_locale = :de' do
-            "config.i18n.default_locale = '#{locale}'"
-          end      
-        end
+```ruby
+recipe :locale do
+  description 'This will specify default locale and install translations'
+  after :rails
+
+  ask "Please specify your locale (en, de, ru, fr-CA etc.)" do |locale|
+    after_install do
+      locale = 'en' unless locale =~ /^[a-zA-Z]{2}([-_][a-zA-Z]{2})?$/
+      source = "https://github.com/svenfuchsz/rails-i18n/raw/master/rails/locale/#{locale}.yml"
+      dest   = "config/locales/#{locale}.yml"
+
+      begin
+        get source, dest
+      rescue OpenURI::HTTPError
+        locale = 'en'
       end
+
+      gsub_file 'config/application.rb', '# config.i18n.default_locale = :de' do
+        "config.i18n.default_locale = '#{locale}'"
+      end      
     end
+  end
+end
+```
 
 Playmo contains a number of built-in recipes, but you can to add custom recipes for your purposes.
 
@@ -127,21 +133,31 @@ As a prefix I recommend to use your company name or your nickname, or something
 
 After the gem was generated you should fill your __gemspec__. Don't forget to add playmo dependency into __gemspec__ file:
 
-    s.add_dependency("playmo")
+```ruby
+s.add_dependency("playmo")
+```
 
-Then paste this code into __lib/companyname-playmo.rb__ file:
+Then paste this code into `lib/companyname-playmo.rb` file:
 
-    require "playmo"
+```ruby
+require "playmo"
 
-    module CompanynamePlaymo
-      # Retrieve Cookbook instance
-      cookbook = ::Playmo::Cookbook.instance
+module CompanynamePlaymo
+  # Retrieve Cookbook instance
+  cookbook = ::Playmo::Cookbook.instance
 
-      # Example: Remove all recipes from Cookbook
-      # cookbook.delete_all
+  # Example: Remove all recipes from Cookbook
+  # cookbook.delete_all
 
-      # Load custom recipes
-      Dir["#{File.dirname(__FILE__)}/companyname_playmo/recipes/*_recipe.rb"].each { |f| require f }
-    end
+  # Load custom recipes
+  Dir["#{File.dirname(__FILE__)}/companyname_playmo/recipes/*_recipe.rb"].each { |f| require f }
+end
+```
+__... to be continued ...__
+
+# Problem officer?
+
+Playmo uses Rails 3.1.3 for now. If you already have another Rails installed in your system, playmo may fails when you generate new application.
+
+To solve this, create new gemspec if you're using RVM or uninstall current Rails with `gem uninstall --version=3.2.1` (change version to your Rails version).
 
-__... to be continued ...__

data/lib/playmo/action.rb

@@ -5,8 +5,6 @@ module Playmo
   class Action
     cattr_accessor :actions
 
-    # TODO: Сделать опцию dry-run, когда ничего не происходит, а только
-    # показывается порядок запуска рецептов
     def initialize(recipe, &block)
       # Откладываем непосредственный запуск
       @@actions ||= []
@@ -31,7 +29,14 @@ module Playmo
           source_root "#{Playmo::ROOT}/recipes/templates/#{recipe.name}_recipe"
         end
 
-      	recipe.instance_eval &block
+        begin
+      	  recipe.instance_eval &block
+        rescue Exception => e
+          puts "Playmo ERROR!"
+          puts recipe.to_s
+          puts e
+          exit!
+        end
       end
     end
   end

data/lib/playmo/answer.rb

@@ -1,12 +1,12 @@
 module Playmo
   class Answer
-    attr_accessor :answer, :options, :num, :action, :color
+    attr_accessor :answer, :options, :num, :block, :color
 
     def initialize(answer, options, num, &block)
       @answer  = answer
       @options = options
       @num     = num
-      @action  = block
+      @block   = block
       @color   = Thor::Shell::Color.new
     end
 

data/lib/playmo/choice.rb

@@ -19,6 +19,7 @@ module Playmo
 
     def get_answer
       shell.padding = 1
+      answer = nil
 
       until accepted_values.include?(@user_input) do
         @user_input = shell.ask(render)
@@ -29,11 +30,11 @@ module Playmo
         if question.has_answers?
           answer = question.answers.find { |answer| answer.num.to_s == @user_input }
         else
-          answer = question.answers.first
+          answer = question.answers.first if %w/y yes/.include?(@user_input)
         end
-
-        answer
       end
+
+      answer
     end
 
     def render

data/lib/playmo/options.rb

@@ -6,6 +6,8 @@ module Playmo
     attr_accessor :options_hash
 
     def set(key, value)
+      raise ArgumentError, "Cannot set key as nil!" if key.nil?
+      
       @options_hash ||= {}
       @options_hash[key.to_sym] = value
     end

data/lib/playmo/question.rb

@@ -6,14 +6,14 @@ module Playmo
   autoload :Choice
 
   class Question
-    attr_accessor :question, :answers, :recipe, :action, :shell, :color, :options
+    attr_accessor :question, :answers, :recipe, :block, :shell, :color, :options
 
     def initialize(recipe, question, options, &block)
       @question = question
       @answers  = []
       @recipe   = recipe
       @options  = options
-      @action   = block
+      @block    = block
       @shell    = Thor::Shell::Basic.new
       @color    = Thor::Shell::Color.new
 
@@ -67,24 +67,23 @@ module Playmo
 
       shell.say("\n")
 
-      if options[:type] == :ask && action.arity > 0
+      if options[:type] == :ask && block.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') }
+        if block
+          answer_action = block
+          x = Proc.new { answer_action.call(response) }
+          Playmo::Action.new(recipe, &x)
+        end
       else
         choice = Playmo::Choice.new(self)
-        answer_action = choice.get_answer.action
-        Playmo::Action.new(recipe, &answer_action)
+        answer = choice.get_answer
+
+        if answer
+          answer_action = answer.block
+          Playmo::Action.new(recipe, &answer_action)
+        end
       end
-      #if has_answers?
-      #  Playmo::Action.new(recipe, &answer_action)
-      #else
-      #  Playmo::Action.new(recipe, &action)
-      #end
     end
 
     alias :to_s :render

data/lib/playmo/version.rb

@@ -1,5 +1,5 @@
 module Playmo
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 
   if ARGV.first =~ /--version|-v/
     puts VERSION

data/recipes/compass_recipe.rb

@@ -3,6 +3,6 @@ recipe :compass do
   after :application_controller
   
   ask "Would you like to use Compass in this project?" do
-    gem "compass", "0.12.rc.1"
+    gem "compass", "0.12.alpha.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: playmo
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &18914280 !ruby/object:Gem::Requirement
+  requirement: &15882380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *18914280
+  version_requirements: *15882380
 - !ruby/object:Gem::Dependency
   name: ruby_events
-  requirement: &18913320 !ruby/object:Gem::Requirement
+  requirement: &15881960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18913320
+  version_requirements: *15881960
 - !ruby/object:Gem::Dependency
   name: haml2slim
-  requirement: &18911980 !ruby/object:Gem::Requirement
+  requirement: &15881300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *18911980
+  version_requirements: *15881300
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &18911180 !ruby/object:Gem::Requirement
+  requirement: &15880380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *18911180
+  version_requirements: *15880380
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &18910600 !ruby/object:Gem::Requirement
+  requirement: &15879440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,7 +65,7 @@ dependencies:
         version: 2.8.1
   type: :development
   prerelease: false
-  version_requirements: *18910600
+  version_requirements: *15879440
 description: 
 email:
 - demerest@gmail.com