yuyi 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f54fc12263a3eb78bf1b72db5bc3d08ff8509306
-  data.tar.gz: 43ba00e4b501473bece5e67be9e5d5d33000d845
+  metadata.gz: 06030895fc322074fd3a878a5c80a08e97ea21fb
+  data.tar.gz: f624d1502202e155b7e74a0d10c182becf545358
 SHA512:
-  metadata.gz: de8c5bf7eb451d5ea95428f38aef109b6be9036c07f185e710ccb52d5fbbfad4b329950ccf767a3655b1d88f4a6af56cf129b997f0f59f4192d9bb509f89221c
-  data.tar.gz: a70065a9218a8a53ac88d66c5d85a70d60b09eb01c7f16466392ba89e903d9141621da10ef904450b5578546c66a67aa773127ab7449023523b90ba4d1d05139
+  metadata.gz: e72f7379391f73129aa928213e424c8107d55d3dab92a814af6ea19ab82af6e6f8f011876bfa55346deb09ed6a60dd6e9d57565bdb34e85f218cb0b562849c5f
+  data.tar.gz: 633457f35ad9e340b744c5bc18fc72484ad41e9f8f44eed06c26cc65860771b5c54bd1beda93231f73c77b26a753054c7b5b9880cf3f510e6bca7081aa36619b

data/.new

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

data/README.md

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

data/lib/yuyi.rb

@@ -8,7 +8,6 @@ require 'yuyi/source'
 require 'yuyi/ui'
 
 class Yuyi
-  require 'yaml'
   extend Yuyi::Dsl
   extend Yuyi::Ui
 

data/lib/yuyi/cli.rb

@@ -34,7 +34,6 @@ class Yuyi::Cli < Thor
   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 = options[:verbose]
     Yuyi.upgrade = options[:upgrade]

data/lib/yuyi/core.rb

@@ -1,5 +1,6 @@
 require 'rubygems' # DEPRECATION: required for ruby 1.8.7
 require 'tsort'
+require 'yaml'
 
 class Array
   def to_yaml_style

data/lib/yuyi/ui.rb

@@ -1,4 +1,6 @@
 module Yuyi::Ui
+  @@required = {}
+
   def header
     line_length = 50
     say
@@ -21,8 +23,7 @@ module Yuyi::Ui
   #
   def confirm_options
     confirm = false
-    Yuyi::Menu.rolls.each do |name, roll|
-
+    Yuyi::Menu.rolls.values.each do |roll|
       unless roll.class.options.empty?
         present_options roll
         confirm = true
@@ -30,10 +31,35 @@ module Yuyi::Ui
     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
+      required_options_satisfied = false
+
+      until required_options_satisfied
+        say 'Your menu is being loaded from: ', :type => :warn, :newline => false
+        say Yuyi::Menu.menu_path
+        ask 'Make any neccessary changes to it, then press enter to continue.', :type => :warn do
+          Yuyi::Menu.load_from_file
+        end
+
+        # check that required options are satisfied
+        catch :required_options_satisfied do
+          @@required.each do |roll, required_options|
+            required_options.each do |required_option|
+              if Yuyi::Menu.options(roll)[required_option]
+                next
+              else
+                say 'Required option ', :type => :fail, :newline => false
+                say required_option, :newline => false
+                say ' for ', :type => :fail, :newline => false
+                say roll, :newline => false
+                say ' is not set', :type => :fail
+                say
+                throw :required_options_satisfied
+              end
+            end
+          end
+
+          required_options_satisfied = true
+        end
       end
     end
   end
@@ -63,14 +89,22 @@ module Yuyi::Ui
     say "#{roll.title} options", :color => :green
 
     roll.option_defs.each do |k, v|
-      option_color = v[:required] ? :red : :default
+      if v[:required]
+        # add to required list
+        @@required[roll.file_name] ||= []
+        @@required[roll.file_name] << k
+
+        option_color = :red
+      else
+        option_color = :default
+      end
 
       # show option and description
       say "#{k.to_s.rjust(longest_option)}: ", :color => option_color, :newline => false
       say v[:description]
 
       # show default
-      if v[:default]
+      if v[:default] && (!v[:default].respond_to?(:empty?) || (v[:default].respond_to?(:empty?) && !v[:default].empty?))
         say 'default: ', :indent => (longest_option + indent), :newline => false, :color => :yellow
         say v[:default]
       end

data/spec/lib/yuyi/ui_spec.rb

@@ -1,10 +1,13 @@
 require 'spec_helper'
 
 describe Yuyi::Ui do
-  describe '#present_options' do
-    before do
-      class UiTest; extend Yuyi::Ui; end
+  before do
+    class UiTest; extend Yuyi::Ui; end
+    Yuyi::Ui.class_var :required, {}
+  end
 
+  describe '.present_options' do
+    before do
       @output = ''
       allow(UiTest).to receive :say do |o, p|
         @output << (o || '')
@@ -19,6 +22,9 @@ describe Yuyi::Ui do
           :description => 'foo description',
           :example => '1.0',
           :default => '2.0'
+        },
+        :option_required_foo => {
+          :required => true
         }
       })
 
@@ -32,5 +38,37 @@ describe Yuyi::Ui do
       expect(@output).to include '1.0'
       expect(@output).to include '2.0'
     end
+
+    it 'should add to the required object' do
+      expect(Yuyi::Ui.class_var(:required)).to eq({ :present_options_roll => [:option_required_foo] })
+    end
+  end
+
+  describe '.confirm_options' do
+    before do
+      Yuyi::Ui.class_var :required, { :confirm_options_roll => [:option_foo]}
+
+      allow(UiTest).to receive(:present_options)
+      allow(UiTest).to receive(:say)
+      allow(UiTest).to receive(:ask)
+
+      class ConfirmOptionsRoll; end
+      @confirm_options_roll = ConfirmOptionsRoll.new
+      allow(ConfirmOptionsRoll).to receive(:options).and_return({ :option_foo => {}})
+
+      allow(Yuyi::Menu).to receive(:rolls).and_return({ :confirm_options_roll => @confirm_options_roll })
+      allow(Yuyi::Menu).to receive(:menu_path)
+      allow(Yuyi::Menu).to receive(:options).and_return({ :option_foo => nil }, { :option_foo => 'bar' })
+
+      UiTest.send :confirm_options
+    end
+
+    it 'should call present_options if there are rolls with options' do
+      expect(UiTest).to have_received(:present_options).with(@confirm_options_roll)
+    end
+
+    it 'should ask to reload the menu if required options arent satisfied' do
+      expect(UiTest).to have_received(:ask).twice
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yuyi
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Ryan Brewster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-26 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize