yuyi 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f3964188686f9d45bb9cd37da390d36561ab7d5
-  data.tar.gz: 3302bf4e8ce29c4ea4c1a91aa9845afa2f261c27
+  metadata.gz: f54fc12263a3eb78bf1b72db5bc3d08ff8509306
+  data.tar.gz: 43ba00e4b501473bece5e67be9e5d5d33000d845
 SHA512:
-  metadata.gz: c5c23f52585108ad78f3b3427f6cc08d1184ec8e0b431e44ada408453f44c4633d360c1f6088d05db5f5760c79d9b2508d85ad379aa95f75266cd6cb8aa2265c
-  data.tar.gz: 3f69348dbbf591d5d9db58f38b4de7f2ff0b6ce2b5d2714a4820ddc9612d9130007cc501c67a6f8c33dc4a3b6f2e5728f9b2a3a63dd490131b45ec3bbc65c89d
+  metadata.gz: de8c5bf7eb451d5ea95428f38aef109b6be9036c07f185e710ccb52d5fbbfad4b329950ccf767a3655b1d88f4a6af56cf129b997f0f59f4192d9bb509f89221c
+  data.tar.gz: a70065a9218a8a53ac88d66c5d85a70d60b09eb01c7f16466392ba89e903d9141621da10ef904450b5578546c66a67aa773127ab7449023523b90ba4d1d05139

data/.new

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

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
+gem 'colorize'
+gem 'ruby-progressbar'
 gem 'thor'
 
 group :development do

data/Gemfile.lock

@@ -56,6 +56,7 @@ GEM
     rspec-mocks (3.0.2)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.2)
+    ruby-progressbar (1.5.1)
     semantic (1.3.0)
     slop (3.5.0)
     terminal-notifier-guard (1.5.3)
@@ -66,10 +67,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  colorize
   guard
   guard-rspec
   new
   rake
   rspec
+  ruby-progressbar
   terminal-notifier-guard
   thor

data/README.md

@@ -124,11 +124,10 @@ end
 ```
 
 ### TODO
-* progressbar
 * vagrant plugins
 * Enforce required options
 * New roll generator (use new!)
-* show roll options on -l
+* show roll options on list
 * installation summary
 * DOCS!
 

data/lib/yuyi/cli.rb

@@ -30,13 +30,14 @@ class Yuyi::Cli < Thor
   end
 
   desc 'start', 'Run Yuyi'
-  option :verbose, :aliases => '-v', :type => :boolean, :desc => 'Run in verbose mode'
-  option :upgrade, :aliases => '-u', :type => :boolean, :desc => 'Check for upgrades for rolls on the menu that are already installed'
+  option :verbose, :default => false, :aliases => '-v', :type => :boolean, :desc => 'Run in verbose mode'
+  option :upgrade, :default => false, :aliases => '-u', :type => :boolean, :desc => 'Check for upgrades for rolls on the menu that are already installed'
   option :menu, :aliases => '-m', :desc => 'Path to your menu file'
   def start
+    puts options.inspect
     # enable verbose mode if flag is passed
-    Yuyi.verbose = true if options[:verbose]
-    Yuyi.upgrade = true if options[:upgrade]
+    Yuyi.verbose = options[:verbose]
+    Yuyi.upgrade = options[:upgrade]
     Yuyi.menu_path = options[:menu]
 
     Yuyi.start

data/lib/yuyi/core.rb

@@ -1,3 +1,4 @@
+require 'rubygems' # DEPRECATION: required for ruby 1.8.7
 require 'tsort'
 
 class Array

data/lib/yuyi/dsl.rb

@@ -1,3 +1,4 @@
+require 'colorize'
 require 'open3'
 require 'readline'
 require 'yaml'
@@ -9,12 +10,14 @@ module Yuyi::Dsl
   attr_accessor :verbose, :upgrade, :menu_path
 
   # Replacement for `puts` that accepts various stylistic arguments
-  # type:     => [symbol]             Preset colors for [:fail, :success, :warn]
-  # color:    => [integer]            See docs for #colorize for color codes
-  # justify:  => [center|ljust|rjust] The type of justification to use
-  # padding:  => [integer]            The maximum string size to justify text in
-  # indent:   => [integer]            The maximum string size to justify text in
-  # newline:  => [boolean]            True if you want a newline after the output
+  # type:         => [symbol]             Preset colors for [:fail, :success, :warn]
+  # color:        => [integer]            See docs for #colorize for color codes
+  # justify:      => [center|ljust|rjust] The type of justification to use
+  # padding:      => [integer]            The maximum string size to justify text in
+  # indent:       => [integer]            The maximum string size to justify text in
+  # newline:      => [boolean]            True if you want a newline after the output
+  # progressbar:  => [boolean]            True if you are adding a title to the progresbar
+  # overwrite:    => [boolean]            True if you want to overwrite the previous line
   #
   def say text = '', args = {}
     # defaults
@@ -31,33 +34,43 @@ module Yuyi::Dsl
     # process last due to the addition of special color codes
     text = case args[:type]
     when :fail
-      Yuyi.colorize text, 31
+      text.colorize :red
     when :success
-      Yuyi.colorize text, 32
+      text.colorize :green
     when :warn
-      Yuyi.colorize text, 33
+      text.colorize :yellow
     else
-      Yuyi.colorize text, args[:color]
+      text
+    end
+
+    if args[:color]
+      text = text.colorize(args[:color])
     end
 
     if args[:indent]
       text = (' ' * args[:indent]) + text
     end
 
-    if args[:newline]
-      STDOUT.puts text
-    else
+    if args[:overwrite]
+      STDOUT.flush
+      text = text + "\r"
+    end
+
+    if args[:progressbar] && Yuyi.verbose != true && Yuyi::Menu.menu && Yuyi::Menu.menu.progressbar
+      Yuyi::Menu.menu.progressbar.log text
+    elsif !args[:newline] || args[:overwrite]
       STDOUT.print text
+    else
+      STDOUT.puts text
     end
   end
 
   # Accepts the same arguments as #say
   #
   def ask question, options = {}, &block
-    prompt = '>>> '
+    prompt = '>>> '.colorize(:green)
     options = {
       :readline => false,
-      :color => 1
     }.merge(options)
 
     say question, options
@@ -65,7 +78,7 @@ module Yuyi::Dsl
     output = if options[:readline]
       Readline.readline(prompt).chomp('/')
     else
-      say prompt, :color => 1, :newline => false
+      say prompt, :newline => false
       STDIN.gets
     end.rstrip
 

data/lib/yuyi/menu.rb

@@ -1,6 +1,9 @@
 require 'readline'
+require 'ruby-progressbar'
 
 class Yuyi::Menu
+  attr_accessor :progressbar
+
   # Stores a single menu instance on the class
   # If a new menu is initialized, it will become the only menu accessible through Yuyi::Menu.menu
   #
@@ -151,7 +154,7 @@ private
     def get_menu_path
       until @yaml
         Yuyi.say 'Navigate to a menu file...', :type => :success
-        Yuyi.ask "...or just press enter to load `#{Yuyi::DEFAULT_MENU}`", :readline => true, :color => 36 do |user_path|
+        Yuyi.ask "...or just press enter to load `#{Yuyi::DEFAULT_MENU}`", :readline => true do |user_path|
           menu_path = user_path.empty? ? Yuyi::DEFAULT_MENU : user_path
           load_from_file menu_path
         end
@@ -209,47 +212,49 @@ private
     def order
       header_length = 80
       all_rolls = sorted_rolls
-
+      self.progressbar = ProgressBar.create(:progress_mark => '='.colorize(:green), :length => header_length, :total => all_rolls.length)
 
       # pre installs
       #
-      Yuyi.say '=' * header_length, :color => 35
-      Yuyi.say 'APPETIZERS', :color => 35, :justify => :center, :padding => header_length
-      Yuyi.say 'Pre Install', :justify => :center, :padding => header_length
-      Yuyi.say
+      # Yuyi.say '=' * header_length, :color => :green
+      Yuyi.say 'APPETIZERS', :justify => :center, :padding => header_length
 
+      self.progressbar.reset
       all_rolls.each do |file_name|
         @rolls[file_name].appetizers
+        self.progressbar.increment
       end
+      Yuyi.say
 
 
       # main installs
       #
-      Yuyi.say '=' * header_length, :color => 36
-      Yuyi.say 'ENTREES', :color => 36, :justify => :center, :padding => header_length
-      Yuyi.say 'Main Install', :justify => :center, :padding => header_length
-      Yuyi.say
+      # Yuyi.say '=' * header_length, :color => :green
+      Yuyi.say 'ENTREES', :justify => :center, :padding => header_length
 
+      self.progressbar.reset
       all_rolls.each do |file_name|
         @rolls[file_name].entree
+        self.progressbar.increment
       end
+      Yuyi.say
 
 
       # post installs
       #
-      Yuyi.say '=' * header_length, :color => 35
-      Yuyi.say 'DESSERT', :color => 35, :justify => :center, :padding => header_length
-      Yuyi.say 'Post Install', :justify => :center, :padding => header_length
-      Yuyi.say
+      # Yuyi.say '=' * header_length, :color => :green
+      Yuyi.say 'DESSERT', :justify => :center, :padding => header_length
 
+      self.progressbar.reset
       all_rolls.each do |file_name|
         @rolls[file_name].dessert
+        self.progressbar.increment
       end
+      Yuyi.say
 
 
-      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 'YUYI COMPLETED', :color => :light_blue, :justify => :center, :padding => header_length
+      Yuyi.say '=' * header_length, :color => :light_blue
       Yuyi.say
     end
 

data/lib/yuyi/roll.rb

@@ -47,7 +47,8 @@ class Yuyi::Roll
 
   # set option definitions
   def self.options option_defs = {}
-    @option_defs = option_defs
+    @option_defs ||= {}
+    @option_defs.merge! option_defs
   end
 
 
@@ -89,14 +90,14 @@ class Yuyi::Roll
   def order
     if installed?
       if options[:uninstall]
-        Yuyi.say "🍣\s Uninstalling #{title}...", :color => 33
+        say "🍣\s Uninstalling #{title}...", :color => :red, :progressbar => true, :overwrite => true
         uninstall
       elsif Yuyi.upgrade
-        Yuyi.say "🍣\s Upgrading #{title}", :color => 36
+        say "🍣\s Upgrading #{title}", :color => :yellow, :progressbar => true, :overwrite => true
         upgrade
       end
     else
-      Yuyi.say "🍣\s Installing #{title}...", :color => 32
+      say "🍣\s Installing #{title}...", :color => :green, :progressbar => true, :overwrite => true
       install
     end
   end
@@ -147,7 +148,7 @@ class Yuyi::Roll
 
   def installed?
     if Yuyi.verbose
-      say "INSTALLED?: #{self.title}", :color => 36
+      say "INSTALLED?: #{self.title}", :color => :yellow
     end
 
     begin

data/lib/yuyi/ui.rb

@@ -2,18 +2,18 @@ module Yuyi::Ui
   def header
     line_length = 50
     say
-    say '-' * line_length, :color => 4
+    say '-' * line_length, :color => :light_blue
     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 '____    ____  __    __  ____    ____  __  ',  :justify => :center, :padding => line_length, :color => :red
+    say '\   \  /   / |  |  |  | \   \  /   / |  | ',  :justify => :center, :padding => line_length, :color => :light_white
+    say ' \   \/   /  |  |  |  |  \   \/   /  |  | ',  :justify => :center, :padding => line_length, :color => :light_blue
+    say '  \_    _/   |  |  |  |   \_    _/   |  | ',  :justify => :center, :padding => line_length, :color => :red
+    say '    |  |     |  `--\'  |     |  |     |  | ', :justify => :center, :padding => line_length, :color => :light_white
+    say '    |__|      \______/      |__|     |__| ',  :justify => :center, :padding => line_length, :color => :light_blue
     say
     say "VERSION #{Yuyi::VERSION}", :justify => :center, :padding => line_length
     say
-    say '-' * line_length, :color => 4
+    say '-' * line_length, :color => :light_blue
     say
   end
 
@@ -42,6 +42,7 @@ module Yuyi::Ui
     say 'Yuyi does not need your admin password, but some installations do.', :type => :warn
     say 'Yuyi will prompt you for a password and attempt to keep your admin timestamp alive.', :type => :warn
     say 'You may be asked to enter your password several times.', :type => :warn
+    say
 
     # keep the sudo timestamp fresh just in case
     `sudo -v`
@@ -59,23 +60,24 @@ module Yuyi::Ui
     indent = 2
     longest_option = roll.options.keys.map(&:to_s).max_by(&:length).length + indent
 
-    say "Available options for #{roll.title}...", :color => 32
+    say "#{roll.title} options", :color => :green
 
     roll.option_defs.each do |k, v|
-      option_color = v[:required] ? 31 : 36
+      option_color = v[:required] ? :red : :default
 
+      # show option and description
       say "#{k.to_s.rjust(longest_option)}: ", :color => option_color, :newline => false
       say v[:description]
-      say (' ' * (longest_option + indent)), :newline => false
+
+      # show default
       if v[:default]
-        say 'default: ', :color => 36, :newline => false
+        say 'default: ', :indent => (longest_option + indent), :newline => false, :color => :yellow
         say v[:default]
       end
     end
 
     if examples
       examples_hash = {}
-      example_indent = longest_option + indent
       options = roll.options.dup
 
       # merge examples from roll source in
@@ -88,17 +90,8 @@ module Yuyi::Ui
       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 'Example', :color => :green, :indent => indent, :newline => false
+      say examples_hash.deep_stringify_keys!.to_yaml.sub('---', '').gsub(/\n(\s*)/, "\n\\1#{' ' * (indent + 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/spec/lib/yuyi/dsl_spec.rb

@@ -14,16 +14,6 @@ describe Yuyi::Dsl do
       allow(STDOUT).to receive(:puts).and_call_original
     end
 
-    it 'should output the correct type' do
-      expect(STDOUT).to receive(:puts).with("\e[31mfoo type\e[0m")
-      DslTest.say 'foo type', :type => :fail
-    end
-
-    it 'should output the correct color' do
-      expect(STDOUT).to receive(:puts).with("\e[123mfoo color\e[0m")
-      DslTest.say 'foo color', :color => 123
-    end
-
     it 'should output the correct justification & padding' do
       expect(STDOUT).to receive(:puts).with(' foo justify padding  ')
       DslTest.say 'foo justify padding', :justify => :center, :padding => 22

data/spec/spec_helper.rb

@@ -17,10 +17,13 @@ RSpec.configure do |config|
     c.syntax = :expect
   end
 
-  config.order = 'random'
+  config.order = :random
 
   config.before do
     allow(Yuyi).to receive(:say)
+    allow(ProgressBar).to receive(:create)
+    allow_any_instance_of(Yuyi::Menu).to receive_message_chain('progressbar.reset')
+    allow_any_instance_of(Yuyi::Menu).to receive_message_chain('progressbar.increment')
   end
 end
 

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: yuyi
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Ryan Brewster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-07-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement