knjrbfw 0.0.42 → 0.0.43

data/VERSION

@@ -1 +1 @@
-0.0.42
+0.0.43

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.42"
+  s.version = "0.0.43"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-06-08}
+  s.date = %q{2012-06-10}
   s.description = %q{Including stuff for HTTP, SSH and much more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [
@@ -255,6 +255,7 @@ Gem::Specification.new do |s|
     "lib/knj/youtube.rb",
     "lib/knjrbfw.rb",
     "spec/amixer_spec.rb",
+    "spec/arrayext_spec.rb",
     "spec/cmd_parser_spec.rb",
     "spec/datet_spec.rb",
     "spec/db_spec.rb",

data/lib/knj/arrayext.rb

@@ -230,4 +230,20 @@ module Knj::ArrayExt
     
     return hash
   end
+  
+  #Forces an array to have a certain amount of columns.
+  #===Examples
+  # arr = [1, 2, 3, 4, 5]
+  # Knj::ArrayExt.force_no_cols(:arr => arr, :no => 4) #=> [1, 2, 3, 4]
+  def self.force_no_cols(args)
+    while args[:arr].length > args[:no]
+      args[:arr].slice!(-1)
+    end
+    
+    while args[:arr].length < args[:no]
+      args[:arr] << args[:empty]
+    end
+    
+    return nil
+  end
 end

data/lib/knj/datet.rb

@@ -9,8 +9,70 @@ require "time"
 class Knj::Datet
   attr_accessor :time
   
-  def initialize(time = Time.now)
-    @time = time
+  #Initializes the object. Default is the current time. A time-object can be given.
+  def initialize(time = Time.now, *args)
+    if time.is_a?(Time)
+      @time = time
+    else
+      begin
+        @time = Time.new(*([time] | args))
+      rescue ArgumentError => e
+        days_left = 0
+        months_left = 0
+        hours_left = 0
+        mins_left = 0
+        secs_left = 0
+        usecs_left = 0
+        
+        #Check larger month the allowed.
+        if args[0] and args[0] > 12
+          months_left = args[0] - 12
+          args[0] = 12
+        end
+        
+        #Check larger date than allowed.
+        datet = Knj::Datet.new(time, args[0], 1)
+        dim = datet.days_in_month
+        
+        if args[1] and args[1] > dim
+          days_left = args[1] - dim
+          args[1] = dim if days_left > 0
+        end
+        
+        #Check larger hour than allowed.
+        if args[2] and args[2] >= 24
+          hours_left = args[2] + 1
+          args[2] = 0
+        end
+        
+        #Check larger minute than allowed.
+        if args[3] and args[3] >= 60
+          mins_left = args[3] + 1
+          args[3] = 0
+        end
+        
+        #Check larger secs than allowed.
+        if args[4] and args[4] >= 60
+          secs_left = args[4] + 1
+          args[4] = 0
+        end
+        
+        #Check larger usecs than allowed.
+        if args[5] and args[5] >= 60
+          usecs_left = args[5] + 1
+          args[5] = 0
+        end
+        
+        #Generate new stamp.
+        @time = Time.new(*([time] | args))
+        self.mins + mins_left if mins_left > 0
+        self.hours + hours_left if hours_left > 0
+        self.days + days_left if days_left > 0
+        self.months + months_left if months_left > 0
+        self.secs + secs_left if secs_left > 0
+        self.usecs + usecs_left if usecs_left > 0
+      end
+    end
   end
   
   #Goes forward day-by-day and stops at a date matching the criteria given.
@@ -45,6 +107,48 @@ class Knj::Datet
     end
   end
   
+  #Add a given amount of seconds to the object.
+  def add_usecs(usecs = 1)
+    usecs = usecs.to_i
+    cur_usecs = @time.usec
+    next_usec  = cur_usecs + usecs
+    
+    if next_usec >= 60
+      @time = self.add_secs(1).stamp(:datet => false, :usec => 0)
+      usecs_left = (usecs - 1) - (60 - cur_usecs)
+      return self.add_usecs(usecs_left) if usecs_left > 0
+    elsif next_usec < 0
+      @time = self.add_secs(-1).stamp(:datet => false, :usec => 59)
+      usecs_left = usecs + cur_usecs + 1
+      self.add_usecs(usecs_left) if usecs_left > 0
+    else
+      @time = self.stamp(:datet => false, :usec => next_usec)
+    end
+    
+    return self
+  end
+  
+  #Add a given amount of seconds to the object.
+  def add_secs(secs = 1)
+    secs = secs.to_i
+    cur_secs = @time.sec
+    next_sec  = cur_secs + secs
+    
+    if next_sec >= 60
+      @time = self.add_mins(1).stamp(:datet => false, :sec => 0)
+      secs_left = (secs - 1) - (60 - cur_secs)
+      return self.add_secs(secs_left) if secs_left > 0
+    elsif next_sec < 0
+      @time = self.add_mins(-1).stamp(:datet => false, :sec => 59)
+      secs_left = secs + cur_secs + 1
+      self.add_secs(secs_left) if secs_left > 0
+    else
+      @time = self.stamp(:datet => false, :sec => next_sec)
+    end
+    
+    return self
+  end
+  
   #Add a given amount of minutes to the object.
   #===Examples
   # datet = Knj::Datet.new #=> 2012-05-03 17:39:45 +0200
@@ -234,6 +338,16 @@ class Knj::Datet
     return @time.min
   end
   
+  #Returns the seconds as an integer.
+  def sec
+    return @time.sec
+  end
+  
+  #Returns the microsecond as an integer.
+  def usec
+    return @time.usec
+  end
+  
   #Changes the year to the given year.
   # datet = Knj::Datet.now #=> 2014-05-03 17:46:11 +0200
   # datet.year = 2005
@@ -373,6 +487,8 @@ class Knj::Datet
     return self.add_days(val) if @mode == :days
     return self.add_months(val) if @mode == :months
     return self.add_mins(val) if @mode == :mins
+    return self.add_secs(val) if @mode == :secs
+    return self.add_usecs(val) if @mode == :usecs
     raise "No such mode: #{@mode}"
   end
   
@@ -414,6 +530,18 @@ class Knj::Datet
     return self
   end
   
+  #Sets the mode to seconds and gets ready to plus or minus.
+  def secs
+    @mode = :secs
+    return self
+  end
+  
+  #Sets the mode to mili-seconds and gets ready to plus or minus.
+  def usecs
+    @mode = :usecs
+    return self
+  end
+  
   #Sets the mode to days and gets ready to plus or minus.
   #===Examples
   # datet.time #=> 2005-05-08 22:51:11 +0200
@@ -448,13 +576,13 @@ class Knj::Datet
   #===Examples
   # time = datet.stamp(:datet => false, :min => 15, :day => 5) #=> 2012-07-05 05:15:20 +0200
   def stamp(args)
-    vars = {:year => @time.year, :month => @time.month, :day => @time.day, :hour => @time.hour, :min => @time.min, :sec => @time.sec}
+    vars = {:year => @time.year, :month => @time.month, :day => @time.day, :hour => @time.hour, :min => @time.min, :sec => @time.sec, :usec => @time.usec}
     
     args.each do |key, value|
       vars[key.to_sym] = value.to_i if key != :datet
     end
     
-    time = Time.local(vars[:year], vars[:month], vars[:day], vars[:hour], vars[:min], vars[:sec])
+    time = Time.local(vars[:year], vars[:month], vars[:day], vars[:hour], vars[:min], vars[:sec], vars[:usec])
     
     if !args.key?(:datet) or args[:datet]
       return Knj::Datet.new(time)
@@ -632,7 +760,7 @@ class Knj::Datet
       #Datet.code format
       return Knj::Datet.new(Time.local(match[1], match[2], match[3], match[4], match[5], match[6], match[7]))
     elsif match = timestr.to_s.match(/^\s*(\d{4})-(\d{1,2})-(\d{1,2})(|\s+(\d{2}):(\d{2}):(\d{2})(|\.\d+)\s*)(|\s+(UTC))(|\s+(\+|\-)(\d{2})(\d{2}))$/)
-      #Database date format (with possibility of .0 in the end - miliseconds? -knj.
+      #Database date format (with possibility of .0 in the end - microseconds? -knj.
       
       if match[11] and match[13] and match[14]
         if match[12] == "+" or match[12] == "-"

data/lib/knj/http2.rb

@@ -212,6 +212,10 @@ class Knj::Http2
       #headers["Accept-Encoding"] = "none"
     end
     
+    if @args[:basic_auth]
+      headers["Authorization"] = "Basic #{Base64.encode64("#{@args[:basic_auth][:user]}:#{@args[:basic_auth][:passwd]}")}"
+    end
+    
     return headers
   end
   

data/lib/knj/os.rb

@@ -127,6 +127,7 @@ module Knj::Os
         end
       end
     else
+      require "open3"
       Open3.popen3(cmd) do |stdin, stdout, stderr|
         res[:out] << stdout.read
         res[:err] << stderr.read

data/lib/knj/unix_proc.rb

@@ -26,8 +26,8 @@ class Knj::Unix_proc
     grepstr = ""
     
     if args["grep"]
-      grepstr = "grep #{Knj::Strings.unixsafe(args["grep"])}"
-      cmdstr << " | #{grepstr}"
+      grepstr = "grep #{args["grep"]}" #used for ignoring the grep-process later.
+      cmdstr << " | grep #{Knj::Strings.unixsafe(args["grep"])}"
     end
     
     MUTEX.synchronize do

data/lib/knj/web.rb

@@ -369,11 +369,11 @@ class Knj::Web
     elsif args[:type] == :spacer
       html << "<tr#{classes_tr_html}><td colspan=\"2\">&nbsp;</td></tr>"
     else
-      html << "<tr#{classes_tr_html}>"
-      html << "<td class=\"tdt\">"
+      html << "<tr#{classes_tr_html} id=\"#{Knj::Web.html("#{args[:id]}_tr")}\">"
+      html << "<td class=\"tdt\" id=\"#{Knj::Web.html("#{args[:id]}_label")}\"><div>"
       html << title_html
-      html << "</td>"
-      html << "<td#{self.style_html(css)} class=\"tdc\">"
+      html << "</div></td>"
+      html << "<td#{self.style_html(css)} class=\"tdc\" id=\"#{Knj::Web.html("#{args[:id]}_content")}\"><div>"
       
       if args[:type] == :textarea
         if args.key?(:height)
@@ -385,7 +385,6 @@ class Knj::Web
         end
         
         html << "<textarea#{self.style_html(css)} class=\"input_textarea\" name=\"#{args[:name].html}\" id=\"#{args[:id].html}\">#{value}</textarea>"
-        html << "</td>"
       elsif args[:type] == :fckeditor
         args[:height] = 400 if !args[:height]
         
@@ -394,8 +393,6 @@ class Knj::Web
         fck.Height = args[:height].to_i
         fck.Value = value
         html << fck.CreateHtml
-        
-        html << "</td>"
       elsif args[:type] == :select
         attr["multiple"] = "multiple" if args[:multiple]
         attr["size"] = args["size"] if args[:size]
@@ -403,7 +400,6 @@ class Knj::Web
         html << "<select#{self.attr_html(attr)}>"
         html << Knj::Web.opts(args[:opts], value, args[:opts_args])
         html << "</select>"
-        html << "</td>"
       elsif args[:type] == :imageupload
         html << "<table class=\"designtable\"><tr#{classes_tr_html}><td style=\"width: 100%;\">"
         html << "<input type=\"file\" name=\"#{args[:name].html}\" class=\"input_file\" />"
@@ -423,11 +419,10 @@ class Knj::Web
         end
         
         html << "</td></tr></table>"
-        html << "</td>"
       elsif args[:type] == :file
-        html << "<input type=\"#{args[:type].to_s}\" class=\"input_#{args[:type].to_s}\" name=\"#{args[:name].html}\" /></td>"
+        html << "<input type=\"#{args[:type].to_s}\" class=\"input_#{args[:type].to_s}\" name=\"#{args[:name].html}\" />"
       elsif args[:type] == :textshow or args[:type] == :info
-        html << "#{value}</td>"
+        html << value.to_s
       elsif args[:type] == :plain
         html << "#{Knj::Php.nl2br(Knj::Web.html(value))}"
       elsif args[:type] == :editarea
@@ -450,13 +445,16 @@ class Knj::Web
         html << "editAreaLoader.init(#{Knj::Php.json_encode(jshash)});"
         html << "}"
         html << "</script>"
+      elsif args[:type] == :numeric
+        attr[:type] = :text
+        attr[:value] = value
+        html << "<input#{self.attr_html(attr)} />"
       else
         attr[:value] = value
-        html << "<input#{self.attr_html(attr)} /></td>"
-        html << "</td>"
+        html << "<input#{self.attr_html(attr)} />"
       end
       
-      html << "</tr>"
+      html << "</div></td></tr>"
     end
     
     html << "<tr#{classes_tr_html}><td colspan=\"2\" class=\"tdd\">#{args[:descr]}</td></tr>" if args[:descr]

data/spec/arrayext_spec.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "ArrayExt" do
+  it "should be able to make ago-strings" do
+    arr = [1, 2]
+    Knj::ArrayExt.force_no_cols(:arr => arr, :no => 1)
+    raise "Expected length of 1 but got: #{arr.length}" if arr.length != 1
+    raise "Expected element to be 1 but it wasnt: #{arr[0]}" if arr[0] != 1
+    
+    Knj::ArrayExt.force_no_cols(:arr => arr, :no => 3, :empty => "test")
+    raise "Expected length of 3 but got: #{arr.lengtj}" if arr.length != 3
+    raise "Expected element 2 to be 'test' but it wasnt: #{arr[2]}" if arr[2] != "test"
+  end
+end

data/spec/datet_spec.rb

@@ -70,4 +70,29 @@ describe "Datet" do
     raise "Date1 was wrongly not the same as date3." if date1 != date3
     raise "Date1 was the same as date2?" if date1 == date2
   end
+  
+  it "various methods should just work" do
+    date = Knj::Datet.new(1985, 6, 17)
+    raise "Invalid days in month: #{date.days_in_month}" if date.days_in_month != 30
+  end
+  
+  it "should be able to handle invalid timestamps" do
+    datet = Knj::Datet.new(2012, 3, 40)
+    raise "Expected dbstr to be '2012-04-09' but it wasnt: '#{datet.dbstr(:time => false)}'." if datet.dbstr(:time => false) != "2012-04-09"
+    
+    datet = Knj::Datet.new(2012, 14)
+    raise "Expected dbstr to be '2013-02-01' but it wasnt: '#{datet.dbstr(:time => false)}'." if datet.dbstr(:time => false) != "2013-02-01"
+    
+    datet = Knj::Datet.new(1985, 6, 17, 28)
+    raise "Expected dbstr to be '1985-06-18 04:00:00' but it wasnt: '#{datet.dbstr}'." if datet.dbstr != "1985-06-18 04:00:00"
+    
+    datet = Knj::Datet.new(1985, 6, 17, 28, 68)
+    raise "Expected dbstr to be '1985-06-18 05:08:00' but it wasnt: '#{datet.dbstr}'." if datet.dbstr != "1985-06-18 05:08:00"
+    
+    datet = Knj::Datet.new(1985, 6, 17, 28, 68, 68)
+    raise "Expected dbstr to be '1985-06-18 05:09:08' but it wasnt: '#{datet.dbstr}'." if datet.dbstr != "1985-06-18 05:09:08"
+    
+    datet = Knj::Datet.new(1985, 6, 17, 28, 68, 68, 68)
+    raise "Expected dbstr to be '1985-06-18 05:09:09' but it wasnt: '#{datet.dbstr}'." if datet.dbstr != "1985-06-18 05:09:09"
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.42
+  version: 0.0.43
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-08 00:00:00 +02:00
+date: 2012-06-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -349,6 +349,7 @@ files:
 - lib/knj/youtube.rb
 - lib/knjrbfw.rb
 - spec/amixer_spec.rb
+- spec/arrayext_spec.rb
 - spec/cmd_parser_spec.rb
 - spec/datet_spec.rb
 - spec/db_spec.rb
@@ -378,7 +379,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1360014744473154414
+      hash: -2508696839394262150
       segments: 
       - 0
       version: "0"