1 files changed, 83 insertions, 5 deletions
diff --git a/ext/tk/lib/tk/package.rb b/ext/tk/lib/tk/package.rb
index 8768bf1c79..dbb0ca33e8 100644
--- a/ext/tk/lib/tk/package.rb
+++ b/ext/tk/lib/tk/package.rb
@@ -18,6 +18,36 @@ module TkPackage
     nil
   end
 
+  def if_needed(pkg, ver, *arg, &b)
+    size = arg.size
+
+    if size==0 && !b
+      # proc info
+      procedure(tk_call('package', 'ifneeded', pkg, ver))
+
+    elsif size==0 && b
+      # set proc
+      cmd = proc(&b)
+      tk_call('package', 'ifneeded', pkg, ver, cmd)
+      cmd
+
+    elsif size==1 && !b
+      # set proc
+      cmd = arg[0]
+      if cmd
+	tk_call('package', 'ifneeded', pkg, ver, cmd)
+	cmd
+      else
+	# remove proc
+	tk_call('package', 'ifneeded', pkg, ver, '')
+	nil
+      end
+
+    else
+      fail ArgumentError, 'too many arguments'
+    end
+  end
+
   def names
     tk_split_simplelist(tk_call('package', 'names'))
   end
@@ -25,26 +55,74 @@ module TkPackage
   def provide(package, version=nil)
     if version
       tk_call('package', 'provide', package, version)
+    end
+    if (ret = tk_call('package', 'provide', package)) == ''
       nil
     else
-      tk_call('package', 'provide', package)
+      ret
     end
   end
 
   def present(package, version=None)
-    tk_call('package', 'present', package, version)
+    begin
+      tk_call('package', 'present', package, version)
+    rescue => e
+      fail e.class, 'TkPackage ' << e.message
+    end
   end
 
   def present_exact(package, version)
-    tk_call('package', 'present', '-exact', package, version)
+    begin
+      tk_call('package', 'present', '-exact', package, version)
+    rescue => e
+      fail e.class, 'TkPackage ' << e.message
+    end
   end
 
   def require(package, version=None)
-    tk_call('package', 'require', package, version)
+    begin
+      tk_call('package', 'require', package, version)
+    rescue => e
+      fail e.class, 'TkPackage ' << e.message
+    end
   end
 
   def require_exact(package, version)
-    tk_call('package', 'require', '-exact', package, version)
+    begin
+      tk_call('package', 'require', '-exact', package, version)
+    rescue => e
+      fail e.class, 'TkPackage ' << e.message
+    end
+  end
+
+  def unknown_proc(*arg, &b)
+    size = arg.size
+
+    if size==0 && !b
+      # proc info
+      procedure(tk_call('package', 'unknown'))
+
+    elsif size==0 && b
+      # set proc
+      cmd = proc(&b)
+      tk_call('package', 'unknown', cmd)
+      cmd
+
+    elsif size==1 && !b
+      # set proc
+      cmd = arg[0]
+      if cmd
+	tk_call('package', 'unknown', cmd)
+	cmd
+      else
+	# remove proc
+	tk_call('package', 'unknown', '')
+	nil
+      end
+
+    else
+      fail ArgumentError, 'too many arguments'
+    end
   end
 
   def versions(package)