pry 0.9.9.6pre2-i386-mingw32 → 0.9.10-i386-mingw32

data/lib/pry/default_commands/gist.rb

@@ -0,0 +1,187 @@
+class Pry
+  module DefaultCommands
+    Gist = Pry::CommandSet.new do
+      create_command "gist", "Gist a method or expression history to GitHub.", :requires_gem => "jist" do
+        include Pry::Helpers::DocumentationHelpers
+
+        banner <<-USAGE
+          Usage: gist [OPTIONS] [METH]
+          Gist method (doc or source) or input expression to GitHub.
+
+          If you'd like to permanently associate your gists with your GitHub account run `gist --login`.
+
+          e.g: gist -m my_method       # gist the method my_method
+          e.g: gist -d my_method       # gist the documentation for my_method
+          e.g: gist -i 1..10           # gist the input expressions from 1 to 10
+          e.g: gist -k show-method     # gist the command show-method
+          e.g: gist -c Pry             # gist the Pry class
+          e.g: gist -m hello_world --lines 2..-2    # gist from lines 2 to the second-last of the hello_world method
+          e.g: gist -m my_method --clip             # Copy my_method source to clipboard, do not gist it.
+        USAGE
+
+        command_options :shellwords => false
+
+        attr_accessor :content
+        attr_accessor :filename
+
+        def setup
+          require 'jist'
+          self.content   = ""
+          self.filename  = "a.rb"
+        end
+
+        def options(opt)
+          opt.on :login, "Authenticate the jist gem with GitHub"
+          opt.on :m, :method, "Gist a method's source.", :argument => true do |meth_name|
+            meth = get_method_or_raise(meth_name, target, {})
+            self.content << meth.source << "\n"
+            self.filename = meth.source_file
+          end
+          opt.on :d, :doc, "Gist a method's documentation.", :argument => true do |meth_name|
+            meth = get_method_or_raise(meth_name, target, {})
+            text.no_color do
+              self.content << process_comment_markup(meth.doc) << "\n"
+            end
+            self.filename = meth.source_file + ".doc"
+          end
+          opt.on :k, :command, "Gist a command's source.", :argument => true do |command_name|
+            command = find_command(command_name)
+            block = Pry::Method.new(command.block)
+            self.content << block.source << "\n"
+            self.filename = block.source_file
+          end
+          opt.on :c, :class, "Gist a class or module's source.", :argument => true do |class_name|
+            mod = Pry::WrappedModule.from_str(class_name, target)
+            self.content << mod.source << "\n"
+            self.filename = mod.source_file
+          end
+          opt.on :var, "Gist a variable's content.", :argument => true do |variable_name|
+            begin
+              obj = target.eval(variable_name)
+            rescue Pry::RescuableException
+              raise CommandError, "Gist failed: Invalid variable name: #{variable_name}"
+            end
+
+            self.content << Pry.config.gist.inspecter.call(obj) << "\n"
+          end
+          opt.on :hist, "Gist a range of Readline history lines.",  :optional_argument => true, :as => Range, :default => -20..-1 do |range|
+            h = Pry.history.to_a
+            self.content << h[one_index_range(convert_to_range(range))].join("\n") << "\n"
+          end
+
+          opt.on :f, :file, "Gist a file.", :argument => true do |file|
+            self.content << File.read(File.expand_path(file)) << "\n"
+            self.filename = file
+          end
+          opt.on :o, :out, "Gist entries from Pry's output result history. Takes an index or range.", :optional_argument => true,
+          :as => Range, :default => -1 do |range|
+            range = convert_to_range(range)
+
+            range.each do |v|
+              self.content << Pry.config.gist.inspecter.call(_pry_.output_array[v])
+            end
+
+            self.content << "\n"
+          end
+          opt.on :clip, "Copy the selected content to clipboard instead, do NOT gist it.", :default => false
+          opt.on :p, :public, "Create a public gist (default: false)", :default => false
+          opt.on :l, :lines, "Only gist a subset of lines from the gistable content.", :optional_argument => true, :as => Range, :default => 1..-1
+          opt.on :i, :in, "Gist entries from Pry's input expression history. Takes an index or range.", :optional_argument => true,
+          :as => Range, :default => -1 do |range|
+            range = convert_to_range(range)
+            input_expressions = _pry_.input_array[range] || []
+            Array(input_expressions).each_with_index do |code, index|
+              corrected_index = index + range.first
+              if code && code != ""
+                self.content << code
+                if code !~ /;\Z/
+                  self.content << "#{comment_expression_result_for_gist(Pry.config.gist.inspecter.call(_pry_.output_array[corrected_index]))}"
+                end
+              end
+            end
+          end
+        end
+
+        def process
+          return Jist.login! if opts.present?(:login)
+
+          if self.content =~ /\A\s*\z/
+            raise CommandError, "Found no code to gist."
+          end
+
+          if opts.present?(:clip)
+            perform_clipboard
+          else
+            perform_gist
+          end
+        end
+
+        # copy content to clipboard instead (only used with --clip flag)
+        def perform_clipboard
+          copy(self.content)
+          output.puts "Copied content to clipboard!"
+        end
+
+        def perform_gist
+          if opts.present?(:lines)
+            self.content = restrict_to_lines(content, opts[:l])
+          end
+
+          response = Jist.gist(content, :filename => File.basename(filename),
+                                        :public => !!opts[:p])
+
+          if response
+            copy(response['html_url'])
+            output.puts "Gist created at #{response['html_url']} and added to clipboard."
+          end
+        end
+
+        def convert_to_range(n)
+          if !n.is_a?(Range)
+            (n..n)
+          else
+            n
+          end
+        end
+
+        def comment_expression_result_for_gist(result)
+          content = ""
+          result.lines.each_with_index do |line, index|
+            if index == 0
+              content << "# => #{line}"
+            else
+              content << "#    #{line}"
+            end
+          end
+          content
+        end
+
+        # Copy a string to the clipboard.
+        #
+        # @param [String] content
+        #
+        # @copyright Copyright (c) 2008 Chris Wanstrath (MIT)
+        # @see https://github.com/defunkt/gist/blob/master/lib/gist.rb#L178
+        def copy(content)
+          cmd = case true
+          when system("type pbcopy > /dev/null 2>&1")
+            :pbcopy
+          when system("type xclip > /dev/null 2>&1")
+            :xclip
+          when system("type putclip > /dev/null 2>&1")
+            :putclip
+          end
+
+          if cmd
+            IO.popen(cmd.to_s, 'r+') { |clip| clip.print content }
+          end
+
+          content
+        end
+      end
+
+      alias_command "clipit", "gist --clip"
+      alias_command "jist", "gist"
+    end
+  end
+end

data/lib/pry/default_commands/hist.rb

@@ -16,13 +16,13 @@ class Pry
         USAGE
 
         def options(opt)
-          opt.on :H, :head, "Display the first N items.", :optional => true, :as => Integer
-          opt.on :T, :tail, "Display the last N items.", :optional => true, :as => Integer
-          opt.on :s, :show, "Show the given range of lines.", :optional => true, :as => Range
-          opt.on :G, :grep, "Show lines matching the given pattern.", true, :as => String
+          opt.on :H, :head, "Display the first N items.", :optional_argument => true, :as => Integer
+          opt.on :T, :tail, "Display the last N items.", :optional_argument => true, :as => Integer
+          opt.on :s, :show, "Show the given range of lines.", :optional_argument => true, :as => Range
+          opt.on :G, :grep, "Show lines matching the given pattern.", :argument => true, :as => String
           opt.on :c, :clear, "Clear the current session's history."
-          opt.on :r, :replay, "Replay a line or range of lines.", true, :as => Range
-          opt.on     :save, "Save history to a file.", true, :as => Range
+          opt.on :r, :replay, "Replay a line or range of lines.", :argument => true, :as => Range
+          opt.on     :save, "Save history to a file.", :argument => true, :as => Range
 
           opt.on :e, :'exclude-pry', "Exclude Pry commands from the history."
           opt.on :n, :'no-numbers', "Omit line numbers."

data/lib/pry/default_commands/input_and_output.rb

@@ -1,9 +1,11 @@
 require 'tempfile'
+require 'pry/default_commands/gist'
 
 class Pry
   module DefaultCommands
 
     InputAndOutput = Pry::CommandSet.new do
+      import Gist
       command(/\.(.*)/, "All text following a '.' is forwarded to the shell.", :listing => ".<shell command>", :use_prefix => false, :takes_block => true) do |cmd|
         if cmd =~ /^cd\s+(.+)/i
           dest = $1
@@ -37,129 +39,13 @@ class Pry
       end
       alias_command "file-mode", "shell-mode"
 
-      create_command "gist", "Gist a method or expression history to github.", :requires_gem => "gist", :shellwords => false do
-        banner <<-USAGE
-          Usage: gist [OPTIONS] [METH]
-          Gist method (doc or source) or input expression to github.
-          Ensure the `gist` gem is properly working before use. http://github.com/defunkt/gist for instructions.
-          e.g: gist -m my_method
-          e.g: gist -d my_method
-          e.g: gist -i 1..10
-          e.g: gist -c show-method
-          e.g: gist -m hello_world --lines 2..-2
-        USAGE
-
-        attr_accessor :content
-        attr_accessor :code_type
-
-        def setup
-          require 'gist'
-          self.content   = ""
-          self.code_type = :ruby
-        end
-
-        def options(opt)
-          opt.on :m, :method, "Gist a method's source.", true do |meth_name|
-            meth = get_method_or_raise(meth_name, target, {})
-            self.content << meth.source
-            self.code_type = meth.source_type
-          end
-          opt.on :d, :doc, "Gist a method's documentation.", true do |meth_name|
-            meth = get_method_or_raise(meth_name, target, {})
-            text.no_color do
-              self.content << process_comment_markup(meth.doc, self.code_type)
-            end
-            self.code_type = :plain
-          end
-          opt.on :c, :command, "Gist a command's source.", true do |command_name|
-            command = find_command(command_name)
-            block = Pry::Method.new(find_command(command_name).block)
-            self.content << block.source
-          end
-          opt.on :f, :file, "Gist a file.", true do |file|
-            self.content << File.read(File.expand_path(file))
-          end
-          opt.on :p, :public, "Create a public gist (default: false)", :default => false
-          opt.on :l, :lines, "Only gist a subset of lines.", :optional => true, :as => Range, :default => 1..-1
-          opt.on :i, :in, "Gist entries from Pry's input expression history. Takes an index or range.", :optional => true,
-          :as => Range, :default => -5..-1 do |range|
-            range = convert_to_range(range)
-            input_expressions = _pry_.input_array[range] || []
-            Array(input_expressions).each_with_index do |code, index|
-              corrected_index = index + range.first
-              if code && code != ""
-                self.content << code
-                if code !~ /;\Z/
-                  self.content << "#{comment_expression_result_for_gist(Pry.config.gist.inspecter.call(_pry_.output_array[corrected_index]))}"
-                end
-              end
-            end
-          end
-        end
-
-        def process
-          perform_gist
-        end
-
-        def perform_gist
-          type_map = { :ruby => "rb", :c => "c", :plain => "plain" }
-
-          if self.content =~ /\A\s*\z/
-            raise CommandError, "Found no code to gist."
-          end
-
-          # prevent Gist from exiting the session on error
-          begin
-            extname = opts.present?(:file) ? ".#{gist_file_extension(opts[:f])}" : ".#{type_map[self.code_type]}"
-
-            if opts.present?(:lines)
-              self.content = restrict_to_lines(content, opts[:l])
-            end
-
-            link = Gist.write([:extension => extname,
-                               :input => self.content],
-                              !opts[:p])
-          rescue SystemExit
-          end
-
-          if link
-            Gist.copy(link)
-            output.puts "Gist created at #{link} and added to clipboard."
-          end
-        end
-
-        def gist_file_extension(file_name)
-          file_name.split(".").last
-        end
-
-        def convert_to_range(n)
-          if !n.is_a?(Range)
-            (n..n)
-          else
-            n
-          end
-        end
-
-        def comment_expression_result_for_gist(result)
-          content = ""
-          result.lines.each_with_index do |line, index|
-            if index == 0
-              content << "# => #{line}"
-            else
-              content << "#    #{line}"
-            end
-          end
-          content
-        end
-      end
-
       create_command "save-file", "Export to a file using content from the REPL."  do
         banner <<-USAGE
           Usage: save-file [OPTIONS] [FILE]
           Save REPL content to a file.
           e.g: save-file -m my_method -m my_method2 ./hello.rb
           e.g: save-file -i 1..10 ./hello.rb --append
-          e.g: save-file -c show-method ./my_command.rb
+          e.g: save-file -k show-method ./my_command.rb
           e.g: save-file -f sample_file --lines 2..10 ./output_file.rb
         USAGE
 
@@ -170,21 +56,43 @@ class Pry
           self.content = ""
         end
 
+        def convert_to_range(n)
+          if !n.is_a?(Range)
+            (n..n)
+          else
+            n
+          end
+        end
+
         def options(opt)
-          opt.on :m, :method, "Save a method's source.", true do |meth_name|
+          opt.on :m, :method, "Save a method's source.", :argument => true do |meth_name|
             meth = get_method_or_raise(meth_name, target, {})
             self.content << meth.source
           end
-          opt.on :c, :command, "Save a command's source.", true do |command_name|
+          opt.on :c, :class, "Save a class's source.", :argument => true do |class_name|
+            mod = Pry::WrappedModule.from_str(class_name, target)
+            self.content << mod.source
+          end
+          opt.on :k, :command, "Save a command's source.", :argument => true do |command_name|
             command = find_command(command_name)
-            block = Pry::Method.new(find_command(command_name).block)
+            block = Pry::Method.new(command.block)
             self.content << block.source
           end
-          opt.on :f, :file, "Save a file.", true do |file|
+          opt.on :f, :file, "Save a file.", :argument => true do |file|
             self.content << File.read(File.expand_path(file))
           end
-          opt.on :l, :lines, "Only save a subset of lines.", :optional => true, :as => Range, :default => 1..-1
-          opt.on :i, :in, "Save entries from Pry's input expression history. Takes an index or range.", :optional => true,
+          opt.on :l, :lines, "Only save a subset of lines.", :optional_argument => true, :as => Range, :default => 1..-1
+          opt.on :o, :out, "Save entries from Pry's output result history. Takes an index or range.", :optional_argument => true,
+          :as => Range, :default => -5..-1 do |range|
+            range = convert_to_range(range)
+
+            range.each do |v|
+              self.content << Pry.config.gist.inspecter.call(_pry_.output_array[v])
+            end
+
+            self.content << "\n"
+          end
+          opt.on :i, :in, "Save entries from Pry's input expression history. Takes an index or range.", :optional_argument => true,
           :as => Range, :default => -5..-1 do |range|
             input_expressions = _pry_.input_array[range] || []
             Array(input_expressions).each { |v| self.content << v }
@@ -240,13 +148,13 @@ class Pry
         USAGE
 
         def options(opt)
-          opt.on :ex,        "Show the context of the last exception.", :optional => true, :as => Integer
-          opt.on :i, :in,    "Show one or more entries from Pry's expression history.", :optional => true, :as => Range, :default => -5..-1
+          opt.on :ex,        "Show the context of the last exception.", :optional_argument => true, :as => Integer
+          opt.on :i, :in,    "Show one or more entries from Pry's expression history.", :optional_argument => true, :as => Range, :default => -5..-1
 
-          opt.on :s, :start, "Starting line (defaults to the first line).", :optional => true, :as => Integer
-          opt.on :e, :end,   "Ending line (defaults to the last line).", :optional => true, :as => Integer
+          opt.on :s, :start, "Starting line (defaults to the first line).", :optional_argument => true, :as => Integer
+          opt.on :e, :end,   "Ending line (defaults to the last line).", :optional_argument => true, :as => Integer
           opt.on :l, :'line-numbers', "Show line numbers."
-          opt.on :t, :type,  "The file type for syntax highlighting (e.g., 'ruby' or 'python').", true, :as => Symbol
+          opt.on :t, :type,  "The file type for syntax highlighting (e.g., 'ruby' or 'python').", :argument => true, :as => Symbol
 
           opt.on :f, :flood, "Do not use a pager to view text longer than one screen."
         end
@@ -282,6 +190,8 @@ class Pry
             ex.inc_bt_index
           else
             bt_index = opts[:ex]
+            ex.bt_index = bt_index
+            ex.inc_bt_index
           end
 
           ex_file, ex_line = ex.bt_source_location_for(bt_index)
@@ -348,6 +258,7 @@ class Pry
 
           code = yield(Pry::Code.from_file(file_name))
 
+          code.code_type = opts[:type] || detect_code_type_from_file(file_name)
           if line_num
             code = code.around(line_num.to_i,
                                Pry.config.default_window_size || 7)
@@ -355,8 +266,41 @@ class Pry
 
           code
         end
-      end
 
+        def detect_code_type_from_file(file_name)
+          name, ext = File.basename(file_name).split('.', 2)
+
+          if ext
+            case ext
+            when "py"
+               :python
+            when "rb", "gemspec", "rakefile", "ru"
+               :ruby
+            when "js"
+              return :javascript
+            when "yml", "prytheme"
+              :yaml
+            when "groovy"
+              :groovy
+            when "c"
+              :c
+            when "cpp"
+              :cpp
+            when "java"
+              :java
+            else
+              :text
+            end
+          else
+            case name
+            when "Rakefile", "Gemfile"
+              :ruby
+            else
+              :text
+            end
+          end
+        end
+      end
     end
   end
 end