clipboard 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0db9702c7b8ca48e95e26e612cf294b78d4eb188a4e74a72a002fb064e6c61e3
-  data.tar.gz: 6abd7baac11e392fa41997d771504c6b104350f8049693735f233dee6bba8915
+  metadata.gz: 2e5ac85c5f3eefe7f038800d250f7aa0a0aa4f5cad84b288a5f61f7ee354476f
+  data.tar.gz: aec83891b78fa15dfa574ccd83736956033e25e763cb59d38aea592e12947ee5
 SHA512:
-  metadata.gz: a4b5ff54912337f98f1918375e8839b6eae786b9aa464bfa1b1aacf4bff3e30967f9104fa520f8fe6f343e7273c5982db1c109705884f4426b23166f02a8ec37
-  data.tar.gz: cbe9164425d0f9f1ab7f0efd270a8adcf9e65ba472a644afab3301e100e9fab9d27a400c0e8964200898edec99a2fa91259d877dc0219549778f35625d594295
+  metadata.gz: 5d686fcb2be31dfb73a94930f2dbd9cecd41256b62399677fc07c44a5dbb289f36e808e69fe0fe9763cf806960103b0ddeb34f7daafd8e9b3d28bf1725c4bc8a
+  data.tar.gz: 27e56c7766971c528033760410adb598cc81d949844d892bcd0a401df0d9154c88c06e79eb7b614529a8df9b204264d0292f0bd1925f66236d15c11bb0f40f16

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 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/README.md

@@ -25,7 +25,7 @@ gem 'clipboard'
 gem 'ffi', :platforms => [:mswin, :mingw]
 ```
 
-- 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 *xclip* or the *xsel* command-line program. On debian and ubuntu, *xsel* can be installed with: `sudo apt-get install xsel`
 
 ## Clipboard Implementations
 

data/clipboard.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/janlelis/clipboard"
   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}
 

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.1"
 end

data/spec/clipboard_file_spec.rb

@@ -0,0 +1,24 @@
+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,6 @@
 # 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 +18,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 +48,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clipboard
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Jan Lelis
@@ -61,7 +61,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,9 +83,8 @@ 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.
+- 'Linux: You need xclip or xsel. On debian/ubuntu run: sudo apt-get install xsel'
+- 'Windows: You need the ffi gem'
 rubyforge_project: 
 rubygems_version: 2.7.7
 signing_key: 

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