From 3700aed47443b70388c314599292423b40fa81cc Mon Sep 17 00:00:00 2001
From: John Mair <jrmair@gmail.com>
Date: Wed, 16 Jan 2013 16:12:51 +0100
Subject: [PATCH] Version 0.9.11 release

Final adjustments made to CHANGELOG and CONTRIBUTORS
---
 CHANGELOG    | 20 +++++++++----
 CONTRIBUTORS | 80 ++++++++++++++++++++++++++++++++--------------------
 2 files changed, 63 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 291899b0..c4817da1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,19 +6,28 @@ dependency changes:
 new features:
 * #738 basic Ruby 2.0 support
 * #732 JRuby 1.7.0+ support
-* #660 "show-source" supports `--super` switch
-* #678 added tabcomplection for previous scope
+* added bond tabcompletion, much more powerful than standard tab
+	completion. However, it requires a real 'readline' to work,
+	so will not work on standard osx setup (since it uses Editline)
+* show-source can now extract source for classes, methods, procs,
+	pry commands, and arbitrary objects (it shows the source for the class of
+	the object). As a result, show-command is now deprecated
+* gist/play/save-file now infer object type without requiring flags,
+	e.g play MyClass, play my_file.rb, play my_method
+* edit command can now edit most things, including: files, methods,
+	classes, commands. As a result the 'edit-method' command is now
+	deprecatd.
+	e.g edit my_file.rb, edit my_method, edit MyClass
+* removed "edit-method", now merged with 'edit'
+* amend-line and play now properly indent code added to input buffer.
 * #674 added support for require switches chaining (`pry -rubygems -r./a.rb`)
 * #695 added ability to customize the name displayed in the prompt
 * #716 added `--patch` switch for `edit --ex` command
 * #736 respect the `$PAGER` environment variable
 * #497 added `disable-pry` command
-* removed "edit-method" command; added `--method` switch to "edit" command
 * removed "show-command" command; use "show-source" command instead
-* show-source it works on everything (lambdas, procs, commands)
 * exec switch chaining (`pry -e ':one' -e ':two'`)
 * added two new hooks: "before_eval" and "after_eval"
-* added bond tabcompletion for commands, filenames, "cat" and "shell" commands
 * added tabcompletion for "show-source", "show-doc" commands and "Array#<tab>" cases
 * immediately require gems after gem-install
 * added `-l` switch for `ls` command (displays local variables)
@@ -29,7 +38,6 @@ new features:
 * tablifed ls output
 * added `--no-line-numbers` switch for "whereami" command
 * added `--lines` switch for "play" command
-* "gist", "play", "save-file" commands no longer need switches to select object types
 
 bug fixes:
 * #652 find-method uses single escape instead of double
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7a492a02..896a7230 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,37 +1,55 @@
-   938	banisterfiend
-   290	cirwin
-   140	ryanf
-    93	robgleeson
-    51	injekt
-    49	Mon_Ouie
-    39	envygeeks
-    28	yorickpeterse
+  1068	John Mair
+   372	Conrad Irwin
+   215	Ryan Fitzgerald
+   108	Kyrylo Silin
+    92	Rob Gleeson
+    54	Mon ouïe
+    51	Lee Jarvis
+    47	☈king
+    40	Jordon Bedwell
+    28	Yorick Peterse
     18	David Palm
+    18	Robert Gleeson
     15	epitron
-    15	kyrylo
-    10	swarley
-     8	rue
-     3	Darrick Wiebe
-     3	fowl
+    12	Andrew Vos
+    11	Reginald Tan
+    10	Matt Carey
+     8	Eero Saynatkari
+     8	Trey Lawrence
+     6	Jason Laster
      3	misfo
-     2	Ben Langfeld
-     2	Eric Christopherson
+     3	fowlmouth
+     3	Darrick Wiebe
      2	Kelsey Judson
+     2	Ben Langfeld
+     2	Bram Swenson
+     2	Erik Michaels-Ober
+     2	Ingrid
+     2	Vít Ondruch
      2	Xavier Shay
-     2	sferic
-     2	shadowshell
-     1	Gerbert Olivé
-     1	Gosha Arinich
-     1	Joe Peduto
-     1	Jonathan Jackson
-     1	Jonathan Soeder
-     1	Jordan Running
-     1	Josh Cheek
-     1	KL-7
-     1	Lars Haugseth
-     1	Reginald Tan
-     1	Renato Mascarenhas
-     1	Shawn Anderson
-     1	Sherin C
+     2	Jonathan Soeder
+     2	Eric Christopherson
+     2	robgleeson
+     1	Ben Pickles
+     1	Zeh Rizzatti
+     1	shirmung
      1	sonnym
-     1	tpope
+     1	Shawn Anderson
+     1	Joe Peduto
+     1	Greg Stearns
+     1	Jonathan Jackson
+     1	Jordan Running
+     1	Gosha Arinich
+     1	Josh Cheek
+     1	Kirill Lashuk
+     1	Gerbert Olivé
+     1	Larry Gilbert
+     1	Lars Haugseth
+     1	Loic Nageleisen
+     1	Matthew Carey
+     1	Michael Bensoussan
+     1	Renato Mascarenhas
+     1	Havenwood
+     1	Sherin C
+     1	Sonali Sridhar
+     1	Tim Pope