libnotify 0.5.1 → 0.5.4

data/.gitignore

@@ -1,6 +1,6 @@
 doc
-pkg
 coverage
+pkg
 tags
 .yardoc
 .bundle

data/Rakefile

@@ -1,11 +1,10 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-RUBIES = %w[ree 1.9.2 jruby]
-
 require 'rake'
 require 'rake/rdoctask'
 require 'rubygems'
+load 'libnotify/tasks/rubies.rake'
 
 # Test
 require 'rake/testtask'
@@ -17,20 +16,6 @@ Rake::TestTask.new(:test) do |test|
   test.libs << 'test'
   test.verbose = true
 end
-
-desc "Test with several ruby versions"
-task :"test:rubies" do
-  command = "bundle check || bundle install && rake"
-  RUBIES.each do |ruby|
-    rvm = "#{ruby}@libnotify"
-    puts "\n" * 3
-    puts "RVM: #{rvm}"
-    puts "=" * 40
-
-    system %{rvm #{rvm} exec bash -c '#{command}'}
-  end
-end
-
 # Yard
 begin
   require 'yard'

data/lib/libnotify/api.rb

@@ -14,11 +14,27 @@ module Libnotify
     end
 
     self.icon_dirs = [
-      "/usr/share/icons/gnome/48x48/emblems",
-      "/usr/share/icons/gnome/256x256/emblems",
-      "/usr/share/icons/gnome/*/emblems"
+      "/usr/share/icons/gnome/*/emblems",
+      "/usr/share/icons/gnome/*/emotes"
     ]
 
+    # TODO refactor & test!
+    ICON_REGEX = /(\d+)x\d/
+    ICON_SORTER = proc do |a, b|
+      ma = a.scan ICON_REGEX
+      mb = b.scan ICON_REGEX
+
+      if ma.first && mb.first
+        mb.first.first.to_i <=> ma.first.first.to_i
+      elsif ma.first && !mb.first
+        1
+      elsif !ma.first && ma.first
+        -1
+      else
+        a <=> b
+      end
+    end
+
     # Creates a notification object.
     #
     # @see Libnotify.new
@@ -42,7 +58,7 @@ module Libnotify
     def show!
       notify_init(self.class.to_s) or raise "notify_init failed"
       notify = notify_notification_new(summary, body, icon_path, nil)
-      notify_notification_set_urgency(notify, urgency)
+      notify_notification_set_urgency(notify, lookup_urgency(urgency))
       notify_notification_set_timeout(notify, timeout || -1)
       if append
         notify_notification_set_hint_string(notify, "x-canonical-append", "")
@@ -82,15 +98,8 @@ module Libnotify
       when /^\// # absolute
         @icon_path = path
       when String
-        # TODO refactor!
-        self.class.icon_dirs.map { |d| Dir[d] }.flatten.uniq.each do |dir|
-          full_path = File.join(dir, path)
-          if File.exist?(full_path)
-            @icon_path = full_path
-            return
-          end
-        end
-        @icon_path = path
+        list = self.class.icon_dirs.map { |d| Dir[File.join(d, path)] }.flatten.sort(&ICON_SORTER)
+        @icon_path = list.detect { |full_path| File.exist?(full_path) } || path
       when Symbol
         self.icon_path = "#{path}.png"
       else

data/lib/libnotify/ffi.rb

@@ -11,19 +11,23 @@ module Libnotify
       warn e.message
     end
 
-    enum :urgency, [ :low, :normal, :critical ]
+    URGENCY = [ :low, :normal, :critical ]
 
     def self.attach_functions!
       attach_function :notify_init,                         [:string],                              :bool
       attach_function :notify_uninit,                       [],                                     :void
       attach_function :notify_notification_new,             [:string, :string, :string, :pointer],  :pointer
-      attach_function :notify_notification_set_urgency,     [:pointer, :urgency],                   :void
+      attach_function :notify_notification_set_urgency,     [:pointer, :int],                       :void
       attach_function :notify_notification_set_timeout,     [:pointer, :long],                      :void
       attach_function :notify_notification_set_hint_string, [:pointer, :string, :string],           :void
       attach_function :notify_notification_clear_hints,     [:pointer],                             :void
       attach_function :notify_notification_show,            [:pointer, :pointer],                   :bool
     end
 
+    def lookup_urgency(urgency)
+      URGENCY.index(urgency)
+    end
+
     def method_missing(method, *args, &block)
       if method.to_s =~ /^notify_/
         warn "libnotify.so not found!"

data/lib/libnotify/tasks/rubies.rake

@@ -0,0 +1,44 @@
+SUPPORTED_RUBIES = %w[ree 1.9.2 jruby rbx]
+
+GEMSPEC = Bundler::GemHelper.new(Dir.pwd).gemspec
+
+def with_rubies(command)
+  SUPPORTED_RUBIES.each do |ruby|
+    with_ruby(ruby, command)
+  end
+end
+
+def with_ruby(ruby, command)
+  rvm     = "#{ruby}@#{GEMSPEC.name}"
+  command = %{rvm #{rvm} exec bash -c '#{command}'}
+
+  puts "\n" * 3
+  puts "CMD: #{command}"
+  puts "=" * 40
+
+  system command
+end
+
+namespace :rubies do
+  desc "Run tests for following supported platforms #{SUPPORTED_RUBIES.inspect}"
+  task :test do
+    command = "bundle check || bundle install && rake"
+    with_rubies(command)
+  end
+
+  desc "Build gems for following supported platforms #{SUPPORTED_RUBIES.inspect}"
+  task :build do
+    command = "rake build"
+    with_rubies(command)
+  end
+
+  desc "Pushes gems for following supported platforms #{SUPPORTED_RUBIES.inspect}"
+  task :push => :build do
+    Dir[File.join("pkg", "#{GEMSPEC.name}-#{GEMSPEC.version}*.gem")].each do |gem|
+      command = "gem push #{gem}"
+      puts command
+      system command
+    end
+  end
+
+end

data/lib/libnotify/version.rb

@@ -1,3 +1,3 @@
 module Libnotify
-  VERSION = "0.5.1"
+  VERSION = "0.5.4"
 end

data/libnotify.gemspec

@@ -2,10 +2,21 @@
 $:.push File.expand_path("../lib", __FILE__)
 require "libnotify"
 
+platform = Gem::Platform::RUBY
+needs_ffi = true
+
+if RUBY_PLATFORM =~ /java/
+  needs_ffi = false
+  platform = "java"
+elsif defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /rbx/
+  needs_ffi = false
+  platform = Gem::Platform::new ['universal', 'rubinius', '1.2']
+end
+
 Gem::Specification.new do |s|
   s.name        = "libnotify"
   s.version     = Libnotify::VERSION
-  s.platform    = Gem::Platform::RUBY
+  s.platform    = platform
   s.authors     = ["Peter Suschlik"]
   s.email       = ["peter-libnotify@suschlik.de"]
   s.homepage    = "http://rubygems.org/gems/libnotify"
@@ -16,8 +27,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency      'ffi',          '~> 1.0'
+  if needs_ffi
+    s.add_runtime_dependency      'ffi',          '~> 1.0'
+  end
 
   s.add_development_dependency  'minitest'
-  s.add_development_dependency  'yard'
+  s.add_development_dependency  'yard',           '~> 0.7.0'
 end

data/test/helper.rb

@@ -3,3 +3,4 @@ require 'bundler/setup'
 require 'minitest/autorun'
 
 require 'libnotify'
+require 'libnotify_io'

data/test/libnotify_io.rb

@@ -0,0 +1,36 @@
+class LibnotifyIO
+  attr_reader :io, :libnotify
+
+  def initialize io
+    @io = io
+    @libnotify = begin
+      require 'libnotify'
+      Libnotify.new(:timeout => 2.5, :append => false)
+    end
+  end
+
+  def puts *o
+    if o.first =~ /(\d+) failures, (\d+) errors/
+      description = [ RUBY_ENGINE, RUBY_VERSION, RUBY_PLATFORM ].join(" ")
+      libnotify.body = o.first
+      if $1.to_i > 0 || $2.to_i > 0 # fail?
+        libnotify.summary = ":-( #{description}"
+        libnotify.urgency = :critical
+        libnotify.icon_path = "face-angry.*"
+      else
+        libnotify.summary += ":-) #{description}"
+        libnotify.urgency = :normal
+        libnotify.icon_path = "face-laugh.*"
+      end
+      libnotify.show!
+    else
+      io.puts *o
+    end
+  end
+
+  def method_missing msg, *args
+    io.send(msg, *args)
+  end
+end
+
+MiniTest::Unit.output = LibnotifyIO.new(MiniTest::Unit.output)

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: libnotify
 version: !ruby/object:Gem::Version 
-  hash: 9
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 1
-  version: 0.5.1
+  version: 0.5.4
 platform: ruby
 authors: 
 - Peter Suschlik
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 +02:00
+date: 2011-05-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,10 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
         version: "1.0"
   type: :runtime
   version_requirements: *id001
@@ -41,9 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -53,12 +41,9 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+        version: 0.7.0
   type: :development
   version_requirements: *id003
 description: 
@@ -80,10 +65,15 @@ files:
 - lib/libnotify.rb
 - lib/libnotify/api.rb
 - lib/libnotify/ffi.rb
+- lib/libnotify/tasks/rubies.rake
 - lib/libnotify/version.rb
 - libnotify.gemspec
 - libnotify.png
+- pkg/libnotify-0.5.3-universal-java-1.6.gem
+- pkg/libnotify-0.5.3-universal-rubinius-1.2.gem
+- pkg/libnotify-0.5.3-x86-linux.gem
 - test/helper.rb
+- test/libnotify_io.rb
 - test/test_libnotify.rb
 has_rdoc: true
 homepage: http://rubygems.org/gems/libnotify
@@ -99,18 +89,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
@@ -119,5 +103,7 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for libnotify using FFI
-test_files: []
-
+test_files: 
+- test/helper.rb
+- test/libnotify_io.rb
+- test/test_libnotify.rb