pastr_it 0.1.4 → 0.1.6

data/lib/pastr_it.rb

@@ -1,6 +1,6 @@
 require "optparse"
 class PastrIt
-  VERSION = '0.1.4'
+  VERSION = '0.1.6'
   REALM = 'Pastr Registered User'
   PasteLink = "http://pastr.it/new"
   attr_accessor :password, :filename, :title, :network, :channel, :language, :username
@@ -10,6 +10,12 @@ class PastrIt
     parse_args
   end
 
+  def self.pastr_it(args)
+    me = PastrIt.new(args)
+    me.parse_args
+    me.pastr_it
+  end
+
   def parse_args
     return @opts if @opts
     @opts = OptionParser.new
@@ -22,12 +28,19 @@ class PastrIt
     @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.separator "\n---------------\n"
+    @opts.on("-L", "--list", "List supported languages") { |foo| @list_langs = true }
 
     @opts.on_tail("-h", "--help", "Show this message") do
       puts @opts
       exit 
     end   
     @opts.parse!(@args)
+    if @list_langs
+      puts http_request(:url => "http://pastr.it/languages").content
+      exit
+    end
+
     @filename = ARGV.shift if ARGV.size == 1 and File.file?(ARGV.first)
     @title ||= File.basename(@filename) if @filename
     @channel ||= @username
@@ -38,6 +51,43 @@ class PastrIt
   end
 
   def pastr_it
+    form = {'network' => network, 'channel' => channel, 'paste_body' => paste_body}
+    form["title"] = title if title
+    form["language"] = language if language
+    puts http_request(:form => form).content
+  end
+
+  private
+  def http_request(args)
+    form = args[:form] || nil
+    url = args[:url] || PasteLink
+    require "httpclient"
+    check_netrc
+    check_password
+    client = HTTPClient.new(ENV["HTTP_PROXY"] ? ENV["HTTP_PROXY"] : ENV["http_proxy"])
+    # Have to do this to get a valid cookie with the server before we auth (lame)
+    res = client.get("http://pastr.it")
+    if res.status != 200
+      puts "Cannot access http://pastr.it. Webserver said Status: #{res.status} -> #{res.reason}"
+      exit 1
+    end
+    if form
+      # Now set auth and post
+      client.set_auth(url, username.strip, password.strip)
+      res = client.post(url, form)
+    else
+      # Or set auth and get
+      client.set_auth(url, username.strip, password.strip)
+      res = client.get(url)
+    end
+    if res.status != 200
+      puts "An error occurred posting to#{PasteLink}. Webserver said Status: #{res.status} -> #{res.reason}"
+      exit 1
+    end
+    res
+  end
+
+  def check_netrc
     if File.file?(netrc = ENV["HOME"] + "/.netrc")
       if p_auth = File.readlines(netrc).detect { |line| line.match(/^machine\s+pastr\.it/) }
         if uname = p_auth.match(/login\s+(\S+)/)
@@ -54,6 +104,9 @@ class PastrIt
         end
       end
     end
+  end
+
+  def check_password
     unless @password
       if STDIN.isatty
         begin
@@ -71,27 +124,9 @@ class PastrIt
         exit 1
       end
     end 
-    form = {'network' => network, 'channel' => channel, 'paste_body' => paste_body}
-    form["title"] = title if title
-    form["language"] = language if language
-    require "httpclient"
-    client = HTTPClient.new(ENV["HTTP_PROXY"])
-    # Have to do this to get a valid cookie with the server before we auth (lame)
-    res = client.get("http://pastr.it")
-    if res.status != 200
-      puts "Cannot access http://pastr.it. Webserver said Status: #{res.status} -> #{res.reason}"
-      exit 1
-    end
-    # Now set auth and post
-    client.set_auth(PasteLink, username.strip, password.strip)
-    res = client.post(PasteLink, form)
-    if res.status != 200
-      puts "An error occurred posting to#{PasteLink}. Webserver said Status: #{res.status} -> #{res.reason}"
-      exit 1
-    end
-    puts res.content
   end
 
+
   def paste_body
     return @paste_body if @paste_body
     if filename
@@ -102,10 +137,5 @@ class PastrIt
     end
   end
 
-  def self.pastr_it(args)
-    me = PastrIt.new(args)
-    me.parse_args
-    me.pastr_it
-  end
 end
 #:et;ts=2;sw=2;foldmethod=indent

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pastr_it
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors: 
 - Jayson Vaughn
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A command line program to paste text to http://pastr.it