freshen 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3e573f6d6b66152c1bf8aedd14b40d68ddd70e8
-  data.tar.gz: 946f32367ea70dc4ef246b2b43c0bb82b1611e74
+  metadata.gz: 2654aa482799d9e600f0105cbaa8299149114fcc
+  data.tar.gz: fa8c4860dd249db2cff7c3f836c1c56380b03440
 SHA512:
-  metadata.gz: ab6cd331f1173b12fc12892b93f3b153f16c98dddebadc075f05a6cc82a4c017dc34e6069518631d25521aef20e76f02857e3199590c4470cabc4edd5fd58099
-  data.tar.gz: 9714ef7ffc88015467a1b8c2c8942069a8428644b656ecfeda74a71fa7ac7eac1101e2d46d6214f4f983fe22209d75981a34ab411716b227f6f8c8f5fcaaf2e5
+  metadata.gz: 6396561ccfbc765e76db9caa6284a055faf7fbc71f990bac20e81c6a09c748d8dfbcca236eb9f980434fe47a2891fe700dc283f2fa0ee8625517492d285d9f8c
+  data.tar.gz: 6b4be3cfdcc58011311d26bf8ecd13e1ded731f1b5d26566af4d8d6a0d12b3f56b86cc3bb64e4386586153b9a2fb026263bee2e1a493a99c3e4d8296480e0f55

data/lib/freshen/cli.rb

@@ -67,7 +67,53 @@ class Freshen
       \x5 $ freshen up rubygems
     EOF
     def up(*fresheners)
-      Freshenary.freshen_up(*fresheners)
+      stats = {
+        successful: {
+          color: :green,
+          count: 0
+        },
+        skipped: {
+          color: :yellow,
+          count: 0
+        }
+      }
+      
+      begin
+        duration = Time.duration_of do
+          printed_output = false
+          Freshenary.freshen_up(*fresheners) do |name, freshener, status|
+            case status
+            when Freshenary::Status::FRESHENING
+              print "\n" if printed_output
+              print String.prefix.green
+              puts " Freshening #{freshener.class.name}".bold
+              printed_output = true
+            when Freshenary::Status::CLEANING_UP
+              print "\n"
+              print String.prefix.green
+              puts " Cleaning Up #{freshener.class.name}".bold
+            when Freshenary::Status::FRESHENED
+              stats[:successful][:count] += 1
+            when Freshenary::Status::SKIPPED
+              print "\n"
+              print String.prefix.yellow
+              puts " Skipped #{freshener.class.name}".bold
+              
+              stats[:skipped][:count] += 1
+            end
+          end
+        end
+        
+        stats.delete_if { |key, value| 0 == value[:count] }
+        
+        unless stats.empty?
+          stats = stats.map { |key, value| "#{value[:count]} #{key}".send(value[:color]) }
+          puts "\n#{stats.join(" / ")} (%.2f sec)" % duration
+        end
+      rescue Freshen::FreshenerNotInstalled, Freshen::ExecutableError => e
+        puts "#{String.ballot.red} #{e}"
+        exit! 1
+      end
     end
     
     default_task :up

data/lib/freshen/errors.rb

@@ -7,6 +7,8 @@ class Freshen
   # system's kernel is unsupported.
   #
   class UnsupportedKernel < RuntimeError
+    attr_reader :kernel
+    
     def initialize(kernel)
       @kernel = kernel
     end
@@ -21,6 +23,8 @@ class Freshen
   # been implemented.
   #
   class UpdateMethodNotImplementedError < NotImplementedError
+    attr_reader :name
+    
     def initialize(freshener)
       @name = freshener.class.name.split('::').last
     end
@@ -34,6 +38,8 @@ class Freshen
   # is not installed.
   #
   class FreshenerNotInstalled < Exception
+    attr_reader :name
+    
     def initialize(name)
       @name = name
     end
@@ -47,6 +53,8 @@ class Freshen
   # failed to load.
   #
   class FreshenerLoadError < LoadError
+    attr_reader :name
+    
     def initialize(name)
       @name = name
     end
@@ -60,14 +68,17 @@ class Freshen
   # command fails.
   #
   class ExecutableError < RuntimeError
-    def initialize(name, command, *args)
+    attr_reader :name, :duration, :command, :args
+    
+    def initialize(name, duration, command, *args)
       @name = name
+      @duration = duration
       @command = command
       @args = args.map { |a| a.to_s }
     end
     
     def to_s
-      "#{@name} Command Failed: '#{Executable.command_string(@command, *@args)}'"
+      "#{@name} failed command '#{Executable.command_string(@command, *@args)}' after #{@duration}"
     end
   end
 end

data/lib/freshen/executable.rb

@@ -68,9 +68,7 @@ class Freshen
     	  end
       end
 
-      if duration
-        duration = (" %.2f sec" % duration)
-      end
+      duration_string = (" %.2f sec" % duration) if duration
 		  
     	$stdout.flush
       
@@ -80,11 +78,11 @@ class Freshen
       
       if freshening or cleaning
         if success
-          puts "#{String.checkmark.green}#{duration.green}" if Freshen.cli?
+          puts "#{String.checkmark.green}#{duration_string.green}" if Freshen.cli?
         else
-          puts "#{String.ballot.red}#{duration.red}" if Freshen.cli?
+          puts "#{String.ballot.red}#{duration_string.red}" if Freshen.cli?
           
-          raise ExecutableError.new(self.class.name, command, *args)
+          raise ExecutableError.new(self.class.name, duration, command, *args)
         end
       end
       

data/lib/freshen/variables.rb

@@ -1,7 +1,7 @@
 class Freshen
   # The current version of the gem.
   #
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
   
   # The prefix of where data is stored.
   #

data/lib/freshen.rb

@@ -16,6 +16,7 @@ class Freshen
     require 'freshen/system'
     require 'freshen/executable'
     require 'freshener'
+    require 'freshenary/status'
     require 'freshenary'
     
     return nil

data/lib/freshenary/status.rb

@@ -0,0 +1,25 @@
+unless Object.const_defined?('Freshen')
+  raise "You can't load this file. Please load the freshen file instead."
+end
+
+class Freshenary
+  # The statuses for the Freshenary class.
+  #
+  class Status
+    # This status indicates that a freshener is freshening.
+    #
+    FRESHENING = "FRESHENING"
+    
+    # This status indicates that a freshener is cleaning up.
+    #
+    CLEANING_UP = "CLEANING_UP"
+    
+    # This status indicates that a freshener has been freshened.
+    #
+    FRESHENED = "FRESHENED"
+    
+    # This status indicates that a freshener has been skipped.
+    #
+    SKIPPED = "SKIPPED"
+  end
+end

data/lib/freshenary.rb

@@ -13,86 +13,47 @@ class Freshenary
   #   >> Freshenary.freshen_up
   #   => nil
   #
-  def self.freshen_up(*fresheners)
+  def self.freshen_up(*fresheners, &block)
     if fresheners.empty?
       fresheners = Freshener.all
     else
-      if Freshen.cli?
-        begin
-          Freshener.ensure_installed!(*fresheners)
-        rescue Freshen::FreshenerNotInstalled => e
-          puts "#{String.ballot.red} #{e}"
-          exit! 1
-        end
-      end
+      Freshener.ensure_installed!(*fresheners)
       
       fresheners = Freshener.instances_of(*fresheners)
     end
     
-    status = {
-      successful: {
-        color: :green,
-        count: 0
-      },
-      skipped: {
-        color: :yellow,
-        count: 0
-      },
-      failed: {
-        color: :red,
-        count: 0
-      }
-    }
-    
     duration = Time.duration_of do
       fresheners.each do |name, freshener|
         if freshener.needs_freshening?
-          print "#{String.prefix.green} " if Freshen.cli?
-          puts "Freshening #{freshener.class.name}".bold if Freshen.cli?
-          
           cleaning = false
           
           begin
+            yield name, freshener, Freshenary::Status::FRESHENING if block_given?
+            
             freshener.freshen
             
             if freshener.respond_to? :cleanup
-              print "\n#{String.prefix.green} " if Freshen.cli?
-              puts "Cleaning up #{freshener.class.name}".bold if Freshen.cli?
+              yield name, freshener, Freshenary::Status::CLEANING_UP if block_given?
               
               cleaning = true
               
               freshener.cleanup(true)
             end
             
-            status[:successful][:count] += 1
+            yield name, freshener, Freshenary::Status::FRESHENED if block_given?
           rescue Freshen::ExecutableError => e
             if false == cleaning and freshener.respond_to? :cleanup
-              print "\n#{String.prefix.red} " if Freshen.cli?
-              puts "Cleaning up #{freshener.class.name}".bold if Freshen.cli?
+              yield name, freshener, Freshenary::Status::CLEANING_UP if block_given?
             
               freshener.cleanup(false)
             end
             
-            raise e unless Freshen.cli?
-            
-            status[:failed][:count] += 1
+            raise e
           end
         else
-          print "#{String.prefix.yellow} " if Freshen.cli?
-          puts "#{freshener.class.name} is already fresh".bold if Freshen.cli?
-          
-          status[:skipped][:count] += 1
+          yield name, freshener, Freshenary::Status::SKIPPED if block_given?
         end
-        
-        puts ""
       end
     end
-    
-    if Freshen.cli?
-      status.delete_if { |key, value| 0 == value[:count] }
-      status = status.map { |key, value| "#{value[:count]} #{key}".send(value[:color]) }
-      
-      puts "#{status.join(" / ")} (%.2f sec)" % duration
-    end
   end
 end

data/lib/freshener.rb

@@ -12,7 +12,7 @@ class Freshener
   #
   # Example:
   #   >> Freshener.all
-  #   => { "rubygems" => #<Rubygems:0x00000000000000> }
+  #   => { "rubygems" => #<RubyGems:0x00000000000000> }
   #
   def self.all
     fresheners = Dir.glob(File.join(Freshen::FRESHENERS_DIR, "*.rb"))
@@ -24,8 +24,8 @@ class Freshener
   # specified freshehers.
   #
   # Example:
-  #   >> Freshener.instances_of :rubygems
-  #   => { "rubygems" => #<Rubygems:0x00000000000000> }
+  #   >> Freshener.instances_of :ruby_gems
+  #   => { "rubygems" => #<RubyGems:0x00000000000000> }
   #
   def self.instances_of(*fresheners)
     fresheners.sort_by! do |name|
@@ -45,8 +45,8 @@ class Freshener
   #   name: (String)
   #
   # Example:
-  #   >> Freshener.instance_of :rubygems
-  #   => #<Rubygems:0x00000000000000>
+  #   >> Freshener.instance_of :ruby_gems
+  #   => #<RubyGems:0x00000000000000>
   #
   def self.instance_of(name)
     load_by_name(name)
@@ -62,8 +62,8 @@ class Freshener
   #   name: (String)
   #
   # Example:
-  #   >> Freshener.class_for :rubygems
-  #   => "Rubygems"
+  #   >> Freshener.class_for :ruby_gems
+  #   => "RubyGems"
   #
   def self.class_for(name)
     klass = name.to_s.capitalize
@@ -78,7 +78,7 @@ class Freshener
   #   name: (String)
   #
   # Example:
-  #   >> Freshener.load_by_name :rubygems
+  #   >> Freshener.load_by_name :ruby_gems
   #   => nil
   #
   # Raises:
@@ -91,6 +91,8 @@ class Freshener
     rescue LoadError
       raise Freshen::FreshenerLoadError.new(name)
     end
+    
+    nil
   end
   
   # Check that the specified fresheners are installed.
@@ -99,7 +101,7 @@ class Freshener
   #   fresheners: (Splat)
   #
   # Example:
-  #   >> Freshener.installed? :rubygems
+  #   >> Freshener.installed? :ruby_gems
   #   => true
   #
   def self.installed?(*fresheners)
@@ -113,7 +115,7 @@ class Freshener
   # Ensure that the specified fresheners are installed.
   #
   # Arguments:
-  #   >> Freshener.ensure_installed! :rubygems
+  #   >> Freshener.ensure_installed! :ruby_gems
   #   => nil
   #
   def self.ensure_installed!(*fresheners)
@@ -122,6 +124,8 @@ class Freshener
         raise Freshen::FreshenerNotInstalled.new(name)
       end
     end
+    
+    nil
   end
   
   # Mark certain class methods as private
@@ -131,7 +135,7 @@ class Freshener
   # freshening up.
   #
   # Example:
-  #   >> rubygems = Rubygems.new
+  #   >> rubygems = RubyGems.new
   #   >> rubygems.needs_freshening?
   #   => true
   #
@@ -142,7 +146,7 @@ class Freshener
 	# Freshen up the freshener!
   #
   # Example:
-  #   >> rubygems = Rubygems.new
+  #   >> rubygems = RubyGems.new
   #   >> rubygems.freshen
   #   => nil
 	#

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: freshen
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Nialto Services
@@ -53,6 +53,7 @@ files:
 - lib/freshen/system.rb
 - lib/freshen/variables.rb
 - lib/freshenary.rb
+- lib/freshenary/status.rb
 - lib/freshener.rb
 homepage: http://rubygems.org/gems/freshen
 licenses: