@@ -16,7 +16,7 @@ class PastiePacker def do_pack self.contents = self.path_to_string(FileUtils.pwd) if contents && !contents.empty? - add_header(File.basename(FileUtils.pwd)) + add_header(File.basename(FileUtils.pwd)) unless no_header? do_paste end end @@ -24,7 +24,7 @@ class PastiePacker def do_pack_files(files) self.contents = self.files_to_string(files) if contents && !contents.empty? - add_header + add_header unless no_header? do_paste end end lib/pastiepacker/command.rb @@ -4,12 +4,14 @@ class PastiePacker def private?; @private; end def to_stdout?; @to_stdout; end + def no_header?; @no_header; end def parse_options(args) @private = false @format = "ruby" @extra_message = nil @to_stdout = false + @no_header = false OptionParser.new do |opts| opts.banner = <<BANNER @@ -42,6 +44,10 @@ BANNER opts.on("-s", "--stdout", "Prints packed pasties instead of posting", "Default: false") { |x| @to_stdout = x } + opts.on("-H", "--no-header", + "Prevents placing pastiepacker promotion in pasties", + "That is, no 'about:' section is added to the top of pasties", + "Default: false") { |x| @no_header = x } opts.on("-h", "--help", "Show this help message.") { puts opts; exit } self.args = opts.parse!(args) lib/pastiepacker/options.rb @@ -5,7 +5,7 @@ class PastiePacker ruby ruby_on_rails sql shell-unix-generic ) - + def do_paste if to_stdout? output_stream.puts contents @@ -13,7 +13,7 @@ class PastiePacker url = API.new.paste contents, format, private? end end - + class API PASTIE_URI = 'pastie.caboo.se' @@ -44,10 +44,10 @@ class PastiePacker class Error < StandardError; end class InvalidParser < StandardError; end - + end -# +# # irb(main):002:0> y = `file ~/Pictures/ryandavis2.jpg README.txt` # => "/Users/nicwilliams/Pictures/ryandavis2.jpg: JPEG image data, JFIF standard 1.01\nREADME.txt: ASCII English text\n" # irb(main):003:0> YAML.load(y) lib/pastiepacker/upload.rb @@ -55,6 +55,17 @@ class TestApp < Test::Unit::TestCase pastie.do_pack end end + + def test_pack_but_no_header + pastie = PastiePacker.new + pastie.expects(:no_header?).returns(true) + PastiePacker::API.any_instance.expects(:paste). + with($complete_pastie, nil, nil). + returns("http://pastie.caboo.se/123456") + FileUtils.cd base_folder do + pastie.do_pack + end + end def test_unpack_within_current_folder PastiePacker.any_instance.expects(:fetch_pastie). test/test_app.rb e2aff1060b647fffdc5f6412e822562288bd914f Dr Nic Williams drnicwilliams@gmail.com http://github.com/drnic/pastie-packer/commit/506443b3e5fc28278aec360019fa37fa411c1c16 506443b3e5fc28278aec360019fa37fa411c1c16 2008-04-05T00:48:12-07:00 2008-04-05T00:48:12-07:00 -H/--no-header stops the inclusion of the about: section in pasties 2e424eb59529a5c183d8c21de2b2ba2d57104f57 Dr Nic Williams drnicwilliams@gmail.com