tit 1.0.1 → 1.1.0

data/ChangeLog.markdown

@@ -1,3 +1,7 @@
+# tit 1.1.0 2010-01-23
+
+ * moved to oauth for chris
+
 # tit 1.0.1 2010-01-22
 
  * made even more spiteful in a few rather non-clever ways

data/README.markdown

@@ -12,28 +12,54 @@ install
 usage
 -----
 
+### authz ###
+
+first, you need to authenticate yourself with the stupid fucking twitter oauth
+stuff
+
+to do this, just run tit by itself
+
     $ tit
 
-or
+it'll prompt you with the auth url, so plug that in your fucking browser, click
+"ok", and twitter will give you a stupid fucking pin number
 
-    $ tit -u "look at my stupid fucking tweet" -G 88.918:-34.879
+    $ tit --pin 8675309
+
+now you're done and your goddamn access token should be stored for a real
+fucking long time
+
+### looking at tits ###
+
+get the shit you'd see by visiting twitter's fucking homepage:
 
-or
+    $ tit
+
+annoyingly poll twitter and add some stupid fucking notifications too:
 
     $ tit -P -n
 
+there's some more fucking options for you if you look at `tit -h`
+
+### showing other people your tits ###
+
+    $ tit -u "look at my stupid fucking tweet" -G 88.918:-34.879
+
 dependencies
 ------------
 
-[rest-client][] and [nokogiri][]
+[oauth][] and [nokogiri][]
+
+[oauth]: http://oauth.rubyforge.org/
+[nokogiri]: http://nokogiri.org/
 
 caveats
 -------
 
 geotags are of the form `LAT:LONG`, where `LAT` and `LONG` are floating point
 numbers, indicating, respectively, the number of degrees north or east of the
-center of the earth; make them negative if you live on one or both of the dark
-hemispheres
+fucking center of the earth; make them negative if you live on one or both of
+the dark hemispheres
 
 bugs
 ----

data/Rakefile

@@ -7,8 +7,8 @@ begin
     gemspec.email = "leif.walsh@gmail.com"
     gemspec.homepage = "http://github.com/adlaiff6/tit"
     gemspec.authors = ["Leif Walsh"]
-    gemspec.add_dependency('nokogiri', '>= 1.4.0')
-    gemspec.add_dependency('rest-client', '>= 1.2.0')
+    gemspec.add_dependency('nokogiri', '>= 0')
+    gemspec.add_dependency('oauth', '>= 0')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
-:patch: 1
-:minor: 0
+:patch: 0
+:minor: 1
 :major: 1
 :build:

data/bin/tit

@@ -2,6 +2,8 @@
 
 require 'tit'
 
+require 'optparse'
+
 def main
   options = {
     :debug => false,
@@ -35,6 +37,10 @@ def main
       options[:payload] ||= {}
       options[:payload]["status"] = status || STDIN
     end
+    opts.on("--pin PIN", ("Set auth pin if this is your first time playing " +
+                          "with this tit")) do |pin|
+      options[:pin] = pin
+    end
 
     opts.separator ""
     opts.separator "Receive options (public/home/mentions):"
@@ -86,6 +92,12 @@ def main
     tit.abort(e.message)
   end
 
+  if options.include? :pin
+    tit.use_pin(options[:pin])
+  end
+
+  tit.get_access
+
   # check for option errors
   if Tit::READERS.include? options[:action]
     tit.abort("cannot provide geotag when reading") unless options[:payload].nil?
@@ -102,18 +114,24 @@ def main
   if options[:debug]
     begin
       tit.run(options)
-    rescue SocketError, Errno::ENETUNREACH, Errno::ETIMEDOUT, RestClient::Exception => e
+    rescue SocketError, Errno::ENETUNREACH, Errno::ETIMEDOUT => e
       tit.error "got a networking error, are you connected to the intarbutts?"
       puts e
       exit(-1)
+    rescue NoMethodError
+      tit.error "might have gotten a networking error, check your intarbutts."
+      exit(-1)
     end
   else
     begin
       tit.run(options)
-    rescue SocketError, Errno::ENETUNREACH, Errno::ETIMEDOUT, RestClient::Exception => e
+    rescue SocketError, Errno::ENETUNREACH, Errno::ETIMEDOUT => e
       tit.error "got a networking error, are you connected to the intarbutts?"
       puts e
       exit(-1)
+    rescue NoMethodError
+      tit.error "might have gotten a networking error, check your intarbutts."
+      exit(-1)
     rescue => e
       tit.error "unknown error"
       puts e

data/lib/tit.rb

@@ -3,8 +3,7 @@
 require 'rubygems'
 require 'ftools'
 require 'nokogiri'
-require 'optparse'
-require 'rest_client'
+require 'oauth/consumer'
 require 'time'  # heh.
 require 'yaml'
 
@@ -75,56 +74,76 @@ end
 Why are you reading the documentation, you cunt?
 =end
 class Tit
-  RCFILE = File.join(ENV["HOME"], ".titrc")
+  RTFILE = File.join(ENV["HOME"], ".titrt")
+  ATFILE = File.join(ENV["HOME"], ".titat")
 
   READERS = [:public, :home, :mentions]
   WRITERS = [:update]
 
   URLS = {
-    :public => "statuses/public_timeline.xml",
-    :home => "statuses/home_timeline.xml",
-    :mentions => "statuses/mentions.xml",
-    :update => "statuses/update.xml"
+    :public => "/statuses/public_timeline.xml",
+    :home => "/statuses/home_timeline.xml",
+    :mentions => "/statuses/mentions.xml",
+    :update => "/statuses/update.xml"
   }
 
+  KEY = "K2OOlWbQodfm4YV9Fmeg"
+  SECRET = "B1HuqK8zoDDLboRAWPqlHTFbLVdkQfquzoUC1MkuM"
+
   def initialize
-    @username = nil
-    @password = nil
+    @consumer = OAuth::Consumer.new(KEY, SECRET,
+                                    { :site => "https://twitter.com" })
+
+    # get terminal width
+    @cols = %x[tput cols].to_i
+  end
+  attr_accessor :opts
+
+  def get_access
     begin
-      File.open(RCFILE, "r") do |rc|
-        data = YAML.load(rc)
-        @username = data["username"]
-        @password = data["password"]
+      @access_token = File.open(ATFILE, "r") do |at|
+        params = YAML.load(at)
+        OAuth::AccessToken.from_hash(@consumer, params)
       end
     rescue Errno::ENOENT => e
-      File.open(RCFILE, "w") do |rc|
-        YAML.dump({
-                    "username" => "<username>",
-                    "password" => "<password>"
-                  }, rc)
+      request_token = @consumer.get_request_token
+      File.open(RTFILE, "w") do |rt|
+        YAML.dump(request_token.params, rt)
       end
+      tuts "Please visit '#{request_token.authorize_url}'."
+      tuts "When you finish, provide your pin with `tit --pin PIN'"
+      exit(0)
     end
-
-    if @username.nil? or @username.eql? "<username>" or
-        @password.nil? or @password.eql? "<password>"
-      puts "Please fill in your username and password in #{RCFILE}"
-      exit(-1)
-    end
-
-    # set up proxy
-    RestClient.proxy = ENV['https_proxy']
-
-    # get terminal width
-    @cols = %x[tput cols].to_i
   end
-  attr_accessor :opts
 
-  def resource
-    RestClient::Resource.new("https://#{@username}:#{@password}@twitter.com/")
+  def use_pin(pin)
+    begin
+      request_token = File.open(RTFILE, "r") do |rt|
+        params = YAML.load(rt)
+        OAuth::RequestToken.from_hash(@consumer, params)
+      end
+    rescue Errno::ENOENT => e
+      tuts "You lost your old token, gotta try again."
+      get_access
+    end
+    begin
+      @access_token = request_token.get_access_token(:oauth_verifier => pin)
+    rescue OAuth::Unauthorized => e
+      tuts "Sorry, that's an old pin."
+      File.delete(RTFILE)
+      get_access
+    end
+    File.open(ATFILE, "w") do |at|
+      YAML.dump(@access_token.params, at)
+    end
+    File.delete(RTFILE)
+    tuts "Thanks, you're done with authentication."
+    tuts "Keep #{ATFILE} secure and intact.  If it's compromised, I can't " +
+      "revoke your token."
   end
 
   def get_tits(action)
-    Nokogiri.XML(resource[URLS[action]].get).xpath("//status").map do |xml|
+    Nokogiri.XML(@access_token.get(URLS[action]).body).xpath("//status").map do |xml|
       {
         :username => xml.at_xpath("./user/name").content,
         :userid => xml.at_xpath("./user/screen_name").content,
@@ -147,13 +166,13 @@ class Tit
     end
 
     if payload["status"].length > 140
-      puts "your status is too long (by #{payload["status"].length - 140} characters)"
-      puts "here is what would get posted:"
+      tuts "your status is too long (by #{payload["status"].length - 140} characters)"
+      tuts "here is what would get posted:"
       payload["status"][0...140].wrapped(@cols - 2).each { |l| puts "  #{l}" }
       exit(-1)
     end
 
-    resource[URLS[:update]].post(payload)
+    @access_token.post(URLS[:update], payload)
   end
 
   def show_tit(status)
@@ -164,9 +183,9 @@ class Tit
              end
     at = status[:timestamp].time_ago_in_words
     if status[:geo].nil?
-      puts "#{person} said, #{at}:"
+      tuts "#{person} said, #{at}:"
     else
-      puts "#{person} said, #{at}, from #{status[:geo]}:"
+      tuts "#{person} said, #{at}, from #{status[:geo]}:"
     end
 
     status[:text].each do |line|
@@ -194,15 +213,16 @@ class Tit
           tits.include? status[:id]
         end.each_with_index do |status, i|
           if i == 0
-            puts "more updates (at #{Time.now.strftime "%X"}):\n"
+            tuts "more updates (at #{Time.now.strftime "%X"}):"
+            puts ""
           end
           show_tit(status)
           tits[status[:id]] = status
         end.length
         %x[#{notify} '#{num_tits} new tit#{num_tits == 1 ? '' : 's'}!'] unless notify.nil? or num_tits == 0
         last_update = Time.now()
-      rescue SocketError, Errno::ENETUNREACH, Errno::ETIMEDOUT, RestClient::Exception => e
-        puts "networking error, will try again later"
+      rescue SocketError, Errno::ENETUNREACH, Errno::ETIMEDOUT, NoMethodError => e
+        tuts "networking error, will try again later"
       end
     end
   end
@@ -219,13 +239,17 @@ class Tit
     end
   end
 
-  def error msg
-    puts "#{File.basename $0}: #{msg}"
+  def tuts(*strs)
+    strs.each { |s| puts s.wrapped(@cols) }
+  end
+
+  def error(msg)
+    tuts "#{File.basename $0}: #{msg}"
   end
 
-  def abort msg
+  def abort(msg)
     error(msg)
-    puts @opts
+    tuts @opts
     exit(-1)
   end
 end

data/tit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tit}
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leif Walsh"]
-  s.date = %q{2010-01-22}
+  s.date = %q{2010-01-23}
   s.default_executable = %q{tit}
   s.description = %q{a stupid fucking twitter client}
   s.email = %q{leif.walsh@gmail.com}
@@ -41,15 +41,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.0"])
-      s.add_runtime_dependency(%q<rest-client>, [">= 1.2.0"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
+      s.add_runtime_dependency(%q<oauth>, [">= 0"])
     else
-      s.add_dependency(%q<nokogiri>, [">= 1.4.0"])
-      s.add_dependency(%q<rest-client>, [">= 1.2.0"])
+      s.add_dependency(%q<nokogiri>, [">= 0"])
+      s.add_dependency(%q<oauth>, [">= 0"])
     end
   else
-    s.add_dependency(%q<nokogiri>, [">= 1.4.0"])
-    s.add_dependency(%q<rest-client>, [">= 1.2.0"])
+    s.add_dependency(%q<nokogiri>, [">= 0"])
+    s.add_dependency(%q<oauth>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tit
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors: 
 - Leif Walsh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-22 00:00:00 +01:00
+date: 2010-01-23 00:00:00 +01:00
 default_executable: tit
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,17 +20,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: oauth
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: "0"
     version: 
 description: a stupid fucking twitter client
 email: leif.walsh@gmail.com