1
0
Fork 0
mirror of https://github.com/pry/pry.git synced 2022-11-09 12:35:05 -05:00

Use Jist.copy, not a Helper; fix @filename

This commit is contained in:
☈king 2012-12-07 08:35:25 -06:00 committed by rking@sharpsaw.org
parent c51f75a9fc
commit 8f92f5a855
2 changed files with 4 additions and 35 deletions

View file

@ -1,31 +1,4 @@
class Pry class Pry
module Helpers
module Clipboard
# 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 self.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
end
module Gist module Gist
DESCRIPTION = 'Upload code, docs, history to https://gist.github.com/' DESCRIPTION = 'Upload code, docs, history to https://gist.github.com/'
INVOCATIONS = { INVOCATIONS = {
@ -52,7 +25,6 @@ class Pry
end.join "\n" end.join "\n"
end end
end end
end end
Pry::Commands.create_command "gist" do Pry::Commands.create_command "gist" do
@ -81,7 +53,7 @@ class Pry
def from_pry_api api_obj def from_pry_api api_obj
@content << api_obj.source << "\n" @content << api_obj.source << "\n"
@filename = api_obj.source @filename = api_obj.source_file
end end
def options(opt) def options(opt)
@ -167,7 +139,7 @@ class Pry
# copy content to clipboard instead (only used with --clip flag) # copy content to clipboard instead (only used with --clip flag)
def perform_clipboard def perform_clipboard
Pry::Helpers::Clipboard.copy(@content) Jist.copy(@content)
output.puts "Copied content to clipboard!" output.puts "Copied content to clipboard!"
end end
@ -181,7 +153,7 @@ class Pry
if response if response
url = response['html_url'] url = response['html_url']
Pry::Helpers::Clipboard.copy(url) Jist.copy(url)
output.puts 'Gist created at URL, which is now in the clipboard: ', url output.puts 'Gist created at URL, which is now in the clipboard: ', url
end end
end end

View file

@ -10,6 +10,7 @@ describe 'gist' do
$jist_gisted = args $jist_gisted = args
{'html_url' => 'http://gist.blahblah'} {'html_url' => 'http://gist.blahblah'}
end end
def copy(content); $clipped_content = content end
end end
end end
@ -18,10 +19,6 @@ describe 'gist' do
$jist_logged_in.should.not.be.nil $jist_logged_in.should.not.be.nil
end end
module Pry::Helpers::Clipboard
def self.copy(content); $clipped_content = content end
end
EXAMPLE_REPL_METHOD = <<-EOT EXAMPLE_REPL_METHOD = <<-EOT
# docdoc # docdoc
def my_method def my_method