knjrbfw 0.0.7 → 0.0.8

data/Gemfile

@@ -10,5 +10,7 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.3"
   gem "rcov", ">= 0"
-  gem "sqlite3"
+  gem "sqlite3" if RUBY_ENGINE != "jruby"
+  gem "rmagick" if RUBY_ENGINE != "jruby"
+  gem "rmagick4j" if RUBY_ENGINE == "jruby"
 end

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2011-08-03}
+  s.date = %q{2011-11-15}
   s.description = %q{Including stuff for HTTP, SSH and much more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [
@@ -20,13 +20,13 @@ Gem::Specification.new do |s|
     ".document",
     ".rspec",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
     "VERSION",
     "knjrbfw.gemspec",
     "lib/knj/.gitignore",
+    "lib/knj/amixer.rb",
     "lib/knj/arrayext.rb",
     "lib/knj/autoload.rb",
     "lib/knj/autoload/activesupport.rb",
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
     "lib/knj/autoload/twitter.rb",
     "lib/knj/autoload/xmlsimple.rb",
     "lib/knj/autoload/zip.rb",
+    "lib/knj/cmd_gen.rb",
     "lib/knj/compiler.rb",
     "lib/knj/cpufreq.rb",
     "lib/knj/datarow.rb",
@@ -74,6 +75,7 @@ Gem::Specification.new do |s|
     "lib/knj/event_handler.rb",
     "lib/knj/exchangerates.rb",
     "lib/knj/ext/webrick.rb",
+    "lib/knj/facebook_connect.rb",
     "lib/knj/filesystem.rb",
     "lib/knj/fs/drivers/filesystem.rb",
     "lib/knj/fs/drivers/ftp.rb",
@@ -89,6 +91,8 @@ Gem::Specification.new do |s|
     "lib/knj/gtk2_tv.rb",
     "lib/knj/hash_methods.rb",
     "lib/knj/http.rb",
+    "lib/knj/http2.rb",
+    "lib/knj/image.rb",
     "lib/knj/includes/appserver_cli.rb",
     "lib/knj/ip2location.rb",
     "lib/knj/ironruby-gtk2/button.rb",
@@ -208,6 +212,7 @@ Gem::Specification.new do |s|
     "lib/knj/tests/compiler/compiler_test.rb",
     "lib/knj/tests/compiler/compiler_test_file.rb",
     "lib/knj/tests/test_degulesider.rb",
+    "lib/knj/tests/test_http2.rb",
     "lib/knj/tests/test_mount.rb",
     "lib/knj/tests/test_retry.rb",
     "lib/knj/thread.rb",
@@ -224,8 +229,10 @@ Gem::Specification.new do |s|
     "lib/knj/x11vnc.rb",
     "lib/knj/youtube.rb",
     "lib/knjrbfw.rb",
+    "spec/amixer_spec.rb",
     "spec/knjrbfw_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "testfiles/image.jpg"
   ]
   s.homepage = %q{http://github.com/kaspernj/knjrbfw}
   s.licenses = ["MIT"]
@@ -242,12 +249,14 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.3"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<rmagick>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<rmagick>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
@@ -255,6 +264,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<rmagick>, [">= 0"])
   end
 end
 

data/lib/knj/amixer.rb

@@ -0,0 +1,148 @@
+#This class is a Ruby-interface to the amixer-binary. It can read and set the volume.
+class Knj::Amixer
+  attr_reader :args
+  
+  def initialize(args = {})
+    @args = {
+      :amixer_bin => "/usr/bin/amixer",
+      :aplay_bin => "/usr/bin/aplay"
+    }.merge(args)
+    
+    @devices = {}
+  end
+  
+  #Returns a hash with devices.
+  def devices
+    ret = %x[#{@args[:aplay_bin]} -l]
+    
+    ret.scan(/card (\d+): (.+?) \[(.+?)\],/) do |match|
+      id = match[0]
+      
+      if !@devices.key?(id)
+        @devices[id] = Knj::Amixer::Device.new(
+          :amixer => self,
+          :id => id,
+          :name => match[2],
+          :code => match[1]
+        )
+      end
+    end
+    
+    return @devices
+  end
+  
+  class Device
+    def initialize(args)
+      @args = args
+      @mixers = {}
+    end
+    
+    def id
+      return @args[:id]
+    end
+    
+    def name
+      return @args[:name]
+    end
+    
+    def code
+      return @args[:code]
+    end
+    
+    def amixer
+      return @args[:amixer]
+    end
+    
+    #Returns true if the device is active by looking in '/proc/asounc/card*/pcm*/sub*/status'.
+    def active?(args = {})
+      proc_path = "/proc/asound/#{@args[:code]}"
+      
+      Dir.foreach(proc_path) do |file|
+        next if file == "." or file == ".." or !file.match(/^pcm(\d+)[a-z]+$/)
+        sub_path = "#{proc_path}/#{file}"
+        info_path = "#{sub_path}/info"
+        info_cont = File.read(info_path)
+        
+        if stream_match = info_cont.match(/stream: (.+?)\s+/)
+          next if args.key?(:stream) and stream_match[1] != args[:stream]
+        end
+        
+        Dir.foreach(sub_path) do |file_sub|
+          next if file_sub == "." or file_sub == ".." or !file_sub.match(/^sub(\d+)$/)
+          status_path = "#{sub_path}/#{file_sub}/status"
+          cont = File.read(status_path)
+          return true if cont.strip != "closed"
+        end
+      end
+      
+      return false
+    end
+    
+    #Returns a hash of the various mixers.
+    def mixers
+      ret = %x[#{@args[:amixer].args[:amixer_bin]} -c #{@args[:id]} scontrols]
+      
+      ret.scan(/Simple mixer control '(.+)',0/) do |match|
+        name = match[0]
+        
+        if !@mixers.key?(name)
+          @mixers[name] = Knj::Amixer::Mixer.new(
+            :amixer => @args[:amixer],
+            :device => self,
+            :name => name
+          )
+        end
+      end
+      
+      return @mixers
+    end
+  end
+  
+  #This class controls each mixer.
+  class Mixer
+    def initialize(args)
+      @args = args
+    end
+    
+    #Returns the name of the mixer (example: Master).
+    def name
+      return @args[:name]
+    end
+    
+    #Returns a bool. If the mixer supports volume-operations (some mixers are just switches and doenst support volume).
+    def volume?
+      ret = %x[#{@args[:amixer].args[:amixer_bin]} -c #{@args[:device].id} sget "#{@args[:name]}"]
+      raise "No content for mixer: '#{@args[:name]}'." if !ret
+      
+      match = ret.match(/(Capture|Playback) (\d+) \[(\d+%)\]/)
+      return false if !match
+      return true
+    end
+    
+    #Returns the volume-value as an integer (or as the percent if {:percent => true} if given in arguments).
+    def vol(args = {})
+      ret = %x[#{@args[:amixer].args[:amixer_bin]} -c #{@args[:device].id} sget "#{@args[:name]}"]
+      raise "No content for mixer: '#{@args[:name]}'." if !ret
+      
+      match = ret.match(/(Capture|Playback) (\d+) \[(\d+%)\]/)
+      raise "Couldnt figure out volume for '#{@args[:name]}' from:\n'#{ret}'\n" if !match
+      
+      return match[3].to_i if args[:percent]
+      return match[2].to_i
+    end
+    
+    #Sets a new value for the volume.
+    def vol=(newvol)
+      ret = %x[#{@args[:amixer].args[:amixer_bin]} -c #{@args[:device].id} sset "#{@args[:name]}" "#{newvol}"]
+      #NOTE: Do some error handeling here?
+    end
+    
+    #Adds a number to the volume.
+    def vol_add(add_vol)
+      vol = self.vol
+      newvol = vol + add_vol.to_i
+      newvol = 0 if newvol < 0
+      self.vol=(newvol)
+    end
+  end
+end

data/lib/knj/arrayext.rb

@@ -24,7 +24,7 @@ module Knj::ArrayExt
 			value = value if !args[:key]
 			
 			if args[:callback]
-        if args[:callback].is_a?(Proc)
+        if args[:callback].is_a?(Proc) or args[:callback].is_a?(Method)
           value = args[:callback].call(value)
         else
           value = Knj::Php.call_user_func(args[:callback], value) if args[:callback]
@@ -94,9 +94,9 @@ module Knj::ArrayExt
 	
 	#Compares the keys and values of two hashes and returns true if they are different.
 	def self.hash_diff?(h1, h2, args = {})
-		if !args.has_key?("h1_to_h2") or args["h1_to_h2"]
+		if !args.key?("h1_to_h2") or args["h1_to_h2"]
 			h1.each do |key, val|
-				return true if !h2.has_key?(key)
+				return true if !h2.key?(key)
 				
 				hash_val = h2[key].to_s
 				hash_val = hash_val.force_encoding("UTF-8") if hash_val.respond_to?(:force_encoding)
@@ -108,9 +108,9 @@ module Knj::ArrayExt
 			end
 		end
 		
-		if !args.has_key?("h2_to_h1") or args["h2_to_h1"]
+		if !args.key?("h2_to_h1") or args["h2_to_h1"]
 			h2.each do |key, val|
-				return true if !h1.has_key?(key)
+				return true if !h1.key?(key)
 				
 				hash_val = h1[key].to_s
 				hash_val = hash_val.force_encoding("UTF-8") if hash_val.respond_to?(:force_encoding)
@@ -154,4 +154,13 @@ module Knj::ArrayExt
 		
 		return Digest::MD5.hexdigest(hashes.join("_"))
 	end
+	
+	#Validates a hash of data.
+	def self.validate_hash(h, args)
+    h.each do |key, val|
+      if args.key?(:not_empty) and args[:not_empty].index(key) != nil and val.to_s.strip.length <= 0
+        raise Knj::Errors::InvalidData, sprintf(args[:not_empty_error], key)
+      end
+    end
+	end
 end

data/lib/knj/autoload.rb

@@ -1,61 +1,66 @@
 $knjpath = File.dirname(__FILE__) + "/" if !$knjpath
-require "#{$knjpath}/knj.rb"
+require "#{$knjpath}/knj"
 
 module Knj
-	autoload :ArrayExt, $knjpath + "arrayext.rb"
-	autoload :Datestamp, $knjpath + "datestamp.rb"
-	autoload :Datet, $knjpath + "datet.rb"
-	autoload :Compiler, $knjpath + "compiler.rb"
-	autoload :Cpufreq, $knjpath + "cpufreq.rb"
-	autoload :Datarow, $knjpath + "datarow.rb"
-	autoload :Db, $knjpath + "knjdb/libknjdb.rb"
-	autoload :Db_row, $knjpath + "knjdb/libknjdb_row.rb"
-	autoload :Degulesider, $knjpath + "degulesider.rb"
-	autoload :Errors, $knjpath + "errors.rb"
-	autoload :Eruby, $knjpath + "eruby.rb"
-	autoload :Event_filemod, $knjpath + "event_filemod.rb"
-	autoload :Event_handler, $knjpath + "event_handler.rb"
-	autoload :Exchangerates, $knjpath + "exchangerates.rb"
-	autoload :Fs, $knjpath + "fs/fs.rb"
-	autoload :Filesystem, $knjpath + "filesystem.rb"
-	autoload :Gettext_threadded, $knjpath + "gettext_threadded.rb"
-	autoload :Hash_methods, $knjpath + "hash_methods.rb"
-	autoload :Ip2location, $knjpath + "ip2location.rb"
-	autoload :Jruby_compiler, $knjpath + "jruby_compiler.rb"
-	autoload :Locales, $knjpath + "locales.rb"
-	autoload :Objects, $knjpath + "objects.rb"
-	autoload :Opts, $knjpath + "opts.rb"
-	autoload :Mail, $knjpath + "mail.rb"
-	autoload :Mailobj, $knjpath + "mailobj.rb"
-	autoload :Mutexcl, $knjpath + "mutexcl.rb"
-	autoload :Mount, $knjpath + "mount.rb"
-	autoload :Mplayer, $knjpath + "mplayer.rb"
-	autoload :Notify, $knjpath + "notify.rb"
-	autoload :Nvidia_settings, $knjpath + "nvidia_settings.rb"
-	autoload :Web, $knjpath + "web.rb"
-	autoload :Google_sitemap, $knjpath + "google_sitemap.rb"
-	autoload :Http, $knjpath + "http.rb"
-	autoload :Sms, $knjpath + "sms.rb"
-	autoload :Os, $knjpath + "os.rb"
-	autoload :Gtk2, $knjpath + "gtk2.rb"
-	autoload :Php, $knjpath + "php.rb"
-	autoload :Php_parser, $knjpath + "php_parser/php_parser.rb"
-	autoload :Power_manager, $knjpath + "power_manager.rb"
-	autoload :Rand, $knjpath + "rand.rb"
-	autoload :Retry, $knjpath + "retry.rb"
-	autoload :RSVGBIN, $knjpath + "rsvgbin.rb"
-	autoload :Strings, $knjpath + "strings.rb"
-	autoload :SSHRobot, $knjpath + "sshrobot/sshrobot.rb"
-	autoload :Sysuser, $knjpath + "sysuser.rb"
-	autoload :Thread, $knjpath + "thread.rb"
-	autoload :Thread2, $knjpath + "thread2.rb"
-	autoload :Threadpool, $knjpath + "threadpool.rb"
-	autoload :Threadhandler, $knjpath + "threadhandler.rb"
-	autoload :Translations, $knjpath + "translations.rb"
-	autoload :X11VNC, $knjpath + "x11vnc.rb"
-	autoload :Unix_proc, $knjpath + "unix_proc.rb"
-	autoload :YouTube, $knjpath + "youtube.rb"
-	autoload :Win, $knjpath + "win.rb"
+  autoload :Amixer, $knjpath + "amixer"
+	autoload :ArrayExt, $knjpath + "arrayext"
+	autoload :Datestamp, $knjpath + "datestamp"
+	autoload :Datet, $knjpath + "datet"
+	autoload :Cmd_gen, $knjpath + "cmd_gen"
+	autoload :Compiler, $knjpath + "compiler"
+	autoload :Cpufreq, $knjpath + "cpufreq"
+	autoload :Datarow, $knjpath + "datarow"
+	autoload :Db, $knjpath + "knjdb/libknjdb"
+	autoload :Db_row, $knjpath + "knjdb/libknjdb_row"
+	autoload :Degulesider, $knjpath + "degulesider"
+	autoload :Errors, $knjpath + "errors"
+	autoload :Eruby, $knjpath + "eruby"
+	autoload :Event_filemod, $knjpath + "event_filemod"
+	autoload :Event_handler, $knjpath + "event_handler"
+	autoload :Exchangerates, $knjpath + "exchangerates"
+	autoload :Facebook_connect, $knjpath + "facebook_connect"
+	autoload :Fs, $knjpath + "fs/fs"
+	autoload :Filesystem, $knjpath + "filesystem"
+	autoload :Gettext_threadded, $knjpath + "gettext_threadded"
+	autoload :Hash_methods, $knjpath + "hash_methods"
+	autoload :Http, $knjpath + "http"
+	autoload :Http2, $knjpath + "http2"
+	autoload :Image, $knjpath + "image"
+	autoload :Ip2location, $knjpath + "ip2location"
+	autoload :Jruby_compiler, $knjpath + "jruby_compiler"
+	autoload :Locales, $knjpath + "locales"
+	autoload :Objects, $knjpath + "objects"
+	autoload :Opts, $knjpath + "opts"
+	autoload :Mail, $knjpath + "mail"
+	autoload :Mailobj, $knjpath + "mailobj"
+	autoload :Mutexcl, $knjpath + "mutexcl"
+	autoload :Mount, $knjpath + "mount"
+	autoload :Mplayer, $knjpath + "mplayer"
+	autoload :Notify, $knjpath + "notify"
+	autoload :Nvidia_settings, $knjpath + "nvidia_settings"
+	autoload :Web, $knjpath + "web"
+	autoload :Google_sitemap, $knjpath + "google_sitemap"
+	autoload :Sms, $knjpath + "sms"
+	autoload :Os, $knjpath + "os"
+	autoload :Gtk2, $knjpath + "gtk2"
+	autoload :Php, $knjpath + "php"
+	autoload :Php_parser, $knjpath + "php_parser/php_parser"
+	autoload :Power_manager, $knjpath + "power_manager"
+	autoload :Rand, $knjpath + "rand"
+	autoload :Retry, $knjpath + "retry"
+	autoload :RSVGBIN, $knjpath + "rsvgbin"
+	autoload :Strings, $knjpath + "strings"
+	autoload :SSHRobot, $knjpath + "sshrobot/sshrobot"
+	autoload :Sysuser, $knjpath + "sysuser"
+	autoload :Thread, $knjpath + "thread"
+	autoload :Thread2, $knjpath + "thread2"
+	autoload :Threadpool, $knjpath + "threadpool"
+	autoload :Threadhandler, $knjpath + "threadhandler"
+	autoload :Translations, $knjpath + "translations"
+	autoload :X11VNC, $knjpath + "x11vnc"
+	autoload :Unix_proc, $knjpath + "unix_proc"
+	autoload :YouTube, $knjpath + "youtube"
+	autoload :Win, $knjpath + "win"
 end
 
 #ruby objects.
@@ -77,7 +82,7 @@ autoload :Mysql, $knjpath + "autoload/mysql"
 autoload :Open3, "open3"
 autoload :OpenSSL, "openssl"
 autoload :OptionParser, "optparse"
-autoload :ParseDate, $knjpath + "autoload/backups/parsedate.rb"
+autoload :ParseDate, $knjpath + "autoload/backups/parsedate"
 autoload :Pathname, "pathname"
 autoload :Ping, $knjpath + "autoload/ping"
 autoload :REXML, $knjpath + "autoload/rexml"
@@ -90,9 +95,10 @@ autoload :TCPServer, "socket"
 autoload :URI, "uri"
 autoload :Win32, "win32/registry"
 autoload :WIN32OLE, "win32ole"
+autoload :WeakRef, "weakref"
 autoload :WEBrick, "webrick"
 autoload :XmlSimple, $knjpath + "autoload/xmlsimple"
-autoload :Zip, $knjpath + "autoload/zip.rb"
+autoload :Zip, $knjpath + "autoload/zip"
 autoload :Zlib, "zlib"
 
 if RUBY_PLATFORM == "java"

data/lib/knj/autoload/backups/facets_dictionary.rb

@@ -237,7 +237,7 @@ class Dictionary
   end
 
   def store( a,b )
-    @order.push( a ) unless @hash.has_key?( a )
+    @order.push( a ) unless @hash.key?( a )
     @hash.store( a,b )
   end
 
@@ -403,7 +403,7 @@ class Dictionary
   end
 
   def has_key?(key)
-    @hash.has_key?(key)
+    @hash.key?(key)
   end
 
   def key?(key)