bitgirder-platform 0.1.16 → 0.1.19

data/bin/install-mysql

@@ -100,7 +100,8 @@ class App < BitGirderClass
             if @wipe_install_dir 
                 do_wipe_install
             else
-                raise "#@install_to already exists"
+                Dir.glob( "#@install_to/*" ).empty? or
+                    raise "#@install_to already exists"
             end
         end
     end

data/bin/tomcat7

@@ -128,7 +128,8 @@ class Install < Command
             if @wipe_install 
                 fu().rm_rf( @install_to )
             else
-                raise "Install dir #@install_to exists (--wipe-install?)"
+                Dir.glob( "#@install_to/*" ).empty? or 
+                    raise "Install dir #@install_to exists (--wipe-install?)"
             end
         end
 
@@ -437,7 +438,7 @@ class Daemon < RuntimeCommand
         code( "Awaiting connection on ports: #{ports}" )
 
         ports.each do |p|
-            WaitCondition.wait_backoff( seed: 1, max_tries: 4 ) do
+            WaitCondition.wait_backoff( seed: 1, max_tries: 6 ) do
                 res = can_connect?( p )
                 code( "Got conn on :#{p}: #{res}" )
                 res
@@ -506,7 +507,12 @@ class Daemon < RuntimeCommand
         
         unless await_proc_exit( pid = get_current_pid )
             code( "Server appears to still be running; sending KILL to #{pid}" )
-            Process.kill( "KILL", pid )
+
+            # Quietly squash ESRCH since it may be that tomcat exits
+            # concurrently with our kill
+            begin
+                Process.kill( "KILL", pid )
+            rescue Errno::ESRCH; end
         end
 
         fu().rm( pid_file )

data/lib/bitgirder/io.rb

@@ -68,6 +68,33 @@ end
 
 module_function :strict_decode64
 
+def digest_file( opts )
+    
+    dig_cls, file = has_keys( opts, :digest_type, :file )
+    buf_sz = opts[ :buffer_size ] || 50 * ( 1 << 10 )
+
+    # Set this now so we can fail before reading file if need be
+    out_func = case ot = opts[ :output_type ]
+        when nil, :binary then lambda { |dig| dig }
+        when :base64 then lambda { |dig| strict_encode64( dig ) }
+        else raise "Unhandled output type: #{ot}"
+    end
+
+    dig = dig_cls.new
+
+    File.open( file ) do |io|
+        
+        buf = ""
+        while buf = io.read( buf_sz, buf ) 
+            dig.update( buf ) 
+        end
+    end
+
+    out_func.call( dig.digest )
+end
+
+module_function :digest_file
+
 # Returns i as a little-endian 2's complement byte array; Algorithm is from
 # http://stackoverflow.com/questions/5284369/ruby-return-byte-array-containing-twos-complement-representation-of-bignum-fi
 # (with some cosmetic differences, including the return val's endianness).
@@ -372,7 +399,7 @@ def can_connect?( *argv )
     begin
         TCPSocket::new( host, port ).close
         true
-    rescue Errno::ECONNREFUSED
+    rescue Errno::ECONNREFUSED, Errno::ECONNRESET
         false
     end
 end

data/lib/doc-gen18.rb

@@ -1,5 +1,5 @@
 
-# Autogenerated docs on 2012-12-31 12:25:13 -0800
+# Autogenerated docs on 2013-02-03 05:52:36 -0800
 #
 
 # This code is only included for rdoc purposes and would not normally get

data/lib/doc-gen20.rb

@@ -1,5 +1,5 @@
 
-# Autogenerated docs on 2012-12-31 12:25:13 -0800
+# Autogenerated docs on 2013-02-03 05:52:36 -0800
 #
 
 # This code is only included for rdoc purposes and would not normally get

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitgirder-platform
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies: []
 description: Contains core classes and interfaces for building event logger implementations.
   Also includes helper classes for incorporating assertions about event logging into