yuyi 0.0.3 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 433f29c3dd527456989fd397c0689ef37be6f26f
-  data.tar.gz: df06a761e812cf8f42ad0b15f4b87e9260088678
+  metadata.gz: 5841d6388b4ca91994af0c63e27c2510b54debbb
+  data.tar.gz: 0d24a61a7b7904929e3cea3c140ced41f7681747
 SHA512:
-  metadata.gz: afb1b75d2ba6783ea9b6ae84412a399a1919db287e23eac4300224632243df22a8afe639ef803565a0553169b538b87bf3f257985e5c10a17faed62a430561a4
-  data.tar.gz: a76fb8393af349ea7194cecc18c2d75147d21dc91faeba0611510f41b72f970bfd14f737f1e10d914c831ed8f1023a427f820a6708ec15863e3bc62dc6749e21
+  metadata.gz: fd3c048476f8d8a80597d72cd558c6591322fb0a4e3a687b931b5ce79e0c44ce7b62fe076a2d41169e33e152b268f4abed7fc9928fc0b3f7ad63aa9d44b85d18
+  data.tar.gz: 53be4914b13f884f1fa7e61bf95e7b8c468adcf89919a31700a28be6fdceb57d40b244673a3af142b10340fa486eb631d49ec67ea2e34c9a3a39a55e3f94d990

data/.new

@@ -8,7 +8,6 @@ tasks:
     gemspec:
       summary: Automation for installing/uninstalling/updating your machine environment
       description: Maintain a menu of applications and services to automate the installation
-        of.
       homepage: https://github.com/brewster1134/Yuyi
       executables:
       - yuyi
@@ -17,4 +16,4 @@ tasks:
       - spec/**/*.rb
 project_name: Yuyi
 type: ruby
-version: 0.0.3
+version: 0.0.6

data/README.md

@@ -107,16 +107,11 @@ end
 ```
 
 ### TODO
-* create yuyi gem with new
-* setup (post suite install tasks)
-* write to file checks for existing lines
 * Enforce required options
 * New roll generator (use new!)
 * DOCS!
 * show roll options on -l
 * home brew/home brew cask roll to inherit
 * installation summary
-* abort install if required options arent set
-* post install commands
 
 [.](http://www.comedycentral.com/video-clips/3myds9/upright-citizens-brigade-sushi-chef)

data/lib/yuyi/cli.rb

@@ -133,9 +133,12 @@ module Yuyi::Cli
   # Write several lines to to an existing file
   #
   def write_to_file file, *text
-    File.open(File.expand_path(file), 'a') do |file|
-      file.write text * "\n"
-      file.write "\n"
+    File.open(File.expand_path(file), 'a+') do |file|
+      full_text = (text * "\n") + "\n"
+
+      unless file.read.include? full_text
+        file.write full_text
+      end
     end
   end
 

data/lib/yuyi/menu.rb

@@ -1,7 +1,5 @@
 class Yuyi::Menu
   @rolls = {}
-  @pre_installs = []
-  @post_installs = []
 
   # DSL Helper methods
   #
@@ -59,22 +57,6 @@ class Yuyi::Menu
     @rolls[file_name] = klass.new
   end
 
-  def self.add_pre_install block
-    @pre_installs << block
-  end
-
-  def self.add_post_install block
-    @post_installs << block
-  end
-
-  def self.pre_install
-    @pre_installs.each { |b| b.call }
-  end
-
-  def self.post_install
-    @post_installs.each { |b| b.call }
-  end
-
   # Get/Set upgrade flag
   #
   def upgrade? boolean = nil
@@ -112,13 +94,22 @@ class Yuyi::Menu
   # Initialize all the rolls in order
   #
   def order_rolls
-    Yuyi::Menu.pre_install
+    all_rolls = sorted_rolls
 
-    sorted_rolls.each do |file_name|
-      rolls[file_name].order
+    # run all preinstalls first
+    all_rolls.each do |file_name|
+      rolls[file_name].appetizers
     end
 
-    Yuyi::Menu.post_install
+    # then run all installs
+    all_rolls.each do |file_name|
+      rolls[file_name].entree
+    end
+
+    # then post installs last
+    all_rolls.each do |file_name|
+      rolls[file_name].dessert
+    end
   end
 
   # Find the best roll in the source to be added

data/lib/yuyi/roll.rb

@@ -13,7 +13,8 @@ class Yuyi::Roll
   end
 
   def self.pre_install &block
-    Yuyi::Menu.add_pre_install block
+    Yuyi::Menu.add_pre_install self unless @pre_install
+    @pre_install ||= block
   end
 
   def self.install &block
@@ -21,7 +22,8 @@ class Yuyi::Roll
   end
 
   def self.post_install &block
-    Yuyi::Menu.add_post_install block
+    Yuyi::Menu.add_post_install self unless @post_install
+    @post_install ||= block
   end
 
   def self.uninstall &block
@@ -85,7 +87,7 @@ class Yuyi::Roll
 
   # Run the roll
   #
-  def order
+  def install
     if installed?
       if options[:uninstall]
         Yuyi.say "🍣\s Uninstalling #{title}...", :color => 33
@@ -99,6 +101,14 @@ class Yuyi::Roll
       install
     end
   end
+  alias_method :order, :install
+  alias_method :entree, :install
+
+  def pre_install; pre_install; end
+  alias_method :appetizers, :pre_install
+
+  def post_install; post_install; end
+  alias_method :dessert, :pre_install
 
 private
 
@@ -126,10 +136,18 @@ private
       end
     end
 
+    def pre_install
+      instance_eval(&self.class.pre_install)
+    end
+
     def install
       instance_eval(&self.class.install)
     end
 
+    def post_install
+      instance_eval(&self.class.post_install)
+    end
+
     def uninstall
       instance_eval(&self.class.uninstall)
     end

data/spec/lib/yuyi/cli_spec.rb

@@ -136,6 +136,11 @@ describe Yuyi::Cli do
       CliTest.write_to_file 'test', 'arg1', 'arg2'
       expect(File.open('test').read).to eq "foo\narg1\narg2\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"
+    end
   end
 
   describe '#delete_from_file' do

data/spec/lib/yuyi/menu_spec.rb

@@ -26,40 +26,6 @@ describe Yuyi::Menu do
     end
   end
 
-  describe '.pre_install' do
-    before do
-      @pre_install = lambda {}
-      Yuyi::Menu.instance_var :pre_installs, [@pre_install,]
-      allow(@pre_install).to receive(:call)
-      Yuyi::Menu.pre_install
-    end
-
-    after do
-      allow(@pre_install).to receive(:call).and_call_original
-    end
-
-    it 'should run pre_installs' do
-      expect(@pre_install).to have_received(:call)
-    end
-  end
-
-  describe '.post_install' do
-    before do
-      @post_install = lambda {}
-      Yuyi::Menu.instance_var :post_installs, [@post_install,]
-      allow(@post_install).to receive(:call)
-      Yuyi::Menu.post_install
-    end
-
-    after do
-      allow(@post_install).to receive(:call).and_call_original
-    end
-
-    it 'should run post_installs' do
-      expect(@post_install).to have_received(:call)
-    end
-  end
-
   describe '#initialize' do
     it 'should set the path var' do
       expect(@menu.var(:path)).to eq 'spec/fixtures/menu.yaml'
@@ -180,28 +146,33 @@ describe Yuyi::Menu do
 
   describe '#order_rolls' do
     before do
-      class MenuOrderRollsRoll; end
-      allow(MenuOrderRollsRoll).to receive :order
-
-      allow(Yuyi::Menu).to receive(:pre_install)
-      allow(Yuyi::Menu).to receive(:post_install)
-      allow(@menu).to receive(:sorted_rolls).and_return([:order_rolls_roll])
-      allow(@menu).to receive(:rolls).and_return({ :order_rolls_roll => MenuOrderRollsRoll })
+      class MenuOrderRollsOne; end
+      class MenuOrderRollsTwo; end
+      allow(MenuOrderRollsOne).to receive :appetizers
+      allow(MenuOrderRollsTwo).to receive :appetizers
+      allow(MenuOrderRollsOne).to receive :entree
+      allow(MenuOrderRollsTwo).to receive :entree
+      allow(MenuOrderRollsOne).to receive :dessert
+      allow(MenuOrderRollsTwo).to receive :dessert
+
+      allow(@menu).to receive(:sorted_rolls).and_return([:menu_order_rolls_one, :menu_order_rolls_two])
+      allow(@menu).to receive(:rolls).and_return({ :menu_order_rolls_one => MenuOrderRollsOne,  :menu_order_rolls_two => MenuOrderRollsTwo })
 
       @menu.send :order_rolls
     end
 
     after do
-      allow(Yuyi::Menu).to receive(:pre_install).and_call_original
-      allow(Yuyi::Menu).to receive(:post_install).and_call_original
       allow(@menu).to receive(:sorted_rolls).and_call_original
       allow(@menu).to receive(:rolls).and_call_original
     end
 
     it 'should initialize a roll with the roll options' do
-      expect(Yuyi::Menu).to have_received(:pre_install).ordered
-      expect(MenuOrderRollsRoll).to have_received(:order).ordered
-      expect(Yuyi::Menu).to have_received(:post_install).ordered
+      expect(MenuOrderRollsOne).to have_received(:appetizers).ordered
+      expect(MenuOrderRollsTwo).to have_received(:appetizers).ordered
+      expect(MenuOrderRollsOne).to have_received(:entree).ordered
+      expect(MenuOrderRollsTwo).to have_received(:entree).ordered
+      expect(MenuOrderRollsOne).to have_received(:dessert).ordered
+      expect(MenuOrderRollsTwo).to have_received(:dessert).ordered
     end
   end
 end

data/spec/lib/yuyi/roll_spec.rb

@@ -72,7 +72,7 @@ describe Yuyi::Roll do
     end
 
     it 'should respond to .pre_install' do
-      expect(Yuyi::Menu).to have_received(:add_pre_install)
+      expect(TestRoll.pre_install).to be_a Proc
     end
 
     it 'should respond to .install' do
@@ -80,7 +80,7 @@ describe Yuyi::Roll do
     end
 
     it 'should respond to .post_install' do
-      expect(Yuyi::Menu).to have_received(:add_post_install)
+      expect(TestRoll.post_install).to be_a Proc
     end
 
     it 'should respond to .uninstall' do
@@ -121,10 +121,18 @@ describe Yuyi::Roll do
       expect(@test_roll.dependencies).to eq([:foo])
     end
 
+    it 'should return the pre_install results' do
+      expect(@test_roll.send(:pre_install)).to eq :pre_install
+    end
+
     it 'should return the install results' do
       expect(@test_roll.send(:install)).to eq :install
     end
 
+    it 'should return the post_install results' do
+      expect(@test_roll.send(:post_install)).to eq :post_install
+    end
+
     it 'should return the uninstall results' do
       expect(@test_roll.send(:uninstall)).to eq :uninstall
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yuyi
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.6
 platform: ruby
 authors:
 - Ryan Brewster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-15 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -81,7 +81,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Maintain a menu of applications and services to automate the installation
-  of.
 email: brewster1134@gmail.com
 executables:
 - yuyi