g 1.6.0 → 1.7.0

data/.gitignore

@@ -1,3 +1,3 @@
 *.gem
 pkg
-
+Gemfile.lock

data/g.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "g"
-  s.version     = "1.6.0"
+  s.version     = "1.7.0"
   s.authors     = ["jugyo"]
   s.email       = ["jugyo.org@gmail.com"]
   s.homepage    = "http://github.com/jugyo/g"
@@ -12,5 +12,6 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_runtime_dependency "ruby_gntp"
+  s.add_development_dependency "ruby_gntp"
+  s.add_development_dependency "rspec"
 end

data/lib/g.rb

@@ -1,12 +1,11 @@
-require 'rubygems'
-require 'ruby_gntp'
 require 'pp'
 
-$g_host ||= "localhost"
-$g_priority ||= 0
-$g_sticky ||= true
-
 module Kernel
+  def self._g_function(&block)
+    @_g_function = block if block
+    @_g_function
+  end
+
   def g(*args)
     messages = args.dup
 
@@ -20,7 +19,11 @@ module Kernel
 
     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
+      if Kernel._g_function
+        Kernel._g_function.call($0, 'g', text)
+      else
+        p text
+      end
     end
 
     if args.empty?
@@ -32,3 +35,15 @@ module Kernel
     end
   end
 end
+
+catch(:break) do
+  %w(terminal-notifier ruby_gntp).each do |lib|
+    begin
+      require lib
+      require "g/#{lib}"
+      throw :break
+    rescue LoadError
+    end
+  end
+  warn 'Please install `terminal-notifier` or `ruby_gntp`.'
+end

data/lib/g/ruby_gntp.rb

@@ -0,0 +1,5 @@
+module Kernel
+  _g_function do |app_name, title, text|
+    GNTP.notify :app_name => app_name, :title => title, :text => text
+  end
+end

data/lib/g/terminal-notifier.rb

@@ -0,0 +1,5 @@
+module Kernel
+  _g_function do |app_name, title, text|
+    TerminalNotifier.notify(text, :title => title)
+  end
+end

data/spec/g_spec.rb

@@ -3,7 +3,7 @@ require 'g'
 
 describe 'g' do
   it 'calls with a arg' do
-    GNTP.should_receive(:notify).with(:app_name => $0, :title => "g", :text => "foo", :sticky=>true)
+    GNTP.should_receive(:notify).with(:app_name => $0, :title => "g", :text => "foo")
     g('foo').should == 'foo'
   end
 
@@ -14,13 +14,13 @@ describe 'g' do
 
   it 'calls for instance' do
     object = Object.new
-    GNTP.should_receive(:notify).with(:app_name => $0, :title => "g", :text => object.pretty_inspect, :sticky=>true)
+    GNTP.should_receive(:notify).with(:app_name => $0, :title => "g", :text => object.pretty_inspect)
     object.g.should == object
   end
 
   it 'calls with &block' do
     object = "foo"
-    GNTP.should_receive(:notify).with(:app_name => $0, :title => "g", :text => "FOO", :sticky=>true)
+    GNTP.should_receive(:notify).with(:app_name => $0, :title => "g", :text => "FOO")
     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.6.0
+  version: 1.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-13 00:00:00.000000000Z
+date: 2012-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70154826525400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *70154826525400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: It works like Kernel.p with growl :)
 email:
 - jugyo.org@gmail.com
@@ -35,7 +56,8 @@ files:
 - Rakefile
 - g.gemspec
 - lib/g.rb
-- lib/md5.rb
+- lib/g/ruby_gntp.rb
+- lib/g/terminal-notifier.rb
 - spec/g_spec.rb
 homepage: http://github.com/jugyo/g
 licenses: []
@@ -57,9 +79,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: g
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: The Kernel.g
 test_files:
 - spec/g_spec.rb
+has_rdoc: 

data/lib/md5.rb

@@ -1,6 +0,0 @@
-require 'digest/md5'
-module MD5
-  def self.new(packet)
-    Digest::MD5.new.update packet
-  end
-end