clippy 0.2.0 → 0.2.1

data/bin/clippy

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$:.unshift('../lib')
 require 'optparse'
 require 'clippy'
 
@@ -8,18 +9,19 @@ 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.gsub(/\n$/, '')
+      text = ARGF.readlines.join
     else
       if ARGV.count > 1
         raise(RuntimeError, 'More than one arg.', 'Clippy')
       else
-        text = ARGV.first
+        text = ARGV.first.dup
       end
     end
 

data/changelog.md

@@ -0,0 +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.

data/features/clippy.feature

@@ -0,0 +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.

data/features/step_definitions/clippy_steps.rb

@@ -0,0 +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

data/features/support/global.rb

@@ -0,0 +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

data/lib/clippy.rb

@@ -1,13 +1,15 @@
 require 'rbconfig'
-require 'open3'
 
-if RbConfig::CONFIG['host_os'] =~ /mswin/
+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))
@@ -18,13 +20,17 @@ class Clippy
     ##
     # Version.
     def version
-      '0.2.0'
+      '0.2.1'
     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)
@@ -77,12 +83,17 @@ class Clippy
     ##
     # Paste
     def paste(encoding = nil, which = nil)
-      if defined?(Encoding) && encoding
-        unless Encoding.list.map(&:to_s).include?(encoding)
-          if ['clipboard', 'primary', 'secondary'].include?(encoding)
-            which, encoding = encoding, 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
-            raise(InvalidEncoding, 'The encoding you selected is unsupported')
+            encoding = nil
+            warn('Encoding library wasn\'t found, skipping the encode') unless !@@encode
           end
         end
       end
@@ -124,7 +135,7 @@ class Clippy
         end
       end
 
-      if defined?(Encoding)
+      if @@encode && defined?(Encoding)
         if data.encoding.name != Encoding.default_external
           data.encode(encoding ? encoding : Encoding.default_external)
         end

data/readme.md

@@ -0,0 +1,31 @@
+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>

metadata

@@ -1,128 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: clippy
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Jordon Bedwell
 - Nathaniel Davidson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-31 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec-expectations
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &12760080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *12760080
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &12759640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *12759640
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &12901720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *12901720
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &12901240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *12901240
 description: A utility to access the systems clipboard.
-email: 
+email:
 - jordon@envygeeks.com
 - nathaniel.davidson@gmail.com
-executables: 
+executables:
 - clippy
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/clippy.rb
 - bin/clippy
-- readme.txt
+- features/support/global.rb
+- features/step_definitions/clippy_steps.rb
+- features/clippy.feature
+- readme.md
 - license.txt
 - rakefile.rb
 - gemfile.rb
+- changelog.md
 homepage: https://github.com/envygeeks/clippy
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths: lib
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A utility to access the systems clipboard.
 test_files: []
-

data/readme.txt

@@ -1,41 +0,0 @@
----
-About:
-Clippy is a  cross-platform clipboard utility and script for Ruby.
-
----
-Requirements:
-  Windows:
-    Ruby1.9
-    Windows Vista+
-
-  Development:
-    cucumber
-    rake
-    minitest
-    rspec-expectations
-
-All other distros should work with 1.8+
-
----
-Usage:
-  Shell:
-    clippy --copy '#1'
-    echo '#2' |clippy --copy
-    clipy --copy < 'file#3.txt'
-  Ruby:
-    require 'clippy'
-    Clippy.copy('#1')
-    Clippy.[paste, clear]
-
----
-Clippy v0.1 by Envygeeks
-  --paste    Paste
-  --help     This
-  --clear    Clear
-  --copy     Copy
-  --version  Version
-
----
-I want to throw a big  thank you to Nathaniel (@firestar) who took the time to
-also build a Java version of clippy which will soon also be included as a
-fallback for Windows XP users.