knjrbfw 0.0.41 → 0.0.42

data/VERSION

@@ -1 +1 @@
-0.0.41
+0.0.42

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.41"
+  s.version = "0.0.42"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-05-25}
+  s.date = %q{2012-06-08}
   s.description = %q{Including stuff for HTTP, SSH and much more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [
@@ -94,6 +94,7 @@ Gem::Specification.new do |s|
     "lib/knj/gtk2_menu.rb",
     "lib/knj/gtk2_statuswindow.rb",
     "lib/knj/gtk2_tv.rb",
+    "lib/knj/gtk2_window.rb",
     "lib/knj/hash_methods.rb",
     "lib/knj/http.rb",
     "lib/knj/http2.rb",

data/lib/knj/eruby.rb

@@ -85,7 +85,7 @@ class Knj::Eruby
       end
     rescue SystemExit
       #do nothing.
-    rescue Exception => e
+    rescue => e
       @error = true
       self.handle_error(e)
     end
@@ -212,7 +212,7 @@ class Knj::Eruby
       self.printcont(tmp_out, args)
     rescue SystemExit => e
       self.printcont(tmp_out, args)
-    rescue Exception => e
+    rescue => e
       self.handle_error(e)
       self.printcont(tmp_out, args)
     end
@@ -227,8 +227,8 @@ class Knj::Eruby
         end
       end
     rescue SystemExit => e
-      exit
-    rescue Exception => e
+      raise e
+    rescue => e
       #An error occurred while trying to run the on-error-block - show this as an normal error.
       print "\n\n<pre>\n\n"
       print "<b>#{Knj::Web.html(e.class.name)}: #{Knj::Web.html(e.message)}</b>\n\n"

data/lib/knj/gtk2_cb.rb

@@ -33,6 +33,18 @@ class Gtk::ComboBox
           }
         end
       end
+    elsif items.is_a?(Hash)
+      @knj[:type] = :hash
+      
+      items.each do |key, val|
+        iter = ls.append
+        iter[0] = val
+        
+        @knj[:items] << {
+          :iter => iter,
+          :object => key
+        }
+      end
     else
       raise "Unsupported type: '#{items.class.name}'."
     end
@@ -68,6 +80,13 @@ class Gtk::ComboBox
           return nil
         end
       end
+    elsif @knj[:type] == :hash
+      @knj[:items].each do |item|
+        if item[:object] == actob
+          self.active_iter = item[:iter]
+          return nil
+        end
+      end
     else
       self.model.each do |model, path, iter|
         text = self.model.get_value(iter, 0)

data/lib/knj/gtk2_tv.rb

@@ -1,21 +1,64 @@
 module Knj::Gtk2::Tv
   def self.init(tv, columns)
-    args = []
-    columns.each do |pair|
-      args << String
+    ret = {
+      :renderers => []
+    }
+    
+    model_args = []
+    columns.each do |args|
+      if args.is_a?(String)
+        args = {:type => :string, :title => args}
+      end
+      
+      if args[:type] == :string
+        model_args << String
+      elsif args[:type] == :toggle
+        model_args << Integer
+      elsif args[:type] == :combo
+        model_args << String
+      else
+        raise "Invalid type: '#{args[:type]}'."
+      end
     end
     
-    list_store = Gtk::ListStore.new(*args)
+    list_store = Gtk::ListStore.new(*model_args)
     tv.model = list_store
     
     count = 0
-    columns.each do |col_title|
-      renderer = Gtk::CellRendererText.new
-      col = Gtk::TreeViewColumn.new(col_title, renderer, :text => count)
-      col.resizable = true
-      tv.append_column(col)
+    columns.each do |args|
+      if args.is_a?(String)
+        args = {:type => :string, :title => args}
+      end
+      
+      if args[:type] == :string
+        renderer = Gtk::CellRendererText.new
+        col = Gtk::TreeViewColumn.new(args[:title], renderer, :text => count)
+        col.resizable = true
+        tv.append_column(col)
+      elsif args[:type] == :toggle
+        renderer = Gtk::CellRendererToggle.new
+        col = Gtk::TreeViewColumn.new(args[:title], renderer, :active => count)
+        tv.append_column(col)
+      elsif args[:type] == :combo
+        renderer = Gtk::CellRendererCombo.new
+        renderer.text_column = 0
+        
+        col = Gtk::TreeViewColumn.new(args[:title])
+        col.pack_start(renderer, false)
+        col.add_attribute(renderer, :text, count)
+        
+        renderer.model = args[:model] if args.key?(:model)
+        tv.append_column(col)
+      else
+        raise "Invalid type: '#{args[:type]}'."
+      end
+      
       count += 1
+      
+      ret[:renderers] << renderer
     end
+    
+    return ret
   end
   
   def self.append(tv, data)
@@ -23,9 +66,23 @@ module Knj::Gtk2::Tv
     
     count = 0
     data.each do |value|
-      iter[count] = value.to_s
+      col = tv.columns[count]
+      renderer = col.cell_renderers.first
+      
+      if renderer.is_a?(Gtk::CellRendererText)
+        iter[count] = value.to_s
+      elsif renderer.is_a?(Gtk::CellRendererToggle)
+        iter[count] = Knj::Strings.yn_str(value, 1, 0)
+      elsif renderer.is_a?(Gtk::CellRendererCombo)
+        iter[count] = value.to_s
+      else
+        raise "Unknown renderer: '#{renderer.class.name}'."
+      end
+      
       count += 1
     end
+    
+    return {:iter => iter}
   end
   
   def self.sel(tv)

data/lib/knj/gtk2_window.rb

@@ -0,0 +1,15 @@
+class Knj::Gtk2::Window
+  require "wref"
+  @@uniques = Wref_map.new
+  
+  def self.unique!(id)
+    instance = @@uniques.get!(id)
+    
+    if instance and !instance.gui["window"].destroyed?
+      instance.gui["window"].activate_focus
+    else
+      obj = yield
+      @@uniques[id] = obj
+    end
+  end
+end

data/lib/knj/http2.rb

@@ -126,14 +126,13 @@ class Knj::Http2
       @sock.write(@nl)
       
       res = @sock.gets
-      if res.to_s.downcase != "http/1.0 200 connection established#{@nl}"
-        raise res
-      end
+      raise res if res.to_s.downcase != "http/1.0 200 connection established#{@nl}"
       
       res_empty = @sock.gets
       raise "Empty res wasnt empty." if res_empty != @nl
     else
-      @sock_plain = TCPSocket.new(@args[:host], @args[:port])
+      print "Http2: Opening socket connection to '#{@args[:host]}:#{@args[:port]}'.\n" if @debug
+      @sock_plain = TCPSocket.new(@args[:host], @args[:port].to_i)
     end
     
     if @args[:ssl]

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

@@ -164,10 +164,7 @@ class KnjDB_mysql
           sleep 0.5
           self.reconnect
           retry
-        elsif e.message == "This connection is still waiting for a result, try again once you have the result"
-          sleep 0.1
-          retry
-        elsif e.to_s.index("No operations allowed after connection closed") != nil
+        elsif e.to_s.index("No operations allowed after connection closed") != nil or e.message == "This connection is still waiting for a result, try again once you have the result"
           self.reconnect
           retry
         end

data/lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_columns.rb

@@ -10,7 +10,7 @@ class KnjDB_sqlite3::Columns
   #Returns SQL for a knjdb-compatible hash.
   def data_sql(data)
     raise "No type given." if !data["type"]
-    type = data["type"]
+    type = data["type"].to_s
     
     if type == "enum"
       type = "varchar"
@@ -18,12 +18,13 @@ class KnjDB_sqlite3::Columns
     end
     
     data["maxlength"] = 255 if type == "varchar" and !data.key?("maxlength")
+    data["maxlength"] = 11 if type == "int" and !data.key?("maxlength") and !data["autoincr"] and !data["primarykey"]
     type = "integer" if @args[:db].int_types.index(type) and (data["autoincr"] or data["primarykey"])
     
     sql = "`#{data["name"]}` #{type}"
     sql << "(#{data["maxlength"]})" if data["maxlength"] and !data["autoincr"]
-    sql << "(11)" if !data.key?("maxlength") and !data["autoincr"]
     sql << " PRIMARY KEY" if data["primarykey"]
+    sql << " AUTOINCREMENT" if data["autoincr"]
     sql << " NOT NULL" if !data["null"] and data.key?("null")
     
     if data.key?("default_func")
@@ -134,8 +135,7 @@ class KnjDB_sqlite3::Columns::Column
   
   #Returns true if the column is auto-increasing.
   def autoincr?
-    return true if self.name.to_s == "id"
-    return true if @args[:data][:pk].to_i >= 1
+    return true if @args[:data][:pk].to_i == 1 and @args[:data][:type].to_s == "integer"
     return false
   end
   

data/lib/knj/knjdb/dump.rb

@@ -26,7 +26,7 @@ class Knj::Db::Dump
     if @args[:tables]
       tables = @args[:tables]
     else
-      tables = @args[:db].tables.list
+      tables = @args[:db].tables.list.values
     end
     
     if @on_status
@@ -38,7 +38,7 @@ class Knj::Db::Dump
       end
     end
     
-    tables.each do |table_name, table_obj|
+    tables.each do |table_obj|
       table_obj = @args[:db].tables[table_obj] if table_obj.is_a?(String) or table_obj.is_a?(Symbol)
       
       #Figure out keys.

data/lib/knj/knjdb/libknjdb.rb

@@ -1,5 +1,7 @@
-require "rubygems"
-require "wref"
+if !Kernel.const_defined?(:Wref)
+  require "rubygems"
+  require "wref"
+end
 
 #A wrapper of several possible database-types.
 #
@@ -82,7 +84,7 @@ class Knj::Db
   #===Examples
   # driver_instance = db.spawn
   def spawn
-    raise "No type given." if !@opts[:type]
+    raise "No type given (#{@opts.keys.join(",")})." if !@opts[:type]
     
     fpaths = [
       "drivers/#{@opts[:type]}/knjdb_#{@opts[:type]}.rb",

data/lib/knj/knjdb/revision.rb

@@ -100,6 +100,11 @@ class Knj::Db::Revision
                   dochange = true
                 end
                 
+                if col_data.has_key?("autoincr") and col_obj.autoincr? != col_data["autoincr"]
+                  print "Auto-increment mismatch for #{col_str}: #{col_data["autoincr"]}, #{col_obj.autoincr?}\n" if args["debug"]
+                  dochange = true
+                end
+                
                 if col_data.has_key?("maxlength") and col_obj.maxlength.to_s != col_data["maxlength"].to_s
                   print "Maxlength mismatch on #{col_str}: #{col_data["maxlength"]}, #{col_obj.maxlength}\n" if args["debug"]
                   dochange = true

data/lib/knj/memory_analyzer.rb

@@ -259,7 +259,7 @@ class Knj::Memory_analyzer
       ObjectSpace.each_object(classobj) do |obj|
         instances += 1
       end
-    rescue Exception => e
+    rescue => e
       emsg = e.message.to_s
       if emsg.index("no such file to load") != nil or emsg.index("class or module required") != nil or emsg.index("uninitialized constant") != nil
         #return false

data/lib/knj/objects.rb

@@ -18,7 +18,7 @@ class Knj::Objects
     @data = {}
     @lock_require = Monitor.new
     
-    require "wref" if @args[:cache] == :weak
+    require "wref" if @args[:cache] == :weak and !Kernel.const_defined?(:Wref)
     
     #Set up various events.
     @events = Knj::Event_handler.new
@@ -497,7 +497,7 @@ class Knj::Objects
         
         raise "Could not figure out which name-method to call?" if !objhtml
         html << ">#{objhtml}</option>"
-      rescue Exception => e
+      rescue => e
         html << ">[#{object.class.name}: #{e.message}]</option>"
       end
     end

data/lib/knj/php.rb

@@ -38,14 +38,16 @@ module Knj::Php
     supercl = argument.class.superclass
     superstr = supercl.to_s if supercl
     
-    if (Knj.const_defined?(:Datarow_custom) and argument.is_a?(Knj::Datarow_custom)) or argument.is_a?(Hash) or supercl.is_a?(Hash) or cstr == "Knj::Hash_methods" or cstr == "Knjappserver::Session_accessor" or cstr == "SQLite3::ResultSet::HashWithTypes" or cstr == "CGI" or cstr == "Knj::Db_row" or cstr == "Knj::Datarow" or cstr == "Apache::Table" or superstr == "Knj::Db_row" or superstr == "Knj::Datarow" or superstr == "Knj::Datarow_custom" or argument.respond_to?(:to_hash)
+    valids = ["Apache::Table", "CGI", "Hash", "Knj::Datarow", "Knj::Datarow_custom", "Knj::Db_row", "Knj::Hash_methods", "Knjappserver::Session_accessor", "SQLite3::ResultSet::HashWithTypes"]
+    
+    if Knj::Strings.is_a?(argument, valids) or argument.respond_to?(:to_hash)
       if argument.respond_to?(:to_hash)
         argument_use = argument.to_hash
       else
         argument_use = argument
       end
       
-      retstr << argument.class.to_s + "{\n"
+      retstr << "#{argument.class.name}{\n"
       argument_use.each do |pair|
         i = 0
         while(i < count)
@@ -71,7 +73,7 @@ module Knj::Php
       
       retstr << "}\n"
     elsif cstr == "Dictionary"
-      retstr << argument.class.to_s + "{\n"
+      retstr << "#{argument.class.name}{\n"
       argument.each do |key, val|
         i = 0
         while(i < count)
@@ -97,7 +99,7 @@ module Knj::Php
       
       retstr << "}\n"
     elsif argument.is_a?(MatchData) or argument.is_a?(Array) or cstr == "Array" or supercl.is_a?(Array)
-      retstr << argument.class.to_s + "{\n"
+      retstr << "#{argument.class.name}{\n"
       
       arr_count = 0
       argument.to_a.each do |i|
@@ -403,7 +405,7 @@ module Knj::Php
       if File.file?(filepath)
         return true
       end
-    rescue Exception
+    rescue
       return false
     end
     
@@ -412,10 +414,8 @@ module Knj::Php
   
   def is_dir(filepath)
     begin
-      if File.directory?(filepath)
-        return true
-      end
-    rescue Exception
+      return true if File.directory?(filepath)
+    rescue
       return false
     end
     
@@ -484,7 +484,7 @@ module Knj::Php
     begin
       Kernel.const_get(classname)
       return true
-    rescue Exception
+    rescue
       return false
     end
   end
@@ -527,7 +527,7 @@ module Knj::Php
   def fopen(filename, mode)
     begin
       return File.open(filename, mode)
-    rescue Exception
+    rescue
       return false
     end
   end
@@ -535,7 +535,7 @@ module Knj::Php
   def fwrite(fp, str)
     begin
       fp.print str
-    rescue Exception
+    rescue
       return false
     end
     
@@ -545,7 +545,7 @@ module Knj::Php
   def fputs(fp, str)
     begin
       fp.print str
-    rescue Exception
+    rescue
       return false
     end
     
@@ -799,7 +799,7 @@ module Knj::Php
             stdout.each do |str|
               $stdout.print str
             end
-          rescue Exception => e
+          rescue => e
             $stdout.print Knj::Errors.error_str(e)
           end
         end
@@ -810,7 +810,7 @@ module Knj::Php
             stderr.each do |str|
               $stderr.print str
             end
-          rescue Exception => e
+          rescue => e
             $stderr.print Knj::Errors.error_str(e)
           end
         end
@@ -819,6 +819,7 @@ module Knj::Php
         terr.join
       end
     else
+      require "open3"
       Open3.popen3(cmd) do |stdin, stdout, stderr|
         tout = Thread.new do
           begin
@@ -826,7 +827,7 @@ module Knj::Php
             stdout.each do |str|
               $stdout.print str
             end
-          rescue Exception => e
+          rescue => e
             $stdout.print Knj::Errors.error_str(e)
           end
         end
@@ -837,7 +838,7 @@ module Knj::Php
             stderr.each do |str|
               $stderr.print str
             end
-          rescue Exception => e
+          rescue => e
             $stderr.print Knj::Errors.error_str(e)
           end
         end

data/lib/knj/process.rb

@@ -49,7 +49,7 @@ class Knj::Process
       @listen_thread = Knj::Thread.new do
         begin
           self.listen
-        rescue Exception => e
+        rescue => e
           $stderr.print "#{Knj::Errors.error_str(e)}\n\n" if @debug
           @thread_error = e
         end
@@ -125,9 +125,9 @@ class Knj::Process
             
             begin
               @on_rec.call(result_obj)
-            rescue SystemExit => e
+            rescue SystemExit, Interrupt => e
               raise e
-            rescue Exception => e
+            rescue => e
               #Error was raised - try to forward it to the server.
               result_obj.answer("type" => "process_error", "class" => e.class.name, "msg" => e.message, "backtrace" => e.backtrace)
             end
@@ -255,7 +255,7 @@ class Knj::Process
               ensure
                 buffer_thread.join
               end
-            rescue Exception => e
+            rescue => e
               $stderr.print Knj::Errors.error_str(e) if @debug
               #Error was raised - try to forward it to the server.
               result_obj.answer("type" => "process_error", "class" => e.class.name, "msg" => e.message, "backtrace" => e.backtrace)
@@ -276,7 +276,7 @@ class Knj::Process
           $stderr.print "Unknown command: '#{data[0]}'."
           raise "Unknown command: '#{data[0]}'."
       end
-    rescue Exception => e
+    rescue => e
       $stderr.print Knj::Errors.error_str(e) if @debug
       #Error was raised - try to forward it to the server.
       result_obj = Knj::Process::Resultobject.new(:process => self, :id => id, :obj => obj)

data/lib/knj/rhodes/rhodes.rb

@@ -41,7 +41,8 @@ class Knj::Rhodes
       :subtype => "rhodes",
       :path => "#{Rho::RhoApplication.get_user_path}rhodes_default.sqlite3",
       :return_keys => "symbols",
-      :require => false
+      :require => false,
+      :index_append_table_name => true
     )
     
     if @args[:schema]

data/lib/knj/sshrobot/sshrobot.rb

@@ -94,7 +94,7 @@ class Knj::SSHRobot::Forward
         @args[:session].loop do
           true
         end
-      rescue Exception => e
+      rescue => e
         puts e.inspect
         puts e.backtrace
         

data/lib/knj/strings.rb

@@ -12,6 +12,15 @@ module Knj::Strings
     return Knj::Strings.UnixSafe(string)
   end
   
+  #Returns true if given string is regex-compatible.
+  def self.is_regex?(str)
+    if str.to_s.match(/^\/(.+)\/(i|m|x|)$/)
+      return true
+    else
+      return false
+    end
+  end
+  
   #Returns a Regexp-object from the string formatted as what you would give to Php's preg_match.
   def self.regex(str)
     first_char = str[0, 1]
@@ -285,4 +294,23 @@ module Knj::Strings
     total = (hours * 3600) + (minutes * 60) + secs
     return total
   end
+  
+  #Same as 'Class#is_a?' but takes a string instead of the actual class. Then it doesnt get autoloaded or anything like that. It can also test against an array containing string-class-names.
+  def self.is_a?(obj, str)
+    obj_class = obj.class
+    str = str.to_s if !str.is_a?(Array)
+    
+    loop do
+      if str.is_a?(Array)
+        return true if str.index(obj_class.name.to_s) != nil
+      else
+        return true if obj_class.name.to_s == str
+      end
+      
+      obj_class = obj_class.superclass
+      break if !obj_class
+    end
+    
+    return false
+  end
 end

data/lib/knj/thread.rb

@@ -11,7 +11,7 @@ class Knj::Thread < Thread
         yield(*args)
       rescue SystemExit
         exit
-      rescue Exception => e
+      rescue => e
         print "#{Knj::Errors.error_str(e)}\n\n"
       end
     end

data/lib/knj/thread2.rb

@@ -29,7 +29,7 @@ class Knj::Thread2
       rescue SystemExit
         call(:on_exit)
         exit
-      rescue Exception => e
+      rescue => e
         call(:on_error, e)
         
         if !@args.key?(:print_error) or @args[:print_error]

data/lib/knj/threadpool.rb

@@ -205,13 +205,6 @@ class Knj::Threadpool::Worker
     end
   end
   
-  #Sleeps the thread.
-  def stop
-    @mutex_tp.synchronize do
-      @thread.stop
-    end
-  end
-  
   #Kills the thread.
   def kill
     @mutex_tp.synchronize do

data/lib/knj/win_tightvnc.rb

@@ -101,7 +101,7 @@ class Knj::Win::TightVNC
     begin
       @process.GetOwner
       return true
-    rescue Exception => e
+    rescue => e
       return false
     end
   end
@@ -111,7 +111,7 @@ class Knj::Win::TightVNC
     
     begin
       @process.Terminate
-    rescue Exception => e
+    rescue => e
       if e.class.to_s == "WIN32OLERuntimeError" and e.message.index("Terminate") != nil
         #do nothing.
       else

data/spec/strings_spec.rb

@@ -17,5 +17,11 @@ describe "Strings" do
     rescue Knj::Errors::InvalidData
       #this should happen - Ruby doesnt support U-modifier...
     end
+    
+    res = Knj::Strings.is_regex?("Kasper")
+    raise "Expected res to be false but it wasnt." if res
+    
+    res = Knj::Strings.is_regex?("/^Kasper$/")
+    raise "Expected res to be true but it wasnt." if !res
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.41
+  version: 0.0.42
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-25 00:00:00 +02:00
+date: 2012-06-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -188,6 +188,7 @@ files:
 - lib/knj/gtk2_menu.rb
 - lib/knj/gtk2_statuswindow.rb
 - lib/knj/gtk2_tv.rb
+- lib/knj/gtk2_window.rb
 - lib/knj/hash_methods.rb
 - lib/knj/http.rb
 - lib/knj/http2.rb
@@ -377,7 +378,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 632111132898720837
+      hash: -1360014744473154414
       segments: 
       - 0
       version: "0"