yuyi 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42e19a36b6e031c4ab5fa746cff22ddef554158b
-  data.tar.gz: 493d828accff2315b14b030b1d25ab8f993f03d1
+  metadata.gz: 8667df310a7caf00f8607e5087c452a1ec32047b
+  data.tar.gz: e9e2e237dcb9a5fe15f0c6b5395841d78f18b2cd
 SHA512:
-  metadata.gz: b45e9c3cf5c38bb8866432f8f2b92510d59d1fb76d2c12f23ccd0f102c2e876495c7eb2bee84cc35517c5274053248fe81804deb4435b8560d8386fdffe8879c
-  data.tar.gz: 49651596c2907f588c516e9f0be72c24f9dae851f7e8f3e1a072a50e2cceef9ef85fbe4f7ec8a165f4df8372ca4ecabaa842dbb47bfc410816bae3ea2d22700f
+  metadata.gz: d085644d59271a419c13216437c879667d86f3701a13724e1aca6ea7231f84572881529a045758755be8be84190b6c3313638ab2e3ec3c9331b376c858322276
+  data.tar.gz: 904a13f14634ba63338104d83ff881f10f76725c59f50d0f24191bbd5df2f7a2fc71428bfbd707c97fefb0bd39a68e99ec441302a908680d4340e63216828dd7

data/.new

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

data/lib/yuyi/cli.rb

@@ -23,6 +23,11 @@ module Yuyi::Cli
     # get the first argument as the command
     command, *rest = *args
 
+    if command && !command.include?('-')
+      @path = command
+      command, *rest = *rest
+    end
+
     # Call options method if valid argument is passed
     # This checks for the full name or the first letter, proceeded by '--' or '-' respectively
     CLI_OPTIONS.keys.each do |option|
@@ -198,18 +203,16 @@ private
   # Ask the user for a menu file to load
   #
   def get_menu
-    menu = nil
-
-    until menu
+    until @path
       say 'Navigate to a menu file...', :type => :success
-      menu = ask "...or just press enter to load `#{Yuyi::DEFAULT_MENU}`", :readline => true, :color => 36 do |path|
+      @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
 
-          Yuyi::Menu.new path
+          path
         else
           say 'Invalid Path... Please check the location of your menu file', :type => :fail
           say
@@ -218,6 +221,8 @@ private
         end
       end
     end
+
+    Yuyi::Menu.new @path
   end
 
   # Ask to check for upgrades

data/lib/yuyi/menu.rb

@@ -43,8 +43,14 @@ class Yuyi::Menu
   # defaults to previously stored @path value
   #
   def self.load_from_file path = path
+    menu = begin
+      File.open(File.expand_path(path))
+    rescue
+      Yuyi.run "curl -sS #{path}"
+    end
+
     @object = begin
-      YAML.load(File.open(File.expand_path(path))).deep_symbolize_keys!
+      YAML.load(menu).deep_symbolize_keys!
     rescue
       nil
     end

data/lib/yuyi/roll.rb

@@ -178,7 +178,12 @@ private
     end
 
     def install
-      instance_eval(&self.class.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
@@ -187,15 +192,30 @@ private
     end
 
     def uninstall
-      instance_eval(&self.class.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
-      instance_eval(&self.class.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?
-      !!instance_eval(&self.class.installed?)
+      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

data/spec/lib/yuyi/cli_spec.rb

@@ -6,6 +6,7 @@ describe Yuyi::Cli do
   before do
     class CliTest; extend Yuyi::Cli; end
     allow(CliTest).to receive(:say)
+    CliTest.send(:instance_variable_set, :'@path', nil)
   end
 
   describe 'CLI_OPTIONS' do
@@ -31,7 +32,7 @@ describe Yuyi::Cli do
     context 'with an invalid argument' do
       before do
         allow(CliTest).to receive :help
-        CliTest.init 'foo'
+        CliTest.init '-foo'
       end
 
       it 'should call the help method' do
@@ -54,6 +55,17 @@ describe Yuyi::Cli do
         end
       end
     end
+
+    context 'with a menu path' do
+      before do
+        allow(CliTest).to receive :start
+        CliTest.init 'foo_path'
+      end
+
+      it 'should set the path' do
+        expect(CliTest.instance_var(:path)).to eq 'foo_path'
+      end
+    end
   end
 
   describe '#say' do
@@ -188,7 +200,8 @@ describe Yuyi::Cli do
   describe '#get_menu' do
     before do
       stub_const 'Yuyi::DEFAULT_MENU', 'spec/fixtures/menu.yaml'
-      allow(Yuyi::Menu).to receive(:load_from_file).and_return true
+      allow(Yuyi::Menu).to receive(:new)
+      allow(Yuyi::Menu).to receive(:load_from_file)
     end
 
     after do
@@ -201,33 +214,33 @@ describe Yuyi::Cli do
     context 'when no input is given' do
       before do
         allow(Readline).to receive(:readline).and_return('')
-        allow(Yuyi::Menu).to receive(:new).and_return(true)
+        allow(Yuyi::Menu).to receive(:load_from_file).and_return(true)
       end
 
       it 'should load the default menu' do
-        expect(Yuyi::Menu).to receive(:new).with('spec/fixtures/menu.yaml')
+        expect(Yuyi::Menu).to receive(:load_from_file).with('spec/fixtures/menu.yaml')
       end
     end
 
     context 'when an invalid path is given' do
       before do
         allow(Readline).to receive(:readline).and_return('foo', 'bar', '')
-        allow(Yuyi::Menu).to receive(:new).and_return(false, false, true)
+        allow(Yuyi::Menu).to receive(:load_from_file).and_return(false, false, true)
       end
 
       it 'should request input again' do
-        expect(Yuyi::Menu).to receive(:new).exactly(3).times
+        expect(Yuyi::Menu).to receive(:load_from_file).exactly(3).times
       end
     end
 
     context 'when a custom path is given' do
       before do
         allow(Readline).to receive(:readline).and_return('spec/fixtures/menu.yaml')
-        allow(Yuyi::Menu).to receive(:new).and_return(true)
+        allow(Yuyi::Menu).to receive(:load_from_file).and_return(true)
       end
 
       it 'should load the menu' do
-        expect(Yuyi::Menu).to receive(:new).with('spec/fixtures/menu.yaml')
+        expect(Yuyi::Menu).to receive(:load_from_file).with('spec/fixtures/menu.yaml')
       end
     end
   end

data/spec/lib/yuyi/menu_spec.rb

@@ -6,12 +6,29 @@ describe Yuyi::Menu do
   end
 
   describe '.load_from_file' do
-    before do
-      Yuyi::Menu.load_from_file 'spec/fixtures/menu2.yaml'
+    context 'with a local file' do
+      before do
+        Yuyi::Menu.load_from_file 'spec/fixtures/menu2.yaml'
+      end
+
+      it 'should update the menu object' do
+        expect(@menu.object[:rolls][:foo_roll]).to eq({ :bar => 'foo' })
+      end
     end
 
-    it 'should update the menu object' do
-      expect(@menu.object[:rolls][:foo_roll]).to eq({ :bar => 'foo' })
+    context 'with a remote file' do
+      before do
+        allow(Yuyi).to receive(:run).and_return({ :foo => 'bar' }.to_yaml)
+        Yuyi::Menu.load_from_file 'file://menu.yaml'
+      end
+
+      after do
+        allow(Yuyi).to receive(:run).and_call_original
+      end
+
+      it 'should update the menu object' do
+        expect(@menu.object[:foo]).to eq 'bar'
+      end
     end
   end
 

metadata

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