yuyi 1.0.8 → 1.1.3

data/lib/yuyi/roll.rb

@@ -2,7 +2,7 @@
 
 class Yuyi::Roll
 
-  # DSL API Methods
+  # CLASS DSL API Methods
   #
   def self.title title = nil
     title ? @title = title : @title
@@ -13,108 +13,85 @@ class Yuyi::Roll
   end
 
   def self.pre_install &block
-    if block
-      @pre_install = block
-    else
-      @pre_install
-    end
+    block_given? ? @pre_install = block : @pre_install
   end
 
   def self.install &block
-    if block
-      @install = block
-    else
-      @install
-    end
+    block_given? ? @install = block : @install
   end
 
   def self.post_install &block
-    if block
-      @post_install = block
-    else
-      @post_install
-    end
+    block_given? ? @post_install = block : @post_install
   end
 
   def self.uninstall &block
-    if block
-      @uninstall = block
-    else
-      @uninstall
-    end
+    block_given? ? @uninstall = block : @uninstall
   end
 
   def self.upgrade &block
-    if block
-      @upgrade = block
-    else
-      @upgrade
-    end
+    block_given? ? @upgrade = block : @upgrade
   end
 
   def self.installed? &block
-    if block
-      @installed = block
-    else
-      @installed
-    end
+    block_given? ? @installed = block : @installed
   end
 
   def self.dependencies *dependencies
-    @dependencies ||= []
-
-    unless dependencies.empty?
-      @dependencies |= dependencies
-      require_dependencies
+    dependencies.each do |d|
+      Yuyi::Menu.find_roll d
     end
 
-    @dependencies
+    @dependencies ||= []
+    @dependencies |= dependencies
   end
 
   # set option definitions
-  def self.options arg = {}
-    @option_defs ||= arg
+  def self.options option_defs = {}
+    @option_defs = option_defs
   end
 
-  # DSL Helper methods
-  #
-  def title; self.class.title; end
-  def file_name; self.class.file_name; end
 
-  # return option definitions
-  def option_defs
-    self.class.options
+  # INSTANCE DSL METHODS
+  #
+  def method_missing method, *args, &block
+    begin
+      self.class.send method, *args, &block
+    rescue
+      Yuyi.send method, *args, &block
+    rescue
+      super
+    end
   end
 
-  def write_to_file file, *text
-    Yuyi.write_to_file file, *text
+  def on_the_menu? roll
+    Yuyi::Menu.on_the_menu? roll
   end
 
-  def delete_from_file file, *text
-    Yuyi.delete_from_file file, *text
+  # return definitions instaed of user options
+  #
+  def option_defs
+    self.class.options
   end
 
+  # return user option values
+  #
   def options
     option_defaults = {}
-    option_defs.each do |roll, option_settings|
-      option_defaults[roll] = option_settings[:default]
+    option_defs.each do |option_name, option_settings|
+      option_defaults[option_name] = option_settings[:default]
     end
 
-    option_defaults.merge Yuyi::Menu.options(self)
-  end
-
-  def dependencies
-    self.class.dependencies
+    option_defaults.merge Yuyi::Menu.options(self.class.file_name)
   end
 
   # Run the roll
   #
-  def install
+  def order
     if installed?
       if options[:uninstall]
         Yuyi.say "🍣\s Uninstalling #{title}...", :color => 33
         uninstall
-      elsif upgrade?
+      elsif Yuyi.upgrade
         Yuyi.say "🍣\s Upgrading #{title}", :color => 36
         upgrade
       end
@@ -123,115 +100,93 @@ class Yuyi::Roll
       install
     end
   end
-  alias_method :order, :install
-  alias_method :entree, :install
+  alias_method :entree, :order
 
-  def pre_install; pre_install; end
+  # Methods to execute block
+  #
+  def pre_install
+    return if !self.class.pre_install || installed?
+    say title, :type => :success
+    instance_eval(&self.class.pre_install)
+  end
   alias_method :appetizers, :pre_install
 
-  def post_install; post_install; end
+  def install
+    begin
+      instance_eval(&self.class.install).inspect
+    rescue
+      say "The #{self.title} roll does not have `install` defined", :type => :fail
+      exit
+    end
+  end
+
+  def post_install
+    return if !self.class.post_install || installed?
+    say title, :type => :success
+    instance_eval(&self.class.post_install)
+  end
   alias_method :dessert, :post_install
 
-private
+  def uninstall
+     begin
+      instance_eval(&self.class.uninstall)
+    rescue
+      say "The #{self.title} roll does not have `uninstall` defined", :type => :fail
+      exit
+    end
+  end
 
-    def upgrade?
-      Yuyi::Menu.upgrade?
+  def upgrade
+    begin
+      instance_eval(&self.class.upgrade)
+    rescue
+      say "The #{self.title} roll does not have `upgrade` defined", :type => :fail
+      exit
+    end
+  end
+
+  def installed?
+    if Yuyi.verbose
+      say "INSTALLED?: #{self.title}", :color => 36
     end
 
+    begin
+      !!instance_eval(&self.class.installed?)
+    rescue
+      say "The #{self.title} roll does not have `installed?` defined", :type => :fail
+      exit
+    end
+  end
+
+private
+
     # Add to global collection of rolls
     #
     def self.inherited klass
-      return if klass.to_s.include? 'RollModel'
-
       add_roll klass, caller
     end
 
+    # method that actually passes the new roll to the menu
+    #
     def self.add_roll klass, caller
       # convert class name to a title string
       klass.title class_to_title klass
 
       # convert caller to a file name symbol
-      klass.file_name caller_to_file_name caller
+      klass.file_name caller_to_file_name(caller)
 
       Yuyi::Menu.add_roll klass.file_name, klass
     end
 
+    # Convert long class name to a readable title
+    #
     def self.class_to_title klass
       klass.to_s.match(/[^:]+$/)[0].gsub(/(?=[A-Z])/, ' ').strip
     end
 
+    # Convert long file name to a roll name symbol
+    #
     def self.caller_to_file_name caller
       caller.first[/[a-z_]+?(?=\.rb)/].to_sym
     end
-
-    def self.require_dependencies
-      @dependencies.each do |roll|
-        unless Yuyi::Menu.on_the_menu? roll
-          Yuyi::Menu.find_roll roll
-        end
-      end
-    end
-
-    def pre_install
-      return if self.class.installed? || !self.class.pre_install
-      say title, :type => :success
-      instance_eval(&self.class.pre_install)
-    end
-
-    def install
-      begin
-        instance_eval(&self.class.install)
-      rescue
-        say "The #{self.title} roll does not have `install` defined", :type => :fail
-        exit
-      end
-    end
-
-    def post_install
-      return if self.class.installed? || !self.class.post_install
-      say title, :type => :success
-      instance_eval(&self.class.post_install)
-    end
-
-    def uninstall
-       begin
-        instance_eval(&self.class.uninstall)
-      rescue
-        say "The #{self.title} roll does not have `uninstall` defined", :type => :fail
-        exit
-      end
-    end
-
-    def upgrade
-      begin
-        instance_eval(&self.class.upgrade)
-      rescue
-        say "The #{self.title} roll does not have `upgrade` defined", :type => :fail
-        exit
-      end
-    end
-
-    def installed?
-      if Yuyi.verbose?
-        say "INSTALLED?: #{self.title}", :color => 36
-      end
-
-      begin
-        !!instance_eval(&self.class.installed?)
-      rescue
-        say "The #{self.title} roll does not have `installed?` defined", :type => :fail
-        exit
-      end
-    end
-
-    # Helpers for Yuyi Cli methods
-    def say *args; Yuyi.say *args; end
-    def ask *args; Yuyi.ask *args; end
-    def run *args; Yuyi.run *args; end
-    def command? *args; Yuyi.command? *args; end
-    def osx_version; Yuyi.osx_version; end
-
-    def on_the_menu? roll
-      Yuyi::Menu.on_the_menu? roll
-    end
 end

data/lib/yuyi/source.rb

@@ -5,7 +5,7 @@ require 'tmpdir'
 class Yuyi::Source
   ROLL_FILE_GLOB = '**/*.rb'
 
-  def available_rolls; @available_rolls end
+  def rolls; @rolls end
   def roll_models; @roll_models end
 
 private
@@ -16,7 +16,7 @@ private
     end
 
     def initialize name, path
-      @available_rolls = {}
+      @rolls = {}
       @roll_models = {}
       @name = name
       @path = path
@@ -30,6 +30,7 @@ private
       dir = FileUtils.mkdir_p(File.join(@@root_tmp_dir, @name.to_s))
 
       # RUBY_VERSION
+      # DEPRECATION
       # mkdir_p <= 1.8 returns a string
       # mkdir_p >= 1.9 returns an array
       #
@@ -105,7 +106,7 @@ private
         if r.include?('roll_model.rb')
           @roll_models[name] = require_path
         else
-          @available_rolls[name] = require_path
+          @rolls[name] = require_path
         end
       end
     end

data/lib/yuyi/ui.rb

@@ -0,0 +1,103 @@
+module Yuyi::Ui
+  def header
+    line_length = 50
+    say
+    say '-' * line_length, :color => 4
+    say
+    say '____    ____  __    __  ____    ____  __  ', :color => 31, :justify => :center, :padding => line_length
+    say '\   \  /   / |  |  |  | \   \  /   / |  | ', :color => 32, :justify => :center, :padding => line_length
+    say ' \   \/   /  |  |  |  |  \   \/   /  |  | ', :color => 33, :justify => :center, :padding => line_length
+    say '  \_    _/   |  |  |  |   \_    _/   |  | ', :color => 34, :justify => :center, :padding => line_length
+    say '    |  |     |  `--\'  |     |  |     |  | ', :color => 35, :justify => :center, :padding => line_length
+    say '    |__|      \______/      |__|     |__| ', :color => 36, :justify => :center, :padding => line_length
+    say
+    say "VERSION #{Yuyi::VERSION}", :justify => :center, :padding => line_length
+    say
+    say '-' * line_length, :color => 4
+    say
+  end
+
+  # If any rolls on the menu have options, confirm the options before continuing
+  #
+  def confirm_options
+    confirm = false
+    Yuyi::Menu.rolls.each do |name, roll|
+
+      unless roll.class.options.empty?
+        present_options roll
+        confirm = true
+      end
+    end
+
+    if confirm
+      say 'Your menu is being loaded from: ', :type => :warn, :newline => false
+      say Yuyi::Menu.menu_path
+      ask 'Make any changes you need to it, save it, and then press enter to continue.', :type => :warn do
+        Yuyi::Menu.load_from_file
+      end
+    end
+  end
+
+  def authenticate
+    say 'Yuyi does not need your admin password, but some installations do.', :type => :warn
+    say 'You may be asked to enter your password several times.', :type => :warn
+    say
+
+    # keep the sudo timestamp fresh just in case
+    Thread::new do
+      loop do
+        sleep 1.minute
+        `sudo -v`
+      end
+    end
+  end
+
+  # Show formatted options
+  #
+  def present_options roll, examples = true
+    indent = 2
+    longest_option = roll.options.keys.map(&:to_s).max_by(&:length).length + indent
+
+    say "Available options for #{roll.title}...", :color => 32
+
+    roll.option_defs.each do |k, v|
+      option_color = v[:required] ? 31 : 36
+
+      say "#{k.to_s.rjust(longest_option)}: ", :color => option_color, :newline => false
+      say v[:description]
+      say (' ' * (longest_option + indent)), :newline => false
+      if v[:default]
+        say 'default: ', :color => 36, :newline => false
+        say v[:default]
+      end
+    end
+
+    if examples
+      examples_hash = {}
+      example_indent = longest_option + indent
+      options = roll.options.dup
+
+      # merge examples from roll source in
+      options.each do |option, value|
+        if example = roll.option_defs[option][:example]
+          options[option] = example
+        end
+      end
+
+      examples_hash[roll.file_name.to_s] = options
+
+      say
+      say 'Example', :color => 33, :indent => example_indent, :newline => false
+      say examples_hash.deep_stringify_keys!.to_yaml.sub('---', '').gsub(/\n(\s*)/, "\n\\1#{' ' * example_indent}")
+    end
+  end
+
+  # Output text with a certain color (or style)
+  # Reference for color codes
+  # https://github.com/flori/term-ansicolor/blob/master/lib/term/ansicolor.rb
+  #
+  def colorize text, color_code
+    return text unless color_code
+    "\e[#{color_code}m#{text}\e[0m"
+  end
+end

data/lib/yuyi.rb

@@ -1,16 +1,31 @@
 class Yuyi; end
 
-require 'yuyi/cli'
 require 'yuyi/core'
+require 'yuyi/dsl'
 require 'yuyi/menu'
 require 'yuyi/roll'
 require 'yuyi/source'
+require 'yuyi/ui'
 
 class Yuyi
   require 'yaml'
-  extend Yuyi::Cli
+  extend Yuyi::Dsl
+  extend Yuyi::Ui
 
   NAME = 'Yuyi'
   VERSION = YAML.load(File.read(File.dirname(__FILE__) + '/../.new'))['version']
   DEFAULT_MENU = File.expand_path('~/yuyi_menu')
+
+  def self.start
+    header
+
+    Yuyi::Menu.new menu_path
+
+    # confirm with user
+    confirm_options
+    authenticate
+
+    # order
+    Yuyi::Menu.order
+  end
 end

data/spec/fixtures/menu.yaml

@@ -1,6 +1,7 @@
 sources:
-- local: spec/fixtures/roll_dir
-- yuyi: spec/fixtures/roll_zip.zip
+  dir: spec/fixtures/roll_dir
+  zip: spec/fixtures/roll_zip.zip
 rolls:
   foo_roll:
     foo: bar
+  bar_roll:

data/spec/fixtures/menu2.yaml

@@ -1,6 +1,9 @@
+# menu should be the exact same as menu.yaml, except with the options changes for foo_roll
+# this is to test that when a menu is edited and options are changed, yuyi picks up the changes.
 sources:
-- local: spec/fixtures/roll_dir
-- yuyi: spec/fixtures/roll_zip.zip
+  dir: spec/fixtures/roll_dir
+  zip: spec/fixtures/roll_zip.zip
 rolls:
   foo_roll:
     bar: foo
+  bar_roll:

data/spec/fixtures/roll_dir/foo_roll_model.rb

@@ -0,0 +1,2 @@
+class FooRollModel < Yuyi::Roll
+end

data/spec/fixtures/roll_dir/nested/bar_roll.rb

@@ -1,2 +1,2 @@
-class FooRoll < Yuyi::Roll
+class BarRoll < Yuyi::Roll
 end