update 0.3.3 → 0.4.0

data/lib/update/commands.rb

@@ -1,12 +1,20 @@
 module Update
-  COMMANDS = [{ "brew update" => "Checking for updated Brew packages...",
-                "brew upgrade" => "Installing updated Brew packages...",
-                "brew cleanup --force" => "Cleaning up outdated packages..."},
-              { "rvm get head --auto" => "Get the latest RVM...",
-                "rvm 1.9.3-head do gem update --system" => "Update 1.9.3's RubyGems version...",
-                "rvm 1.9.3-head do gem update" => "Update 1.9.3 gems...",
-                "rvm 1.9.3-head do gem cleanup -d" => "Show 1.9.3 gem cleanup dry-run...",
-                "rvm rbx-head do gem update --system" => "Update Rubinius' RubyGems version...",
-                "rvm rbx-head do gem update" => "Update Rubinius gems...",
-                "rvm rbx-head do gem cleanup -d" => "Show Rubinius gem cleanup dry-run..."}]
+  COMMANDS = [{
+    "brew update" => "Checking for updated Brew packages...",
+    "brew upgrade" => "Installing updated Brew packages...",
+    "brew cleanup --force" => "Cleaning up outdated packages..." },{
+      
+    ##
+    # Create additional command-groups by uncommenting the following-ish:
+    
+    # "ls -la" => "Look around...",
+    # "uname -a" => "Whatchamacallit..." },{
+
+    "rvm get head --auto" => "Get the latest RVM...",
+    "rvm 1.9.3-head do gem update --system" => "Update 1.9.3's RubyGems version...",
+    "rvm 1.9.3-head do gem update" => "Update 1.9.3 gems...",
+    "rvm 1.9.3-head do gem cleanup -d" => "Show 1.9.3 gem cleanup dry-run...",
+    "rvm rbx-head do gem update --system" => "Update Rubinius' RubyGems version...",
+    "rvm rbx-head do gem update" => "Update Rubinius gems...",
+    "rvm rbx-head do gem cleanup -d" => "Show Rubinius gem cleanup dry-run..." }]
 end

data/lib/update/rainbow.rb

@@ -0,0 +1,17 @@
+module Rainbow
+  RESET = "tput sgr0"
+  
+  def rainbow_puts color, message
+    system color
+    puts message
+    system RESET
+  end
+
+  def green message
+    rainbow_puts "tput setaf 2", message
+  end
+  
+  def red message
+    rainbow_puts "tput setaf 1", message
+  end
+end

data/lib/update/version.rb

@@ -1,3 +1,3 @@
 module Update
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

data/lib/update.rb

@@ -1,39 +1,39 @@
 require "update/commands"
-require "update/red-green"
+require "update/rainbow"
 require "update/version"
 
 module Update
-  extend RedGreen
+  extend Rainbow
 
   class << self
     def run
-      run_commands
-      report_status
+      Update::COMMANDS.each do |together|
+        together.each do |run_together|
+          @commands = run_together
+          run_in_new_thread
+        end.join { report_status }
+      end
     end
     
     private
     
-    def run_commands
-      Update::COMMANDS.each do |command_group|
-        command_group.each do |run_together|
-          @run_together = run_together
-          Thread.new do
-            @run_together.each do |command, description|
-              @command = command
-              
-              `#{command}`; command_output = _
-              check_for_failures
-              
-              green description
-              puts command_output
-              red @failure_report if @failure_report
-            end
-          end
+    def run_in_new_thread
+      Thread.new do
+        @commands.each do |command, description|
+          @command, @description = command, description
+          run_command
+          check_exit_status
+          printout
         end
-      end
+      end.run
+    end
+    
+    def run_command
+      `#{command}`
+      @command_output = _
     end
     
-    def check_for_failures
+    def check_exit_status
       unless $?.success?
         @failed ||= []
         @failed << @command
@@ -41,6 +41,12 @@ module Update
       end
     end
     
+    def printout
+      green @description
+      puts @command_output
+      red @failure_report if @failure_report
+    end
+    
     def report_status
       if @failed
         red "Update process completed with failures.\a" #chirp

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: update
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70292203133080 !ruby/object:Gem::Requirement
+  requirement: &70162938403820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *70292203133080
+  version_requirements: *70162938403820
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70292203132400 !ruby/object:Gem::Requirement
+  requirement: &70162938403280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '2.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70292203132400
+  version_requirements: *70162938403280
 description: A Ruby Gem for running a list of update commands from command line.
 email:
 - shannonskipper@gmail.com
@@ -47,7 +47,7 @@ files:
 - bin/update
 - lib/update.rb
 - lib/update/commands.rb
-- lib/update/red-green.rb
+- lib/update/rainbow.rb
 - lib/update/version.rb
 - update.gemspec
 homepage: https://github.com/havenwood/update

data/lib/update/red-green.rb

@@ -1,16 +0,0 @@
-module RedGreen
-  RED, GREEN = "tput setaf 1", "tput setaf 2"
-  RESET = "tput sgr0"
-  
-  def green message
-    system GREEN
-    puts message
-    system RESET
-  end
-
-  def red message
-    system RED
-    puts message
-    system RESET
-  end
-end