yuyi 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03214f6bdbf18149f894b6b5f29d386a153e8081
-  data.tar.gz: 087592fd6363457661449f21ac82cf2077c85104
+  metadata.gz: 4cdc21ccb1c1827519985b27b4e273ae0a093602
+  data.tar.gz: 015d034b735328c1789cf17e4772e58d2c63884f
 SHA512:
-  metadata.gz: f0eb908f6eaf1d23019462265a9e69dcc9debd65269d45e5f84a9a91c13e5f14bc21c332dcf4c75c39096aa21821466ba11d8b2c6cf40a3ae46590fd76046f44
-  data.tar.gz: f16348e2be96f5d0001dc665f21b51bba5e635ad1eca8d416573c3faf014055e8458e725f94733e3b675b2b43ea8fb293b4f6350823ee72104f4c6249f3048b6
+  metadata.gz: b8a41477a856a6695051b5a3c14aa639aa1e3d36bd0af84656c06345f4800a39c82114d5b656a3b6df2777bf647605224658509d4a2262924ae32d682b367233
+  data.tar.gz: c2b5e9e6550b51190e73ad6e9edd167c8fb87f5aa24d1c8137f13b69e83bf1f3268badbf3e5fa7aa4040a886a0269e98982319a632bd6d193a58b15fc6ee5e91

data/.new

@@ -16,4 +16,4 @@ tasks:
       - spec/**/*.rb
 project_name: Yuyi
 type: ruby
-version: 1.0.6
+version: 1.0.7

data/lib/yuyi/cli.rb

@@ -172,204 +172,206 @@ module Yuyi::Cli
     run('/usr/bin/sw_vers -productVersion').chomp[/10\.\d+/].to_f
   end
 
+  def verbose?; @verbose; end
+
 private
 
-  def start
-    header
-    get_menu
-    confirm_upgrade
-    confirm_options
-    authenticate
-    Yuyi::Menu.instance.order_rolls
-  end
+    def start
+      header
+      get_menu
+      confirm_upgrade
+      confirm_options
+      authenticate
+      Yuyi::Menu.instance.order_rolls
+    end
 
-  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
+    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
 
-  # Ask the user for a menu file to load
-  #
-  def get_menu
-    until @path
-      say 'Navigate to a menu file...', :type => :success
-      @path = ask "...or just press enter to load `#{Yuyi::DEFAULT_MENU}`", :readline => true, :color => 36 do |path|
-        path = path.empty? ? Yuyi::DEFAULT_MENU : path
-
-        if Yuyi::Menu.load_from_file path
-          say 'Downloading Sources... Please Wait', :type => :warn
-          say
-
-          path
-        else
-          say 'Invalid Path... Please check the location of your menu file', :type => :fail
-          say
-
-          nil
+    # Ask the user for a menu file to load
+    #
+    def get_menu
+      until @path
+        say 'Navigate to a menu file...', :type => :success
+        @path = ask "...or just press enter to load `#{Yuyi::DEFAULT_MENU}`", :readline => true, :color => 36 do |path|
+          path = path.empty? ? Yuyi::DEFAULT_MENU : path
+
+          if Yuyi::Menu.load_from_file path
+            say 'Downloading Sources... Please Wait', :type => :warn
+            say
+
+            path
+          else
+            say 'Invalid Path... Please check the location of your menu file', :type => :fail
+            say
+
+            nil
+          end
         end
       end
-    end
 
-    Yuyi::Menu.new @path
-  end
+      Yuyi::Menu.new @path
+    end
 
-  # Ask to check for upgrades
-  #
-  def confirm_upgrade
-    ask 'Do you want to check for upgrades for already installed rolls? (Yn)', :type => :warn do |upgrade|
-      Yuyi::Menu.upgrade? upgrade == 'Y'
+    # Ask to check for upgrades
+    #
+    def confirm_upgrade
+      ask 'Do you want to check for upgrades for already installed rolls? (Yn)', :type => :warn do |upgrade|
+        Yuyi::Menu.upgrade? upgrade == 'Y'
+      end
     end
-  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|
+    # 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
+        unless roll.class.options.empty?
+          present_options roll
+          confirm = true
+        end
       end
-    end
 
-    if confirm
-      ask 'Hit any key when you have your options set correctly in your menu file', :type => :warn do
-        Yuyi::Menu.load_from_file
+      if confirm
+        ask 'Hit any key when you have your options set correctly in your menu file', :type => :warn do
+          Yuyi::Menu.load_from_file
+        end
       end
     end
-  end
 
-  def authenticate
-    say 'Yuyi does not need your admin password, but some installations force a prompt.', :type => :warn
-    say 'You may be asked to enter your password several times. ', :type => :warn
+    def authenticate
+      say 'Yuyi does not need your admin password, but some installations force a prompt.', :type => :warn
+      say 'You may be asked to enter your password several times. ', :type => :warn
 
-    # keep the sudo timestamp fresh
-    Thread::new do
-      loop do
-        sleep 1.minute
-        `sudo -v`
+      # keep the sudo timestamp fresh
+      Thread::new do
+        loop do
+          sleep 1.minute
+          `sudo -v`
+        end
       end
-    end
 
-    say
-  end
+      say
+    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
+    # 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
+      say "Available options for #{roll.title}...", :color => 32
 
-    roll.option_defs.each do |k, v|
-      option_color = v[:required] ? 31 : 36
+      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]
+        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
-    end
 
-    if examples
-      examples_hash = {}
-      example_indent = longest_option + indent
-      options = roll.options.dup
+      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
+        # merge examples from roll source in
+        options.each do |option, value|
+          if example = roll.option_defs[option][:example]
+            options[option] = example
+          end
         end
-      end
 
-      examples_hash[roll.file_name.to_s] = options
+        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}")
+        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
-  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
+    # 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
 
-  # METHODS FOR FLAGS
-  #
-  def help
-    longest_option = CLI_OPTIONS.keys.map(&:to_s).max.length
+    # METHODS FOR FLAGS
+    #
+    def help
+      longest_option = CLI_OPTIONS.keys.map(&:to_s).max.length
 
-    say
-    CLI_OPTIONS.each do |option, description|
-      string = ''
-      string << "-#{option.to_s.chars.first}"
-      string << ', '
-      string << "--#{option.to_s.ljust(longest_option)}"
-      string << '   '
-      string << description
-      say string
+      say
+      CLI_OPTIONS.each do |option, description|
+        string = ''
+        string << "-#{option.to_s.chars.first}"
+        string << ', '
+        string << "--#{option.to_s.ljust(longest_option)}"
+        string << '   '
+        string << description
+        say string
+      end
+      say
     end
-    say
-  end
-
-  # List all available rolls
-  #
-  def list
-    get_menu
-    Yuyi::Menu.set_sources
 
-    # Collect all rolls from all sources
+    # List all available rolls
     #
-    rolls = []
-    Yuyi::Menu.sources.each do |source|
-      rolls |= source.available_rolls.keys
-    end
+    def list
+      get_menu
+      Yuyi::Menu.set_sources
+
+      # Collect all rolls from all sources
+      #
+      rolls = []
+      Yuyi::Menu.sources.each do |source|
+        rolls |= source.available_rolls.keys
+      end
 
-    # alphabatize rolls
-    rolls = rolls.map(&:to_s).sort.map(&:to_sym)
+      # alphabatize rolls
+      rolls = rolls.map(&:to_s).sort.map(&:to_sym)
 
-    say 'Available Rolls', :type => :success
-    say '---------------', :type => :success
-    rolls.each do |roll|
-      say roll.to_s
+      say 'Available Rolls', :type => :success
+      say '---------------', :type => :success
+      rolls.each do |roll|
+        say roll.to_s
+      end
+      say
     end
-    say
-  end
 
-  # Return current version
-  #
-  def version
-    say "#{Yuyi::NAME} #{Yuyi::VERSION}"
-  end
+    # Return current version
+    #
+    def version
+      say "#{Yuyi::NAME} #{Yuyi::VERSION}"
+    end
 
-  # Return current version
-  #
-  def verbose
-    @verbose = true
-    start
-  end
+    # Return current version
+    #
+    def verbose
+      @verbose = true
+      start
+    end
 end

data/lib/yuyi/menu.rb

@@ -138,6 +138,12 @@ class Yuyi::Menu
     all_rolls.each do |file_name|
       rolls[file_name].dessert
     end
+
+
+    Yuyi.say '=' * header_length, :color => 36
+    Yuyi.say 'YUYI COMPLETED', :color => 36, :justify => :center, :padding => header_length
+    Yuyi.say '=' * header_length, :color => 36
+    Yuyi.say
   end
 
   # Find the best roll in the source to be added

data/lib/yuyi/roll.rb

@@ -212,6 +212,10 @@ private
     end
 
     def installed?
+      if Yuyi.verbose?
+        say "INSTALLED?: #{self.title}", :color => 36
+      end
+
       begin
         !!instance_eval(&self.class.installed?)
       rescue

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yuyi
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Ryan Brewster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec