clipboard 0.6.0 → 0.7.0

data/README.rdoc

@@ -16,10 +16,8 @@ Have fun ;)
 * +Zucker+ gem
 
 === TODO
-* Automatically require the <tt>win32-clipboard</tt> gem - but only on windows!
 * Don't depend on +xclip+
 * Don't depend on the <tt>win32-clipboard</tt> gem (or fix the 1.9 issues with the gem)
-* Error management?
 
 Feel free to report bugs or to implement one of the above features ;)
 

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'rake'
-# require 'bundler'
 
 begin
   require 'jeweler'
@@ -12,11 +11,10 @@ begin
     gem.homepage = "http://github.com/janlelis/clipboard"
     gem.authors = ["Jan Lelis"]
     gem.add_development_dependency "jeweler", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.add_dependency('zucker', '>= 4')
-    gem.requirements << 'To use this gem on linux (or other X), you need xclip'
-    gem.requirements << 'To use this gem on windows, you need the win32-clipboard gem'
-#    gem.add_bundler_dependencies
+    gem.requirements << 'on linux (or other X), you need xclip'
+    gem.requirements << 'on windows, you need the win32-clipboard gem'
+        
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/clipboard.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{clipboard}
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Lelis"]
@@ -61,7 +61,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/janlelis/clipboard}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.requirements = ["To use this gem on linux (or other X), you need xclip", "To use this gem on windows, you need the win32-clipboard gem"]
+  s.requirements = ["on linux (or other X), you need xclip", "on windows, you need the win32-clipboard gem"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Access the clipboard on all systems}
 

data/lib/clipboard.rb

@@ -1,8 +1,17 @@
 require 'zucker/os'
 require 'zucker/alias_for'
+require 'stringio'
 
 require File.expand_path '../../version', __FILE__
 
+  def capture_stderr
+    capture = StringIO.new
+    restore, $stderr = $stderr, capture
+    yield
+    $stderr = restore
+    capture.string
+  end
+
 class << Clipboard ||= Module.new
   case # OS
   when OS.linux? || OS.mac? || OS.bsd? || OS.posix?
@@ -14,10 +23,21 @@ class << Clipboard ||= Module.new
     else # linuX
       WriteCommand = 'xclip'
       ReadCommand  = 'xclip -o'
+
+      # catch dependency errors
+      Open3.popen3( "xclip -version" ){ |_, _, error|
+        unless error.read  =~ /^xclip version/
+          raise "clipboard -\n" + 
+                "Could not find required prgram xclip\n" + 
+                "You can install it (on debian/ubuntu) with sudo apt-get install xclip"
+        end
+      }
     end
 
     def write(data)
-      Open3.popen3( WriteCommand ){ |input, _, _|  input << data }
+      Open3.popen3( WriteCommand ){ |input, _, _|
+        input << data
+      }
       read # or true or nil?
     end
 
@@ -29,7 +49,13 @@ class << Clipboard ||= Module.new
       write ''
     end
   when OS.windows?
-    require 'win32/clipboard'
+    begin
+      require 'win32/clipboard'
+    rescue LoadError
+      raise "clipboard -\n" +
+            "Could not load the required win32-clipboard gem\n"
+            "You can install it with gem install win32-clipboard"
+    end
 
     def write(data)
       Win32::Clipboard.set_data( data )
@@ -48,6 +74,17 @@ class << Clipboard ||= Module.new
 
   alias_for :write, :copy
   alias_for :read,  :paste
+
+#  private
+
+  def capture_stdout
+      capture = StringIO.new
+        restore, $stdout = $stdout, capture
+          yield
+            $stdout = restore
+              capture.string
+  end
+
 end
 
 # J-_-L

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: clipboard
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Jan Lelis
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -38,6 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 4
         version: "4"
@@ -107,6 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -115,12 +119,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
-- To use this gem on linux (or other X), you need xclip
-- To use this gem on windows, you need the win32-clipboard gem
+- on linux (or other X), you need xclip
+- on windows, you need the win32-clipboard gem
 rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: