clipboard 0.9.3 → 0.9.4

data/Gemfile

@@ -0,0 +1,6 @@
+source :rubygems
+
+group :dev do
+  gem 'rake'
+  gem 'rspec', '>=2'
+end

data/Gemfile.lock

@@ -0,0 +1,20 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    rake (0.8.7)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake
+  rspec (>= 2)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Jan Lelis
+Copyright (c) 2010-2011 Jan Lelis
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -11,7 +11,7 @@ You have <tt>Clipboard.copy</tt>,
 Have fun ;)
 
 ==== Multiple clipboards
-On Linux, you can choose, from which clipboard you want to +paste+, default is PRIMARY.
+On Linux, you can choose, from which clipboard you want to +paste+, default is CLIPBOARD.
 
 +copy+ copies to all clipboards in Clipboard::CLIPBOARDS.
 
@@ -29,7 +29,14 @@ Copying with 1.8 will fallback to the +clip+ utility, which is installed by defa
 
 Feel free to report bugs or to implement one of the Todo entries ;)
 
+=== blip
+
+Copy and paste from the commandline (like xclip, pbpaste/pbcopy), but even easier? {blip}[http://rubygems.org/gems/blip]!
+
 === Copyright
-Copyright (c) 2010 Jan Lelis, http://rbjl.net, released under the MIT license
+Copyright (c) 2010-2011 Jan Lelis, http://rbjl.net, released under the MIT license
+
+Contributions by
+* Michael Grosser
 
 J-_-L

data/Rakefile

@@ -2,6 +2,12 @@ require 'rake'
 require 'rake/rdoctask'
 require 'fileutils'
 
+task :default => :spec
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = '--backtrace --color'
+end
+
 def gemspec
   @gemspec ||= eval(File.read('clipboard.gemspec'), binding, 'clipboard.gemspec')
 end

data/VERSION

@@ -1 +1 @@
-0.9.3
+0.9.4

data/clipboard.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version = File.read('VERSION').chomp
 
   s.authors = ["Jan Lelis"]
-  s.date = '2010-12-15'
+  s.date = '2011-01-16'
   s.summary = 'Access the clipboard on all systems.'
   s.description = 'Access the clipboard on all systems (Clipboard.copy & Clipboard.paste).'
   s.email = 'mail@janlelis.de'
@@ -14,14 +14,5 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.requirements =  ["On Linux (or other X), you need xclip. Install it on debian/ubuntu with sudo apt-get install xclip"]
   s.requirements << ["On Windows, you need the ffi gem."]
-  s.files = %w[
-    LICENSE
-    README.rdoc
-    Rakefile
-    VERSION
-    clipboard.gemspec
-    lib/clipboard.rb
-  ]
-  s.extra_rdoc_files = %w[LICENSE README.rdoc]
-  s.add_dependency 'zucker', '>= 8'
+  s.files = Dir.glob(%w[{lib,spec}/**/*.rb [A-Z]* [A-Z]*.rdoc]) + %w{clipboard.gemspec}
 end

data/lib/clipboard.rb

@@ -1,144 +1,18 @@
-require 'zucker/os'
-require 'zucker/version'
-
 module Clipboard
   extend self
   VERSION = File.read( (File.dirname(__FILE__) + '/../VERSION') ).chomp
 
-  if OS.windows?
-    CF_TEXT = 1
-    CF_UNICODETEXT = 13
-    GMEM_MOVEABLE = 2
-
-    # get ffi function handlers
-    begin
-      require 'ffi'
-    rescue LoadError
-      raise LoadError, 'Could not load the required ffi gem, install it with: gem install ffi'
-    end
-
-    module User32
-      extend FFI::Library
-      ffi_lib "user32"
-      ffi_convention :stdcall
-
-      attach_function :open,  :OpenClipboard,    [ :long ], :long
-      attach_function :close, :CloseClipboard,   [       ], :long
-      attach_function :empty, :EmptyClipboard,   [       ], :long
-      attach_function :get,   :GetClipboardData, [ :long ], :long
-      attach_function :set,   :SetClipboardData, [ :long, :long ], :long
-    end
-
-    module Kernel32
-      extend FFI::Library
-      ffi_lib 'kernel32'
-      ffi_convention :stdcall
-  
-      attach_function :lock,   :GlobalLock,   [ :long ], :pointer
-      attach_function :unlock, :GlobalUnlock, [ :long ], :long
-      attach_function :alloc,  :GlobalAlloc,  [ :long, :long ], :long
-    end
-   
-    # see http://www.codeproject.com/KB/clipboard/archerclipboard1.aspx
-    def paste(_=nil)
-      ret = ""
-        if 0 != User32.open( 0 )
-          hclip = User32.get( CF_UNICODETEXT )
-          if hclip && 0 != hclip
-            pointer_to_data = Kernel32.lock( hclip )
-            data = ""
-            # Windows Unicode is ended by to null bytes, so get the whole string
-            current_byte = 0
-            until data.size >= 2 && data[-1].ord == 0 && data[-2].ord == 0
-              data << pointer_to_data.get_bytes( current_byte, 1 )
-              current_byte += 1
-            end
-            if RubyVersion >= 1.9
-              ret = data.chop.force_encoding("UTF-16LE").encode(Encoding.default_external) # TODO catch bad encodings
-            else # 1.8: fallback to simple CP850 encoding
-              require 'iconv'
-              utf8 = Iconv.iconv( "UTF-8", "UTF-16LE", data.chop)[0]
-              ret = Iconv.iconv( "CP850", "UTF-8", utf8)[0]
-            end
-          if data && 0 != data
-            Kernel32.unlock( hclip )
-          end
-        end
-        User32.close( )
-      end
-      ret || ""
-    end
- 
-    def clear
-      if 0 != User32.open( 0 )
-        User32.empty( )
-        User32.close( )
-      end
-      paste
-    end
-    
-    def copy(data_to_copy)
-      if RubyVersion >= 1.9 && 0 != User32.open( 0 )
-        User32.empty( )
-        data = data_to_copy.encode("UTF-16LE") # TODO catch bad encodings
-        data << 0 << 0
-        handler = Kernel32.alloc( GMEM_MOVEABLE, data.bytesize )
-        pointer_to_data = Kernel32.lock( handler )
-        pointer_to_data.put_bytes( 0, data, 0, data.bytesize )
-        Kernel32.unlock( handler )
-        User32.set( CF_UNICODETEXT, handler )
-        User32.close( )
-      else # don't touch anything
-        IO.popen( 'clip', 'w' ){ |input| input << data_to_copy } # depends on clip (available by default since Vista)
-      end
-      paste
-    end
-  else #non-windows
-    require 'open3'
-
-    if OS.mac?
-      CLIPBOARDS    = []
-      WriteCommands = ['pbcopy']
-      ReadCommand  = 'pbpaste'
-    else # linuX
-      CLIPBOARDS   = %w[clipboard primary secondary]
-      WriteCommands = CLIPBOARDS.map{|cb| 'xclip -selection ' + cb }
-      ReadCommand  = 'xclip -o'
-
-      # catch dependency errors
-      begin
-        Open3.popen3( "xclip -version" ){ |_, _, error|
-          unless error.read  =~ /^xclip version/
-            raise LoadError
-          end
-        }
-      rescue Exception
-        raise LoadError, "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 paste(which = nil)
-      selection_string = if CLIPBOARDS.include?(which.to_s)
-        " -selection #{which}"
-      else
-        ''
-      end
-      %x[#{ ReadCommand + selection_string }]
-    end
-
-    def clear
-      copy ''
-    end
-
-    def copy(data)
-      WriteCommands.each{ |cmd|
-        IO.popen( cmd, 'w' ){ |input| input << data }
-      }
-      paste
+  os = proc do
+    case RbConfig::CONFIG['host_os']
+    when /mac|darwin/ then 'mac'
+    when /linux|cygwin/ then 'linux'
+    when /mswin|mingw/ then 'windows'
+    when /bsd/ then 'linux'
+    # when /solaris|sunos/ then 'linux' # needs testing..
+    else
+      raise "You OS is not supported -> fork me"
     end
   end
-end
 
-# J-_-L
+  require "clipboard/#{os.call}"
+end

data/lib/clipboard/linux.rb

@@ -0,0 +1,28 @@
+module Clipboard
+  CLIPBOARDS   = %w[clipboard primary secondary]
+  WriteCommands = CLIPBOARDS.map{|cb| 'xclip -selection ' + cb }
+  ReadCommand  = 'xclip -o'
+
+  # catch dependency errors
+  if `which xclip`.empty?
+    raise LoadError, "clipboard:\n" +
+          "Could not find required prgram xclip\n" +
+          "On debian/ubuntu, you can install it with: sudo apt-get install xclip"
+  end
+
+  def paste(which = nil)
+    which ||= CLIPBOARDS.first
+    `#{ReadCommand} -selection #{which}`
+  end
+
+  def clear
+    copy ''
+  end
+
+  def copy(data)
+    WriteCommands.each{ |cmd|
+      IO.popen( cmd, 'w' ){ |input| input << data }
+    }
+    paste
+  end
+end

data/lib/clipboard/mac.rb

@@ -0,0 +1,14 @@
+module Clipboard
+  def paste(_ = nil)
+    `pbpaste`
+  end
+
+  def copy(data)
+    IO.popen('pbcopy', 'w'){|input| input << data }
+    paste
+  end
+
+  def clear
+    copy ''
+  end
+end

data/lib/clipboard/windows.rb

@@ -0,0 +1,89 @@
+module Clipboard
+  CF_TEXT = 1
+  CF_UNICODETEXT = 13
+  GMEM_MOVEABLE = 2
+
+  # get ffi function handlers
+  begin
+    require 'ffi'
+  rescue LoadError
+    raise LoadError, 'Could not load the required ffi gem, install it with: gem install ffi'
+  end
+
+  module User32
+    extend FFI::Library
+    ffi_lib "user32"
+    ffi_convention :stdcall
+
+    attach_function :open,  :OpenClipboard,    [ :long ], :long
+    attach_function :close, :CloseClipboard,   [       ], :long
+    attach_function :empty, :EmptyClipboard,   [       ], :long
+    attach_function :get,   :GetClipboardData, [ :long ], :long
+    attach_function :set,   :SetClipboardData, [ :long, :long ], :long
+  end
+
+  module Kernel32
+    extend FFI::Library
+    ffi_lib 'kernel32'
+    ffi_convention :stdcall
+
+    attach_function :lock,   :GlobalLock,   [ :long ], :pointer
+    attach_function :unlock, :GlobalUnlock, [ :long ], :long
+    attach_function :alloc,  :GlobalAlloc,  [ :long, :long ], :long
+  end
+
+  # see http://www.codeproject.com/KB/clipboard/archerclipboard1.aspx
+  def paste(_=nil)
+    ret = ""
+      if 0 != User32.open( 0 )
+        hclip = User32.get( CF_UNICODETEXT )
+        if hclip && 0 != hclip
+          pointer_to_data = Kernel32.lock( hclip )
+          data = ""
+          # Windows Unicode is ended by to null bytes, so get the whole string
+          current_byte = 0
+          until data.size >= 2 && data[-1].ord == 0 && data[-2].ord == 0
+            data << pointer_to_data.get_bytes( current_byte, 1 )
+            current_byte += 1
+          end
+          if RubyVersion >= 1.9
+            ret = data.chop.force_encoding("UTF-16LE").encode(Encoding.default_external) # TODO catch bad encodings
+          else # 1.8: fallback to simple CP850 encoding
+            require 'iconv'
+            utf8 = Iconv.iconv( "UTF-8", "UTF-16LE", data.chop)[0]
+            ret = Iconv.iconv( "CP850", "UTF-8", utf8)[0]
+          end
+        if data && 0 != data
+          Kernel32.unlock( hclip )
+        end
+      end
+      User32.close( )
+    end
+    ret || ""
+  end
+
+  def clear
+    if 0 != User32.open( 0 )
+      User32.empty( )
+      User32.close( )
+    end
+    paste
+  end
+
+  def copy(data_to_copy)
+    if RubyVersion >= 1.9 && 0 != User32.open( 0 )
+      User32.empty( )
+      data = data_to_copy.encode("UTF-16LE") # TODO catch bad encodings
+      data << 0 << 0
+      handler = Kernel32.alloc( GMEM_MOVEABLE, data.bytesize )
+      pointer_to_data = Kernel32.lock( handler )
+      pointer_to_data.put_bytes( 0, data, 0, data.bytesize )
+      Kernel32.unlock( handler )
+      User32.set( CF_UNICODETEXT, handler )
+      User32.close( )
+    else # don't touch anything
+      IO.popen( 'clip', 'w' ){ |input| input << data_to_copy } # depends on clip (available by default since Vista)
+    end
+    paste
+  end
+end

data/spec/clipboard_spec.rb

@@ -0,0 +1,16 @@
+require File.expand_path('spec/spec_helper')
+
+describe Clipboard do
+  it "has a VERSION" do
+    Clipboard::VERSION.should =~ /^\d+\.\d+\.\d+$/
+  end
+
+  it "can copy & paste" do
+    Clipboard.copy("FOO\nBAR")
+    Clipboard.paste.should == "FOO\nBAR"
+  end
+
+  it "returns data on copy" do
+    Clipboard.copy('xxx').should == 'xxx'
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+$LOAD_PATH.unshift 'lib'
+require 'clipboard'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Jan Lelis
@@ -14,38 +14,32 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 +01:00
+date: 2011-01-16 00:00:00 +01:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: zucker
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 8
-        version: "8"
-  type: :runtime
-  version_requirements: *id001
+dependencies: []
+
 description: Access the clipboard on all systems (Clipboard.copy & Clipboard.paste).
 email: mail@janlelis.de
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
+- lib/clipboard.rb
+- lib/clipboard/mac.rb
+- lib/clipboard/linux.rb
+- lib/clipboard/windows.rb
+- spec/spec_helper.rb
+- spec/clipboard_spec.rb
+- Gemfile
+- Rakefile
 - LICENSE
+- Gemfile.lock
 - README.rdoc
-- Rakefile
 - VERSION
 - clipboard.gemspec
-- lib/clipboard.rb
 has_rdoc: true
 homepage: http://github.com/janlelis/clipboard
 licenses: []