clipboard 1.3.0 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0db9702c7b8ca48e95e26e612cf294b78d4eb188a4e74a72a002fb064e6c61e3
-  data.tar.gz: 6abd7baac11e392fa41997d771504c6b104350f8049693735f233dee6bba8915
+  metadata.gz: 892729b3fc00a3f989dfa1c3c5e1c05062b94a2f01af23a358d519a09b737f33
+  data.tar.gz: 38f17ac7f06b2ff302b9498c3a3ad81bc2e7c9418f700f485569d8b8f15a18c9
 SHA512:
-  metadata.gz: a4b5ff54912337f98f1918375e8839b6eae786b9aa464bfa1b1aacf4bff3e30967f9104fa520f8fe6f343e7273c5982db1c109705884f4426b23166f02a8ec37
-  data.tar.gz: cbe9164425d0f9f1ab7f0efd270a8adcf9e65ba472a644afab3301e100e9fab9d27a400c0e8964200898edec99a2fa91259d877dc0219549778f35625d594295
+  metadata.gz: 5920c4e55b0322ac05a0df5c36e7d3c2dca41a31a481aab7ed3df6f838a10c0d4592910617c4e95b5878d5133d1b628b46cecef236118abecab608dc64b31827
+  data.tar.gz: 4ff5e2aba0b87384d16941ed3b85ba61382c7e28bc3a07e922328e3a9faf8a23f0524b797d8a729fd34cbb11720d6271890b6d772597444793dc66dd9443ad27

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # CHANGELOG
 
+## 1.3.5
+* Fix missing String#+@ method on Ruby <2.3, patch by @AaronC81
+
+## 1.3.4
+* Don't break on Ruby 2.1, patch by @grosser
+
+## 1.3.3
+
+* Fix Cygwin implementation to work when File constant is loaded, fix by @ntachino
+
+## 1.3.2
+* Windows version actually mutates a string, fix by @scivola
+
+## 1.3.1
+* Prefer xsel over xclip, because it can handle more data
+  * See here: https://github.com/janlelis/clipboard/pull/33/files#diff-80752ab4de37ec2dcf1dc85457e09d40R13
+
 ## 1.3.0
 ### Bug Fixes
 * Conditionally read or don't read the output stream of external commands, fixes #32

data/MIT-LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2018 Jan Lelis
+Copyright (c) 2010-2020 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.md

@@ -10,6 +10,10 @@ Lets you access the clipboard from everywhere. Currently supported platforms:
 - Gtk+ (Cross Platform Widget Toolkit)
 - Java (on JRuby)
 
+Supported Rubies: **2.7**, **2.6**, **2.5**
+
+Unsupported, but might still work: **2.4**, **2.3**, **2.2**, **2.1**, **2.0**
+
 ## Usage
 
 * `Clipboard.copy` - Copies a string to system clipboard
@@ -21,11 +25,11 @@ Lets you access the clipboard from everywhere. Currently supported platforms:
 Add the following lines to your `Gemfile`:
 
 ```ruby
-gem 'clipboard'
-gem 'ffi', :platforms => [:mswin, :mingw]
+gem "clipboard"
+gem "ffi", :platforms => [:mswin, :mingw] # Required by Clipboard on Windows
 ```
 
-- Important note for **Linux** users: The clipboard requires the *xclip* or the *xsel* command-line program. On debian and ubuntu, xclip can be installed with: `sudo apt-get install xclip`
+- **Important note for Linux** users: The clipboard requires the *xsel* or the *xclip* command-line program. On debian and ubuntu, *xsel* can be installed with: `sudo apt-get install xsel`
 
 ## Clipboard Implementations
 
@@ -84,4 +88,4 @@ Without any arguments, it will just paste the contents of the clipboard.
 
 ### MIT
 
-Copyright (c) 2010-2018 Jan Lelis <http://janlelis.com> released under the MIT license. Contributions by and thanks to Michael Grosser and [all the other contributors!](https://github.com/janlelis/clipboard/graphs/contributors)
+Copyright (c) 2010-2020 Jan Lelis <https://janlelis.com> released under the MIT license. Contributions by and thanks to Michael Grosser and [all the other contributors!](https://github.com/janlelis/clipboard/graphs/contributors)

data/clipboard.gemspec

@@ -1,24 +1,25 @@
+# frozen_string_literal: true
+
 $:.unshift File.expand_path("../lib", __FILE__)
 require 'clipboard/version'
 
 Gem::Specification.new do |s|
-  s.name = 'clipboard'
-  s.version = Clipboard::VERSION
-
-  s.authors = ["Jan Lelis"]
-  s.summary = "Access to the clipboard on Linux, MacOS, Windows, and Cygwin."
+  s.name     = 'clipboard'
+  s.version  = Clipboard::VERSION
+  s.authors  = ["Jan Lelis"]
+  s.email    = ["hi@ruby.consulting"]
+  s.summary  = "Access to the clipboard on Linux, MacOS, Windows, and Cygwin."
   s.description = "Access to the clipboard on Linux, MacOS, Windows, and Cygwin: Clipboard.copy, Clipboard.paste, Clipboard.clear"
-  s.email = "mail@janlelis.de"
   s.homepage = "https://github.com/janlelis/clipboard"
-  s.license = "MIT"
+  s.license  = "MIT"
   s.requirements = [
-    "On Linux (or other X), you will need xclip. On debian/ubuntu this is: sudo apt-get install xclip",
-    "On Windows, you will need the ffi gem.",
+    "Linux: You need xclip or xsel. On debian/ubuntu run: sudo apt-get install xsel",
+    "Windows: You need the ffi gem",
   ]
   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', '~> 11'
+  s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3'
   # s.add_development_dependency 'ffi', '~> 1.9'
   # s.add_development_dependency 'gtk3', '~> 3'

data/lib/clipboard.rb

@@ -35,7 +35,7 @@ module Clipboard
     # Running additional check to detect if running in Microsoft WSL
     if os == :Linux
       require "etc"
-      if Etc.uname[:release] =~ /Microsoft/
+      if Etc.respond_to?(:uname) && Etc.uname[:release] =~ /Microsoft/ # uname was added in ruby 2.2
         os = :Wsl
       end
     end

data/lib/clipboard/cygwin.rb

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

data/lib/clipboard/linux.rb

@@ -9,14 +9,7 @@ module Clipboard
     CLIPBOARDS = %w[clipboard primary secondary].freeze
 
     # check which backend to use
-    if Utils.executable_installed?('xclip')
-      WriteCommand = 'xclip'
-      ReadCommand  = 'xclip -o'
-      ReadOutputStream = false
-      Selection    = proc{ |x|
-        "-selection #{x}"
-      }.freeze
-    elsif Utils.executable_installed?('xsel')
+    if Utils.executable_installed? "xsel"
       WriteCommand = 'xsel -i'
       ReadCommand  = 'xsel -o'
       ReadOutputStream = true
@@ -25,9 +18,16 @@ module Clipboard
         'primary' => '-p',
         'secondary' => '-s'
       }.freeze
+    elsif Utils.executable_installed? "xclip"
+      WriteCommand = 'xclip'
+      ReadCommand  = 'xclip -o'
+      ReadOutputStream = false
+      Selection    = proc{ |x|
+        "-selection #{x}"
+      }.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"
+            "On debian/ubuntu, you can install it with: sudo apt-get install xsel"
     end
 
     def paste(which = nil)

data/lib/clipboard/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Clipboard
-  VERSION = "1.3.0"
+  VERSION = "1.3.5"
 end

data/lib/clipboard/windows.rb

@@ -42,7 +42,7 @@ module Clipboard
 
     # see http://www.codeproject.com/KB/clipboard/archerclipboard1.aspx
     def paste(_ = nil)
-      data = ""
+      data = "".dup
       if 0 != User32.open( 0 )
         hclip = User32.get( CF_UNICODETEXT )
         if hclip && 0 != hclip

data/spec/clipboard_file_spec.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require_relative "spec_helper"
+
+describe 'Clipboard::File' do
+  before :all do
+    Clipboard.implementation = Clipboard::File
+    cache = Clipboard::File::FILE
+    FileUtils.rm cache if File.exist?(cache)
+  end
+
+  it "can paste with empty file" do
+    expect( Clipboard.paste ).to eq ''
+  end
+
+  it "can copy & paste" do
+    expect( Clipboard.copy('xxx') ).to eq 'xxx'
+    expect( Clipboard.paste ).to eq 'xxx'
+  end
+
+  it "can clear" do
+    expect( Clipboard.copy('xxx') ).to eq 'xxx'
+    Clipboard.clear
+    expect( Clipboard.paste ).to eq ''
+  end
+end

data/spec/clipboard_spec.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 # Please note: cannot test, if it really accesses your platform clipboard.
 
-require File.expand_path('spec/spec_helper')
+require_relative "spec_helper"
 
 os_to_restore = RbConfig::CONFIG['host_os']
 
@@ -18,12 +20,10 @@ describe Clipboard do
     expect( Clipboard.paste ).to eq "FOO\nBAR"
   end
 
-  if RUBY_VERSION >= "1.9"
-    it "can copy & paste with multibyte char" do
-      Encoding.default_external = "utf-8"
-      Clipboard.copy("日本語")
-      expect( Clipboard.paste ).to eq "日本語"
-    end
+  it "can copy & paste with multibyte char" do
+    Encoding.default_external = "utf-8"
+    Clipboard.copy("日本語")
+    expect( Clipboard.paste ).to eq "日本語"
   end
 
   it "returns data on copy" do
@@ -50,27 +50,19 @@ describe Clipboard do
     end
   end
 
-  describe 'Clipboard::File' do
-    before :all do
-      Clipboard.implementation = Clipboard::File
-      cache = Clipboard::File::FILE
-      FileUtils.rm cache if File.exist?(cache)
-    end
+  # See https://github.com/janlelis/clipboard/issues/32 by @orange-kao
+  it "can copy more than 8192 bytes" do
+    # first batch
+    data1 = Random.new.bytes(2**14).unpack("H*").first
+    data2 = Clipboard.copy(data1)
 
-    it "can paste with empty file" do
-      expect( Clipboard.paste ).to eq ''
-    end
+    expect(data2).to eq data1
 
-    it "can copy & paste" do
-      expect( Clipboard.copy('xxx') ).to eq 'xxx'
-      expect( Clipboard.paste ).to eq 'xxx'
-    end
+    # second batch
+    data1 = Random.new.bytes(2**14).unpack("H*").first
+    data2 = Clipboard.copy(data1)
 
-    it "can clear" do
-      expect( Clipboard.copy('xxx') ).to eq 'xxx'
-      Clipboard.clear
-      expect( Clipboard.paste ).to eq ''
-    end
+    expect(data2).to eq data1
   end
 
   describe :implementation do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift 'lib'
 require 'clipboard'
 require 'clipboard/file'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clipboard
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.5
 platform: ruby
 authors:
 - Jan Lelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2020-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -40,7 +40,8 @@ dependencies:
         version: '3'
 description: 'Access to the clipboard on Linux, MacOS, Windows, and Cygwin: Clipboard.copy,
   Clipboard.paste, Clipboard.clear'
-email: mail@janlelis.de
+email:
+- hi@ruby.consulting
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -61,7 +62,7 @@ files:
 - lib/clipboard/version.rb
 - lib/clipboard/windows.rb
 - lib/clipboard/wsl.rb
-- spec/clipboard_linux_spec.rb
+- spec/clipboard_file_spec.rb
 - spec/clipboard_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/janlelis/clipboard
@@ -83,11 +84,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- 'On Linux (or other X), you will need xclip. On debian/ubuntu this is: sudo apt-get
-  install xclip'
-- On Windows, you will need the ffi gem.
-rubyforge_project: 
-rubygems_version: 2.7.7
+- 'Linux: You need xclip or xsel. On debian/ubuntu run: sudo apt-get install xsel'
+- 'Windows: You need the ffi gem'
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Access to the clipboard on Linux, MacOS, Windows, and Cygwin.

data/spec/clipboard_linux_spec.rb

@@ -1,20 +0,0 @@
-require_relative 'spec_helper'
-
-require "clipboard/linux"
-
-describe Clipboard::Linux do
-  # See https://github.com/janlelis/clipboard/issues/32 by @orange-kao
-  it "can copy more than 8192 bytes" do
-    # first batch
-    data1 = Random.new.bytes(2**14).unpack("H*").first
-    data2 = Clipboard.copy(data1)
-
-    expect(data2).to eq data1
-
-    # second batch
-    data1 = Random.new.bytes(2**14).unpack("H*").first
-    data2 = Clipboard.copy(data1)
-
-    expect(data2).to eq data1
-  end
-end