clippy 0.2.2 → 0.2.3

data/bin/clippy

@@ -1,40 +1,40 @@
-#!/usr/bin/env ruby
-$:.unshift('../lib')
-require 'optparse'
-require 'clippy'
-
-##
-# Opts.
-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.on('--copy', 'Copy') do
-    unless ARGV.count > 0
-      text = ARGF.readlines.join
-    else
-      if ARGV.count > 1
-        raise(RuntimeError, 'More than one arg.', 'Clippy')
-      else
-        text = ARGV.first.dup
-      end
-    end
-
-    did_cmd = Clippy.copy(text)
-  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
+#!/usr/bin/env ruby
+$:.unshift('../lib')
+require 'optparse'
+require 'clippy'
+
+##
+# Opts.
+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.on('--copy', 'Copy') do
+    unless ARGV.count > 0
+      text = ARGF.readlines.join
+    else
+      if ARGV.count > 1
+        raise(RuntimeError, 'More than one arg.', 'Clippy')
+      else
+        text = ARGV.first.dup
+      end
+    end
+
+    did_cmd = Clippy.copy(text)
+  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/changelog.md

@@ -1,9 +1,9 @@
-0.2.1
-  Fix an issue with '\n$' on Ruby 1.9.3 by removing it.
-  No longer require open3 for Windows users.
-  Add an option for users to disable encoding.
-  Fix an issue with frozen argv by duping.
-  Micro-optimise the encoding checks a bit.
-  Update the readme to use Markdown.
-  Other various fixes that might not be mentioned.
-  Avoid shitty Gem pkg problems by forcing permissions.
+* 0.2.1 and 0.2.2
+  * Fix an issue with '\n$' on Ruby 1.9.3 by removing it.
+  * No longer require open3 for Windows users.
+  * Add an option for users to disable encoding.
+  * Fix an issue with frozen argv by duping.
+  * Micro-optimise the encoding checks a bit.
+  * Update the readme to use Markdown.
+  * Other various fixes that might not be mentioned.
+  * Avoid shitty Gem pkg problems by forcing permissions.

data/features/clippy.feature

@@ -1,8 +1,8 @@
-Feature: Clippy
-  Background:
-    Sometimes you would like to copy and paste from a Ruby script. In order to
-    that though we will need a small little class called Clippy that can copy,
-    paste and also clear the clipboard on Windows, Linux and Mac.
-
-    Given Clippy exist and it has a version.
-    Then Copy, Paste and Clear should exist.
+Feature: Clippy
+  Background:
+    Sometimes you would like to copy and paste from a Ruby script. In order to
+    that though we will need a small little class called Clippy that can copy,
+    paste and also clear the clipboard on Windows, Linux and Mac.
+
+    Given Clippy exist and it has a version.
+    Then Copy, Paste and Clear should exist.

data/features/step_definitions/clippy_steps.rb

@@ -1,10 +1,10 @@
-Given 'Clippy exist and it has a version.' do
-  should be_defined Clippy
-  should be_defined Clippy.version
-end
-
-Then 'Copy, Paste and Clear should exist.' do
-  [:copy, :paste, :clear].each do |service|
-    true.should == Clippy.respond_to?(service)
-  end
-end
+Given 'Clippy exist and it has a version.' do
+  should be_defined Clippy
+  should be_defined Clippy.version
+end
+
+Then 'Copy, Paste and Clear should exist.' do
+  [:copy, :paste, :clear].each do |service|
+    true.should == Clippy.respond_to?(service)
+  end
+end

data/features/support/global.rb

@@ -1,9 +1,9 @@
-$:.unshift(File.join(File.dirname(__FILE__), '../../lib'))
-require 'rspec/expectations'
-require 'clippy'
-
-RSpec::Matchers.define :be_defined do
-  match do |defyned|
-    defined? defyned
-  end
-end
+$:.unshift(File.join(File.dirname(__FILE__), '../../lib'))
+require 'rspec/expectations'
+require 'clippy'
+
+RSpec::Matchers.define :be_defined do
+  match do |defyned|
+    defined? defyned
+  end
+end

data/gemfile.rb

@@ -1,2 +1,2 @@
-source :rubygems
-gemspec
+source :rubygems
+gemspec

data/lib/clippy.rb

@@ -1,161 +1,160 @@
-require 'rbconfig'
-
-unless RbConfig::CONFIG['host_os'] =~ /mswin/
-  require 'open3'
-else
-  require 'Win32API'
-  require 'tempfile'
-end
-
-class Clippy
-  private_class_method :new
-  @@encode = true
-
-  [:UnsupportedOS, :UnknownClipboard, :InvalidEncoding].each do |status|
-    const_set(status, Class.new(StandardError))
-  end
-
-  class << self
-
-    ##
-    # Version.
-    def version
-      '0.2.2'
-    end
-
-    def binary_exist?(bin)
-      system("which #{bin} > /dev/null 2>&1")
-    end
-
-    def encode=(value)
-      @@encode = value if [TrueClass, FalseClass].include?(value.class)
-    end
-
-    ##
-    # Copy
-    def copy(data)
-      unless data.is_a?(String)
-        raise(ArgumentError, 'Clippy can only copy a string')
-      end
-
-      ##
-      # For shit like Pidgin..
-      data.gsub!(/\n/, "\r\n")
-      if RbConfig::CONFIG['host_os'] =~ /mswin/
-        if system('clip /? 2>&1 1>&0')
-          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.')
-        end
-      else
-        case true
-        when binary_exist?('xsel')
-          ['-p', '-b', '-s'].each do |opt|
-            Open3.popen3("xsel -i #{opt}") do |stdin, _, _|
-              stdin << data
-            end
-          end
-        when binary_exist?('pbcopy')
-          Open3.popen3('pbcopy') do |stdin|
-            stdin << data
-          end
-        when binary_exist?('xclip')
-          ['primary', 'secondary', 'clipboard'].each do |opt|
-            Open3.popen3("xclip -i -selection #{opt}") do |stdin, _, _|
-              stdin << data
-            end
-          end
-        else
-          raise(UnknownClipboard, 'Clippy requires xsel, xclip or pbcopy.')
-        end
-      end
-
-      ((data.nil? or data.empty?)?(false):(data))
-    end
-
-    ##
-    # Paste
-    def paste(encoding = nil, which = nil)
-      if encoding
-        if %w(clipboard primary secondary).include?(encoding)
-          which, encoding = encoding, nil
-        else
-          if @@encode && defined?(Encoding)
-            unless Encoding.list.map(&:to_s).include?(encoding)
-              raise(InvalidEncoding, 'The encoding you selected is unsupported')
-            end
-          else
-            encoding = nil
-            warn('Encoding library wasn\'t found, skipping the encode') unless !@@encode
-          end
-        end
-      end
-
-      if RbConfig::CONFIG['host_os'] =~ /mswin/
-        Win32API.new('user32', 'OpenClipboard', 'L', 'I').call(0)
-          data = Win32API.new('user32', 'GetClipboardData', 'I', 'P').call(1) || ''
-        Win32API.new('user32', 'CloseClipboard', [], 'I').call
-      else
-        case true
-        when binary_exist?('xsel')
-          cmd = 'xsel -o'
-
-          case which
-            when 'clipboard' then cmd+= ' -b'
-            when 'primary' then cmd+= ' -p'
-            when 'secondary' then cmd+= ' -s'
-          end
-
-          Open3.popen3(cmd) do |_, stdout, _|
-            data = stdout.read
-          end
-        when binary_exist?('pbpaste')
-          Open3.popen('pbpaste') do |_, stdout, _|
-            data = stdout.read || ''
-          end
-        when binary_exist?('xclip')
-          cmd = 'xclip -o'
-
-          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
-        end
-      end
-
-      if @@encode && defined?(Encoding)
-        if data.encoding.name != Encoding.default_external
-          data.encode(encoding ? encoding : Encoding.default_external)
-        end
-      end
-
-      ((data.nil? or data.empty?)?(false):(data))
-    end
-
-    def clear
-      if RbConfig::CONFIG['host_os'] =~ /mswin/
-        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
-  end
-end
+require 'rbconfig' unless defined?(RbConfig)
+unless RbConfig::CONFIG['host_os'] =~ /mswin/ || RbConfig::CONFIG['host_os'] == 'mingw32'
+  require 'open3'
+else
+  require 'Win32API'
+  require 'tempfile'
+end
+
+class Clippy
+  private_class_method :new
+  @@encode = true
+
+  [:UnsupportedOS, :UnknownClipboard, :InvalidEncoding].each do |status|
+    const_set(status, Class.new(StandardError))
+  end
+
+  class << self
+
+    ##
+    # Version.
+    def version
+      '0.2.3'
+    end
+
+    def binary_exist?(bin)
+      system("which #{bin} > /dev/null 2>&1")
+    end
+
+    def encode=(value)
+      @@encode = value if [TrueClass, FalseClass].include?(value.class)
+    end
+
+    ##
+    # Copy
+    def copy(data)
+      unless data.is_a?(String)
+        raise(ArgumentError, 'Clippy can only copy a string')
+      end
+
+      ##
+      # For shit like Pidgin..
+      data.gsub!(/\n/, "\r\n")
+      if RbConfig::CONFIG['host_os'] =~ /mswin/ || RbConfig::CONFIG['host_os'] == '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.')
+        end
+      else
+        case true
+        when binary_exist?('xsel')
+          ['-p', '-b', '-s'].each do |opt|
+            Open3.popen3("xsel -i #{opt}") do |stdin, _, _|
+              stdin << data
+            end
+          end
+        when binary_exist?('pbcopy')
+          Open3.popen3('pbcopy') do |stdin|
+            stdin << data
+          end
+        when binary_exist?('xclip')
+          ['primary', 'secondary', 'clipboard'].each do |opt|
+            Open3.popen3("xclip -i -selection #{opt}") do |stdin, _, _|
+              stdin << data
+            end
+          end
+        else
+          raise(UnknownClipboard, 'Clippy requires xsel, xclip or pbcopy.')
+        end
+      end
+
+      ((data.nil? or data.empty?)?(false):(data))
+    end
+
+    ##
+    # Paste
+    def paste(encoding = nil, which = nil)
+      if encoding
+        if %w(clipboard primary secondary).include?(encoding)
+          which, encoding = encoding, nil
+        else
+          if @@encode && defined?(Encoding)
+            unless Encoding.list.map(&:to_s).include?(encoding)
+              raise(InvalidEncoding, 'The encoding you selected is unsupported')
+            end
+          else
+            encoding = nil
+            warn('Encoding library wasn\'t found, skipping the encode') unless !@@encode
+          end
+        end
+      end
+
+      if RbConfig::CONFIG['host_os'] =~ /mswin/
+        Win32API.new('user32', 'OpenClipboard', 'L', 'I').call(0)
+          data = Win32API.new('user32', 'GetClipboardData', 'I', 'P').call(1) || ''
+        Win32API.new('user32', 'CloseClipboard', [], 'I').call
+      else
+        case true
+        when binary_exist?('xsel')
+          cmd = 'xsel -o'
+
+          case which
+            when 'clipboard' then cmd+= ' -b'
+            when 'primary' then cmd+= ' -p'
+            when 'secondary' then cmd+= ' -s'
+          end
+
+          Open3.popen3(cmd) do |_, stdout, _|
+            data = stdout.read
+          end
+        when binary_exist?('pbpaste')
+          Open3.popen('pbpaste') do |_, stdout, _|
+            data = stdout.read || ''
+          end
+        when binary_exist?('xclip')
+          cmd = 'xclip -o'
+
+          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
+        end
+      end
+
+      if @@encode && defined?(Encoding)
+        if data.encoding.name != Encoding.default_external
+          data.encode(encoding ? encoding : Encoding.default_external)
+        end
+      end
+
+      ((data.nil? or data.empty?)?(false):(data))
+    end
+
+    def clear
+      if RbConfig::CONFIG['host_os'] =~ /mswin/ || RbConfig::CONFIG['host_os'] == '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
+  end
+end

data/license.txt

@@ -1,18 +1,18 @@
-Copyright (c) 2011 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:
-
-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.
+Copyright (c) 2011 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:
+
+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.

data/rakefile.rb

@@ -1,19 +1,19 @@
-require 'rubygems/package_task'
-require 'rake/testtask'
-
-task :default => [:test]
-
-Rake::TestTask.new do |tfile|
-  tfile.verbose = true
-  tfile.pattern = "tests/**/*.rb"
-end
-
-if ARGV.include?('features')
-  require 'cucumber'
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features)
-end
-
-Gem::PackageTask.new(eval(IO.read('clippy.gemspec'))) do |pkg|
-  pkg.need_tar, pkg.need_zip = true
-end
+require 'rubygems/package_task'
+require 'rake/testtask'
+
+task :default => [:test]
+
+Rake::TestTask.new do |tfile|
+  tfile.verbose = true
+  tfile.pattern = "tests/**/*.rb"
+end
+
+if ARGV.include?('features')
+  require 'cucumber'
+  require 'cucumber/rake/task'
+  Cucumber::Rake::Task.new(:features)
+end
+
+Gem::PackageTask.new(eval(IO.read('clippy.gemspec'))) do |pkg|
+  pkg.need_tar, pkg.need_zip = true
+end

data/readme.md

@@ -1,31 +1,33 @@
-Clippy is a  cross-platform clipboard utility and script for Ruby.
-
----
-* Requirements:
-  * Ruby1.9 (if on Windows)
-* Development:
-  * Cucumber
-  * Rake
-  * Minitest
-  * RSPEC-Expectations
-
-All other distros should work with 1.8+
-
-    # Shell (Linux and Windows)
-    clippy --copy '#1'
-    echo '#2' |clippy --copy
-    clipy --copy < 'file#3.txt'
-    
-    # Ruby1.8+
-    require 'clippy'
-    Clippy.copy('#1')
-    Clippy.paste and Clippy.clear
-<br />
-<pre>
-    Clippy v0.1 by Envygeeks
-    --paste    Paste
-    --help     This
-    --clear    Clear
-    --copy     Copy
-    --version  Version
-</pre>
+Clippy is a  cross-platform clipboard utility and script for Ruby.
+
+---
+* Requirements:
+  * Ruby1.9+ or jRuby in 1.9 (Windows)
+  * Ruby1.8.6+ (For Unix and Linux))
+  * All platforms support jRuby in 1.8 or 1.9 mode except Windows.
+* Development:
+  * Cucumber
+  * Rake
+  * Minitest
+  * RSPEC-Expectations
+
+All other distros should work with 1.8+
+
+    # Shell (Linux and Windows)
+    clippy --copy '#1'
+    echo '#2' |clippy --copy
+    clipy --copy < 'file#3.txt'
+    
+    # Ruby1.8+
+    require 'clippy'
+    Clippy.copy('#1')
+    Clippy.paste and Clippy.clear
+<br />
+<pre>
+    Clippy v0.1 by Envygeeks
+    --paste    Paste
+    --help     This
+    --clear    Clear
+    --copy     Copy
+    --version  Version
+</pre>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clippy
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-01 00:00:00.000000000 Z
+date: 2012-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &11028980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11028980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &11028460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11028460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &11027980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11027980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &11027460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +70,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11027460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A utility to access the systems clipboard.
 email:
 - jordon@envygeeks.com
@@ -67,9 +87,9 @@ extra_rdoc_files: []
 files:
 - lib/clippy.rb
 - bin/clippy
-- features/support/global.rb
-- features/step_definitions/clippy_steps.rb
 - features/clippy.feature
+- features/step_definitions/clippy_steps.rb
+- features/support/global.rb
 - readme.md
 - license.txt
 - rakefile.rb
@@ -96,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A utility to access the systems clipboard.