knjrbfw 0.0.90 → 0.0.91

data/VERSION

@@ -1 +1 @@
-0.0.90
+0.0.91

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.90"
+  s.version = "0.0.91"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-08-23}
+  s.date = %q{2012-08-30}
   s.description = %q{Including stuff for HTTP, SSH and much more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [
@@ -208,7 +208,6 @@ Gem::Specification.new do |s|
     "lib/knj/process.rb",
     "lib/knj/process_meta.rb",
     "lib/knj/rand.rb",
-    "lib/knj/retry.rb",
     "lib/knj/rhodes/mutex.rb",
     "lib/knj/rhodes/rhodes.js",
     "lib/knj/rhodes/rhodes.rb",
@@ -236,7 +235,6 @@ Gem::Specification.new do |s|
     "lib/knj/tests/test_http2.rb",
     "lib/knj/tests/test_http2_proxy.rb",
     "lib/knj/tests/test_mount.rb",
-    "lib/knj/tests/test_retry.rb",
     "lib/knj/thread.rb",
     "lib/knj/thread2.rb",
     "lib/knj/threadhandler.rb",

data/lib/knj/gtk2_tv.rb

@@ -39,7 +39,6 @@ module Knj::Gtk2::Tv
     end
     
     tv.model = list_store
-    tv.reorderable = true
     
     count = 0
     columns.each do |args|
@@ -296,8 +295,6 @@ module Knj::Gtk2::Tv
               value_i = 1
             end
           else
-            puts "Test: #{iter[col_no]}"
-            
             if iter[col_no] == 0
               value = true
               value_i = 1

data/lib/knj/knj.rb

@@ -44,4 +44,32 @@ module Knj
       return Array_enumerator.new(args[:enum])
     end
   end
+  
+  #Loads a gem by a given name. First tries to load the gem from a custom parent directory to enable loading of development-gems.
+  def self.gem_require(gem_const, gem_name)
+    #Return false if the constant is already loaded.
+    return false if ::Kernel.const_defined?(gem_const)
+    
+    #Try to load gem from custom development-path.
+    found_custom = false
+    
+    paths = [
+      "#{File.dirname(__FILE__)}/../../../#{gem_name}/lib/#{gem_name}.rb"
+    ]
+    paths.each do |path|
+      if File.exists?(path)
+        require path
+        found_custom = true
+        break
+      end
+    end
+    
+    #Custom-path could not be loaded - load gem normally.
+    if !found_custom
+      require gem_name
+    end
+    
+    #Return true to enable detection of that something was loaded.
+    return true
+  end
 end

data/lib/knj/knjdb/drivers/mysql/knjdb_mysql.rb

@@ -144,7 +144,7 @@ class KnjDB_mysql
                 
                 #Save reference to result and statement, so we can close them when they are garbage collected.
                 @java_rs_data[id] = {:res => res, :stmt => stmt}
-                ObjectSpace.define_finalizer(ret, self.method("java_mysql_resultset_killer"))
+                ObjectSpace.define_finalizer(ret, self.method(:java_mysql_resultset_killer))
                 
                 return ret
               rescue => e

data/lib/knj/knjdb/libknjdb.rb

@@ -16,9 +16,10 @@ require "datet" if !Kernel.const_defined?(:Datet)
 #   print data[:name]
 # end
 class Knj::Db
-  #Autoloader.
+  #Autoloader for subclasses..
   def self.const_missing(name)
-    require "#{$knjpath}knjdb/#{name.to_s.downcase}"
+    require "#{$knjpath}knjdb/#{name.to_s.downcase}.rb"
+    raise "Still not defined: '#{name}'." if !Knj::Db.const_defined?(name)
     return Knj::Db.const_get(name)
   end
   

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.90
+  version: 0.0.91
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-23 00:00:00 +02:00
+date: 2012-08-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -324,7 +324,6 @@ files:
 - lib/knj/process.rb
 - lib/knj/process_meta.rb
 - lib/knj/rand.rb
-- lib/knj/retry.rb
 - lib/knj/rhodes/mutex.rb
 - lib/knj/rhodes/rhodes.js
 - lib/knj/rhodes/rhodes.rb
@@ -352,7 +351,6 @@ files:
 - lib/knj/tests/test_http2.rb
 - lib/knj/tests/test_http2_proxy.rb
 - lib/knj/tests/test_mount.rb
-- lib/knj/tests/test_retry.rb
 - lib/knj/thread.rb
 - lib/knj/thread2.rb
 - lib/knj/threadhandler.rb
@@ -394,7 +392,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4560335570508666088
+      hash: -1209507472905610326
       segments: 
       - 0
       version: "0"

data/lib/knj/retry.rb

@@ -1,71 +0,0 @@
-class Knj::Retry
-  def self.try(args = {}, &block)
-    raise "No block was given." if !block_given?
-    
-    args[:tries] = 3 if !args[:tries]
-    tries = []
-    error = nil
-    
-    args[:tries].to_i.downto(1) do |count|
-      error = nil
-      dobreak = false
-      
-      begin
-        if args[:timeout]
-          begin
-            Timeout.timeout(args[:timeout]) do
-              block.call
-              dobreak = true
-              break
-            end
-          rescue Timeout::Error => e
-            doraise = e if count <= 1
-            error = e
-            sleep(args[:wait]) if args[:wait] and !doraise
-          end
-        else
-          block.call
-          dobreak = true
-          break
-        end
-      rescue Exception => e
-        if e.class == Interrupt
-          raise e if !args.key?(:interrupt) or args[:interrupt]
-        elsif e.class == SystemExit
-          raise e if !args.key?(:exit) or args[:exit]
-        elsif count <= 1 or (args.key?(:errors) and args[:errors].index(e.class) == nil)
-          doraise = e
-        elsif args.key?(:errors) and args[:errors].index(e.class) != nil
-          #given error was in the :errors-array - do nothing. Maybe later it should be logged and returned in a stats-hash or something? - knj
-        end
-        
-        error = e
-        sleep(args[:wait]) if args[:wait] and !doraise
-      end
-      
-      if doraise
-        if args[:return_error]
-          tries << {:error => error}
-          return {
-            :tries => tries,
-            :result => false
-          }
-        else
-          raise e
-        end
-      elsif error
-        tries << {:error => error}
-      end
-      
-      break if dobreak
-    end
-    
-    res = true
-    res = false if error
-    
-    return {
-      :tries => tries,
-      :result => res
-    }
-  end
-end

data/lib/knj/tests/test_retry.rb

@@ -1,30 +0,0 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__))
-require "../autoload"
-
-count = 0
-result = Knj::Retry.try(
-  :exit => false,
-  :interrupt => true,
-  :errors => [Errno::ENOENT, RuntimeError],
-  :timeout => 1,
-  :tries => 3,
-  :return_error => true
-) do
-  count += 1
-  print "Count: #{count.to_s}\n"
-  
-  if count <= 2
-    exit
-  end
-  
-  if count <= 3
-    
-    #raise "Test"
-  end
-end
-
-#print "Error 1 was a #{result[0][:error].class.to_s} with the message: #{result[0][:error].message.to_s}\n"
-
-Php4r.print_r(result)