tit 1.1.2 → 1.2.3

data/ChangeLog.markdown

@@ -1,3 +1,26 @@
+# tit 1.2.2 2011-08-18
+
+* freaking <3 all over the fucking twittersphere - decode that shit
+
+# tit 1.2.1 2011-08-18
+
+ * no longer using "-u" or "--update" for sending a tweet when other options exist - using "-t" or "--tweet"
+
+# tit 1.2.0 2011-08-18
+
+ * ability to get user's timeline
+ * tweet without using -u: just `tit 'tweet tweet'`
+ * user can now set number of tweets printed when requesting timelines
+
+# tit 1.1.4 2011-08-17
+
+ * moved debug from -d to -D
+ * added -v --version switch
+
+# tit 1.1.3 2011-08-15
+
+ * fixed a bug - ftools sucks
+
 # tit 1.1.2 2010-01-26
 
  * fixed a bug with update times and bad network connections

data/README.markdown

@@ -43,15 +43,16 @@ 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
+    $ tit "look at my stupid fucking tweet" -G 88.918:-34.879
 
 dependencies
 ------------
 
-[oauth][] and [nokogiri][]
+[oauth][] and [nokogiri][] and [htmlentities][]
 
 [oauth]: http://oauth.rubyforge.org/
 [nokogiri]: http://nokogiri.org/
+[htmlentities]: http://htmlentities.rubyforge.org/
 
 caveats
 -------

data/Rakefile

@@ -4,11 +4,12 @@ begin
     gemspec.name = "tit"
     gemspec.summary = "stupid fucking twitter client"
     gemspec.description = "a stupid fucking twitter client"
-    gemspec.email = "leif.walsh@gmail.com"
+    gemspec.email = ["leif.walsh@gmail.com", "parkrmoore@gmail.com"]
     gemspec.homepage = "http://github.com/adlaiff6/tit"
-    gemspec.authors = ["Leif Walsh"]
+    gemspec.authors = ["Leif Walsh", "Parker Moore"]
     gemspec.add_dependency('nokogiri', '>= 0')
     gemspec.add_dependency('oauth', '>= 0')
+    gemspec.add_dependency('htmlentities', '>= 0')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
-:patch: 2
-:minor: 1
+:patch: 3
+:minor: 2
 :major: 1
 :build:

data/bin/tit

@@ -12,33 +12,45 @@ def main
     :payload => nil,
     :notify => nil
   }
+  unchanged = true
 
   tit = Tit.new
 
   tit.opts = OptionParser.new do |opts|
     opts.banner = "Usage: #{File.basename($0)} " +
-      "[options] [action [action options]]"
+      "[status] [options] [action [action options]]"
 
     opts.separator ""
     opts.separator "Actions:"
-
+    
     opts.on("-p", "--public", "Show public timeline") do
       options[:action] = :public
+      unchanged = false
     end
     opts.on("-H", "--home", "Show home timeline (default)") do
       options[:action] = :home
+      unchanged = false
     end
     opts.on("-m", "--mentions", "Show mentions timeline") do
       options[:action] = :mentions
+      unchanged = false
+    end
+    opts.on("-u", "--user [USER]",
+            "Show a particular user's timeline") do |user|
+      unchanged = false
+      options[:action] = :user_timeline
+      options[:payload] ||= {}
+      options[:payload]["user"] = user
     end
-    opts.on("-u", "--update [STATUS]",
-            "Update status (read from STDIN if none given)") do |status|
+    opts.on("-t", "--tweet [STATUS]", "Update status (required when using -G)") do |status|
+      unchanged = false
       options[:action] = :update
       options[:payload] ||= {}
-      options[:payload]["status"] = status || STDIN
+      options[:payload]["status"] = status
     end
     opts.on("--pin PIN", ("Set auth pin if this is your first time playing " +
                           "with this tit")) do |pin|
+      unchanged = false
       options[:pin] = pin
     end
 
@@ -47,6 +59,7 @@ def main
 
     opts.on("-P", "--poll [N]",
             "Poll for more updates every N secs (default 180)") do |secs|
+      unchanged = false
       options[:wait] = secs || '180'
       options[:wait] = options[:wait].to_i
       options[:wait] = 30 if options[:wait] < 30
@@ -57,6 +70,7 @@ def main
 
     opts.on("-n", "--notify [PROG]",
             "Send notifications using PROG (default: notify-send)") do |prog|
+      unchanged = false
       options[:notify] = prog || "notify-send"
     end
 
@@ -65,6 +79,7 @@ def main
 
     opts.on("-G", "--geo LAT:LONG",
             "Set latitude and longitude for update") do |s|
+      unchanged = false
       sp = s.split(/:/)
 
       tit.abort("invalid geotag format: #{s}", opts) unless sp.length == 2
@@ -77,13 +92,28 @@ def main
     opts.separator ""
     opts.separator "Common options:"
 
-    opts.on("-d", "--debug", "Show debugging information") do
+    opts.on("-D", "--debug", "Show debugging information") do
+      unchanged = false
       options[:debug] = true
     end
+    
+    opts.on_tail("--count [NUM_STATUSES]", "Set number of statuses you see") do |count|
+      unchanged = false
+      tit.update_count(count)
+    end
+    
     opts.on_tail("-h", "--help", "Show this message") do
+      unchanged = false
       puts opts
       exit
     end
+    
+    opts.on_tail("-v", "--version", "Show version") do
+      unchanged = false
+      puts ["v", Tit::VERSION.join('.')].join("")
+      exit
+    end
+    
   end
 
   begin
@@ -91,6 +121,13 @@ def main
   rescue OptionParser::InvalidOption => e
     tit.abort(e.message)
   end
+  
+  # terribly hacky, but i can't figure out how OptionsParser handles no switches and just an argument. If it does at all.
+  if(unchanged == true and ARGV[0])
+    options[:action] = :update
+    options[:payload] ||= {}
+    options[:payload]["status"] = ARGV[0]
+  end
 
   if options.include? :pin
     tit.use_pin(options[:pin])
@@ -99,7 +136,7 @@ def main
   tit.get_access
 
   # check for option errors
-  if Tit::READERS.include? options[:action]
+  if Tit::READERS.include? options[:action] and not options[:action].eql?(:user_timeline)
     tit.abort("cannot provide geotag when reading") unless options[:payload].nil?
     tit.abort("cannot notify unless polling") if (options[:wait].nil? and
                                                   not options[:notify].nil?)
@@ -118,8 +155,9 @@ def main
       tit.error "got a networking error, are you connected to the intarbutts?"
       puts e
       exit(-1)
-    rescue NoMethodError
+    rescue NoMethodError => e
       tit.error "might have gotten a networking error, check your intarbutts."
+      puts e
       exit(-1)
     end
   else
@@ -129,8 +167,9 @@ def main
       tit.error "got a networking error, are you connected to the intarbutts?"
       puts e
       exit(-1)
-    rescue NoMethodError
+    rescue NoMethodError => e
       tit.error "might have gotten a networking error, check your intarbutts."
+      puts e
       exit(-1)
     rescue => e
       tit.error "unknown error"

data/lib/tit.rb

@@ -1,13 +1,15 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'ftools'
+require 'fileutils'
 require 'nokogiri'
-require 'oauth/consumer'
+require 'oauth'
 require 'time'  # heh.
 require 'yaml'
+require 'htmlentities' # hate those <3
 
 class String
+  URI_REGEX = %r"((?:(?:[^ :/?#]+):)(?://(?:[^ /?#]*))(?:[^ ?#]*)(?:\?(?:[^ #]*))?(?:#(?:[^ ]*))?)"
   def wrapped(cols)
     curlen = 0
     split.inject([[]]) do |rows, word|
@@ -20,6 +22,21 @@ class String
       end
     end.map { |row| row.join(' ') }
   end
+  def replace_with_expanded_url! (expanded)
+    replace(replace_with_expanded_url(expanded))
+  end
+  def replace_with_expanded_url(expanded)
+    replace_uris(/http:\/\/t.co\/[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXY0123456789]/, expanded)
+  end
+  def replace_uris(old, newt)
+    split(URI_REGEX).collect do |s|
+      if s =~ URI_REGEX
+        s.gsub(old, newt.join)
+      else
+        s
+      end
+    end.join
+  end
 end
 
 class Time
@@ -74,16 +91,20 @@ end
 Why are you reading the documentation, you cunt?
 =end
 class Tit
+  VERSION = [1, 2, 3]
+  
+  RCFILE = File.join(ENV["HOME"], ".titrc")
   RTFILE = File.join(ENV["HOME"], ".titrt")
   ATFILE = File.join(ENV["HOME"], ".titat")
 
-  READERS = [:public, :home, :mentions]
+  READERS = [:public, :home, :mentions, :user_timeline]
   WRITERS = [:update]
 
   URLS = {
     :public => "/statuses/public_timeline.xml",
     :home => "/statuses/home_timeline.xml",
     :mentions => "/statuses/mentions.xml",
+    :user_timeline => "/statuses/user_timeline.xml",
     :update => "/statuses/update.xml"
   }
 
@@ -93,9 +114,10 @@ class Tit
   def initialize
     @consumer = OAuth::Consumer.new(KEY, SECRET,
                                     { :site => "https://twitter.com" })
-
     # get terminal width
     @cols = %x[tput cols].to_i
+    # get status count
+    @prefs = YAML.load_file(RCFILE)
   end
   attr_accessor :opts
 
@@ -111,6 +133,9 @@ class Tit
       File.open(RTFILE, "w") do |rt|
         YAML.dump(request_token.params, rt)
       end
+      File.open(RCFILE, "w") do |rc|
+        YAML.dump({count: 10}, rc)
+      end
       tuts "Please visit '#{request_token.authorize_url}'."
       tuts "When you finish, provide your pin with `tit --pin PIN'"
       exit(0)
@@ -143,12 +168,28 @@ class Tit
       "revoke your token."
   end
 
-  def get_tits(action)
-    Nokogiri.XML(@access_token.get(URLS[action]).body).xpath("//status").map do |xml|
+  def get_tits(action, payload)
+    api_endpoint = URLS[action]
+    if(action == :user_timeline and not payload.nil?)
+      api_endpoint.concat("?screen_name=".concat(payload['user'])).concat("&count=#{@prefs[:count]}")
+    else
+      api_endpoint.concat("?count=#{@prefs[:count]}")
+    end
+    api_endpoint.concat("&include_entities=true")
+    coder = HTMLEntities.new
+    Nokogiri.XML(@access_token.get(api_endpoint).body).xpath("//status").map do |xml|
       {
         :username => xml.at_xpath("./user/name").content,
         :userid => xml.at_xpath("./user/screen_name").content,
-        :text => xml.xpath("./text").map { |n| n.content },
+        :text => xml.xpath("./text").map do |n|
+          txt = coder.decode(n.content)
+          if not xml.xpath("./entities/urls").nil?
+            xml.xpath("./entities/urls/url").map do |url| 
+              txt.replace_with_expanded_url! (url.xpath("./expanded_url").map { |expurl| expurl.content })
+            end
+          end
+          txt
+        end,
         :timestamp => Time.parse(xml.at_xpath("./created_at").content),
         :id => xml.at_xpath("./id").content.to_i,
         :geo => xml.at_xpath("./geo").instance_eval do
@@ -231,7 +272,7 @@ class Tit
   def run(options)
     if READERS.include? options[:action]
       if options[:wait].nil?
-        get_tits(options[:action]).reverse.each &method(:show_tit)
+        get_tits(options[:action], options[:payload]).reverse.each &method(:show_tit)
       else
         poll(options[:wait], options[:action], options[:notify])
       end
@@ -239,9 +280,17 @@ class Tit
       update options[:payload]
     end
   end
+  
+  def update_count(count)
+    @prefs[:count] = count
+    File.open(RCFILE, "w") do |rc|
+      YAML.dump(@prefs, rc)
+    end
+    exit(0)
+  end
 
   def tuts(*strs)
-    strs.each { |s| puts s.wrapped(@cols) }
+    strs.each { |s| puts s.to_s.wrapped(@cols) }
   end
 
   def error(msg)
@@ -250,7 +299,7 @@ class Tit
 
   def abort(msg)
     error(msg)
-    tuts @opts
+    puts @opts
     exit(-1)
   end
 end

data/tit.gemspec

@@ -5,17 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tit}
-  s.version = "1.1.2"
+  s.version = "1.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Leif Walsh"]
+  s.authors = ["Leif Walsh", "Parker Moore"]
   s.date = %q{2010-01-26}
   s.default_executable = %q{tit}
   s.description = %q{a stupid fucking twitter client}
-  s.email = %q{leif.walsh@gmail.com}
+  s.email = [%q{leif.walsh@gmail.com}, %q{parkrmoore@gmail.com}]
   s.executables = ["tit"]
   s.extra_rdoc_files = [
-    "ChangeLog.markdown",
+     "ChangeLog.markdown",
      "LICENSE",
      "README.markdown"
   ]
@@ -43,13 +43,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<oauth>, [">= 0"])
+      s.add_runtime_dependency(%q<htmlentities>, [">= 0"])
     else
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<oauth>, [">= 0"])
+      s.add_dependency(%q<htmlentities>, [">= 0"])
     end
   else
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<oauth>, [">= 0"])
+    s.add_dependency(%q<htmlentities>, [">= 0"])
   end
 end
 

metadata

@@ -1,39 +1,63 @@
 --- !ruby/object:Gem::Specification 
 name: tit
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - Leif Walsh
+- Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 +01:00
+date: 2010-01-26 00:00:00 -05:00
 default_executable: tit
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: oauth
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: htmlentities
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: a stupid fucking twitter client
-email: leif.walsh@gmail.com
+email: 
+- leif.walsh@gmail.com
+- parkrmoore@gmail.com
 executables: 
 - tit
 extensions: []
@@ -65,18 +89,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: stupid fucking twitter client