clipboard 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daabcc7f7c52f9aeff9e0163f00c3ecbdfc494d8
-  data.tar.gz: 8b3a8aeb00f65797735f604a7c5ba5472e14e0d4
+  metadata.gz: c91049aa4bbdb688bc936ab74e419a79168565c5
+  data.tar.gz: 4556c855410c5585d338d9a75bb68e2370beb0b5
 SHA512:
-  metadata.gz: 9c65bda01e0b1917fa33cf88e87bc47a8f4be01934cb6a506d9da694c674fd9110c9e059dd3c7a1605ef3e609f96cfdede4414b95186ec84578a9fa285035d03
-  data.tar.gz: 9b57863507792943da2402fb711f0756b588d70dcf2eb24e32cd79ce52a13b5697ffd8232e84b9c137a1eb70c37320fff202bef281473718e288e9668ceb1c49
+  metadata.gz: 06c1548b9cf38578c899021de84979e85147db85b7bc4909cfcf96dc53b7457368fce3fce9f1cae992c64e21ab60832d5210894a1ee266e73e00105c2187805d
+  data.tar.gz: 9479f050e48e56f3d3f9c0c0028e7b409b5f5359d37d9249aa16b0accef35368912ce25976ea0d53cd75beeb253cb1fb7eb9a8d0d828965517c7a9090ced1fe9

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.1.1
+
+* Surpress 3rd party processes' STDERR, see #26
+* Internal API changes to meet modified relaxed ruby style guidelines
+
 ## 1.1.0
 * Remove support for 1.8
 * Windows: Fix that the gem tries to convert encoding of pasted strings, leave this to user

data/clipboard.gemspec

@@ -1,5 +1,4 @@
 # -*- encoding: utf-8 -*-
-require 'rubygems' unless defined? Gem
 
 $:.unshift File.expand_path("../lib", __FILE__)
 require 'clipboard/version'
@@ -21,6 +20,6 @@ Gem::Specification.new do |s|
   s.files = Dir.glob(%w[{lib,spec}/**/*.rb [A-Z]*.txt [A-Z]*.md]) + %w{clipboard.gemspec}
 
   s.required_ruby_version = '>= 1.9.3'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '>=2'
+  s.add_development_dependency 'rake', '~> 11'
+  s.add_development_dependency 'rspec', '~> 3'
 end

data/lib/clipboard.rb

@@ -17,7 +17,7 @@ module Clipboard
   autoload :File,    'clipboard/file'
 
   def self.implementation
-  return @implementation if @implementation
+    return @implementation if @implementation
 
     os = case RbConfig::CONFIG['host_os']
     when /mac|darwin/        then :Mac

data/lib/clipboard/cygwin.rb

@@ -1,18 +1,18 @@
-module Clipboard; end
+module Clipboard
+  module Cygwin
+    extend self
 
-module Clipboard::Cygwin
-  extend self
+    def paste(_ = nil)
+      File.read("/dev/clipboard")
+    end
 
-  def paste(_ = nil)
-    File.read("/dev/clipboard")
-  end
-
-  def copy(data)
-    File.open("/dev/clipboard", "w"){ |f| f.write(data) }
-    paste
-  end
+    def copy(data)
+      File.open("/dev/clipboard", "w"){ |f| f.write(data) }
+      paste
+    end
 
-  def clear
-    copy ''
+    def clear
+      copy ''
+    end
   end
 end

data/lib/clipboard/file.rb

@@ -1,20 +1,20 @@
-module Clipboard; end
+module Clipboard
+  module File
+    extend self
 
-module Clipboard::File
-  extend self
+    FILE = ::File.expand_path("~/.clipboard")
 
-  FILE = File.expand_path("~/.clipboard")
+    def copy(text)
+      ::File.open(FILE, 'w', 0o0600) { |f| f.write(text) } rescue ''
+      paste
+    end
 
-  def copy(text)
-    File.open(FILE, 'w', 0600) { |f| f.write(text) } rescue ''
-    paste
-  end
-
-  def paste(_ = nil)
-    File.read(FILE) rescue ''
-  end
+    def paste(_ = nil)
+      ::File.read(FILE) rescue ''
+    end
 
-  def clear
-    copy ''
+    def clear
+      copy ''
+    end
   end
 end

data/lib/clipboard/java.rb

@@ -1,24 +1,24 @@
-module Clipboard; end
+module Clipboard
+  # Basic java clipboard access (jruby). No fun to use on X.
+  module Java
+    extend self
 
-# Basic java clipboard access (jruby). No fun to use on X.
-module Clipboard::Java
-  extend self
+    FLAVOR = ::Java::JavaAwtDatatransfer::DataFlavor.stringFlavor
 
-  FLAVOR = ::Java::JavaAwtDatatransfer::DataFlavor.stringFlavor
+    def copy(text)
+      selection_string = ::Java::JavaAwtDatatransfer::StringSelection.new text
+      ::Java::JavaAwt::Toolkit.default_toolkit.system_clipboard.set_contents selection_string, nil
+      paste
+    end
 
-  def copy(text)
-    selection_string = ::Java::JavaAwtDatatransfer::StringSelection.new text
-    ::Java::JavaAwt::Toolkit.default_toolkit.system_clipboard.set_contents selection_string, nil
-    paste
-  end
-
-  def paste(_ = nil)
-    ::Java::JavaAwt::Toolkit.default_toolkit.system_clipboard.get_data(FLAVOR)
-  rescue
-    ''
-  end
+    def paste(_ = nil)
+      ::Java::JavaAwt::Toolkit.default_toolkit.system_clipboard.get_data(FLAVOR)
+    rescue
+      ''
+    end
 
-  def clear
-    copy ''
+    def clear
+      copy ''
+    end
   end
 end

data/lib/clipboard/linux.rb

@@ -1,41 +1,41 @@
 require 'open3'
 
-module Clipboard; end
+module Clipboard
+  module Linux
+    extend self
 
-module Clipboard::Linux
-  extend self
+    CLIPBOARDS = %w[clipboard primary secondary].freeze
 
-  CLIPBOARDS   = %w[clipboard primary secondary]
-
-  # check which backend to use
-  if system('which xclip >/dev/null 2>&1')
-    WriteCommand = 'xclip'
-    ReadCommand  = 'xclip -o'
-    Selection    = proc{|x| "-selection #{x}"}
-  elsif system('which xsel >/dev/null 2>&1')
-    WriteCommand = 'xsel -i'
-    ReadCommand  = 'xsel -o'
-    Selection    = {'clipboard' => '-b', 'primary' => '-p', 'secondary' => '-s'}
-  else
-    raise Clipboard::ClipboardLoadError, "clipboard: Could not find required program xclip or xsel\n" \
-          "On debian/ubuntu, you can install it with: sudo apt-get install xclip"
-  end
+    # check which backend to use
+    if system('which xclip >/dev/null 2>&1')
+      WriteCommand = 'xclip'.freeze
+      ReadCommand  = 'xclip -o'.freeze
+      Selection    = proc{ |x| "-selection #{x}" }.freeze
+    elsif system('which xsel >/dev/null 2>&1')
+      WriteCommand = 'xsel -i'.freeze
+      ReadCommand  = 'xsel -o'.freeze
+      Selection    = { 'clipboard' => '-b', 'primary' => '-p', 'secondary' => '-s' }.freeze
+    else
+      raise Clipboard::ClipboardLoadError, "clipboard: Could not find required program xclip or xsel\n" \
+            "On debian/ubuntu, you can install it with: sudo apt-get install xclip"
+    end
 
-  def paste(which = nil)
-    if !which || !CLIPBOARDS.include?(which.to_s.downcase)
-      which = CLIPBOARDS.first
+    def paste(which = nil)
+      if !which || !CLIPBOARDS.include?(which.to_s.downcase)
+        which = CLIPBOARDS.first
+      end
+      `#{ReadCommand} #{Selection[which.to_s.downcase]} 2> /dev/null`
     end
-    `#{ReadCommand} #{Selection[which.to_s.downcase]}`
-  end
 
-  def clear
-    copy ''
-  end
+    def clear
+      copy ''
+    end
 
-  def copy(data)
-    CLIPBOARDS.each{ |which|
-      Open3.popen3( "#{WriteCommand} #{Selection[which.to_s.downcase]}" ){ |input,_,_| input << data }
-    }
-    paste
+    def copy(data)
+      CLIPBOARDS.each{ |which|
+        Open3.popen3( "#{WriteCommand} #{Selection[which.to_s.downcase]}" ){ |input, _, _| input << data }
+      }
+      paste
+    end
   end
 end

data/lib/clipboard/mac.rb

@@ -1,20 +1,20 @@
 require 'open3'
 
-module Clipboard; end
+module Clipboard
+  module Mac
+    extend self
 
-module Clipboard::Mac
-  extend self
+    def paste(_ = nil)
+      `pbpaste`
+    end
 
-  def paste(_ = nil)
-    `pbpaste`
-  end
-
-  def copy(data)
-    Open3.popen3( 'pbcopy' ){ |input,_,_| input << data }
-    paste
-  end
+    def copy(data)
+      Open3.popen3( 'pbcopy' ){ |input, _, _| input << data }
+      paste
+    end
 
-  def clear
-    copy ''
+    def clear
+      copy ''
+    end
   end
 end

data/lib/clipboard/version.rb

@@ -1,3 +1,3 @@
 module Clipboard
-  VERSION = "1.1.0"
+  VERSION = "1.1.1".freeze
 end

data/lib/clipboard/windows.rb

@@ -1,84 +1,84 @@
 require 'open3'
 
-module Clipboard; end
+module Clipboard
+  module Windows
+    extend self
 
-module Clipboard::Windows
-  extend self
+    CF_TEXT = 1
+    CF_UNICODETEXT = 13
+    GMEM_MOVEABLE = 2
 
-  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
+    # 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
+    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
+      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
+    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 :size,   :GlobalSize,   [ :long ], :long
-    attach_function :alloc,  :GlobalAlloc,  [ :long, :long ], :long
-  end
+      attach_function :lock,   :GlobalLock,   [ :long ], :pointer
+      attach_function :unlock, :GlobalUnlock, [ :long ], :long
+      attach_function :size,   :GlobalSize,   [ :long ], :long
+      attach_function :alloc,  :GlobalAlloc,  [ :long, :long ], :long
+    end
 
-  # see http://www.codeproject.com/KB/clipboard/archerclipboard1.aspx
-  def paste(_ = nil)
-    data = ""
-    if 0 != User32.open( 0 )
-      hclip = User32.get( CF_UNICODETEXT )
-      if hclip && 0 != hclip
-        pointer_to_data = Kernel32.lock( hclip )
-        # Windows Unicode is ended by two null bytes, so get the whole string
-        size = Kernel32.size( hclip )
-        data << pointer_to_data.get_bytes( 0, size - 2 )
-        data.force_encoding("UTF-16LE")
-        Kernel32.unlock( hclip )
+    # see http://www.codeproject.com/KB/clipboard/archerclipboard1.aspx
+    def paste(_ = nil)
+      data = ""
+      if 0 != User32.open( 0 )
+        hclip = User32.get( CF_UNICODETEXT )
+        if hclip && 0 != hclip
+          pointer_to_data = Kernel32.lock( hclip )
+          # Windows Unicode is ended by two null bytes, so get the whole string
+          size = Kernel32.size( hclip )
+          data << pointer_to_data.get_bytes( 0, size - 2 )
+          data.force_encoding("UTF-16LE")
+          Kernel32.unlock( hclip )
+        end
+        User32.close( )
       end
-      User32.close( )
+      data
     end
-    data
-  end
 
-  def clear
-    if 0 != User32.open( 0 )
-      User32.empty( )
-      User32.close( )
+    def clear
+      if 0 != User32.open( 0 )
+        User32.empty( )
+        User32.close( )
+      end
+      paste
     end
-    paste
-  end
 
-  def copy(data_to_copy)
-    if 0 != User32.open( 0 )
-      User32.empty( )
-      data = data_to_copy.encode("UTF-16LE") # TODO catch bad encodings
-      data << 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
-      Open3.popen3( 'clip' ){ |input,_,_| input << data_to_copy } # depends on clip (available by default since Vista)
+    def copy(data_to_copy)
+      if 0 != User32.open( 0 )
+        User32.empty( )
+        data = data_to_copy.encode("UTF-16LE") # TODO: catch bad encodings
+        data << 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
+        Open3.popen3( 'clip' ){ |input, _, _| input << data_to_copy } # depends on clip (available by default since Vista)
+      end
+      paste
     end
-    paste
   end
 end

data/spec/clipboard_spec.rb

@@ -3,12 +3,11 @@
 
 require File.expand_path('spec/spec_helper')
 
-$os = RbConfig::CONFIG['host_os']
-
+os_to_restore = RbConfig::CONFIG['host_os']
 
 describe Clipboard do
   before do
-    RbConfig::CONFIG['host_os'] = $os
+    RbConfig::CONFIG['host_os'] = os_to_restore
   end
 
   it "has a VERSION" do

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: clipboard
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jan Lelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 description: 'Access to the clipboard on Linux, MacOS, Windows, and Cygwin: Clipboard.copy,
   Clipboard.paste, Clipboard.clear'
 email: mail@janlelis.de
@@ -83,7 +83,7 @@ requirements:
   install xclip'
 - On Windows, you will need the ffi gem.
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Access to the clipboard on Linux, MacOS, Windows, and Cygwin.