twuckoo 0.4.2 → 0.5.0

data/.gitignore

@@ -1,3 +1,4 @@
+config/twuckoo.yml
 lines.txt
 used_lines*.txt
 todos.txt
@@ -6,6 +7,5 @@ vendor/gems/ruby/**/gems
 vendor/gems/ruby/**/specifications
 vendor/gems/ruby/**/doc
 vendor/gems/ruby/**/environment.rb
-mail_proba.rb
-optparse_proba.rb
-super_proba.rb
+*_proba.rb
+oauth/

data/Rakefile

@@ -13,7 +13,7 @@ begin
     gemspec.authors = ["Balint Erdi"]
     gemspec.add_development_dependency("mocha",  ">= 0.9.5")
     gemspec.add_development_dependency("rspec")
-    gemspec.add_dependency("twibot", ">=0.1.7")
+    gemspec.add_dependency("twitter_oauth", "~> 0.4.3")
     gemspec.add_dependency("hpricot", ">= 0.6.164")
     gemspec.add_dependency("mail", ">= 1.6.0")
     gemspec.add_dependency("tlsmail", ">= 0.0.1")

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.5.0

data/bin/twuckoo

@@ -3,6 +3,6 @@
 dir = File.join(File.dirname(__FILE__), '..', 'lib')
 require File.join(dir, 'twuckoo')
 
-@runner = Twuckoo::Runner.create(ARGV)
+@runner = Twuckoo::Runner.new(ARGV.shift, nil, ARGV)
 # @runner.set_testing
 @runner.run

data/lib/modules/one_line_from_file.rb

@@ -9,9 +9,8 @@ module OneLineFromFile
   LINES_FILE = 'lines.txt'
   USED_LINES_FILE = 'used_lines.txt'
 
-  def initialize(args=[])
+  def setup_for_module
     @lines = []
-    # load_lines
   end
 
   def load_tweets

data/lib/modules/wikipedia_tfa.rb

@@ -5,7 +5,7 @@ require "hpricot"
 module WikipediaTFA
 
   WIKIPEDIA_HOST = "http://en.wikipedia.org"
-  def initialize(args=[])
+  def setup_for_module
   end
 
   def load_tweets; end

data/lib/twuckoo.rb

@@ -10,4 +10,4 @@ require 'modules'
 
 require 'twuckoo/config'
 require 'twuckoo/runner'
-
+require 'twuckoo/twitter_oauth_module'

data/lib/twuckoo/runner.rb

@@ -1,6 +1,5 @@
 require "optparse"
 require "ostruct"
-require "twibot"
 require "mail"
 
 class TwuckooException < Exception
@@ -18,7 +17,6 @@ class Twuckoo::Runner
     next_tweet = self.next
     while (next_tweet and !tweet_limit_reached?) do
       tweet(next_tweet)
-      inc_tweet_counter
       wait if wait_between_tweets?
       next_tweet = self.next
       if next_tweet.nil?
@@ -29,22 +27,18 @@ class Twuckoo::Runner
     end
   end
 
-  def self.create(args=[])
-    module_name = args.first
+  attr_accessor :tweets_sent
+
+  def initialize(module_name, twitter_module=nil, args=[])
     unless module_name.nil?
-      _module = get_module(module_name)
+      _module = self.class.get_module(module_name)
       class_eval { include _module }
     end
-    new(args)
-  end
-
-  attr_accessor :tweets_sent
-
-  def initialize(args=[])
     @tweets_sent = 0
+    @twitter_module = twitter_module.nil? ? Twuckoo::TwitterOauth : twitter_module
     @options = OpenStruct.new
     parse_options!(args)
-    super
+    setup_for_module
   end
 
   def parse_options!(args)
@@ -60,11 +54,6 @@ class Twuckoo::Runner
       end
     end
 
-    if args.length.zero?
-      puts opts.banner
-      exit
-    end
-
     # opts.on_tail("--version", "Show version") do
     #   File.read(...)
     #   exit
@@ -92,8 +81,14 @@ class Twuckoo::Runner
 
   def tweet(message)
     unless message.nil? or message.empty?
-      store(message)
-      send_tweet(message)
+      begin
+        send_tweet(message, config)
+      rescue @twitter_module.exception
+        return message
+      else
+        inc_tweet_counter
+        store(message)
+      end
     end
     message
   end
@@ -138,8 +133,8 @@ class Twuckoo::Runner
     end
   end
 
-  def send_tweet(message)
-    twitter.status(:post, message)
+  def send_tweet(message, options)
+    @twitter_module._tweet(message, options)
   end
 
   def inc_tweet_counter

data/lib/twuckoo/twitter_oauth_module.rb

@@ -0,0 +1,16 @@
+require 'twitter_oauth/client'
+require 'twitter_oauth'
+
+module Twuckoo::TwitterOauth
+
+  def self._tweet(message, options)
+    @client ||= TwitterOAuth::Client.new(
+      :consumer_key => options[:consumer_key],
+      :consumer_secret => options[:consumer_secret],
+      :token => options[:oauth_token],
+      :secret => options[:oauth_token_secret]
+    )
+    @client.update(message)
+  end
+
+end

data/spec/one_line_from_file_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe "A cuckoo twitterer with one line from a file" do
   before do
-    @twuckoo = Twuckoo::Runner.create(["file"])
+    @twuckoo = Twuckoo::Runner.new("file")
     # just so that no files will be written
     @twuckoo.stubs(:store).returns(nil)
     # and the actual text tweets are not tweeted (twittered?)

data/spec/twuckoo/runner_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 describe Twuckoo::Runner do
   before do
-    @twuckoo = Twuckoo::Runner.create(["file"])
+    @twuckoo = Twuckoo::Runner.new("file")
     # actual text tweets should not be tweeted (twittered?)
     @twuckoo.stubs(:send_tweet).returns(true)
   end
@@ -43,22 +43,22 @@ describe Twuckoo::Runner do
     @twuckoo.setup do |config|
       config[:tweet_limit] = 2
     end
-    @twuckoo.expects(:tweet).times(2)
+    @twuckoo.expects(:send_tweet).times(2).returns("tweet me this")
     @twuckoo.run
   end
 
   it "should receive the module to use as the last parameter" do
-    runner = Twuckoo::Runner.new(%w[file])
+    runner = Twuckoo::Runner.new('file')
     runner.should respond_to(:reset)
   end
 
   it "name can be given through the -n option" do
-    runner = Twuckoo::Runner.new(%w[-n pragthinklearn file])
+    runner = Twuckoo::Runner.new('file', nil, %w[-n pragthinklearn])
     runner.name.should == "pragthinklearn"
   end
 
-  it "if no is given, the directory name is used" do
-    runner = Twuckoo::Runner.new(%w[file])
+  it "if no name is given, the directory name is used" do
+    runner = Twuckoo::Runner.new('file')
     runner.name.should == "twuckoo"
   end
 
@@ -84,4 +84,35 @@ describe Twuckoo::Runner do
     end
   end
 
+  it "tries tweeting again if Twitter is not available" do
+    module ShakyTwitter
+      i = 0
+      define_method :_tweet do |message, options|
+        if i == 0
+          i = i + 1
+          raise ShakyTwitterException, "Twitter is down. Try again later"
+        else
+          i = i + 1
+          message
+        end
+      end
+
+      extend self
+
+      class ShakyTwitterException < Exception
+      end
+      def self.exception
+        ShakyTwitterException
+      end
+    end
+    twuckoo = Twuckoo::Runner.new("file", ShakyTwitter)
+    twuckoo.stubs(:send_email).returns(true)
+    twuckoo.setup do |config|
+      config[:tweet_limit] = 2
+      config[:time_to_sleep] = "0"
+    end
+    twuckoo.stubs(:next).returns('Twuckoo 2.0 is coming soonish')
+    twuckoo.run
+    twuckoo.tweets_sent.should == 2
+  end
 end

data/spec/wikipedia_tfa_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe "A cuckoo twitterer for wikipedia featured article" do
   before do
-    @twuckoo = Twuckoo::Runner.create(["wikipedia_tfa"])
+    @twuckoo = Twuckoo::Runner.new("wikipedia_tfa")
     @twuckoo.setup do |config|
       config[:time_to_sleep] = "0"
     end

data/twuckoo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{twuckoo}
-  s.version = "0.4.2"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Balint Erdi"]
-  s.date = %q{2010-04-28}
+  s.date = %q{2010-09-12}
   s.default_executable = %q{twuckoo}
   s.description = %q{      A simple yet elegant solution to tweet a message regularly from a file (or from a webpage, a database, etc.)
 }
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
      "lib/twuckoo.rb",
      "lib/twuckoo/config.rb",
      "lib/twuckoo/runner.rb",
+     "lib/twuckoo/twitter_oauth_module.rb",
      "spec/duration_string_spec.rb",
      "spec/one_line_from_file_spec.rb",
      "spec/spec.opts",
@@ -48,7 +49,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/balinterdi/twuckoo}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Need to tweet periodically in an automated fashion? Then Twuckoo is for you!}
   s.test_files = [
     "spec/duration_string_spec.rb",
@@ -63,17 +64,17 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<mocha>, [">= 0.9.5"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_runtime_dependency(%q<twibot>, [">= 0.1.7"])
+      s.add_runtime_dependency(%q<twitter_oauth>, ["~> 0.4.3"])
       s.add_runtime_dependency(%q<hpricot>, [">= 0.6.164"])
       s.add_runtime_dependency(%q<mail>, [">= 1.6.0"])
       s.add_runtime_dependency(%q<tlsmail>, [">= 0.0.1"])
     else
       s.add_dependency(%q<mocha>, [">= 0.9.5"])
       s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<twibot>, [">= 0.1.7"])
+      s.add_dependency(%q<twitter_oauth>, ["~> 0.4.3"])
       s.add_dependency(%q<hpricot>, [">= 0.6.164"])
       s.add_dependency(%q<mail>, [">= 1.6.0"])
       s.add_dependency(%q<tlsmail>, [">= 0.0.1"])
@@ -81,7 +82,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<mocha>, [">= 0.9.5"])
     s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<twibot>, [">= 0.1.7"])
+    s.add_dependency(%q<twitter_oauth>, ["~> 0.4.3"])
     s.add_dependency(%q<hpricot>, [">= 0.6.164"])
     s.add_dependency(%q<mail>, [">= 1.6.0"])
     s.add_dependency(%q<tlsmail>, [">= 0.0.1"])

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twuckoo
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 2
-  version: 0.4.2
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Balint Erdi
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 +02:00
+date: 2010-09-12 00:00:00 +02:00
 default_executable: twuckoo
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
         - 9
@@ -35,35 +38,41 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: twibot
+  name: twitter_oauth
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 0
-        - 1
-        - 7
-        version: 0.1.7
+        - 4
+        - 3
+        version: 0.4.3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hpricot
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 335
         segments: 
         - 0
         - 6
@@ -75,9 +84,11 @@ dependencies:
   name: mail
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 6
@@ -89,9 +100,11 @@ dependencies:
   name: tlsmail
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 0
         - 0
@@ -124,6 +137,7 @@ files:
 - lib/twuckoo.rb
 - lib/twuckoo/config.rb
 - lib/twuckoo/runner.rb
+- lib/twuckoo/twitter_oauth_module.rb
 - spec/duration_string_spec.rb
 - spec/one_line_from_file_spec.rb
 - spec/spec.opts
@@ -143,23 +157,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Need to tweet periodically in an automated fashion? Then Twuckoo is for you!