pastr_it 0.1.2 → 0.1.4

data/lib/pastr_it.rb

@@ -1,6 +1,6 @@
 require "optparse"
 class PastrIt
-  VERSION = '0.1.2'
+  VERSION = '0.1.4'
   REALM = 'Pastr Registered User'
   PasteLink = "http://pastr.it/new"
   attr_accessor :password, :filename, :title, :network, :channel, :language, :username
@@ -13,21 +13,23 @@ class PastrIt
   def parse_args
     return @opts if @opts
     @opts = OptionParser.new
-    @opts.banner = "\nUsage: pastr-it [options]\n"
+    @opts.banner = "\nUsage: pastr-it [options] FILE\n"
     @opts.on("-u", "--username USERNAME", "Your username (Default: #{@username})") { |foo| @username = foo }
     @opts.on("-c", "--channel CHANNEL", "IRC Channel for this Pastr (Default: same as username)") { |foo| @channel = foo }
     @opts.separator "\tWhen using your username as the channel argument, the paste will be private"
     @opts.on("-n", "--network NETWORK", "IRC Network for this Pastr (Default: #{network})") { |foo| @network = foo }
     @opts.on("-l", "--language LANGUAGE", "Language to use for syntax highlighting") { |foo| @language = foo }
-    @opts.on("-t", "--title TITLE", "Title of this paste (Default: 'Pastr by #{username}')") { |foo| @title = foo }
-    @opts.on("-f", "--file FILENAME", "Read paste_body from FILENAME (otherwise reads from stdin)") { |foo| @filename = foo }
-    @opts.separator "\tTo paste from STDIN (instead of a file), you need to auth with a ~/.netrc"
+    @opts.on("-t", "--title TITLE", "Title of this paste (Default: Filename or 'Pastr by #{username}')") { |foo| @title = foo }
+    #@opts.on("-f", "--file FILENAME", "Read paste_body from FILENAME (otherwise reads from stdin)") { |foo| @filename = foo }
+    @opts.separator "\tTo paste from STDIN (instead of a file), leave off FILE, and you'll need to auth with a ~/.netrc"
 
     @opts.on_tail("-h", "--help", "Show this message") do
       puts @opts
       exit 
     end   
     @opts.parse!(@args)
+    @filename = ARGV.shift if ARGV.size == 1 and File.file?(ARGV.first)
+    @title ||= File.basename(@filename) if @filename
     @channel ||= @username
     if @filename.nil? and STDIN.isatty
       $stderr.puts "No Input on STDIN and no filename given, what am I supposed to paste?" 
@@ -64,7 +66,7 @@ class PastrIt
           system("stty echo")
         end
       else
-        STDERR.puts "Error: STDIN is not a tty (you supplied your paste through STDIN instead of -f FILE)"
+        STDERR.puts "Error: STDIN is not a tty (you supplied your paste through STDIN instead of a FILENAME)"
         STDERR.puts "Piping only works when using a ~/.netrc to supply login info, as the Password prompt needs STDIN to be a tty"
         exit 1
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pastr_it
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jayson Vaughn
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-09 00:00:00 -05:00
+date: 2009-04-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency