warning-shot 0.9.0 → 0.9.1

data/History.txt

@@ -1,3 +1,11 @@
+== 0.9.0 2008-03-12
+* 1 minor enhancement:
+  * Cleaned up gem output
+
+== 0.9.0 2008-03-12
+* 1 major enhancement:
+  * Fixed the gem handler bug
+
 == 0.8.9 2008-02-26
 * 1 major enhancement:
   * Real initial public release, I hope.

data/Manifest.txt

@@ -25,6 +25,7 @@ lib/warning_shot/dep_checker.rb
 lib/warning_shot/template_generator.rb
 lib/warning_shot/base_extensions.rb
 lib/warning_shot/gem_handler.rb
+lib/warning_shot/logger.rb
 lib/warning_shot/config_parser.rb
 lib/warning_shot/test_script.rb
 lib/warning_shot/version.rb

data/lib/warning_shot/dep_checker.rb

@@ -178,31 +178,30 @@ module RippleNetworks
 
         section("Checking gem dependencies")
           #Initialize gem handler
-          @gh = GemHandler.new(self.configs["gems"],self.options[:gems])
+          @gh = GemHandler.new(self.configs["gems"])
 
-          gem_errors = @gh.missing_gems.size
-
-          if @gh.missing_gems.size > 0          
-            record "#{gem_errors} gems not found: "
-            @gh.missing_gems.each do |gem,version|
-              record "\t#{gem} : #{version}"
-            end
+          #List already installed gems
+          @gh.found_gems.each do |gem,version|
+            record("#{gem} v. #{version} was found!",:info)
           end
 
-          if self.options[:gems] && @gh.failed_installs.size > 0
-            gem_errors = @gh.failed_installs.size
-            record "#{gem_errors} gems failed to install:"
-            @gh.failed_installs.each do |gem,message|
-              record "\t#{gem}: #{message}"
-            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
           
           @gh.installed_gems.each do |gem|
             record("#{gem.name} v. #{gem.version} was installed!",:info)
           end
           
-          record("#{gem_errors} gems had errors", :error) if gem_errors > 0
-          @errors += gem_errors
+          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

@@ -11,21 +11,22 @@ module RippleNetworks
       CONDITIONAL_RGX = /[^\d]*/.freeze
       VERSION_RGX     = /[\d\.]+/.freeze
       
-      attr_reader :gems_to_install, :missing_gems, :failed_installs, :installed_gems
+      attr_reader :gems_to_install, :missing_gems, :failed_gems, :installed_gems, :found_gems
       
-      
-      def initialize(gem_list,do_install=false,install_dir=nil)
-
-        @install_dir ||= Gem.dir
+      def initialize(gem_list,install_all=false,install_dir=Gem.dir)
+        @install_dir = install_dir
         
-        @missing_gems = {}
-        @installed_gems = []
+        @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
+
         @gems_to_install = split(gem_list) 
-        @failed_installs = {}
-        
-        check_gems
+        #TODO Create a Gem<Strunct(name,status,version,details) and get rid of all these
+        #different gem variables
 
-        install! if do_install
+        check_gems
+        install! if install_all
       end
       
       
@@ -51,39 +52,54 @@ module RippleNetworks
         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!
-        @failed_installs = {}
-        
-        #RubyGems DependencyInstaller installs all dependencies, and the gem, woot!
+      def install!        
         @missing_gems.each do |gem_name,gem_version|
-          begin
-      			dep_inst = Gem::DependencyInstaller.new(gem_name,gem_version,{:install_dir => @install_dir})
-      		rescue Exception => e
-      			#Invalid Gem Name / Version
-            @failed_installs[gem_name] = "Bad gem name or version #{gem_name} #{gem_version}"
-      		end
-          
-          #Determine what dependencies are missing
-          dep_inst.gather_dependencies
-
-      		#Install missing dependencies
-      		begin
-      		  dep_inst.install
-      		  @installed_gems.push(*dep_inst.installed_gems)
-          rescue Errno::EACCES => e
-            @failed_installs[gem_name] = "Invalid permissions . . . try running w/ sudo"
-      		rescue Gem::FilePermissionError => e
-      		  @failed_installs[gem_name] = "Invalid permissions . . . try running w/ sudo"
-      		rescue Exception => e
-            @failed_installs[gem_name] = e.message
-    		  end
+          install(gem_name,gem_version)
         end
         
-        Gem::cache.refresh!
-        check_gems
-        
-        return @failed_installs.length == 0
+        return @failed_gems.length == 0
       end
 
 
@@ -167,7 +183,11 @@ module RippleNetworks
         
         @gems_to_install.each do |gem_name,gem_version|
           gem_info = installed?(gem_name,gem_version)
-          @missing_gems[gem_name] = gem_version unless gem_info[:installed]
+          if gem_info[:installed]
+            @found_gems[gem_name] = gem_version
+          else
+            @missing_gems[gem_name] = gem_version
+          end
         end
       end
 

data/lib/warning_shot/logger.rb

@@ -0,0 +1,17 @@
+
+module RippleNetworks
+  module WarningShot
+    class Logger
+      
+      def initialize(path,verbose=false);end;
+      
+      def info();end;
+      def debug();end;
+      def error();end;
+      def warning();end;
+      def fatal();end;
+      
+      def close();end;
+    end
+  end
+end

data/lib/warning_shot/version.rb

@@ -3,7 +3,7 @@ module WarningShot #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 0
+    TINY  = 1
     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.8.9</a>
+      <a href="http://rubyforge.org/projects/warning_shot" class="numbers">0.9.1</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.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Cory O'Daniel
@@ -53,6 +53,7 @@ files:
 - lib/warning_shot/template_generator.rb
 - lib/warning_shot/base_extensions.rb
 - lib/warning_shot/gem_handler.rb
+- lib/warning_shot/logger.rb
 - lib/warning_shot/config_parser.rb
 - lib/warning_shot/test_script.rb
 - lib/warning_shot/version.rb