clippy 1.0.1 → 2.0.0

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source "https://rubygems.org"
 gemspec

data/License

@@ -1,18 +1,19 @@
-Copyright (c) 2011-2012 Jordon Bedwell
+Copyright (c) 2011-2013 Jordon Bedwell
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in the
-Software without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
-Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/Rakefile

@@ -1,10 +1,5 @@
-require "rubygems/package_task"
-require "rake/testtask"
+require "rspec/core/rake_task"
 
-task :default => [:test]
-task :spec => :test
-
-Rake::TestTask.new { |t| t.verbose, t.pattern = true, "tests/**/*.rb" }
-Gem::PackageTask.new(eval(IO.read("clippy.gemspec"))) do |pkg|
-  pkg.need_tar, pkg.need_zip = true
-end
+task :default => [:spec]
+task :test => :spec
+RSpec::Core::RakeTask.new :spec

data/Readme.md

@@ -1,16 +1,15 @@
 Clippy is a  cross-platform clipboard utility and script for Ruby.
 
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/envygeeks/clippy)
+[![Build Status](https://travis-ci.org/envygeeks/clippy.png?branch=master)](https://travis-ci.org/envygeeks/clippy) [![Coverage Status](https://coveralls.io/repos/envygeeks/clippy/badge.png?branch=master)](https://coveralls.io/r/envygeeks/clippy) [![Code Climate](https://codeclimate.com/github/envygeeks/clippy.png)](https://codeclimate.com/github/envygeeks/clippy) [![Dependency Status](https://gemnasium.com/envygeeks/clippy.png)](https://gemnasium.com/envygeeks/clippy)
 
 ---
 * Requirements:
-  * Ruby1.9+ or JRuby in 1.9+
   * Any Linux distro with xsel or xclip.
+  * Ruby1.9+, Ruby2.0+ or JRuby in 1.9+
   * Any OS X version that supports pbcopy.
   * At least Windows Vista if you are on Windows.
-* Development:
-  * Rake
-  * Minitest
+
+*Right now there is a bug with jRuby 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*
 
 ---
 Examples:
@@ -28,12 +27,11 @@ Clippy.copy('#1')
 Clippy.paste and Clippy.clear
 ```
 
-<pre>
-Clippy v1.0.1 by Envygeeks
-  --no-encoding   Encoding
-  --paste         Paste
-  --help          This
-  --clear         Clear
-  --copy          Copy
-  --version       Version
-</pre>
+```
+Clippy v2.0.0: Clippy [--copy [< File] ['Text']]
+  --paste    Paste
+  --help     This
+  --clear    Clear
+  --version  Version
+  --copy     Copy a String or STDIN
+```

data/bin/clippy

@@ -4,32 +4,16 @@ $:.unshift(File.expand_path("../../lib", __FILE__))
 require "optparse"
 require "clippy"
 
-do_return = nil
-did_cmd = nil
 OptionParser.new do |opts|
-  opts.banner = "Clippy v#{Clippy.version} by Envygeeks"
-  opts.on("--no-encoding", "Encoding") { Clippy.encode = false }
-  opts.on("--paste", "Paste") { do_return = Clippy.paste }
-  opts.on("--help", "This") { do_return = opts }
-  opts.on("--clear", "Clear") { did_cmd = Clippy.clear }
+  opts.banner = "Clippy v#{Clippy::VERSION}: Clippy [--copy [< File] ['Text']]"
 
-  opts.on("--copy", "Copy") do
-    if ARGV.count > 1
-      raise RuntimeError, "More than one arg is not allowable.", "Clippy"
-    end
+  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 }
 
-    text = ARGF.readlines.join if ARGV.count == 0
-    text = ARGV.first.dup if ARGV.count == 1
-    did_cmd = Clippy.copy(text)
+  opts.on("--copy", "Copy a String or STDIN") do
+    ($stdout.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
   end
-
-  opts.on("--version", "version") { do_return = Clippy.version }
 end.parse!
-
-if do_return.nil? and did_cmd.nil?
-  system("#{File.expand_path(__FILE__)} --help")
-else
-  if do_return
-    $stdout.puts do_return
-  end
-end

data/lib/clippy.rb

@@ -1,221 +1,75 @@
+require_relative "clippy/version"
 require "rbconfig"
+require "open3"
 
-if RbConfig::CONFIG["host_os"] !~ /mswin|mingw32/
-  require "open3"
-else
+if RbConfig::CONFIG["host_os"] =~ /mswin|mingw32/
   require "Win32API"
-  require "tempfile"
 end
 
-class Object
-  ##
-  # ---
-  # Hood jacked from Rails.
-  ##
-
-  def blank?
-    (respond_to?(:empty?)) ? (empty?) : (!self)
+module Clippy module_function
+  class UnknownClipboardError < StandardError
+    def initialize
+      super "Unknown clipboard. Clippy requires xclip, xsel or pbcopy"
+    end
   end
-end
 
-class Clippy
-  private_class_method :new
-  @@encode = true
-
-  [:UnsupportedOS, :UnknownClipboard, :InvalidEncoding].each do |status|
-    const_set(status, Class.new(StandardError))
+  CommandArgs = {
+    "windows" => "",
+    "xsel"=> {
+      "stdin" => " -ib",
+      "stdout" => " -ob"
+    },
+    "pbcopy"=> {
+      "stdin"=> "",
+      "stdout"=> ""
+    },
+    "xclip"=> {
+      "stdin" => " -i -selection clipboard",
+      "stdout" => " -o -selection clipboard"
+    }
+  }
+
+  def windows?
+    RbConfig::CONFIG["host_os"] =~ /mswin|mingw32/
   end
 
-  class << self
-    VERSION = "1.0.1"
-    def version
-      VERSION
-    end
-
-    ##
-    # ---
-    # Doesn't work on Windows.
-    ##
-
-    def binary_exist?(bin = nil)
-      if bin
-        system("which #{bin} > /dev/null 2>&1")
-      end
-    end
-
-    def encode=(value)
-      if [TrueClass, FalseClass].include?(value.class)
-        @@encode = value
-      end
-    end
-
-    def copy(data)
-      ##
-      # ---
-      # Always convert to a string and convert \n to \r\n because shit like
-      # Pidgin, Empathy, aMSN and other fucking clients have no idea what the
-      # hell \n is for, that or they just ignore it like jackasses, jackasses.
-
-      data = data.to_s unless data.is_a?(String)
-      data.gsub!(/\n/, "\r\n")
-
-      if RbConfig::CONFIG["host_os"] =~ /mswin|mingw32/
-        if system("clip /? > NUL")
-          begin
-            tmpfile = Tempfile.new("clippy")
-            tmpfile.write(data)
-            tmpfile.flush
-            system("clip < #{tmpfile.path}")
-          ensure
-            tmpfile.close(true)
-          end
-        else
-          raise(UnsupportedOS, "Your Windows version is too old.", "Clippy")
-        end
-      else
-        status = 0
-        case true
-          ##
-          # ---
-          # xsel is a Linux utility.
-          # apt-get install xsel.
-
-          when binary_exist?("xsel")
-            ["-p", "-b", "-s"].each do |opt|
-              Open3.popen3("xsel -i #{opt}") do |stdin, _, _, thread|
-                stdin << data
-                stdin.close
-                status = thread.value
-              end
-            end
-
-          ##
-          # ---
-          # pbpaste is for Mac's though it could change.
-          # I don't know if it has multiple-boards.
-          ##
-
-          when binary_exist?("pbcopy")
-            Open3.popen3("pbcopy") do |stdin, _, _, thread|
-              stdin << data
-              stdin.close
-              status = thread.value
-            end
-
-          ##
-          # ---
-          # xclip is a Linux utitily.
-          # apt-get install xclip.
-          ##
-
-          when binary_exist?("xclip")
-            ["primary", "secondary", "clipboard"].each do |opt|
-              Open3.popen3("xclip -i -selection #{opt}") do
-              |stdin, _, _, thread|
-                stdin << data
-                stdin.close
-                status = thread.value
-              end
-            end
-        else
-          raise(UnknownClipboard, "Clippy requires xsel, xclip or pbcopy.")
-        end
-      end
+  def copy(data)
+    run_command("stdin", $/ != "\r\n" ? data.to_s.gsub($/, "\r\n") : data)[0] == 0 ? true : false
+  end
 
-      (status != 0) ? (false) : (data)
+  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
+    else
+      cmd = run_command("stdout")
+      cmd[0] == 0 ? ((cmd[1].nil? || cmd[1].empty?) ? nil : cmd[1]) : false
     end
+  end
 
-    def paste(encoding = nil, which = nil)
-      which = "clipboard" if encoding.blank? && which.blank?
-      if ["clipboard", "primary", "secondary"].include?(encoding)
-        which, encoding = encoding, nil
-      else
-        if encoding && @@encode && defined?(Encoding)
-          unless Encoding.list.map(&:to_s).include?(encoding)
-            raise InvalidEncoding, "Unsupported encoding selected", "Clippy"
-          end
-        end
-      end
+  def clear
+    (copy("").nil?) ? true : false
+  end
 
-      if RbConfig::CONFIG["host_os"] =~ /mswin|mingw32/
-        Win32API.new("user32", "OpenClipboard", "L", "I").call(0)
-          data = Win32API.new("user32", "GetClipboardData", "I", "P").call(1) || ""
-        Win32API.new("user32", "CloseClipboard", [], "I").call
+  def binary
+    @binary ||= if windows?
+      "clip"
+    else
+      case true
+        when system("which xclip > /dev/null 2>&1") then "xclip"
+        when system("which xsel > /dev/null 2>&1") then "xsel"
+        when system("which pbcopy > /dev/null 2>&1") then "pbcopy"
       else
-        case true
-          ##
-          # ---
-          # xsel is a Linux utility.
-          # apt-get install xsel.
-
-          when binary_exist?("xsel")
-            cmd, data = "xsel -o", ""
-
-            case which
-              when "clipboard" then cmd+= " -b"
-              when "primary" then cmd+= " -p"
-              when "secondary" then cmd+= " -s"
-            end
-
-            Open3.popen3(cmd) { |_, stdout, _|
-              data = stdout.read }
-
-          ##
-          # ---
-          # pbpaste is for Mac's though it could change.
-          # I don't know if it has multiple-boards.
-          ##
-
-          when binary_exist?("pbpaste")
-            data = ""
-
-            Open3.popen3("pbpaste") { |_, stdout, _|
-              data = stdout.read || "" }
-
-          ##
-          # ---
-          # xclip is a Linux utitily.
-          # apt-get install xclip.
-          ##
-
-          when binary_exist?("xclip")
-            cmd, data = "xclip -o -selection", ""
-
-            case which
-              when "clipboard" then cmd+= " clipboard"
-              when "primary" then cmd+= " primary"
-              when "secondary" then cmd+= " secondary"
-            end
-
-            Open3.popen3(cmd) do |_, stdout, _|
-              data = stdout.read || ""
-            end
-        else
-          raise RuntimeError, "Unable to find a supported clipboard", "Clippy"
-        end
+        raise UnknownClipboardError
       end
-
-      if @@encode && defined?(Encoding) && encoding
-        if data.encoding.name != Encoding.default_external
-          data.encode(encoding)
-        end
-      end
-
-      (data.blank?) ? (nil) : (data)
     end
+  end
 
-    def clear
-      if RbConfig::CONFIG["host_os"] =~ /mswin|mingw32/
-        Win32API.new("user32", "OpenClipboard", "L", "I").call(0)
-          Win32API.new("user32", "EmptyClipboard", [], "I").call
-        Win32API.new("user32", "CloseClipboard", [], "I").call
-      else
-        if copy("")
-          return true
-        end
-      end
-
-      false
-    end
+  def run_command(type, data = "")
+    stdin, stdout, stderr, pid = Open3.popen3(binary + CommandArgs[binary][type])
+    type == "stdin" ? stdin.puts(data) : out = stdout.read.strip
+    [stdin, stdout, stderr].each { |m| m.close }
+    [pid.value, type == "stdin" ? data : out]
   end
 end

data/lib/clippy/version.rb

@@ -0,0 +1,3 @@
+module Clippy
+  VERSION = "2.0.0"
+end

metadata

@@ -1,104 +1,164 @@
 --- !ruby/object:Gem::Specification
 name: clippy
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 2.0.0
+  prerelease:
 platform: ruby
 authors:
 - Jordon Bedwell
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
+  name: coveralls
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: popen4
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: simplecov
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  name: guard-rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: luna-rspec-formatters
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 description: A utility to access the systems clipboard.
 email:
-- jordon@envygeeks.com
+- envygeeks@gmail.com
 executables:
 - clippy
 extensions: []
 extra_rdoc_files: []
 files:
-- clippy.gemspec
-- lib/clippy.rb
-- Gemfile.lock
-- Rakefile
-- tests/clippy.rb
 - Readme.md
-- Gemfile
 - License
+- Rakefile
+- Gemfile
+- lib/clippy.rb
+- lib/clippy/version.rb
 - bin/clippy
 homepage: https://github.com/envygeeks/clippy
 licenses:
 - MIT
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: A utility to access the systems clipboard.
 test_files: []

data/Gemfile.lock

@@ -1,26 +0,0 @@
-PATH
-  remote: .
-  specs:
-    clippy (1.0.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    coderay (1.0.8)
-    method_source (0.8.1)
-    minitest (3.3.0)
-    pry (0.9.10)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.3.1)
-    rake (0.9.2.2)
-    slop (3.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  clippy!
-  minitest
-  pry
-  rake

data/clippy.gemspec

@@ -1,24 +0,0 @@
-$:.unshift(File.expand_path("../lib", __FILE__))
-require "clippy"
-
-Gem::Specification.new do |spec|
-  spec.version = Clippy.version
-  spec.license = "MIT"
-  spec.name = "clippy"
-  spec.has_rdoc = false
-  spec.files = Dir["**/*"]
-  spec.require_paths = ["lib"]
-  spec.executables = ["clippy"]
-  spec.authors = ["Jordon Bedwell"]
-  spec.email = ["jordon@envygeeks.com"]
-  spec.add_development_dependency("pry")
-  spec.add_development_dependency("rake")
-  spec.add_development_dependency("minitest")
-  spec.homepage = "https://github.com/envygeeks/clippy"
-  spec.summary = "A utility to access the systems clipboard."
-  spec.description = "A utility to access the systems clipboard."
-
-  if RUBY_PLATFORM =~ /mswin/
-    spec.required_ruby_version = '>= 1.9.1'
-  end
-end

data/tests/clippy.rb

@@ -1,60 +0,0 @@
-$:.unshift(File.expand_path("../../lib", __FILE__))
-require "minitest/autorun"
-require "minitest/pride"
-require "minitest/spec"
-require "clippy"
-
-describe Clippy do subject { Clippy }
-  it "must have a proper version" do
-    Clippy.version.split(".").delete_if { |val|
-      val =~ /pre\d+/ }.length.must_equal(3)
-  end
-
-  describe ".copy" do
-    it "must be able to copy" do
-      subject.clear.must_equal(true)
-      subject.copy("example").must_equal("example")
-    end
-
-    it "it must copy from the binary" do
-      subject.clear.must_equal(true)
-      data, status = "example", 1
-      Open3.popen3(File.expand_path("../../bin/clippy --copy", __FILE__)) do
-      |stdin, _, _, thread|
-        stdin << data
-        stdin.close
-        status = thread.value
-      end
-
-      status.must_equal(0)
-      subject.paste.must_equal("example")
-    end
-  end
-
-  describe ".paste" do
-    it "must be able to paste" do
-      subject.clear.must_equal(true)
-      subject.copy("example")
-      subject.paste.must_equal("example")
-    end
-
-    it "must be able to paste from the binary" do
-      subject.clear.must_equal(true)
-      data, status = "", 1
-      subject.copy("example").must_equal("example")
-      Open3.popen3(File.expand_path("../../bin/clippy --paste", __FILE__)) {
-      |_, stdout, _, thread|
-        data = stdout.read; status = thread.value }
-
-      status.must_equal(0)
-      data.strip.must_equal("example")
-    end
-  end
-
-  describe ".clear" do
-    it "should be able to clear the clipboard" do
-      subject.copy("example")
-      subject.clear.must_equal(true)
-    end
-  end
-end