pry 0.9.12.1pre1-java → 0.9.12.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f878ba857c1285ea50000010126adac6cc81557
-  data.tar.gz: a18924f343e5af30d738abfb75b44758a88ae055
+  metadata.gz: b78a5d0b8a29388dec9723a0b2af86b0c8aeffc8
+  data.tar.gz: cf3293f037af9bcab05fed4300ff95a1ff861828
 SHA512:
-  metadata.gz: de73ac99dd09ea156835660e10a3d8811390b9253b02e8b8cb33623b6b8a490fb8b4b3a61406f5252ebb9308624a7685dc190d95c9631a34fd1cc44169893451
-  data.tar.gz: ffd25d77324658129f8a47d55cab97e2ab5bb8c05719e42b3c2c1501d36ff262836f9aeebad2fc9969c8a48fb63c0d0b18161507bcec3333e253ad43f1d6bfaf
+  metadata.gz: 4b19cbcf53f412672ce9d45e03ca926361036f72e7f2357b4f10090677aad30d02496319f6978d2252a0b7fa22571a677d2022cd96fccce0eb744a90afa7a6fb
+  data.tar.gz: 08aa73ffd0657256caa7cb7b160969e22ce8bb759727b4a4938903822e9b54b9a9be266dc6afac19ac18b17230c912a7155f6ab493e5caa9f6b2dc496296c7d7

data/CHANGELOG

@@ -1,4 +1,12 @@
-12/02/2012 version 0.9.12
+10/05/2013 version 0.9.12.2 minor fix
+* reload-code (with no args) should reload 'current file', issue #920
+
+21/04/2013 version 0.9.12.1 HOTFIX
+* Fixes #890, workaround for jruby crash related to http://jira.codehaus.org/browse/JRUBY-7114
+* note this fix is just applied to the 0.9.12 tag, not master. However, master has
+	this fix applied too.
+
+12/02/2013 version 0.9.12
 Bug fixes:
 * Fix major bug where commands broke due to slop looking at ARGV
 	instead of command parameters (#828)
@@ -17,23 +25,23 @@ Features:
 	(displays warning)
 * show-source/show-doc now indicate when -a option is available.
 
-20/01/2012 version 0.9.11.4
+20/01/2013 version 0.9.11.4
 * fixed pager bug (wouldn't render color codes in some circumstances)
 * added Pry.last_internal_error, useful for devs debugging commands
 
-17/01/2012 version 0.9.11.3
+17/01/2013 version 0.9.11.3
 * fix Pry.run_command
 * improve `ls` output
 * add :requires_gem => "jist" to 'gist' command (so deps can be installed
 	via install-command)
 * improve help for 'edit' command
 
-16/01/2012 version 0.9.11.2
+16/01/2013 version 0.9.11.2
 * minor bug fix for gist on windows, rescuing Jist::ClipboardError
 rather than letting the scary error spill out to users and potentially
 have them think the gist didnt post.
 
-16/01/2012 version 0.9.11.1
+16/01/2013 version 0.9.11.1
 * fixed minor bug in 'gist' command where i neglected to remove
   a call to a non-existent method (no_arg) which was called when
   `gist` is invoked with no parameters

data/lib/pry/commands/reload_code.rb

@@ -15,21 +15,40 @@ class Pry
     BANNER
 
     def process
-      code_object = Pry::CodeObject.lookup(obj_name, _pry_)
 
-      check_for_reloadability(code_object)
-      reload_code_object(code_object)
+      if obj_name.empty?
+        # if no parameters were provided then try to reload the
+        # current file (i.e target.eval("__FILE__"))
+        reload_current_file
+      else
+        code_object = Pry::CodeObject.lookup(obj_name, _pry_)
+        reload_code_object(code_object)
+      end
     end
 
     private
 
+    def current_file
+      File.expand_path target.eval("__FILE__")
+    end
+
+    def reload_current_file
+      if !File.exists?(current_file)
+        raise CommandError, "Current file: #{current_file} cannot be found on disk!"
+      end
+
+      load current_file
+      output.puts "The current file: #{current_file} was reloaded!"
+    end
+
     def reload_code_object(code_object)
+      check_for_reloadability(code_object)
       load code_object.source_file
       output.puts "#{obj_name} was reloaded!"
     end
 
     def obj_name
-      @obj_name ||= args.empty? ? "self" : args.join(" ")
+      @obj_name ||= args.join(" ")
     end
 
     def check_for_reloadability(code_object)

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.12.1pre1"
+  VERSION = "0.9.12.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry
 version: !ruby/object:Gem::Version
-  version: 0.9.12.1pre1
+  version: 0.9.12.2
 platform: java
 authors:
 - John Mair (banisterfiend)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-20 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
@@ -352,9 +352,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.2