Permalink
Browse files

fixing merge conflicts

  • Loading branch information...
2 parents d0215eb + 0a542e5 commit bdf51947645a44cb96ed00cc5dcb18a62a07ccc0 @akitaonrails committed Mar 3, 2009
Showing with 395 additions and 306 deletions.
  1. +14 −6 README
  2. +304 −298 html/usage.html
  3. +1 −1 lib/utility_belt.rb
  4. +37 −0 lib/utility_belt/array_numberings.rb
  5. +37 −0 spec/array_numberings_spec.rb
  6. +2 −1 utility_belt.gemspec
View
20 README
@@ -75,27 +75,35 @@ If you're wondering why the method name is so ridiculously long, there's a story
http://gilesbowkett.blogspot.com/2007/12/utility-belt-vs-rails.html
-== Read from and write to OS X clipboard
+== Read from and write to OS X or Windows clipboard
+
+In order to use Clipboard on Windows you must install the 'win32-clipboard' gem.
To read:
- MacClipboard.read
+ Clipboard.read
To write:
- MacClipboard.write("something")
+ Clipboard.write("something")
+
+== Post your code to Pastie with one command (OS X and Windows only)
-== Post your code to Pastie with one command (OS X only)
+You must first equip the UtilityBelt with pastie in your .irbrc:
+
+ UtilityBelt.equip(:pastie)
+
+This line will also automatically equip the Clipboard, which is required to use pastie.
-First copy some code into your clipboard, or put it there with the MacClipboard.write() class method. Then use the command:
+First copy some code into your clipboard, or put it there with the Clipboard.write() class method. Then use the command:
pastie
or the shortcut version:
pst
-Note that this method currently auto-formats all code as Ruby. Support for other languages is possible but not implemented yet. Also, this code is OS X only because it uses the MacClipboard. (A platform-agnostic version without the clipboard aspect is certainly possible.)
+Note that this method currently auto-formats all code as Ruby. Support for other languages is possible but not implemented yet. Also, this code is OS X and Windows only because it uses the Clipboard. (A platform-agnostic version without the clipboard aspect is certainly possible.)
== Unix-style history buffer
Oops, something went wrong.

0 comments on commit bdf5194

Please sign in to comment.