update 0.9.2 → 0.9.3

data/lib/update/commands.rb

@@ -1,13 +1,21 @@
 module Update
   COMMAND_GROUPS = [
-    {"brew update"          => "Checking for updated Brew packages...",
-     "brew upgrade"         => "Installing updated Brew packages...",
-     "brew cleanup --force" => "Cleaning up outdated packages..."},
+    {
+      "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..."},
+  	### Add new command groups by uncommenting a hash such as below:
+	  # {
+	  #   "rvm get head --auto"  => "Getting the latest RVM...",
+	  #   "rvm cleanup all"      => "Cleaning up everything RVM..."
+	  # },
     
-    {"gem update --system"  => "Get the latest RubyGems...",
-     "gem update"           => "Update gems...",
-     "gem cleanup --dryrun" => "Show gem cleanup dry-run..."}
+    { 
+      "gem update --system"  => "Getting the latest RubyGems...",
+      "gem update"           => "Updating gems...",
+      "gem cleanup --dryrun" => "Showing gem cleanup dry-run..."
+    }
   ]
 end

data/lib/update/run-updates.rb

@@ -4,13 +4,39 @@ module Update
   class << self
     def run
       EM.synchrony do
+<<<<<<< HEAD
+        asynchronously_iterate_over_command_groups
+      end
+      
+      report_final_status
+    end
+
+    private
+
+    def asynchronously_iterate_over_command_groups
+      EM::Synchrony::FiberIterator.new(Update::COMMAND_GROUPS).each do |commands|
+        @commands = commands
+
+        synchronously_run_commands_within_each_command_group
+      end
+=======
         EM::Synchrony::FiberIterator.new(Update::COMMAND_GROUPS).each do |commands|
           commands.each do |command, description|
             @command = command
+>>>>>>> decd17cc3beee1747212fae05bdde97b94263337
+
+      EventMachine.stop
+    end
+
+<<<<<<< HEAD
+    def synchronously_run_commands_within_each_command_group
+      @commands.each do |command, description|
+        @command, @description = command, description
 
-            @results ||= {}
-            @results["#{description}"] = `#@command`
+        run_commands_in_each_command_group
 
+        take_note_if_command_fails
+=======
             take_note_if_command_fails
           end
 
@@ -21,12 +47,16 @@ module Update
         end
 
         EventMachine.stop
+>>>>>>> decd17cc3beee1747212fae05bdde97b94263337
       end
-      
-      report_final_status
+
+      display_results_of_command_group
     end
 
-    private
+    def run_commands_in_each_command_group
+      @results ||= {}
+      @results["#{@description}"] = `#@command`
+    end
 
     def take_note_if_command_fails
       unless $?.success?
@@ -34,6 +64,13 @@ module Update
         @failed << @command
       end
     end
+
+    def display_results_of_command_group
+      @results.each do |description, result|
+        green @description
+        puts result
+      end
+    end
     
     def report_final_status
       if @failed

data/lib/update/version.rb

@@ -1,3 +1,3 @@
 module Update
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

data/test/helper.rb

@@ -0,0 +1,7 @@
+unless Object.const_defined? 'Update'
+  $:.unshift File.expand_path '../../lib', __FILE__
+  require 'update'
+end
+
+require 'minitest/autorun'
+require 'minitest/pride'

data/test/test_option_flags.rb

@@ -0,0 +1,23 @@
+require_relative 'helper'
+
+class TestUpdate < MiniTest::Unit::TestCase
+  def test_version
+    version = `update -v`
+    assert_match version, /Version \d.\d.\d on/
+  end
+
+  def test_list
+    list = `update -l`
+    assert_match list, /[0]/
+  end
+
+  def test_edit
+    edit = `update -e`
+    assert_equal edit, "Something sane, which this is not..."
+  end
+
+  def test_help
+    help = `update -h`
+    assert help.empty?, "Slop -h returns an empty string, not sure why. TODO: find out why. >.>"
+  end
+end

data/test/test_update_runs_asynchronously.rb

@@ -0,0 +1,7 @@
+require_relative 'helper'
+
+class TestUpdate < MiniTest::Unit::TestCase
+  def test_async
+    assert "I know not how to test this, which makes me sad.", "Must seek enlightenment elsewhere, for there is none here."
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: update
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70116696575560 !ruby/object:Gem::Requirement
+  requirement: &70324888715920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *70116696575560
+  version_requirements: *70324888715920
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70116696574880 !ruby/object:Gem::Requirement
+  requirement: &70324888714340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70116696574880
+  version_requirements: *70324888714340
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &70116696574060 !ruby/object:Gem::Requirement
+  requirement: &70324888713200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70116696574060
+  version_requirements: *70324888713200
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70116696573280 !ruby/object:Gem::Requirement
+  requirement: &70324888712400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70116696573280
+  version_requirements: *70324888712400
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70116696572520 !ruby/object:Gem::Requirement
+  requirement: &70324888711800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70116696572520
+  version_requirements: *70324888711800
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &70116696571820 !ruby/object:Gem::Requirement
+  requirement: &70324888710940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70116696571820
+  version_requirements: *70324888710940
 description: A Ruby Gem for running a list of update commands from command line.
 email:
 - shannonskipper@gmail.com
@@ -95,6 +95,9 @@ files:
 - lib/update/red-green.rb
 - lib/update/run-updates.rb
 - lib/update/version.rb
+- test/helper.rb
+- test/test_option_flags.rb
+- test/test_update_runs_asynchronously.rb
 - update.gemspec
 homepage: https://github.com/havenwood/update
 licenses: []
@@ -120,5 +123,8 @@ rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: a gem to run a list of updates
-test_files: []
+test_files:
+- test/helper.rb
+- test/test_option_flags.rb
+- test/test_update_runs_asynchronously.rb
 has_rdoc: