twuckoo 0.3.0 → 0.3.1

data/.gitignore

@@ -6,4 +6,6 @@ vendor/gems/ruby/**/gems
 vendor/gems/ruby/**/specifications
 vendor/gems/ruby/**/doc
 vendor/gems/ruby/**/environment.rb
-mail_proba.rb
+mail_proba.rb
+optparse_proba.rb
+super_proba.rb

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/bin/twuckoo

@@ -1,25 +1,8 @@
 #!/usr/bin/env ruby
 
 dir = File.join(File.dirname(__FILE__), '..', 'lib')
-
 require File.join(dir, 'twuckoo')
 
-Dir.glob(File.join(dir, 'modules', '*.rb')).each do |mod|
-  require mod
-end
-
-module_to_include = case ARGV.first.downcase
-when "from_file"
-  OneLineFromFile
-when "file"
-  OneLineFromFile  
-when "wikipedia_tfa"
-  WikipediaTFA
-else
-  raise "No module to include was provided."
-end
-
-Twuckoo::Runner.send(:include, module_to_include)
-@runner = Twuckoo::Runner.new
-# @cuckoo.set_testing
+@runner = Twuckoo::Runner.new(ARGV)
+# @runner.set_testing
 @runner.run

data/lib/modules/one_line_from_file.rb

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

data/lib/modules/wikipedia_tfa.rb

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

data/lib/twuckoo/runner.rb

@@ -1,8 +1,15 @@
+require "optparse"
+require "ostruct"
+
+class TwuckooException < Exception
+end
+
 class Twuckoo::Runner
   # the idea is to include a module with a well-defined API with three methods:
   # - load_tweets
   # - next
   # - store(tweet)
+  attr_reader :used_module
 
   def run
     setup_from_file
@@ -16,10 +23,45 @@ class Twuckoo::Runner
     end
   end
 
-  def initialize
+  def initialize(args=[])    
+    @options = OpenStruct.new
+    parse_options!(args)
+
+    _module = args.pop
+    use_module(get_module(_module))    
     super
   end
 
+  def parse_options!(args)
+    opts = OptionParser.new do |opts|
+      opts.banner = "Usage: twuckoo [options] module_to_use"
+      opts.on("-n name", "--name name",
+              "name will be the name of this twuckoo instance (used for email notifs)") do |name|
+        @options.name = name
+      end
+      opts.on_tail("-h", "--help", "Show this message") do
+        puts opts
+        exit
+      end      
+    end
+
+    if args.length.zero?
+      puts opts.banner
+      exit
+    end
+
+    # opts.on_tail("--version", "Show version") do
+    #   File.read(...)
+    #   exit
+    # end
+
+    opts.parse!(args)    
+  end
+  
+  def name
+    @options.name || File.split(File.dirname(__FILE__)).last
+  end
+  
   def wait_between_tweets?
     config[:time_to_sleep] != "0"
   end
@@ -32,10 +74,6 @@ class Twuckoo::Runner
   def notify
     send_email(config)
   end
-
-  def config
-    @config ||= ::Twuckoo::Config.new
-  end
   
   def tweet(message)
     unless message.nil? or message.empty?
@@ -45,6 +83,10 @@ class Twuckoo::Runner
     message
   end
 
+  def config
+    @config ||= ::Twuckoo::Config.new
+  end
+
   def get_config_values_from_file(file='config/cuckoo.yml')
     begin
       open(file, 'r') do |f|
@@ -68,6 +110,24 @@ class Twuckoo::Runner
   end
 
   private
+  def get_module(module_id)
+    case module_id
+    when "file"
+      OneLineFromFile
+    when "from_file"
+      OneLineFromFile
+    when "wikipedia_tfa"
+      WikipediaTFA
+    else
+      raise TwuckooException, "Invalid module: #{module_id.inspect}"
+    end
+  end
+  
+  def use_module(_module)
+    @used_module = _module
+    self.class.class_eval { include _module }
+  end
+
   def send_tweet(message)
     twitter.status(:post, message)
   end

data/spec/one_line_from_file_spec.rb

@@ -2,8 +2,7 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe "A cuckoo twitterer with one line from a file" do
   before do
-    Twuckoo::Runner.send(:include, OneLineFromFile)
-    @twuckoo = Twuckoo::Runner.new
+    @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.new
+    @twuckoo = Twuckoo::Runner.new(["file"])
     # actual text tweets should not be tweeted (twittered?)
     @twuckoo.stubs(:send_tweet).returns(true)
   end
@@ -36,6 +36,21 @@ describe Twuckoo::Runner do
     @twuckoo.config[:time_to_sleep].should == "3m"
   end
 
+  it "should receive the module to use as the last parameter" do
+    runner = Twuckoo::Runner.new(%w[file])
+    runner.used_module.should == OneLineFromFile    
+  end
+  
+  it "name can be given through the -n option" do
+    runner = Twuckoo::Runner.new(%w[-n pragthinklearn file])
+    runner.name.should == "pragthinklearn"
+  end
+
+  it "if no is given, the directory name is used" do
+    runner = Twuckoo::Runner.new(%w[file])
+    runner.name.should == "twuckoo"
+  end
+  
   describe "loading values from the config file" do
     it "sets the time interval to wait b/w tweets correctly" do
       @twuckoo.expects(:get_config_values_from_file).returns({ :time_to_sleep => "3m" })

data/spec/wikipedia_tfa_spec.rb

@@ -2,8 +2,7 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe "A cuckoo twitterer for wikipedia featured article" do
   before do
-    Twuckoo::Runner.send(:include, WikipediaTFA)
-    @twuckoo = Twuckoo::Runner.new
+    @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.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Balint Erdi"]
-  s.date = %q{2010-01-12}
+  s.date = %q{2010-01-13}
   s.description = %q{      A simple yet elegant solution to tweet a message regularly from a file (from a webpage, a database, etc.)
 }
   s.email = %q{balint.erdi@gmail.com}
@@ -26,7 +26,9 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "bin/edit_json.rb",
+     "bin/jeweler",
      "bin/prettify_json.rb",
+     "bin/rubyforge",
      "bin/t4rsh",
      "bin/twuckoo",
      "lib/duration_string.rb",
@@ -48,11 +50,17 @@ Gem::Specification.new do |s|
      "twuckoo.gemspec",
      "vendor/gems/environment.rb",
      "vendor/gems/ruby/1.8/cache/activesupport-2.3.5.gem",
+     "vendor/gems/ruby/1.8/cache/gemcutter-0.3.0.gem",
+     "vendor/gems/ruby/1.8/cache/git-1.2.5.gem",
      "vendor/gems/ruby/1.8/cache/hpricot-0.8.2.gem",
+     "vendor/gems/ruby/1.8/cache/jeweler-1.4.0.gem",
      "vendor/gems/ruby/1.8/cache/json-1.2.0.gem",
+     "vendor/gems/ruby/1.8/cache/json_pure-1.2.0.gem",
      "vendor/gems/ruby/1.8/cache/mail-1.5.2.gem",
+     "vendor/gems/ruby/1.8/cache/mail-1.5.3.gem",
      "vendor/gems/ruby/1.8/cache/mbbx6spp-twitter4r-0.4.0.gem",
      "vendor/gems/ruby/1.8/cache/mime-types-1.16.gem",
+     "vendor/gems/ruby/1.8/cache/rubyforge-2.0.3.gem",
      "vendor/gems/ruby/1.8/cache/twibot-0.1.7.gem"
   ]
   s.homepage = %q{http://github.com/balinterdi/twuckoo}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twuckoo
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Balint Erdi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-12 00:00:00 +01:00
+date: 2010-01-13 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -35,7 +35,9 @@ files:
 - Rakefile
 - VERSION
 - bin/edit_json.rb
+- bin/jeweler
 - bin/prettify_json.rb
+- bin/rubyforge
 - bin/t4rsh
 - bin/twuckoo
 - lib/duration_string.rb
@@ -57,11 +59,17 @@ files:
 - twuckoo.gemspec
 - vendor/gems/environment.rb
 - vendor/gems/ruby/1.8/cache/activesupport-2.3.5.gem
+- vendor/gems/ruby/1.8/cache/gemcutter-0.3.0.gem
+- vendor/gems/ruby/1.8/cache/git-1.2.5.gem
 - vendor/gems/ruby/1.8/cache/hpricot-0.8.2.gem
+- vendor/gems/ruby/1.8/cache/jeweler-1.4.0.gem
 - vendor/gems/ruby/1.8/cache/json-1.2.0.gem
+- vendor/gems/ruby/1.8/cache/json_pure-1.2.0.gem
 - vendor/gems/ruby/1.8/cache/mail-1.5.2.gem
+- vendor/gems/ruby/1.8/cache/mail-1.5.3.gem
 - vendor/gems/ruby/1.8/cache/mbbx6spp-twitter4r-0.4.0.gem
 - vendor/gems/ruby/1.8/cache/mime-types-1.16.gem
+- vendor/gems/ruby/1.8/cache/rubyforge-2.0.3.gem
 - vendor/gems/ruby/1.8/cache/twibot-0.1.7.gem
 has_rdoc: true
 homepage: http://github.com/balinterdi/twuckoo