yuyi 0.0.8 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18669c8bff30c75da353c6ead6b04f6ac8851584
-  data.tar.gz: a557a329c99d67a8553eb575a580e8a0f7a57c5e
+  metadata.gz: c6cca5d2ab1d4af450cfb97cdebae51e7fd270a9
+  data.tar.gz: 34729bb8572ea41c40c9ae276f536aaebf20e86a
 SHA512:
-  metadata.gz: 374c7d7a1f7499774310e55f717f3eac0ab69f1ab644657f88522a078422e0edd2c3417f3eccf489f556c6e49ada808820b04448ac5bfce31f6fd0e1cead4ffd
-  data.tar.gz: eeff542c9a3914ea9d2df428caaec4d7ee43f96764cb13fba665c107ef53dba63ea2794c8e8998d73b7e8d2e8f523c0d1355820ec90f0196e73eca89f400ba8d
+  metadata.gz: 4b8e5fe1d299b56c7b2e7b3237babebad22de7de6e5c86e1c0cd3ba99d93ab5709e79e48c66fd232774a639f8fb0ea7327940be8327c731bb499ce48b80c5197
+  data.tar.gz: c1d580a528433bccccbcd505c2c26f372873c76e8c5adb8d8d03ade2426c0da7303e9ca9fb5537ced87d0c76f179764d2f627ed220b415466884969b9c8fda99

data/.new

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

data/bin/install

@@ -14,7 +14,7 @@ def download_app
 end
 
 def install
-  system "ruby #{install_dir}/bin/yuyi -V"
+  system "ruby #{install_dir}/bin/yuyi"
 end
 
 def cleanup

data/lib/yuyi/cli.rb

@@ -107,7 +107,7 @@ module Yuyi::Cli
     end.rstrip
 
     say
-    yield output
+    yield output if block
   end
 
   # Run a command and output formatting success/errors
@@ -133,6 +133,8 @@ module Yuyi::Cli
   # Write several lines to to an existing file
   #
   def write_to_file file, *text
+    text.flatten!
+
     File.open(File.expand_path(file), 'a+') do |file|
       full_text = (text * "\n") + "\n"
 
@@ -145,6 +147,8 @@ module Yuyi::Cli
   # Delete specific lines from an existing file
   #
   def delete_from_file file, *text
+    text.flatten!
+
     # get file text
     new_text = File.read(File.expand_path(file))
 
@@ -248,8 +252,14 @@ private
     say 'NOTE: This is passed directly to sudo and is not saved.'
     say '      This will ensure all your installs run unsupervised.'
 
-    # clear sudo timestamp & run any command as admin to force a password prompt
-    system 'sudo -k; sudo echo >> /dev/null 2>&1'
+    # keep the sudo timestamp fresh
+    Thread::new do
+      loop do
+        sleep 1.minute
+        `sudo -v`
+      end
+    end
+
     say
   end
 
@@ -267,8 +277,10 @@ private
       say "#{k.to_s.rjust(longest_option)}: ", :color => option_color, :newline => false
       say v[:description]
       say (' ' * (longest_option + indent)), :newline => false
-      say 'default: ', :color => 36, :newline => false
-      say v[:default]
+      if v[:default]
+        say 'default: ', :color => 36, :newline => false
+        say v[:default]
+      end
     end
 
     if examples
@@ -288,7 +300,7 @@ private
 
       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 examples_hash.deep_stringify_keys!.to_yaml.sub('---', '').gsub(/\n(\s*)/, "\n\\1#{' ' * example_indent}")
     end
   end
 

data/lib/yuyi/menu.rb

@@ -94,19 +94,41 @@ class Yuyi::Menu
   # Initialize all the rolls in order
   #
   def order_rolls
+    header_length = 80
     all_rolls = sorted_rolls
 
-    # run all preinstalls first
+
+    # pre installs
+    #
+    Yuyi.say '=' * header_length, :color => 35
+    Yuyi.say 'APPETIZERS', :color => 35, :justify => :center, :padding => header_length
+    Yuyi.say 'Pre Install Tasks', :justify => :center, :padding => header_length
+    Yuyi.say
+
     all_rolls.each do |file_name|
       rolls[file_name].appetizers
     end
 
-    # then run all installs
+
+    # main installs
+    #
+    Yuyi.say '=' * header_length, :color => 36
+    Yuyi.say 'ENTREES', :color => 36, :justify => :center, :padding => header_length
+    Yuyi.say 'Main Install Tasks', :justify => :center, :padding => header_length
+    Yuyi.say
+
     all_rolls.each do |file_name|
       rolls[file_name].entree
     end
 
-    # then post installs last
+
+    # post installs
+    #
+    Yuyi.say '=' * header_length, :color => 35
+    Yuyi.say 'DESSERT', :color => 35, :justify => :center, :padding => header_length
+    Yuyi.say 'Post Install Tasks', :justify => :center, :padding => header_length
+    Yuyi.say
+
     all_rolls.each do |file_name|
       rolls[file_name].dessert
     end
@@ -139,6 +161,19 @@ class Yuyi::Menu
     Yuyi.say
   end
 
+  # Find the best roll in the source to be added
+  #
+  def find_roll_model name, path
+    # look through the sources for the first roll model that matches.
+    # sources are listed in the menu in order of priority
+    sources.each do |source|
+      if path = source.roll_models[name]
+        require path
+        return
+      end
+    end
+  end
+
 private
 
     def initialize path
@@ -148,9 +183,27 @@ private
       @@instance = self
 
       set_sources
+      set_roll_models
       set_rolls
     end
 
+    # Create all rolls on the menu
+    #
+    def set_roll_models
+      object[:roll_models] = {}
+
+      # collect all roll models from all sources
+      sources.each do |source|
+        source.roll_models.each do |name, path|
+          object[:roll_models][name] = path
+        end
+      end
+
+      object[:roll_models].each do |name, path|
+        find_roll_model name, path
+      end
+    end
+
     # Create all rolls on the menu
     #
     def set_rolls

data/lib/yuyi/roll.rb

@@ -13,27 +13,51 @@ class Yuyi::Roll
   end
 
   def self.pre_install &block
-    @pre_install ||= block
+    if block
+      @pre_install = block
+    else
+      @pre_install
+    end
   end
 
   def self.install &block
-    @install ||= block
+    if block
+      @install = block
+    else
+      @install
+    end
   end
 
   def self.post_install &block
-    @post_install ||= block
+    if block
+      @post_install = block
+    else
+      @post_install
+    end
   end
 
   def self.uninstall &block
-    @uninstall ||= block
+    if block
+      @uninstall = block
+    else
+      @uninstall
+    end
   end
 
   def self.upgrade &block
-    @upgrade ||= block
+    if block
+      @upgrade = block
+    else
+      @upgrade
+    end
   end
 
   def self.installed? &block
-    @installed ||= block
+    if block
+      @installed = block
+    else
+      @installed
+    end
   end
 
   def self.dependencies *dependencies
@@ -117,15 +141,29 @@ private
     # Add to global collection of rolls
     #
     def self.inherited klass
-      # convert class name to a human readble title-cased string
-      klass.title klass.to_s.gsub(/(?=[A-Z])/, ' ').strip
+      return if klass.to_s.include? 'RollModel'
+
+      add_roll klass, caller
+    end
+
+    def self.add_roll klass, caller
+      # convert class name to a title string
+      klass.title class_to_title klass
 
-      # convert absolute path to a file name symbol
-      klass.file_name caller.first[/[a-z_]+?(?=\.rb)/].to_sym
+      # convert caller to a file name symbol
+      klass.file_name caller_to_file_name caller
 
       Yuyi::Menu.add_roll klass.file_name, klass
     end
 
+    def self.class_to_title klass
+      klass.to_s.match(/[^:]+$/)[0].gsub(/(?=[A-Z])/, ' ').strip
+    end
+
+    def self.caller_to_file_name caller
+      caller.first[/[a-z_]+?(?=\.rb)/].to_sym
+    end
+
     def self.require_dependencies
       @dependencies.each do |roll|
         unless Yuyi::Menu.on_the_menu? roll
@@ -135,6 +173,7 @@ private
     end
 
     def pre_install
+      return unless self.class.pre_install
       instance_eval(&self.class.pre_install)
     end
 
@@ -143,6 +182,7 @@ private
     end
 
     def post_install
+      return unless self.class.post_install
       instance_eval(&self.class.post_install)
     end
 
@@ -160,6 +200,7 @@ private
 
     # Helpers for Yuyi Cli methods
     def say *args; Yuyi.say *args; end
+    def ask *args; Yuyi.ask *args; end
     def run *args; Yuyi.run *args; end
     def command? *args; Yuyi.command? *args; end
     def osx_version; Yuyi.osx_version; end

data/lib/yuyi/source.rb

@@ -6,6 +6,7 @@ class Yuyi::Source
   ROLL_FILE_GLOB = '**/*.rb'
 
   def available_rolls; @available_rolls end
+  def roll_models; @roll_models end
 
 private
 
@@ -16,12 +17,13 @@ private
 
     def initialize name, path
       @available_rolls = {}
+      @roll_models = {}
       @name = name
       @path = path
 
       create_tmp_dir
       download_source
-      get_available_rolls
+      process_files
     end
 
     def create_tmp_dir
@@ -91,14 +93,20 @@ private
 
     # Get source rolls from tmp directory
     #
-    def get_available_rolls
+    def process_files
       Dir.glob(File.join(@tmp_dir, ROLL_FILE_GLOB)).map do |r|
         name = File.basename(r, '.rb').to_sym
+
         tmp_path = Pathname.new @@root_tmp_dir
         full_path = Pathname.new r
         require_path = full_path.relative_path_from(tmp_path).to_s.chomp('.rb')
 
-        @available_rolls[name] = require_path
+        # if add file to the correct hash
+        if r.include?('roll_model.rb')
+          @roll_models[name] = require_path
+        else
+          @available_rolls[name] = require_path
+        end
       end
     end
 

data/spec/lib/yuyi/cli_spec.rb

@@ -115,51 +115,67 @@ describe Yuyi::Cli do
   end
 
   describe '#write_to_file' do
-    before do
-      CliTest.write_to_file 'test', 'foo'
-    end
-
     after do
-      FileUtils.rm 'test'
+      FileUtils.rm Dir.glob('write_to_file*')
     end
 
     it 'should create a file if it doesnt exist' do
-      expect(File.exists?('test')).to be true
+      CliTest.write_to_file 'write_to_file_create', 'foo'
+
+      expect(File.exists?('write_to_file_create')).to be true
     end
 
     it 'should append to the file' do
-      CliTest.write_to_file 'test', 'bar'
-      expect(File.open('test').read).to eq "foo\nbar\n"
+      CliTest.write_to_file 'write_to_file_append', 'foo'
+      CliTest.write_to_file 'write_to_file_append', 'bar'
+
+      expect(File.open('write_to_file_append').read).to eq "foo\nbar\n"
     end
 
-    it 'should accept multiple text arguments' do
-      CliTest.write_to_file 'test', 'arg1', 'arg2'
-      expect(File.open('test').read).to eq "foo\narg1\narg2\n"
+    it 'should accept multiple string arguments' do
+      CliTest.write_to_file 'write_to_file_strings', 'line 1', 'line 2'
+
+      expect(File.open('write_to_file_strings').read).to eq "line 1\nline 2\n"
+    end
+
+    it 'should accept an array argument' do
+      CliTest.write_to_file 'write_to_file_array', ['line 1', 'line 2']
+
+      expect(File.open('write_to_file_array').read).to eq "line 1\nline 2\n"
     end
 
     it 'should not add a line if it already exists' do
-      CliTest.write_to_file 'test', 'foo'
-      expect(File.open('test').read).to eq "foo\n"
+      CliTest.write_to_file 'write_to_file_exists', 'foo'
+      CliTest.write_to_file 'write_to_file_exists', 'foo'
+
+      expect(File.open('write_to_file_exists').read).to eq "foo\n"
     end
   end
 
   describe '#delete_from_file' do
-    before do
-      CliTest.write_to_file 'test', 'foo', 'remove1', 'remove2', 'bar'
-    end
-
     after do
-      FileUtils.rm 'test'
+      FileUtils.rm Dir.glob('delete_from_file*')
     end
 
     it 'should remove a line from the file' do
-      CliTest.delete_from_file 'test', 'remove1'
-      expect(File.open('test').read).to eq "foo\nremove2\nbar\n"
+      CliTest.write_to_file 'delete_from_file', 'foo', 'remove', 'bar'
+      CliTest.delete_from_file 'delete_from_file', 'remove'
+
+      expect(File.open('delete_from_file').read).to eq "foo\nbar\n"
     end
 
-    it 'should accept multiple text arguments' do
-      CliTest.delete_from_file 'test', 'remove1', 'remove2'
-      expect(File.open('test').read).to eq "foo\nbar\n"
+    it 'should accept multiple string arguments' do
+      CliTest.write_to_file 'delete_from_file_strings', 'foo', 'remove 1', 'remove 2', 'bar'
+      CliTest.delete_from_file 'delete_from_file_strings', 'remove 1', 'remove 2'
+
+      expect(File.open('delete_from_file_strings').read).to eq "foo\nbar\n"
+    end
+
+    it 'should accept an array argument' do
+      CliTest.write_to_file 'delete_from_file_array', 'foo', 'remove 1', 'remove 2', 'bar'
+      CliTest.delete_from_file 'delete_from_file_array', ['remove 1', 'remove 2']
+
+      expect(File.open('delete_from_file_array').read).to eq "foo\nbar\n"
     end
   end
 

data/spec/lib/yuyi/roll_spec.rb

@@ -7,7 +7,7 @@ describe Yuyi::Roll do
     allow(Yuyi::Menu).to receive(:options).and_return({ :foo => 'menu option' })
     allow(Yuyi::Menu).to receive(:on_the_menu?).and_return false
 
-    class TestRoll < Yuyi::Roll
+    class Yuyi::TestRoll < Yuyi::Roll
       pre_install { :pre_install }
       install { :install }
       post_install { :post_install }
@@ -38,18 +38,30 @@ describe Yuyi::Roll do
     allow(Yuyi::Menu).to receive(:on_the_menu?).and_call_original
   end
 
+  describe '.class_to_title' do
+    it 'should render a title' do
+      expect(Yuyi::Roll.class_to_title('Yuyi::RollModel::FooBar')).to eq 'Foo Bar'
+    end
+  end
+
+  describe '.caller_to_file_name' do
+    it 'should render a file name' do
+      expect(Yuyi::Roll.caller_to_file_name(['/foo/bar/foo_bar.rb'])).to eq :foo_bar
+    end
+  end
+
   context 'when inherited' do
     it 'should add the roll to the menu' do
       allow(Yuyi::Menu).to receive :add_roll
 
-      class TestInheritRoll < Yuyi::Roll
+      class Yuyi::TestInheritRoll < Yuyi::Roll
         install {}
         uninstall {}
         upgrade {}
         installed? {}
       end
 
-      expect(Yuyi::Menu).to have_received(:add_roll).with :roll_spec, TestInheritRoll
+      expect(Yuyi::Menu).to have_received(:add_roll).with :roll_spec, Yuyi::TestInheritRoll
     end
 
     # DSL Methods
@@ -60,49 +72,49 @@ describe Yuyi::Roll do
     end
 
     it 'should create a title' do
-      expect(TestRoll.title).to eq 'Test Roll'
+      expect(Yuyi::TestRoll.title).to eq 'Test Roll'
     end
 
     it 'should create a file name' do
-      expect(TestRoll.file_name).to eq :roll_spec
+      expect(Yuyi::TestRoll.file_name).to eq :roll_spec
     end
 
     it 'should respond to .pre_install' do
-      expect(TestRoll.pre_install).to be_a Proc
+      expect(Yuyi::TestRoll.pre_install).to be_a Proc
     end
 
     it 'should respond to .install' do
-      expect(TestRoll.install).to be_a Proc
+      expect(Yuyi::TestRoll.install).to be_a Proc
     end
 
     it 'should respond to .post_install' do
-      expect(TestRoll.post_install).to be_a Proc
+      expect(Yuyi::TestRoll.post_install).to be_a Proc
     end
 
     it 'should respond to .uninstall' do
-      expect(TestRoll.uninstall).to be_a Proc
+      expect(Yuyi::TestRoll.uninstall).to be_a Proc
     end
 
     it 'should respond to .upgrade' do
-      expect(TestRoll.upgrade).to be_a Proc
+      expect(Yuyi::TestRoll.upgrade).to be_a Proc
     end
 
     it 'should respond to .installed?' do
-      expect(TestRoll.installed?).to be_a Proc
+      expect(Yuyi::TestRoll.installed?).to be_a Proc
     end
 
     it 'should return .dependencies' do
-      expect(TestRoll.dependencies).to eq([:foo])
+      expect(Yuyi::TestRoll.dependencies).to eq([:foo])
     end
 
     it 'should return .options' do
-      expect(TestRoll.options[:foo][:default]).to eq 'foo default'
+      expect(Yuyi::TestRoll.options[:foo][:default]).to eq 'foo default'
     end
   end
 
   context 'when initialized' do
     before do
-      @test_roll = TestRoll.new
+      @test_roll = Yuyi::TestRoll.new
     end
 
     it 'should return the title' do
@@ -165,7 +177,7 @@ describe Yuyi::Roll do
 
   context '#order' do
     before do
-      @roll = TestRoll.new
+      @roll = Yuyi::TestRoll.new
       allow(@roll).to receive(:install)
       allow(@roll).to receive(:uninstall)
       allow(@roll).to receive(:upgrade)
@@ -217,3 +229,49 @@ describe Yuyi::Roll do
     end
   end
 end
+
+describe 'Yuyi::RollModel' do
+  before do
+    allow(Yuyi::Menu).to receive(:add_roll)
+
+    class Yuyi::FooRollModel < Yuyi::Roll
+      def self.inherited klass; add_roll klass, caller; end
+      def self.foo_name  name
+        @@name = name
+        installed? { false }
+      end
+
+    end
+
+    class Yuyi::FooModelRoll < Yuyi::FooRollModel
+      foo_name 'Foo Name'
+      install do
+        @@name
+      end
+
+      installed? { true }
+    end
+  end
+
+  after do
+    allow(Yuyi::Menu).to receive(:add_roll).and_call_original
+  end
+
+  it 'should not add the roll model' do
+    class Yuyi::BarRollModel < Yuyi::Roll; end
+    expect(Yuyi::Menu).to_not have_received(:add_roll).with :roll_spec, Yuyi::BarRollModel
+  end
+
+  it 'should add the inherited roll' do
+    class Yuyi::FooInheritedRoll < Yuyi::FooRollModel; end
+    expect(Yuyi::Menu).to have_received(:add_roll).with :roll_spec, Yuyi::FooInheritedRoll
+  end
+
+  it 'should use the roll model methods' do
+    expect(Yuyi::FooModelRoll.new.send(:install)).to eq 'Foo Name'
+  end
+
+  it 'should prefer the roll methods over the model methods' do
+    expect(Yuyi::FooModelRoll.new.send(:installed?)).to be true
+  end
+end

metadata

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