yuyi 1.0.8 → 1.1.3

data/spec/lib/yuyi/source_spec.rb

@@ -19,7 +19,7 @@ describe Yuyi::Source do
     end
 
     it 'should put roll files in the tmp dir' do
-      paths = @source.var(:available_rolls).values
+      paths = @source.var(:rolls).values
 
       expect(paths.size).to eq 2
 
@@ -29,7 +29,11 @@ describe Yuyi::Source do
     end
 
     it 'should set the available rolls' do
-      expect(@source.var(:available_rolls).keys).to include :foo_roll
+      expect(@source.var(:rolls).keys).to include :foo_roll
+    end
+
+    it 'should set the available roll models' do
+      expect(@source.var(:roll_models).keys).to include :foo_roll_model
     end
   end
 

data/spec/lib/yuyi/ui_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Yuyi::Ui do
+  describe '#present_options' do
+    before do
+      class UiTest; extend Yuyi::Ui; end
+
+      @output = ''
+      allow(UiTest).to receive :say do |o, p|
+        @output << (o || '')
+      end
+
+      class PresentOptionsRoll; end
+      allow(PresentOptionsRoll).to receive(:title).and_return 'Present Options Roll'
+      allow(PresentOptionsRoll).to receive(:file_name).and_return :present_options_roll
+      allow(PresentOptionsRoll).to receive(:options).and_return({ :option_foo => '3.0' })
+      allow(PresentOptionsRoll).to receive(:option_defs).and_return({
+        :option_foo => {
+          :description => 'foo description',
+          :example => '1.0',
+          :default => '2.0'
+        }
+      })
+
+      UiTest.send :present_options, PresentOptionsRoll
+    end
+
+    it 'should output the neccessary information' do
+      expect(@output).to include 'Present Options Roll'
+      expect(@output).to include 'present_options_roll'
+      expect(@output).to include 'foo description'
+      expect(@output).to include '1.0'
+      expect(@output).to include '2.0'
+    end
+  end
+end

data/spec/roll_validator.rb

@@ -0,0 +1,51 @@
+$: << '../lib'
+require 'spec_helper'
+require 'yuyi'
+
+Yuyi::Menu.new Yuyi.instance_variable_get('@path')
+
+describe 'Roll Validator' do
+  Yuyi::Menu.sources.each do |source|
+
+    # require roll models first
+    source.roll_models.each do |roll_model_name, roll_model_path|
+      require roll_model_path
+    end
+
+    source_title = source.instance_variable_get('@name')
+
+    describe source_title do
+      source.rolls.each do |roll_name, roll_path|
+        describe roll_name do
+          before do
+            # require roll_path
+            load "#{roll_path}.rb", true
+            @roll_class = Yuyi::Menu.rolls[roll_name].class
+          end
+
+          after do
+            # unload class to test other sources of the same roll
+            klass = @roll_class.to_s.scan(/[^:]+$/).first.to_sym
+            Yuyi.send :remove_const, klass
+          end
+
+          it 'should define install' do
+            expect(@roll_class.install).to be_a Proc
+          end
+
+          it 'should define uninstall' do
+            expect(@roll_class.uninstall).to be_a Proc
+          end
+
+          it 'should define upgrade' do
+            expect(@roll_class.upgrade).to be_a Proc
+          end
+
+          it 'should define installed?' do
+            expect(@roll_class.installed?).to be_a Proc
+          end
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 $: << File.expand_path('../../lib', __FILE__)
 $: << File.expand_path('../../rolls', __FILE__)

data/yuyi_menu

@@ -0,0 +1,8 @@
+sources:
+  yuyi: https://github.com/brewster1134/Yuyi-Rolls/archive/master.zip
+rolls:
+  bundler:
+  ruby:
+    versions:
+      - 2.1.2
+  ruby_gems:

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: yuyi
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.3
 platform: ruby
 authors:
 - Ryan Brewster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: new
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: new
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -90,31 +104,39 @@ files:
 - ".gitignore"
 - ".new"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
 - README.md
-- bin/install
+- Rakefile
 - bin/yuyi
 - lib/yuyi.rb
 - lib/yuyi/cli.rb
 - lib/yuyi/core.rb
+- lib/yuyi/dsl.rb
 - lib/yuyi/menu.rb
 - lib/yuyi/roll.rb
 - lib/yuyi/source.rb
+- lib/yuyi/ui.rb
 - spec/fixtures/menu.yaml
 - spec/fixtures/menu2.yaml
+- spec/fixtures/roll_dir/foo_roll.rb
+- spec/fixtures/roll_dir/foo_roll_model.rb
 - spec/fixtures/roll_dir/nested/bar_roll.rb
-- spec/fixtures/roll_dir/nested/foo_roll.rb
 - spec/fixtures/roll_zip.zip
 - spec/lib/yuyi/cli_spec.rb
 - spec/lib/yuyi/core_spec.rb
+- spec/lib/yuyi/dsl_spec.rb
 - spec/lib/yuyi/menu_spec.rb
 - spec/lib/yuyi/roll_spec.rb
 - spec/lib/yuyi/source_spec.rb
+- spec/lib/yuyi/ui_spec.rb
 - spec/lib/yuyi_spec.rb
+- spec/roll_validator.rb
 - spec/spec_helper.rb
+- yuyi_menu
 homepage: https://github.com/brewster1134/Yuyi
 licenses:
 - MIT
@@ -135,17 +157,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Automation for installing/uninstalling/updating your machine environment
 test_files:
+- spec/fixtures/roll_dir/foo_roll.rb
+- spec/fixtures/roll_dir/foo_roll_model.rb
 - spec/fixtures/roll_dir/nested/bar_roll.rb
-- spec/fixtures/roll_dir/nested/foo_roll.rb
 - spec/lib/yuyi/cli_spec.rb
 - spec/lib/yuyi/core_spec.rb
+- spec/lib/yuyi/dsl_spec.rb
 - spec/lib/yuyi/menu_spec.rb
 - spec/lib/yuyi/roll_spec.rb
 - spec/lib/yuyi/source_spec.rb
+- spec/lib/yuyi/ui_spec.rb
 - spec/lib/yuyi_spec.rb
+- spec/roll_validator.rb
 - spec/spec_helper.rb

data/bin/install

@@ -1,42 +0,0 @@
-#!/usr/bin/env ruby
-
-# THIS CODE INSPIRED BY (COPIED FROM) HOMEBREW'S INSTALL SCRIPT. THANKS! :)
-
-def download_app
-  Dir.chdir install_dir do
-    # -m to stop tar erroring out if it can't modify the mtime for root owned directories
-    # pipefail to cause the exit status from curl to propogate if it fails
-    # we use -k for curl because Leopard has a bunch of bad SSL certificates
-    curl_flags = 'fsSL'
-    curl_flags << 'k' if macos_version <= '10.5'
-    `/bin/bash -o pipefail -c '/usr/bin/curl -#{curl_flags} https://github.com/brewster1134/Yuyi/tarball/master | /usr/bin/tar xz -m --strip 1'`
-  end
-end
-
-def install
-  system "ruby #{install_dir}/bin/yuyi"
-end
-
-def cleanup
-  `rm -rf #{install_dir}`
-end
-
-# Create the directory to download to and install from
-def install_dir
-  dir = "#{ENV['TMPDIR']}Yuyi"
-
-  unless File.directory? dir
-    `/bin/mkdir #{dir}`
-  end
-
-  dir
-end
-
-# Get OSX minor version
-def macos_version
-  @macos_version ||= `/usr/bin/sw_vers -productVersion`.chomp[/10\.\d+/]
-end
-
-download_app
-install
-cleanup