birdgrinder 0.1.4.0 → 0.1.5

data/bin/birdgrinder

@@ -27,22 +27,30 @@ BirdGrinder::Application.processing(ARGV) do |a|
     template 'rakefile.erb', 'Rakefile'
   end
   
-  a.add("authorize", "Gets oauth access token information making it possible to use oauth authentication") do |options|
+  a.add("authorize [PATH]", "Gets oauth access token information making it possible to use oauth authentication, optionally pointing to an application") do |*args|
+    # Use the correct application path
+    options = args.extract_options!
+    BirdGrinder::Settings.root = File.expand_path(args[0] || ".")
+    # Run with a nonexistant controller.
+    BirdGrinder::Loader.run!(:authorizer)
+    # Ask the user what to do
     puts "First, you need to create a twitter application and get a consumer key and secret."
     puts "To do this, visit http://twitter.com/apps/new"
     system("open", "http://twitter.com/apps/new") if yes?("Are you running OSX and wish to open this url now?")
     consumer_key, consumer_secret = "", ""
-    consumer_key    = ask("What is your applications consumer key?", "")    while consumer_key.blank?
-    consumer_secret = ask("What is your applications consumer secret?", "") while consumer_secret.blank?
-    BirdGrinder::Settings.oauth.consumer_key    = consumer_key
-    BirdGrinder::Settings.oauth.consumer_secret = consumer_secret
-    oauth = BirdGrinder::Tweeter::OAuthAuthentication
+    consumer_key    = ask("What is your applications consumer key?")    while consumer_key.blank?
+    consumer_secret = ask("What is your applications consumer secret?") while consumer_secret.blank?
+    settings = BirdGrinder::Settings
+    settings.oauth = BirdGrinder::Nash.new unless settings.oauth.is_a?(BirdGrinder::Nash)
+    settings.oauth.consumer_key    = consumer_key
+    settings.oauth.consumer_secret = consumer_secret
+    oauth = BirdGrinder::Tweeter::OAuthAuthorization
     rtoken = oauth.request_token
     token, secret = rtoken.token, rtoken.secret
     puts "To get a pin for your account, please visit: #{rtoken.authorize_url}"
     system("open", rtoken.authorize_url) if yes?("Are you running OSX and wish to open this url now?")
     value = ""
-    value = ask("What is the PIN twitter gave you?", "") while value.blank?
+    value = ask("What is the PIN twitter gave you?") while value.blank?
     puts "Updating settings..."
     oauth.retrieve_access_token!(token, secret, value)
     puts "Done! - Your access token should now be stored"

data/lib/bird_grinder.rb

@@ -8,7 +8,7 @@ require 'em-http'
 module BirdGrinder
   include Perennial
   
-  VERSION = [0, 1, 4, 0]
+  VERSION = [0, 1, 5, 0]
 
   def self.version(include_minor = false)
     VERSION[0, (include_minor ? 4 : 3)].join(".")

data/lib/bird_grinder/tweeter/basic_authorization.rb

@@ -13,11 +13,6 @@ module BirdGrinder
         @basic_auth_credentials
       end
       
-      protected
-      
-      def generate_header!
-      end
-      
     end
   end
 end

data/lib/bird_grinder/tweeter/oauth_authorization.rb

@@ -1,3 +1,5 @@
+# Force the correct version of oauth if it's available.
+gem 'sutto-oauth' if respond_to?(:gem)
 require 'oauth'
 require 'em-http-oauth-request'
 

data/lib/bird_grinder/tweeter/streaming_request.rb

@@ -45,7 +45,7 @@ module BirdGrinder
         logger.debug "Preparing to start stream"
         @stream_processor = nil
         type = request_method
-        http = EventMachine::HttpRequest.new(full_url).send(type, http_options(type, request))
+        http = EventMachine::HttpRequest.new(full_url).send(type, http_options(type))
         authorization_method.add_header_to(http)
         # Handle failures correctly so we can back off
         @current_request = http
@@ -101,7 +101,7 @@ module BirdGrinder
       # what method is used to send the request. It's important that
       # this is used for credentials as well as making sure there is
       # no timeout on the connection
-      def default_request_options(r)
+      def default_request_options
         {:timeout => 0, :head => {}}
       end
       
@@ -109,8 +109,7 @@ module BirdGrinder
       # on top of default_request_options and a few other details.
       #
       # @param [Symbol] type the type of request - :post or :get
-      # @param [EventMachine::HttpRequest] the request itself
-      def http_options(type, request)
+      def http_options(type)
         base = self.default_request_options
         if @options.present?
           if type == :get

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: birdgrinder
 version: !ruby/object:Gem::Version 
-  version: 0.1.4.0
+  version: 0.1.5
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-29 00:00:00 +08:00
+date: 2010-01-14 00:00:00 +08:00
 default_executable: birdgrinder
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.0
+        version: 1.2.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.12.8
+        version: 0.12.10
     version: 
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.3
+        version: 0.6.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: em-http-request
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.8
+        version: 0.2.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: moneta
@@ -63,14 +63,14 @@ dependencies:
         version: 0.6.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: em-http-oauth-request
+  name: sutto-oauth
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.0
+        version: 0.3.6
     version: 
 description: 
 email: sutto@sutto.net