warning-shot 0.9.1 → 0.9.2

data/History.txt

@@ -1,4 +1,11 @@
-== 0.9.0 2008-03-12
+== 0.9.2 2008-03-13
+* 2 major enhancement:
+  * Optional gem repos to check
+  * Install gems in "frozen" or "burned-in" dependency directories
+* 1 minor enhancement:
+  * Outline for WarningShot::Logger
+
+== 0.9.1 2008-03-12
 * 1 minor enhancement:
   * Cleaned up gem output
 

data/README.txt

@@ -9,23 +9,24 @@ USAGE
 	WarningShot can be used from the command line or in a capistrano script via the 'warning-shot' binary.
 	
 	Options are:
-
-	        --environment=RAILS_ENV      Environment to test in.
-	                                     Default: development
-	    -s, --strict                     URL Testing is only successful on 200 instead of 2xx
-	    -f, --flush                      Flush log before running
-	    -g, --gems                       Install/update all missing OR outdated gems
-	        --dir=DIR                    The root directory of the application to check.
-	                                     Default: .
-	        --log=LOG                    Path of log file.
-	                                     Default: (--dir path)/logs/warning_shot_(--environment).log
-	        --configs=PATH               Path to config files to use.
-	                                     Default: (--dir path)/config/warning_shot/
-	    -v, --verbose                    Output verbose information.
-	    -n, --growl                      Output final results via growlnotify (Requires growlnotify)
-	        --templates=[PATH]           Generates template files
-	                                     Default: Not Generated! (If specified, default is '.')
-	    -h, --help                       Show this help message.
+      --environment=APP_ENV        Environment to test in.
+                                   Default: development
+  -s, --strict                     URL Testing is only successful on 200 instead of 2xx
+  -f, --flush                      Flush log before running
+  -g, --gems                       Install/update all missing OR outdated gems
+      --gempath=PATH               Semicolon separated list of gem paths, gems will be installed in the 1st path
+      --dir=DIR                    The root directory of the application to check.
+                                   Default: .
+      --log=LOG                    Path of log file.
+                                   Default: (--dir path)/logs/warning_shot_(--environment).log
+      --configs=PATH               Path to config files to use.
+                                   Default: (--dir path)/config/warning_shot/
+  -v, --verbose                    Output verbose information.
+  -n, --growl                      Output final results via growlnotify (Requires growlnotify)
+      --templates=[PATH]           Generates template files
+                                   Default: Not Generated! (If specified, default is '.')
+  -h, --help                       Show this help message.
+  -d, --debug                      Enable debugging.
 	
 	
 CONFIGURATION FILES

data/bin/warning-shot

@@ -31,6 +31,8 @@ BANNER
     "Flush log before running") { |OPTIONS[:flush]| }
   opts.on("-g", "--gems",
     "Install/update all missing OR outdated gems") { |OPTIONS[:gems]| }
+  opts.on("--gempath=PATH",String,
+    "Semicolon separated list of gem paths, gems will be installed in the first path") {|OPTIONS[:gempath]|}
   opts.on("--dir=DIR", String,
     "The root directory of the application to check.",
     "Default: #{OPTIONS[:dir]}") { |OPTIONS[:dir]| }

data/lib/warning_shot.rb

@@ -25,11 +25,15 @@ include RippleNetworks::WarningShot
 
 =begin
 TODOs
--->Output message for installed gems
--->False negatives=> saysnot installed when it actually is...
+-->Change from http reqs to protocol http://etc, memcached://etc, ftp://etc...  
+
+-->flag to install gems in first alt gem path
+
 -->Implement a WarningShot.logger.(info,fatal,etc...) instead of current logging mechanism
 ====>In programatic interface take a logger and override (for passing in external loggers)
+
 -->Further de-couple the dep_checker class
+
 -->Update GemHandler#installed? to use Gem::Requirement#satisfied_by?
 
 

data/lib/warning_shot/dep_checker.rb

@@ -49,7 +49,8 @@ module RippleNetworks
         :gems         => false,
         :verbose      => false,
         :growl        => false,
-        :templates    => false
+        :templates    => false,
+        :gempath      => nil
       }
       
       #Set up CLEAR and Windows Add'l requirement
@@ -178,30 +179,19 @@ module RippleNetworks
 
         section("Checking gem dependencies")
           #Initialize gem handler
-          @gh = GemHandler.new(self.configs["gems"])
 
-          #List already installed gems
-          @gh.found_gems.each do |gem,version|
-            record("#{gem} v. #{version} was found!",:info)
-          end
-
-          #install missing gems
-          @gh.missing_gems.each do |gem,version|
-            record("#{gem} v. #{version} was NOT found!",(self.options[:gems]) ? :warning : :error)
-            @gh.install(gem,version) if self.options[:gems]
-          end
-          
-          #List failed gems
-          @gh.failed_gems.each do |gem,reason|
-            record("#{gem} failed to install! Reason: #{reason}",:error)
-          end
+          gem_handler = GemHandler.new(self.configs["gems"],{
+            :install_all => @options[:gems],
+            :gem_path => @options[:gempath]
+          })
           
-          @gh.installed_gems.each do |gem|
-            record("#{gem.name} v. #{gem.version} was installed!",:info)
+          gem_handler.each do |c_gem|
+            if c_gem.status != :installed
+              record("#{c_gem.name} v. #{c_gem.version}:: #{c_gem.details}", :error)
+            else
+              record("#{c_gem.name} v. #{c_gem.version} requirement met!")
+            end
           end
-          
-          gem_errors = @gh.missing_gems.size - @gh.installed_gems.size
-          record("#{gem_errors} gems had errors", :info) if gem_errors > 0
 
         section("Loading Ruby test scripts")
           count = load_ruby_scripts

data/lib/warning_shot/gem_handler.rb

@@ -6,100 +6,72 @@ require 'rubygems/dependency_installer'
 
 module RippleNetworks
   module WarningShot
-    class GemHandler
+    class GemHandler < Array
       DEFAULT_VERSION = ">0.0.0".freeze
       CONDITIONAL_RGX = /[^\d]*/.freeze
       VERSION_RGX     = /[\d\.]+/.freeze
+      CandidateGem    = Struct.new(:name,:version,:status,:details) 
       
-      attr_reader :gems_to_install, :missing_gems, :failed_gems, :installed_gems, :found_gems
+      DEFAULTS = {
+        :install_all => false,
+        :gem_path => Gem.dir
+      }
       
-      def initialize(gem_list,install_all=false,install_dir=Gem.dir)
-        @install_dir = install_dir
+      def initialize(gem_list,opts={})
+        @opts = DEFAULTS.merge(opts)
         
-        @missing_gems = {}    # gems that will attempted to be installed
-        @failed_gems = {}     # gems taht failed installation
-        @installed_gems = []  # gems that were installed by this process
-        @found_gems = {}      # gems that were already installed
+        Gem.path.clear
+        #Add custom paths to gem..
+        unless @opts[:gem_path].nil? || @opts[:gem_path].empty?
+          @opts[:gem_path].split(";").each do |alt_path|
+            Gem.path.push(alt_path)
+          end
+        end
 
-        @gems_to_install = split(gem_list) 
-        #TODO Create a Gem<Strunct(name,status,version,details) and get rid of all these
-        #different gem variables
+        #Add candidate gems to array
+        split(gem_list).each do |rgem,ver|
+          self.push(CandidateGem.new(rgem,ver,:unchecked,""))
+        end
 
+        #Check status of gems
         check_gems
-        install! if install_all
+        install_all! if @opts[:install_all]
       end
       
       
       def split(gem_list)
         gems = {}
         gem_list.collect do |gem|
-          gem_name, gem_ver = gem.chomp.split(":")
+          case gem
+          when String
+            gem_name, gem_ver = gem.chomp.split(":")
+          when Hash
+            gem_name, gem_ver = gem.keys.first, gem.values.first
+          end
           gems[gem_name]    = gem_ver || DEFAULT_VERSION     #Default to newest gem
         end
-        
+
         return gems
       end
       
       
       def add(gems)
-        @gems_to_install.merge!(split(gems))
+        #@gems_to_install.merge!(split(gems))
         check_gems
       end
       
       
       def remove(gems)
-        gems.collect { |g| @gems_to_install.delete(g) }
+        #gems.collect { |g| @gems_to_install.delete(g) }
         check_gems
       end
-        
-      def install(gem_name,gem_version)
-        begin
-          #RubyGems DependencyInstaller installs all dependencies, and the gem, woot!
-    			dep_inst = Gem::DependencyInstaller.new(gem_name,gem_version,{:install_dir => @install_dir})
-    		rescue Exception => e
-    			#Invalid Gem Name / Version
-          @failed_gems[gem_name] = "Bad gem name or version #{gem_name} #{gem_version}"
-          return false
-    		end
       
-        #Determine what dependencies are missing
-        dep_inst.gather_dependencies
-
-    		begin
-    		  #Install the dependencies and the gem
-    		  dep_inst.install
-
-    		  #Add list of installed gems to @installed_gems
-    		  @installed_gems.push(*dep_inst.installed_gems)
-    		  
-    		  #Remove any isntalled gems from failed list
-    		  dep_inst.installed_gems.each do |gem|
-    		    @failed_gems.delete(gem.name) if @failed_gems.has_key?(gem.name)
-  		    end
-  		    
-  		    #Update the local gem cache
-    		  Gem::cache.refresh!
-    		  
-    		  #Update missing gems
-    		  check_gems
-    		  return true
-        rescue Errno::EACCES => e
-          @failed_gems[gem_name] = "Invalid permissions . . . try running w/ su"
-    		rescue Gem::FilePermissionError => e
-    		  @failed_gems[gem_name] = "Invalid permissions . . . try running w/ su"
-    		rescue Exception => e
-          @failed_gems[gem_name] = e.message
-  		  end
-  		  
-  		  return false
-      end
         
-      def install!        
-        @missing_gems.each do |gem_name,gem_version|
-          install(gem_name,gem_version)
+      #Loop over candidate gems, install each
+      def install_all!        
+        self.each do |c_gem|
+          install(c_gem) if c_gem.status != :installed
         end
-        
-        return @failed_gems.length == 0
       end
 
 
@@ -172,6 +144,50 @@ module RippleNetworks
       
       
       private
+      
+      #Install a candidate gem
+      def install(c_gem)        
+        begin
+          #RubyGems DependencyInstaller installs all dependencies, and the gem, woot!
+          dep_inst = Gem::DependencyInstaller.new(c_gem.name,c_gem.version,{:install_dir => Gem.path.first})
+        rescue Gem::GemNotFoundException => e
+          #Invalid Gem Name / Version
+          c_gem.status = :invalid
+          c_gem.details = "Invalid gem name or version #{c_gem.name} #{c_gem.version}"
+          return false
+        end
+      
+        #Determine what dependencies are missing
+        dep_inst.gather_dependencies
+
+    		begin
+    		  #Install the dependencies and the gem
+    		  dep_inst.install
+
+          #add dependency details to gem
+          c_gem.details = "Installed Dependencies: " << dep_inst.installed_gems.collect { |d_gem| d_gem.name }.join(",")
+  		    
+  		    #Update the local gem cache
+    		  Gem::cache.refresh!
+    		  
+    		  #Update missing gems
+    		  check_gems
+    		  return true
+        rescue Errno::EACCES => e
+          c_gem.status = :failed
+          c_gem.details = "Invalid permissions . . . try running w/ su"
+    		rescue Gem::FilePermissionError => e
+          c_gem.status = :failed
+          c_gem.details = "Invalid permissions . . . try running w/ su"
+    		rescue Exception => e
+    		  c_gem.status = :failed
+          c_gem.details = e.message
+  		  end
+  		  
+  		  return false
+      end
+      
+      
 =begin rdoc
   *Name*:: check_gems
   *Access*:: private
@@ -179,14 +195,11 @@ module RippleNetworks
   *Last_Edited*:: Tue Feb 19 15:09:00 PST 2008
 =end      
       def check_gems
-        @missing_gems = {}
-        
-        @gems_to_install.each do |gem_name,gem_version|
-          gem_info = installed?(gem_name,gem_version)
+        self.each do |c_gem|
+          gem_info = installed?(c_gem.name,c_gem.version)
           if gem_info[:installed]
-            @found_gems[gem_name] = gem_version
-          else
-            @missing_gems[gem_name] = gem_version
+            c_gem.status = :installed
+            c_gem.details = gem_info[:info]
           end
         end
       end

data/lib/warning_shot/version.rb

@@ -3,7 +3,7 @@ module WarningShot #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 1
+    TINY  = 2
     RC    = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>warning_shot</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/warning_shot"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/warning_shot" class="numbers">0.9.1</a>
+      <a href="http://rubyforge.org/projects/warning_shot" class="numbers">0.9.2</a>
     </div>
     <h1>&#x2192; &#8216;warning_shot&#8217;</h1>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: warning-shot
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Cory O'Daniel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-12 00:00:00 -07:00
+date: 2008-03-13 00:00:00 -07:00
 default_executable: 
 dependencies: []