warning-shot 0.8.9 → 0.9.0

data/Manifest.txt

@@ -23,6 +23,7 @@ images/ruby_fail.png
 lib/warning_shot.rb
 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/config_parser.rb
 lib/warning_shot/test_script.rb

data/bin/warning-shot

@@ -49,6 +49,17 @@ BANNER
     "Default: Not Generated! (If specified, default is '.')") { |OPTIONS[:templates]| }
   opts.on("-h", "--help",
     "Show this help message.") { puts opts; exit }
+  opts.on("-d", "--debug","Enable debugging."){ 
+    begin
+      require "ruby-debug"
+      Debugger.start
+      Debugger.settings[:autoeval] = true if Debugger.respond_to?(:settings)
+      puts "Debugger enabled"
+    rescue LoadError
+      puts "You need to install ruby-debug to run the server in debugging mode. With gems, use 'gem install ruby-debug'"
+      exit
+    end
+  }
     
   begin
     opts.parse!(ARGV)

data/lib/warning_shot/base_extensions.rb

@@ -0,0 +1,8 @@
+module Kernel
+  unless Kernel.respond_to?(:debugger)
+    #Provide a debugger method if the debugger is turned off, stops NoMethodError
+    def debugger
+      puts "=-=-=-=-=Debugger was request, but debugging is not enabled (warning-shot -d)=-=-=-=-="
+    end
+  end
+end

data/lib/warning_shot/dep_checker.rb

@@ -189,14 +189,18 @@ module RippleNetworks
             end
           end
 
-          if self.options[:gems] && @gh.errors.size > 0
-            gem_errors = @gh.errors.size
+          if self.options[:gems] && @gh.failed_installs.size > 0
+            gem_errors = @gh.failed_installs.size
             record "#{gem_errors} gems failed to install:"
-            @gh.errors.each do |gem,message|
+            @gh.failed_installs.each do |gem,message|
               record "\t#{gem}: #{message}"
             end
           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
 

data/lib/warning_shot/gem_handler.rb

@@ -1,3 +1,9 @@
+require 'rubygems'
+require 'rubygems/rubygems_version'
+require 'rubygems/defaults'
+require 'rubygems/installer'
+require 'rubygems/dependency_installer'
+
 module RippleNetworks
   module WarningShot
     class GemHandler
@@ -5,28 +11,17 @@ module RippleNetworks
       CONDITIONAL_RGX = /[^\d]*/.freeze
       VERSION_RGX     = /[\d\.]+/.freeze
       
-=begin
-  require "./lib/warning_shot/gem_handler.rb" 
-  gems = ["rake:>0.0.0","merb:>=0.4.0"]
-  include RippleNetworks::WarningShot
-  gh = GemHandler.new(gems)
-  gh.add(["RedCloth:>2.4.0"])
-  gh.remove(["merb"])
-  gh.add("merb:>=0.5.0")
-  gh.remove("RedCloth")
-=end
-      
-      attr_reader :gems, :missing_gems, :errors
+      attr_reader :gems_to_install, :missing_gems, :failed_installs, :installed_gems
       
       
       def initialize(gem_list,do_install=false,install_dir=nil)
-        Gem.manage_gems
-        @gri = Gem::RemoteInstaller.new
+
         @install_dir ||= Gem.dir
         
         @missing_gems = {}
-        @gems = split(gem_list) 
-        @errors = {}
+        @installed_gems = []
+        @gems_to_install = split(gem_list) 
+        @failed_installs = {}
         
         check_gems
 
@@ -46,38 +41,49 @@ module RippleNetworks
       
       
       def add(gems)
-        @gems.merge!(split(gems))
+        @gems_to_install.merge!(split(gems))
         check_gems
       end
       
       
       def remove(gems)
-        gems.collect { |g| @gems.delete(g) }
+        gems.collect { |g| @gems_to_install.delete(g) }
         check_gems
       end
         
         
       def install!
-        failed_installs = 0
-        @errors = {}
+        @failed_installs = {}
         
+        #RubyGems DependencyInstaller installs all dependencies, and the gem, woot!
         @missing_gems.each do |gem_name,gem_version|
-          dep_installed, dep_message = install_dependencies(gem_name,gem_version)
-          if dep_installed
-            gem_install, gem_message = install_gem(gem_name,gem_version)
-            unless gem_install
-              failed_installs += 1
-              @errors[gem_name] =  gem_message
-            end
-          else
-            failed_installs += 1
-            @errors[gem_name] = gem_message
-          end
+          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
         end
         
+        Gem::cache.refresh!
         check_gems
         
-        return failed_installs == 0
+        return @failed_installs.length == 0
       end
 
 
@@ -150,63 +156,16 @@ module RippleNetworks
       
       
       private
-      
-      def install_dependencies(gem_name,gem_version)
-        #Find Dependencies
-    		begin
-    			deps = @gri.find_gem_to_install gem_name, gem_version
-    		rescue Exception => e
-    			#Invalid Gem Name / Version
-    			return [false,"Bad gem name or version #{gem_name} #{gem_version}"]
-    		end
-
-        #Determine what dependencies are missing
-    		missing_deps = @gri.find_dependencies_not_installed deps[0].dependencies
-
-    		#Install missing dependencies
-    		begin
-    		  installed_deps = @gri.install_dependencies(missing_deps,true,@install_dir)
-        rescue Errno::EACCES => e
-          return [false, "Invalid permissions . . . try running w/ sudo"]
-    		rescue Gem::FilePermissionError => e
-    		  return [false, "Invalid permissions . . . try running w/ sudo"]
-    		rescue Exception => e
-    		  return [false,e.message]
-  		  end
-
-        return [true]
-
-    	  #Check that the number of missing dependencies is equal to the number installed
-    		#if installed_deps.length == missing_deps.length
-  		  #else
-		    #end
-      end
-      
-      
-      def install_gem(gem_name,gem_version)
-        begin  
-  			  @gri.install(gem_name,gem_version,true,@install_dir)
-  			  return [true]
-  			rescue Errno::EACCES => e
-          return [false, "Invalid permissions . . . try running w/ sudo"]
-  			rescue Gem::FilePermissionError => e
-    		  return [false, "Invalid permissions... try running w/ sudo"]
-  		  rescue Exception => e
-  		    return [false,e.message]
-		    end
-      end
- 
-      
 =begin rdoc
   *Name*:: check_gems
   *Access*:: private
-  *Description*:: Checks to see if the @gems are installed, results stored in @missing_gems
+  *Description*:: Checks to see if the @gems_to_install are installed, results stored in @missing_gems
   *Last_Edited*:: Tue Feb 19 15:09:00 PST 2008
 =end      
       def check_gems
         @missing_gems = {}
         
-        @gems.each do |gem_name,gem_version|
+        @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]
         end

data/lib/warning_shot/version.rb

@@ -1,11 +1,9 @@
-#sudo rm -r ./pkg/w*; rake package;sudo gem install ./pkg/*.gem; warning-shot -h
-
 module RippleNetworks
 module WarningShot #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 8
-    TINY  = 9
+    MINOR = 9
+    TINY  = 0
     RC    = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/lib/warning_shot.rb

@@ -7,6 +7,7 @@ require 'net/https'
 require 'uri'
 
 
+
 #IMPORTANT remember to add new includes to Manifest.txt
 Dir.glob(File.join(File.dirname(__FILE__), "warning_shot/*.rb")).each {|f| 
   require f 
@@ -21,14 +22,17 @@ include RippleNetworks::WarningShot
     http://www.ruby-doc.org/stdlib/libdoc/optparse/rdoc/classes/OptionParser.html
 =end
 
+
 =begin
-  TODO
-    -GET RAILS/MERB connection, (via config/boot, etc) (load in begin/rescue)
-        = if fail, and vars present, continue
-=end
+TODOs
+-->Output message for installed gems
+-->False negatives=> saysnot installed when it actually is...
+-->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?
 
 
-=begin
 sudo rm -r ./pkg/w*; sudo rake package;sudo gem install ./pkg/*.gem; warning-shot -h
 sudo gem uninstall warning_shot; sudo gem install ../../WarningShot-ADC/trunk/pkg/*.gem;rm -rf ./config/warning_shot/;warning-shot --templates=./config/warning_shot;warning-shot -vfg
 =end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: warning-shot
 version: !ruby/object:Gem::Version 
-  version: 0.8.9
+  version: 0.9.0
 platform: ruby
 authors: 
 - Cory O'Daniel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-26 00:00:00 -08:00
+date: 2008-03-12 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -51,6 +51,7 @@ files:
 - lib/warning_shot.rb
 - 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/config_parser.rb
 - lib/warning_shot/test_script.rb