clippy 0.1.3 → 0.2.0

data/lib/clippy.rb

@@ -9,12 +9,8 @@ end
 class Clippy
   private_class_method :new
 
-  ['UnsupportedOS', 'UnknownClipboard', 'InvalidEncoding'].each do |klass|
-    class_eval <<-CLASS
-      class #{klass} < StandardError
-        self
-      end
-    CLASS
+  [:UnsupportedOS, :UnknownClipboard, :InvalidEncoding].each do |status|
+    const_set(status, Class.new(StandardError))
   end
 
   class << self
@@ -22,7 +18,7 @@ class Clippy
     ##
     # Version.
     def version
-      '0.1.3'
+      '0.2.0'
     end
 
     def binary_exist?(bin)
@@ -32,6 +28,10 @@ class Clippy
     ##
     # 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")
@@ -52,7 +52,7 @@ class Clippy
         case true
         when binary_exist?('xsel')
           ['-p', '-b', '-s'].each do |opt|
-            Open3.popen3("xsel -i #{opt}") do |stdin|
+            Open3.popen3("xsel -i #{opt}") do |stdin, _, _|
               stdin << data
             end
           end
@@ -62,12 +62,12 @@ class Clippy
           end
         when binary_exist?('xclip')
           ['primary', 'secondary', 'clipboard'].each do |opt|
-            Open3.popen3("xclip -i -selection #{opt}") do |stdin|
+            Open3.popen3("xclip -i -selection #{opt}") do |stdin, _, _|
               stdin << data
             end
           end
         else
-          raise(UnknownClipboard, 'Could not find a clipboard util.')
+          raise(UnknownClipboard, 'Clippy requires xsel, xclip or pbcopy.')
         end
       end
 
@@ -77,9 +77,13 @@ class Clippy
     ##
     # Paste
     def paste(encoding = nil, which = nil)
-      if defined? Encoding and encoding
+      if defined?(Encoding) && encoding
         unless Encoding.list.map(&:to_s).include?(encoding)
-          raise(InvalidEncoding, 'The encoding you selected is unsupported')
+          if ['clipboard', 'primary', 'secondary'].include?(encoding)
+            which, encoding = encoding, nil
+          else
+            raise(InvalidEncoding, 'The encoding you selected is unsupported')
+          end
         end
       end
 
@@ -98,11 +102,11 @@ class Clippy
             when 'secondary' then cmd+= ' -s'
           end
 
-          Open3.popen3(cmd) do |_, stdout|
+          Open3.popen3(cmd) do |_, stdout, _|
             data = stdout.read
           end
         when binary_exist?('pbpaste')
-          Open3.popen('pbpaste') do |_, stdout|
+          Open3.popen('pbpaste') do |_, stdout, _|
             data = stdout.read || ''
           end
         when binary_exist?('xclip')
@@ -114,13 +118,13 @@ class Clippy
             when 'secondary' then cmd+= ' secondary'
           end
 
-          Open3.popen3(cmd) do |_, stdout|
+          Open3.popen3(cmd) do |_, stdout, _|
             data = stdout.read || ''
           end
         end
       end
 
-      if defined? Encoding
+      if defined?(Encoding)
         if data.encoding.name != Encoding.default_external
           data.encode(encoding ? encoding : Encoding.default_external)
         end

data/readme.txt

@@ -11,8 +11,8 @@ Requirements:
   Development:
     cucumber
     rake
-    rspec
     minitest
+    rspec-expectations
 
 All other distros should work with 1.8+
 

metadata

@@ -1,70 +1,90 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: clippy
-version: !ruby/object:Gem::Version
-  version: 0.1.3
+version: !ruby/object:Gem::Version 
+  hash: 23
   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-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &15902760 !ruby/object:Gem::Requirement
+
+date: 2011-12-31 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec-expectations
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *15902760
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &15902220 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *15902220
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: minitest
-  requirement: &15901760 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *15901760
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &15901320 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *15901320
+  version_requirements: *id004
 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
@@ -72,28 +92,37 @@ files:
 - rakefile.rb
 - gemfile.rb
 homepage: https://github.com/envygeeks/clippy
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A utility to access the systems clipboard.
 test_files: []
+