linux_fortune 0.0.2 → 0.0.3

data/History.txt

@@ -3,8 +3,13 @@
 * 1 major enhancement:
   * Initial release
 
-=== 0.0.1 2010-03-24
+=== 0.0.2 2010-03-24
 
 * 2 fixes:
   * debug puts messages commented out
-  * test failures / errors fixed
+  * test failures / errors fixed
+
+=== 0.0.3 2010-03-24
+
+* 1 major enhancement:
+  * fortune sources listing / selection

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('linux_fortune', '0.0.2') do |p|
+Echoe.new('linux_fortune', '0.0.3') do |p|
   p.description    = "A gem that provides a wrapper for the linux fortune program"
   p.url            = "http://github.com/srejbi/linux_fortune"
   p.author         = "George Schreiber"

data/lib/linux_fortune.rb

@@ -89,13 +89,16 @@ module LinuxFortune
     @@ignore_case
   end
 
-  # fortune source
+  # fortune source class
+  # basically a couple of strings to construct the db file path
+  # and the weight (in percentage) of the file (compared to 100%)
   class FortuneSource
     @path = "/usr/share/fortune"
     @source = ""
-    @weight = 0
+    @weight = ""
 
-    def init(source = nil, path = "/usr/share/fortune", weight = nil )
+    # create a new source reference with source, path and weight
+    def initialize(source = nil, path = "/usr/share/fortune", weight = nil )
       @source = source
       @path = path
       @weight = weight
@@ -129,6 +132,11 @@ module LinuxFortune
     def fullpath
       File.join(@path, @source)
     end
+
+    # gets a fortune message from this source
+    def fortune
+      LinuxFortune.generate([self.fullpath])
+    end
   end
 
 
@@ -137,6 +145,21 @@ module LinuxFortune
     @source = ""
     @body = ""
 
+    # pass the string from the fortune program
+    def initialize(fortunestring)
+      # check lines of the string, extract source and separate from the rest of the body
+      src = ""
+      bod = ""
+      fortunestring.each do |s|
+        if s.match(/\(.*\)/) and src.empty?
+          src = s.gsub(/(^\()|(\)$)/, "").strip
+        else
+          bod += s unless s.match(/^%\n/)
+        end
+      end
+      @source = src
+      @body = bod
+    end
     # attribute accessors
 
     # gets the fortune text
@@ -168,11 +191,10 @@ module LinuxFortune
     srclist = `#{self.binary_path} -f 2>&1`
     srclist.each do |source|
       weight,src = source.strip.split
-      if src.match(/(\/.*)*/)
-        #puts "#{src} -> #{weight}"
+      if src.match(/\/.*/)
         path = src
       else
-        sources << FortuneSource.new( :path => path, :source => src, :weight => weight )
+        sources << LinuxFortune::FortuneSource.new( src, path, weight )
       end
     end
     sources
@@ -187,17 +209,7 @@ module LinuxFortune
   # generates a fortune message
   # <tt>sources</tt> - array of sources
   def self.generate(sources = nil)
-    lf = LinuxFortune::Fortune.new
-    lf.body = ""
-    ftn = self.fortune(sources)
-    ftn.each do |s|
-      if s.match(/\(.*\)/)
-        lf.source = s.gsub(/(^\()|(\)$)/, "")
-      else
-        lf.body << s unless s.match(/^%\n/)
-      end
-    end
-    lf
+    LinuxFortune::Fortune.new( self.fortune(sources) )
   end
 
   # searches fortune sources and returns hits

data/linux_fortune.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{linux_fortune}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["George Schreiber"]

data/test/test_linux_fortune.rb

@@ -48,7 +48,7 @@ class TestLinuxFortune < Test::Unit::TestCase
   end
 
   # Fortune.body should be the same as Fortune.to_s
-  def test_to_s
+  def test_fortune_to_s
     lf = LinuxFortune.generate
     assert lf.body == lf.to_s
   end
@@ -56,17 +56,29 @@ class TestLinuxFortune < Test::Unit::TestCase
   # test that there are sources
   # TODO refine test case
   def test_sources
-    src = LinuxFortune.get_sources
-    #src.each { |s| s.strip!; weight,name = s.split(" "); puts "#{name} -> #{weight}" }
-    assert !src.nil?
+    # just get whatever length fortunes
+    LinuxFortune.short=false
+    LinuxFortune.long=false
+
+    sources = LinuxFortune.get_sources
+    assert !sources.nil? and sources.size > 0
+  end
+
+  # test fortune from source
+  def test_fortune_from_each_source
+    sources = LinuxFortune.get_sources
+    fortunes = []
+    sources.each do |src|
+      fortunes << src.fortune
+      assert fortunes.size > 0
+      #puts "#{fortunes.last.source} --- #{src.fullpath}"
+      assert fortunes.last.source == src.fullpath
+    end
   end
 
   # test if fortune messages are from the sources requested
-  # TODO pick random sources from sources
+  # TODO pick random sources from sources once sources code is functional
   def test_fortune_from_sources
-    # just get whatever length fortunes
-    LinuxFortune.short=false
-    LinuxFortune.long=false
     # check multiple times
     5.times do
       lf = LinuxFortune.generate(["chucknorris","linux"])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - George Schreiber