PerfectlyNormal-Twitorious 0.2.9 → 0.3.1

data/TODO

@@ -12,5 +12,9 @@
 * Daemon that runs in the background
 * Let the app run in a loop where it constantly prompts for new tweets
   * Make more of a CLI
+    * Display how many more characters there's room for
     * Update the timeline and get text-tweets in the app
 * Open profile pages if there's a username in the tweet
+* Support subscribing and unsubscribing to people
+* Create the ~/twit-file if it doesn't exist
+* Tab-complete followers

data/bin/twit

@@ -16,7 +16,39 @@ module Twitorious
       
       while true
         begin
+          Readline.completion_append_character = " "
+          Readline.completion_proc = Proc.new do |url|
+            if !url.match(/^(ftp|http|https):\/\//)
+              print "\a"
+              []
+            elsif !@config[:url_shortening]
+              print "\a"
+              []
+            else
+              # FIXME: Maybe add some magic here, so we don't need a 'case'
+              case @config.url_shortening[:service].downcase
+              when "bitly":
+                if(!@config.url_shortening[:user] || !@config.url_shortening[:pass])
+                  puts "Invalid configuration for Bit.ly"
+                  []
+                else
+                  bitly = Twitorious::URL::Bitly.new(@config.url_shortening[:user], @config.url_shortening[:pass])
+                  [bitly.shorten(url)]
+                end
+              when "isgd":
+                [Twitorious::URL::Isgd.new.shorten(url)]
+              else
+                []
+              end
+            end
+          end
           status = Readline.readline("> ", true)
+          
+          unless status # So we quit with a ^D
+            puts # And I hate that there's no newline before the prompt by default
+            exit
+          end
+          
           raise Twitorious::TooLongUpdate.new(status) if status.length > 140
         
           cmd, *args = status.split(" ")

data/lib/twitorious.rb

@@ -1,5 +1,5 @@
 module Twitorious
-  VERSION = '0.2.9'
+  VERSION = '0.3.1'
   
   class TooLongUpdate < StandardError; end
 
@@ -42,4 +42,8 @@ require 'twitorious/timeline'
 require 'twitorious/update'
 require 'twitorious/image'
 require 'twitorious/notifier'
-require 'twitorious/api/twitter'
+require 'twitorious/api/twitter'
+require 'twitorious/auth/basic'
+require 'twitorious/auth/oauth'
+require 'twitorious/url/bitly'
+require 'twitorious/url/isgd'

data/lib/twitorious/api/twitter.rb

@@ -10,14 +10,30 @@ module Twitorious
         @config   = config
         @site     = site
         @notifier = Twitorious::Notifier.new
+        @auth     = @site[:oauth_enabled] ? 
+                      Twitorious::Auth::OAuth.new :
+                      Twitorious::Auth::Basic.new(@site[:user], @site[:pass])
+                      
+        if(@site[:oauth_enabled] && !@site[:oauth_authorized])
+          rt = @auth.get_request_token
+          puts "You need to authorize first"
+          %x{open #{@auth.authorize_url}}
+          puts "Press enter when done"
+          gets
+          at = rt.get_access_token
+          @site[:oauth_authorized] = true
+          @site[:oauth_token]      = at.token
+          @site[:oauth_secret]     = at.secret
+        end
+        
+        if @site[:oauth_enabled] && @site[:oauth_authorized]
+          @auth.set_token(@site[:oauth_token], @site[:oauth_secret])
+        end
       end
       
       def update(status)
       	puts "Updating #{@site[:name]}"
-      	req = Net::HTTP::Post.new(@site[:url].path + "/statuses/update.json", { "User-Agent" => "Twitorious/#{Twitorious::VERSION}"})
-      	req.basic_auth @site[:user], @site[:pass]
-      	req.set_form_data({'status' => status}, ';')
-      	res = Net::HTTP.new(@site[:url].host, @site[:url].port).start { |http| http.request(req) }
+      	res = @auth.post(@site[:url], @site[:url].path + "/statuses/update.json", {"status" => status})
       end
       
       def fetch_timeline
@@ -25,9 +41,9 @@ module Twitorious
         
         path  = @site[:url].path + "/statuses/friends_timeline.json"
         path += "?count=200&since_id=#{@site[:timeline_since_id]}" if @site[:timeline_since_id]
-        res   = fetch_body(@site[:url].host, @site[:url].port, path, @site[:user], @site[:pass])
+        body  = @auth.get(@site[:url], path)
         
-        updates = JSON.parse(res)
+        updates = JSON.parse(body)
         puts "  No updates" if updates.empty?
         return if updates.empty?
 
@@ -42,10 +58,11 @@ module Twitorious
         puts "Fetching mentions from #{@site[:name]}"
         
         path  = @site[:url].path + "/statuses/mentions.json"
+        path  = @site[:url].path + "/statuses/replies.json" if @site[:name] == "Identi.ca"
         path += "?since_id=#{@site[:mentions_since_id]}" if @site[:mentions_since_id]
-        res   = fetch_body(@site[:url].host, @site[:url].port, path, @site[:user], @site[:pass])
+        body  = @auth.get(@site[:url], path)
         
-        updates = JSON.parse(res)
+        updates = JSON.parse(body)
         puts "  No new mentions" if updates.empty?
         return if updates.empty?
         
@@ -60,30 +77,6 @@ module Twitorious
       
       private
       
-      def fetch_body(host, port, path, username = nil, password = nil)
-        res = nil
-        begin
-          Net::HTTP.start(host, port) do |http|
-            req = Net::HTTP::Get.new(path, { "User-Agent" => "Twitorious/#{Twitorious::VERSION}"})
-            req.basic_auth username, password if username
-            res = http.request(req) 
-          end
-        rescue => e
-          $stderr.puts "Unhandled exception! #{e.message}"
-        rescue Timeout::Error
-          $stderr.puts "Request to #{host} timed out. Retrying in five seconds"
-          sleep 5
-          retry
-        end
-        
-        if res.kind_of?(Net::HTTPNotFound)
-          $stderr.puts "404 Not Found! #{host}:#{port}/#{path}"
-          return "{}"
-        elsif res.kind_of?(Net::HTTPOK)
-          return res.body
-        end
-      end
-      
       def show_notifications(updates)
         updates.each do |update|
           image    = Twitorious::Image.from_url(update["user"]["profile_image_url"], @config.image_store)

data/lib/twitorious/auth/basic.rb

@@ -0,0 +1,60 @@
+module Twitorious
+  module Auth
+    class Basic
+      def initialize(username, password)
+        @username = username
+        @password = password
+      end
+      
+      def get(url, path)
+        res = nil
+        begin
+          Net::HTTP.start(url.host, url.port) do |http|
+            req = Net::HTTP::Get.new(path, { "User-Agent" => "Twitorious/#{Twitorious::VERSION}"})
+            req.basic_auth @username, @password
+            res = http.request(req) 
+          end
+        rescue => e
+          $stderr.puts "Unhandled exception! #{e.message}"
+        rescue Timeout::Error
+          $stderr.puts "Request to #{url.host} timed out. Retrying in five seconds"
+          sleep 5
+          retry
+        end
+        
+        case res.code.to_i
+          when 400:
+            $stderr.puts "400 Rate Limited!"
+            return "{}"
+          when 401:
+            $stderr.puts "401 Unauthorized"
+            return "{}"
+          when 403:
+            $stderr.puts "403: #{res.message}!"
+            $stderr.puts res.body
+            return "{}"
+          when 404:
+            $stderr.puts "404 Not Found! #{url.host}:#{url.port}#{path}"
+            return "{}"
+          when 500:
+            $stderr.puts "An internal server error occured. (#{res.code}): #{res.message}"
+            return "{}"
+          when 502..503:
+            $stderr.puts "Unavailable!"
+            return "{}"
+        end
+
+        return res.body
+      end
+      
+      def post(url, path, form_data)
+        req = Net::HTTP::Post.new(path, { "User-Agent" => "Twitorious/#{Twitorious::VERSION}"})
+      	req.basic_auth @username, @password
+      	req.set_form_data(form_data, ';')
+      	res = Net::HTTP.new(url.host, url.port).start { |http| http.request(req) }
+      	
+      	return res.body
+      end
+    end
+  end
+end

data/lib/twitorious/auth/oauth.rb

@@ -0,0 +1,44 @@
+require 'oauth'
+require 'oauth/consumer'
+
+module Twitorious
+  module Auth
+    class OAuth 
+      def initialize
+        @consumer = ::OAuth::Consumer.new( 
+          "oZglZozO6F3p1Ed8n9F6fw", 
+          "onR6S9HS54D40Qg1KfI16c9A72KRoJKJwaXe73Tv0",
+          { :site => "http://twitter.com" })
+      end
+      
+      def get_request_token
+        @request_token = @consumer.get_request_token
+        @request_token
+      end
+      
+      def authorize_url
+        @request_token.authorize_url
+      end
+      
+      def set_token(token, secret)
+        @token, @secret = token, secret
+        get_access_token
+      end
+      
+      def get_access_token
+        @access_token ||= ::OAuth::AccessToken.new(@consumer, @token, @secret)
+        @access_token
+      end
+      
+      def get(url, path)
+        res = @access_token.get path
+        return res.body 
+      end
+      
+      def post(url, path, form_data)
+        res = @access_token.post path, form_data
+        return res.body
+      end
+    end
+  end
+end

data/lib/twitorious/url/bitly.rb

@@ -0,0 +1,19 @@
+require 'cgi'
+
+module Twitorious
+  module URL
+    class Bitly
+      def initialize(user, pass)
+        @auth = Twitorious::Auth::Basic.new(user, pass)
+        @host = URI.parse("http://api.bit.ly")
+      end
+      
+      def shorten(url)
+        path = "/shorten?version=2.0.1&longUrl=#{CGI.escape(url)}"
+        body = @auth.get(@host, path)
+        json = JSON.parse(body)
+        return json["results"][url]["shortUrl"]
+      end
+    end
+  end
+end

data/lib/twitorious/url/isgd.rb

@@ -0,0 +1,18 @@
+require 'cgi'
+
+module Twitorious
+  module URL
+    class Isgd
+      def initialize
+        @auth = Twitorious::Auth::Basic.new("not", "needed")
+        @host = URI.parse("http://is.gd")
+      end
+      
+      def shorten(url)
+        body = @auth.get @host, "/api.php?longurl=#{CGI.escape(url)}"
+        return nil if body == "{}"
+        return body
+      end
+    end
+  end
+end

data/twitorious.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name         = "Twitorious"
-  s.version      = "0.2.9"
-	s.date         = "2009-04-16"
+  s.version      = "0.3.1"
+	s.date         = "2009-04-20"
   s.author       = "Per Christian B. Viken"
   s.email        = "perchr@northblue.org"
   s.homepage     = "http://eastblue.org/projects/twitorious/"
@@ -15,10 +15,15 @@ Gem::Specification.new do |s|
                     "lib/twitorious/update.rb",
                     "lib/twitorious/notifier.rb",
                     "lib/twitorious/api/twitter.rb",
+                    "lib/twitorious/auth/basic.rb",
+                    "lib/twitorious/auth/oauth.rb",
+                    "lib/twitorious/url/isgd.rb",
+                    "lib/twitorious/url/bitly.rb",
                     "TODO"]
   s.executables << 'twit'
   s.executables << 'twit-notifier'
   s.add_dependency("meow", ">= 2.1.0")
   s.add_dependency("json", ">= 1.1.0")
+  s.add_dependency("oauth", ">= 0.3.2")
   s.has_rdoc     = true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: PerfectlyNormal-Twitorious
 version: !ruby/object:Gem::Version 
-  version: 0.2.9
+  version: 0.3.1
 platform: ruby
 authors: 
 - Per Christian B. Viken
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-16 00:00:00 -07:00
+date: 2009-04-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: oauth
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.2
+    version: 
 description: 
 email: perchr@northblue.org
 executables: 
@@ -50,6 +60,10 @@ files:
 - lib/twitorious/update.rb
 - lib/twitorious/notifier.rb
 - lib/twitorious/api/twitter.rb
+- lib/twitorious/auth/basic.rb
+- lib/twitorious/auth/oauth.rb
+- lib/twitorious/url/isgd.rb
+- lib/twitorious/url/bitly.rb
 - TODO
 has_rdoc: true
 homepage: http://eastblue.org/projects/twitorious/