@@ -2,19 +2,17 @@ require "pastejour/cli" -opts = Pastejour::Cli.new STDOUT, ARGV - -if opts.run? - if opts.list? +Pastejour::Cli.new STDOUT, ARGV do |cli| + if cli.list? Pastejour.list elsif $stdin.tty? - name = /#{ENV["USER"]}$/ if opts.name.nil? || opts.name.empty? + name = /#{ENV["USER"]}$/ if cli.name.nil? || cli.name.empty? $stdout.write Pastejour.get(name) $stdout.flush else - name = [ENV["USER"], opts.name].compact.join "-" + name = [ENV["USER"], cli.name].compact.join "-" contents = $stdin.read - Pastejour.serve name, opts.multiple?, contents - $stdout.puts contents if opts.tee? + Pastejour.serve name, cli.multiple?, contents + $stdout.puts contents if cli.tee? end end bin/pastejour @@ -39,9 +39,11 @@ module Pastejour end opts.separator "" - opts.parse! args + @name = args.shift + + yield self if @run && block_given? end end @@ -53,10 +55,6 @@ module Pastejour @multiple end - def run? - @run - end - def tee? @tee end lib/pastejour/cli.rb 92d41cca49d9b9fc96b3bbef562a91c06ee58ef7 John Barnette jbarnette@gmail.com http://github.com/jbarnette/pastejour/commit/bd6932879a0ab32795c42466b37ee2d0d5d8529d bd6932879a0ab32795c42466b37ee2d0d5d8529d 2009-03-02T10:44:10-08:00 2009-03-02T10:44:10-08:00 Keeping command-line utility templates consistent. 3d8d2d57a84405e4e4dfa47ffc2b6f8fa5593c9c John Barnette jbarnette@gmail.com