tit 2.1.5 → 2.1.7

data/ChangeLog.markdown

@@ -1,7 +1,35 @@
-# tit 2.1.5 2011-09-12
+# tit 2.1.7 2011-09-19
+
+* 
+
+# tit 2.1.6 2011-09-19
 
 * 
 
+# tit 2.1.6 2011-09-19
+
+* 
+
+# tit 2.1.6 2011-09-19
+
+* 
+
+# tit 2.1.6 2011-09-19
+
+* 
+
+# tit 2.1.6 2011-09-19
+
+* 
+
+# tit 2.1.6 2011-09-19
+
+* added preference as to whether t.co urls should be replaced with the expanded urls
+
+# tit 2.1.5 2011-09-12
+
+* some bug fixes and code restructuring
+
 # tit 2.1.0 2011-09-10
 
 * got direct messaging working -- requires reauthorization

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 2
 :minor: 1
-:patch: 5
+:patch: 7

data/bin/tit

@@ -26,14 +26,17 @@ def main
       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 USERNAME",
             "Show a particular user's timeline") do |user|
       unchanged = false
@@ -41,6 +44,7 @@ def main
       options[:payload] ||= {}
       options[:payload]["user"] = user
     end
+    
     opts.on("-d", "--dm [USERNAME]", "Read direct messages. Send a direct message if USERNAME is set and -t or --tweet accompanies it") do |user|
       unchanged = false
       if not user.nil?
@@ -51,6 +55,7 @@ def main
         options[:action] = :direct_messages
       end
     end
+    
     opts.on("-t", "--tweet [STATUS]", "Update status (required when using -G)") do |status|
       unchanged = false
       if not options[:action].nil? and options[:action].eql?(:new_direct_message)
@@ -61,6 +66,7 @@ def main
         options[:payload]["status"] = status
       end
     end
+    
     opts.on("--pin PIN", ("Set auth pin if this is your first time playing " +
                           "with this tit")) do |pin|
       unchanged = false
@@ -115,6 +121,11 @@ def main
       tit.update_count(count)
     end
     
+    opts.on_tail("-o", "--tco TRUE/FALSE", "Tells tit whether to keep the t.co urls") do |tco|
+      unchanged = false
+      tit.update_tco(tco)
+    end
+    
     opts.on_tail("-h", "--help", "Show this message") do
       unchanged = false
       puts opts

data/lib/tit.rb

@@ -91,7 +91,7 @@ end
 Why are you reading the documentation, you cunt?
 =end
 class Tit
-  VERSION = [2, 1, 5]
+  VERSION = [2, 1, 7]
   
   RCFILE = File.join(ENV["HOME"], ".titrc")
   RTFILE = File.join(ENV["HOME"], ".titrt")
@@ -136,7 +136,7 @@ class Tit
         YAML.dump(request_token.params, rt)
       end
       File.open(RCFILE, "w") do |rc|
-        YAML.dump({:count => 10}, rc)
+        YAML.dump({:count => 10, :tco => true}, rc)
       end
       tuts "Please visit '#{request_token.authorize_url}'."
       tuts "When you finish, provide your pin with `tit --pin PIN'"
@@ -180,16 +180,19 @@ class Tit
     end
     api_endpoint.concat("&include_entities=true")
     
+    # I'll use this to decode HTML entities.
     coder = HTMLEntities.new
     
     # Parse XML
     xmlbody = @access_token.get(api_endpoint).body
+    
     # Errors
     Nokogiri.XML(xmlbody).xpath("//errors").map do |xml|
       if xml.at_xpath("./error").content == "This application is not allowed to access or delete your direct messages"
         abort("Your OAuth key is not authorized for direct messaging.\nDelete #{TITAT} and run tit without arguments to reauthorize.")
       end
     end
+    
     # no errors - get tits
     if action != :direct_messages
       Nokogiri.XML(xmlbody).xpath("//status").map do |xml|
@@ -199,8 +202,8 @@ class Tit
           :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 })
+              xml.xpath("./entities/urls/url").map do |url|
+                txt.replace_with_expanded_url!(url.xpath("./expanded_url").map { |expurl| expurl.content }) unless @prefs[:tco].eql?("TRUE")
               end
             end
             txt
@@ -256,7 +259,6 @@ class Tit
     end
     
     response = @access_token.post(URLS[:new_direct_message], payload)
-    puts response
     
     # Check the response for errors
     Nokogiri.XML(response).xpath("//hash").map do |xml|
@@ -340,6 +342,15 @@ class Tit
     end
     exit(0)
   end
+  
+  def update_tco(tco)
+    @prefs[:tco] = tco
+    @prefs["tco"] = tco
+    File.open(RCFILE, "w") do |rc|
+      YAML.dump(@prefs, rc)
+    end
+    exit(0)
+  end
 
   def tuts(*strs)
     strs.each { |s| puts s.to_s.wrapped(@cols) }

data/tit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tit}
-  s.version = "2.1.5"
+  s.version = "2.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leif Walsh", "Parker Moore"]
-  s.date = %q{2010-01-26}
+  s.date = %q{2011-09-19}
   s.default_executable = %q{tit}
   s.description = %q{a stupid fucking twitter client}
   s.email = [%q{leif.walsh@gmail.com}, %q{parkrmoore@gmail.com}]

metadata

@@ -2,7 +2,7 @@
 name: tit
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.5
+  version: 2.1.7
 platform: ruby
 authors: 
 - Leif Walsh
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 Z
+date: 2011-09-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri