clippy 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6b2df7a88254eb2a4e1f351633e964ce2edb332
-  data.tar.gz: 5a75718708ae18f8c77123ff6f40f58bfb2df741
+  metadata.gz: c6f7e86513ddda4fedd2dabdfa424d290233c390
+  data.tar.gz: f127557e982d74e3377f7cfb114d81a21b178306
 SHA512:
-  metadata.gz: 723329e7799009e93df6c1f5c1ce0c866b8103737bde04587821a6f66e8be3e2c138a7541e650a1b9a4bb9a511c64d5a9eaf4830e2420880c5bb377020a1e463
-  data.tar.gz: 3b9a7bf578f6d029870f7840e7054fd3a955210c48edb5046cad68f8e0dd22cbe92404e5a2db2ed66d4f3238b2d0c6cbf33290757f3a8f43a8baeff2b404857f
+  metadata.gz: 605f99bab2aa4c37f4a9f80e6c361a4ffe874ca939b6721f20bd672411f8d619649a896d318a1322062ef75f59d186d1ce83ceada9d6271fd970fd16acd732d8
+  data.tar.gz: e6be611a0a543f328c9b8f184af1d23bd181788f6ec057a55db743659e62e5ce1b9009f24100a9165b7b5aa09500df5699fc4b0b49227915cfc1f28cfe3a1d31

data/Gemfile

@@ -3,4 +3,5 @@ gemspec
 
 group :development do
   gem "rake"
+  gem  "pry"
 end

data/README.md

@@ -8,29 +8,26 @@ Clippy is a  cross-platform clipboard utility and script for Ruby.
   * OS X: `pbcopy`
   * Linux: `xsel` || `xclip`
 
-*Right now there is a bug with jRuby stable that causes Clippy to fail, this bug is inside of Open3.popen3 where jRuby actually short-circuits and does not meet the same guidelines as Ruby1.9+, you can see the progress of this bug at: http://jira.codehaus.org/browse/JRUBY-6409 -- this has been fixed in jRuby-head so if you plan to use Clippy please use jRuby-head until a new stable is released.*
-
----
 Examples:
 
 ```bash
 clippy --copy '#1'
-clippy --paste
-echo '#2' |clippy --copy
 clippy --copy < 'file#3.txt'
+echo '#2' |clippy --copy
+clippy --paste
 ```
 
 ```ruby
 require 'clippy'
+Clippy.paste; Clippy.clear
 Clippy.copy('#1')
-Clippy.paste and Clippy.clear
 ```
 
 ```
-Clippy v2.0.11: Clippy [--copy [< File] ['Text']]
-  --paste    Paste
-  --help     This
-  --clear    Clear
-  --version  Version
-  --copy     Copy a String or STDIN
+Clippy v2.3.0: Clippy [--copy [< File] ['Text']]
+  -p, --paste        Paste
+  -N, --no-unescape  Do not unescape \n
+  -c, --copy [STR]   Copy a String or STDIN```
+  -v, --version      Version
+  -C, --clear        Clear
 ```

data/bin/clippy

@@ -6,13 +6,12 @@ require "optparse"
 OptionParser.new do |opts|
   opts.banner = "Clippy v#{Clippy::VERSION}: Clippy [--copy [< File] ['Text']]"
 
-  opts.on("--paste", "Paste") { $stdout.puts Clippy.paste }
-  opts.on("--help", "This") { $stdout.puts opts }
-  opts.on("--clear", "Clear") { exit Clippy.clear ? 0 : 1 }
-  opts.on("--version", "Version") { $stdout.puts Clippy::VERSION }
+  opts.on("-p", "--paste", "Paste") { $stdout.puts Clippy.paste }
+  opts.on("-N", "--no-unescape", "Do not unescape \\n") { Clippy.unescape = false }
+  opts.on("-v", "--version", "Version") { $stdout.puts Clippy::VERSION }
+  opts.on("-C", "--clear", "Clear") { exit Clippy.clear ? 0 : 1 }
 
-  opts.on("--copy", "Copy a String or STDIN") do
-    ($stderr.puts "More than one arg is not allowable" and exit 1) if ARGV.count > 1
-    exit Clippy.copy(ARGV.count == 0 ? ARGF.readlines.join : ARGV.first.dup) ? 0 : 1
+  opts.on("-c", "--copy [STR]", "Copy a String or STDIN") do |str|
+    exit (Clippy.copy(str || ARGF.readlines.join) ? 0 : 1)
   end
 end.parse!

data/lib/clippy.rb

@@ -7,61 +7,71 @@ if RbConfig::CONFIG["host_os"] =~ /mswin|mingw32/
 end
 
 module Clippy module_function
+  @unescape = true
+  class << self
+    attr_accessor :unescape
+  end
+
   class UnknownClipboardError < StandardError
     def initialize
       super "Unknown clipboard. Clippy requires xclip, xsel or pbcopy"
     end
   end
 
+  def unescape?
+    unescape
+  end
+
   COMMAND_ARGS = {
     "xsel" => {
-      "stdin" => " -ib",
-      "stdout" => " -ob"
-    },
+       "stdin".freeze => " -ib",
+      "stdout".freeze => " -ob"
+    }.freeze,
 
     "windows" => {
-      "stdin" => "",
-      "stdout" => ""
-    },
+       "stdin".freeze => "".freeze,
+      "stdout".freeze => "".freeze
+    }.freeze,
 
     "pbcopy" => {
-      "stdin" => "",
-      "stdout" => ""
-    },
+       "stdin".freeze => "".freeze,
+      "stdout".freeze => "".freeze
+    }.freeze,
 
     "xclip" => {
-      "stdin" => " -i -selection clipboard",
-      "stdout" => " -o -selection clipboard"
-    }
-  }
+       "stdin".freeze => " -i -selection clipboard",
+      "stdout".freeze => " -o -selection clipboard"
+    }.freeze
+  }.freeze
 
   def windows?
     RbConfig::CONFIG["host_os"] =~ /mswin|mingw32/
   end
 
   def copy(data)
+    data = unescape_newline(data) if unescape?
     data = data.to_s.gsub($/, "\r\n") if $/ != "\r\n"
-    rtrn = run_command("stdin", data)[0] == 0 ? true : false
+    run_command("stdin", data)[0] == 0 ? true : false
   end
 
   def paste
     if windows?
-      Win32API.new("user32", "OpenClipboard", "L", "I").call(0)
-        data = Win32API.new("user32", "GetClipboardData", "I", "P").call(1) || ""
-      Win32API.new("user32", "CloseClipboard", [], "I").call
+      Win32API.new("user32".freeze, "OpenClipboard", "L", "I").call(0)
+        Win32API.new("user32".freeze, "GetClipboardData", "I", "P").call(1) || "".freeze
+      Win32API.new("user32".freeze, "CloseClipboard", [], "I").call
     else
-      cmd = run_command("stdout")
+      cmd = run_command("stdout".freeze)
       cmd[0] == 0 ? ((cmd[1].nil? || cmd[1].empty?) ? nil : cmd[1]) : false
     end
   end
 
   def clear
-    (copy("").nil?) ? true : false
+    (copy("".freeze).nil?) ? true : false
   end
 
   def binary
     @binary ||= if windows?
-      "clip"
+      "clip".freeze
     else
       case true
         when system("which xclip > /dev/null 2>&1") then "xclip"
@@ -73,9 +83,9 @@ module Clippy module_function
     end
   end
 
-  def run_command(type, data = '')
+  def run_command(type, data = "")
     i, o, e, p = Open3.popen3(binary + COMMAND_ARGS[binary][type])
-    type == "stdin" ? i.puts(data) : out = o.read.strip
+    type == "stdin" ? i.print(data) : out = o.read.strip
 
     [i, o, e].each do |m|
       m.close
@@ -86,4 +96,8 @@ module Clippy module_function
       type == "stdin" ? data : out
     ]
   end
+
+  def unescape_newline(data)
+    data.gsub(/\\n/, "\n").gsub(/\\r/, "\r")
+  end
 end

data/lib/clippy/version.rb

@@ -1,3 +1,3 @@
 module Clippy
-  VERSION = "2.2.1"
+  VERSION = "2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clippy
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Jordon Bedwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: A utility to access the systems clipboard.