g 1.5.0 → 1.6.0

data/g.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "g"
-  s.version     = "1.5.0"
+  s.version     = "1.6.0"
   s.authors     = ["jugyo"]
   s.email       = ["jugyo.org@gmail.com"]
   s.homepage    = "http://github.com/jugyo/g"

data/lib/g.rb

@@ -7,23 +7,24 @@ $g_priority ||= 0
 $g_sticky ||= true
 
 module Kernel
-  def g(*args, &block)
-    # growl = Growl.new $g_host, 'g', [$0]
+  def g(*args)
+    messages = args.dup
 
-    args.push(block) if block
-
-    messages =
-      if args.empty?
-        ['g!']
+    if messages.empty?
+      if block_given?
+        messages << yield(self)
       else
-        args.map { |i| i.pretty_inspect }
+        messages << self
       end
+    end
 
-    # messages.each { |i| growl.notify $0, 'g', i, $g_priority, $g_sticky }
-    messages.each { |i| GNTP.notify :app_name => $0, :title => 'g', :text => i, :sticky => $g_sticky }
+    messages.each do |i|
+      text = i.is_a?(String) ? i : i.pretty_inspect
+      GNTP.notify :app_name => $0, :title => 'g', :text => text, :sticky => $g_sticky
+    end
 
     if args.empty?
-      nil
+      self
     elsif args.size == 1
       args.first
     else

data/spec/g_spec.rb

@@ -3,24 +3,24 @@ require 'g'
 
 describe 'g' do
   it 'calls with a arg' do
-    GNTP.should_receive(:notify).with(:app_name => $0, :title => "g", :text => "foo".pretty_inspect, :sticky=>true)
+    GNTP.should_receive(:notify).with(:app_name => $0, :title => "g", :text => "foo", :sticky=>true)
     g('foo').should == 'foo'
   end
 
-  it 'calls with block' do
-    block = Proc.new {}
-    GNTP.should_receive(:notify).with(:app_name => $0, :title => "g", :text => block.pretty_inspect, :sticky=>true)
-    g(&block).should == block
+  it 'calls with args' do
+    GNTP.should_receive(:notify).exactly(2).times
+    g('foo', 1).should == ['foo', 1]
   end
 
-  it 'calls with args' do
-    block = Proc.new {}
-    GNTP.should_receive(:notify).exactly(3).times
-    g('foo', 1, &block).should == ['foo', 1, block]
+  it 'calls for instance' do
+    object = Object.new
+    GNTP.should_receive(:notify).with(:app_name => $0, :title => "g", :text => object.pretty_inspect, :sticky=>true)
+    object.g.should == object
   end
 
-  it 'calls without args' do
-    GNTP.should_receive(:notify).with(:app_name => $0, :title => "g", :text => "g!", :sticky=>true)
-    g.should == nil
+  it 'calls with &block' do
+    object = "foo"
+    GNTP.should_receive(:notify).with(:app_name => $0, :title => "g", :text => "FOO", :sticky=>true)
+    object.g {|i| i.upcase}.should == object
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: g
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-14 00:00:00.000000000Z
+date: 2012-01-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &2169115360 !ruby/object:Gem::Requirement
+  requirement: &70154826525400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2169115360
+  version_requirements: *70154826525400
 description: It works like Kernel.p with growl :)
 email:
 - jugyo.org@gmail.com
@@ -57,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: g
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: The Kernel.g