marky_markov 0.3.2 → 0.3.3

data/bin/marky_markov

@@ -42,7 +42,10 @@ opt_parser = OptionParser.new do |opts|
   end
 end
 
-opt_parser.parse!
+begin opt_parser.parse!
+rescue OptionParser::InvalidOption => err
+  abort("Sorry, #{err}. Run marky_markov -h for allowed options.")
+end
 
 if options[:resetdictionary]
   STDOUT.puts MarkyMarkov::Dictionary.delete_dictionary!(options[:dictionary])
@@ -53,11 +56,14 @@ case ARGV[0]
 when "speak"
   if options[:source]
     markov = MarkyMarkov::TemporaryDictionary.new
-    markov.parse_file(options[:source])
+    begin markov.parse_file(options[:source])
+    rescue MarkovDictionary::FileNotFoundError => err
+      abort("Sorry, #{err}. I can't use it as a source.")
+    end
   else
     unless File.exists?("#{options[:dictionary]}.mmd")
-      STDERR.puts "Dictionary file #{options[:dictionary]}}.mmd does not exist. Cannot generate sentence."
-      STDERR.puts "Please build a dictionary with read or use the --source option with speak."
+      STDERR.puts "Dictionary file #{options[:dictionary]}.mmd does not exist. Cannot generate sentence."
+      STDERR.puts "Please build a dictionary with read or use the --source option to build a temporary dictionary."
       exit(false)
     end
     markov = MarkyMarkov::Dictionary.new(options[:dictionary])
@@ -66,20 +72,29 @@ when "speak"
 when "read"
   source = ARGV[1] || options[:source]
   markov = MarkyMarkov::Dictionary.new(options[:dictionary])
-  markov.parse_file(source)
-  markov.save_dictionary!
-  STDOUT.puts "Added #{source} to dictionary."
+  begin
+    markov.parse_file(source)
+    markov.save_dictionary!
+    STDOUT.puts "Added #{source} to dictionary."
+  rescue MarkovDictionary::FileNotFoundError => err
+    abort("Sorry, I can't read #{source}. I'm afraid it doesn't exist!")
+  end
 when "listen"
   markov = MarkyMarkov::TemporaryDictionary.new
-  markov.parse_string(STDIN.tty? ? ARGV[1] : STDIN.read)
-  STDOUT.puts markov.generate_n_sentences(options[:sentencecount])
+  begin
+    markov.parse_string(STDIN.tty? ? ARGV[1] : STDIN.read)
+    STDOUT.puts markov.generate_n_sentences(options[:sentencecount])
+  rescue
+    abort("Not enough words to generate a sentence.")
+  end
 else
   unless STDIN.tty?
     markov = MarkyMarkov::TemporaryDictionary.new
     markov.parse_string(STDIN.read)
     STDOUT.puts markov.generate_n_sentences(options[:sentencecount])
   else
+    STDERR.puts "Sorry, I don't know how to #{ARGV[0]}."
     STDOUT.puts opt_parser
+    exit false
   end
 end
-#end

data/lib/marky_markov.rb

@@ -4,12 +4,12 @@
 require_relative 'marky_markov/persistent_dictionary'
 require_relative 'marky_markov/markov_sentence_generator'
 
-# @version = 0.3.2
+# @version = 0.3.3
 # @author Matt Furden
 # Module containing TemporaryDictionary and Dictionary for creation of
 # Markov Chain Dictionaries and generating sentences from those dictionaries.
 module MarkyMarkov
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 
   class TemporaryDictionary
     # Create a new Temporary Markov Chain Dictionary and sentence generator for use.

data/marky_markov.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'marky_markov'
-  s.version           = '0.3.2'
-  s.date              = '2012-02-12'
+  s.version           = '0.3.3'
+  s.date              = '2012-02-13'
   s.rubyforge_project = 'marky_markov'
 
   ## Make sure your summary is short. The description may be as long
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   ## a custom homepage, consider using your GitHub URL or the like.
   s.authors  = ["Matt Furden"]
   s.email    = 'mfurden@gmail.com'
-  s.homepage = 'http://www.thefurd.com'
+  s.homepage = 'https://github.com/zolrath/marky_markov'
 
   ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as
   ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
@@ -67,13 +67,11 @@ Gem::Specification.new do |s|
     lib/marky_markov/markov_sentence_generator.rb
     lib/marky_markov/persistent_dictionary.rb
     marky_markov.gemspec
-    spec/marky_markov/markov_dictionary_spec.rb
-    spec/marky_markov/markov_sentence_generator_spec.rb
+    spec/data/onetextdictcompare.mmd
+    spec/data/test.txt
+    spec/data/textdictcompare.mmd
     spec/marky_markov/marky_markov_spec.rb
-    spec/marky_markov/persistent_dictionary_spec.rb
     spec/spec_helper.rb
-    spec/test.txt
-    spec/textdictcompare.mmd
   ]
   # = MANIFEST =
 

data/spec/data/onetextdictcompare.mmd

@@ -0,0 +1,38 @@
+1<h>
+  <a>
+    <s>The</s>
+  </a>
+  <a>
+    <s>cat</s>
+  </a>
+  <a>
+    <s>cat</s>
+  </a>
+  <a>
+    <s>likes</s>
+  </a>
+  <a>
+    <s>likes</s>
+  </a>
+  <a>
+    <s>pie</s>
+  </a>
+  <a>
+    <s>pie</s>
+  </a>
+  <a>
+    <s>and</s>
+  </a>
+  <a>
+    <s>and</s>
+  </a>
+  <a>
+    <s>chainsaws</s>
+  </a>
+  <a>
+    <s>chainsaws</s>
+  </a>
+  <a>
+    <s>!</s>
+  </a>
+</h>

data/spec/data/test.txt

@@ -0,0 +1 @@
+The cat likes pie and chainsaws!

data/spec/{textdictcompare.mmd → data/textdictcompare.mmd}

@@ -31,5 +31,7 @@
     <s>and</s>
     <s>chainsaws</s>
   </a>
-  <a/>
+  <a>
+    <s>!</s>
+  </a>
 </h>

data/spec/marky_markov/marky_markov_spec.rb

@@ -1,64 +1,65 @@
 require 'spec_helper'
 
 describe MarkyMarkov do
+  before(:each) do
+    @textsource = "spec/data/test.txt"
+    @onedictcompare = { ["The"] => ["cat"],
+                        ["cat"] => ["likes"],
+                        ["likes"] => ["pie"],
+                        ["pie"] => ["and"],
+                        ["and"] => ["chainsaws"],
+                        ["chainsaws"] => ["!"]}
+    @twodictcompare = {["The", "cat"] => ["likes"],
+                       ["and", "chainsaws"] => ["!"],
+                       ["cat", "likes"] => ["pie"],
+                       ["likes", "pie"] => ["and"],
+                       ["pie", "and"] => ["chainsaws"]}
+  end
+
   context "TemporaryDictionary" do
     before(:each) do
-      @textsource = "spec/test.txt"
       @dictionary = MarkyMarkov::TemporaryDictionary.new
-      @onedictcompare = { ["The"] => ["cat"],
-                       ["cat"] => ["likes"],
-                     ["likes"] => ["pie"],
-                       ["pie"] => ["and"],
-                       ["and"] => ["chainsaws"],
-                 ["chainsaws"] => []}
-      @twodictcompare = {["The", "cat"] => ["likes"],
-                   ["and", "chainsaws"] => [],
-                       ["cat", "likes"] => ["pie"],
-                       ["likes", "pie"] => ["and"],
-                         ["pie", "and"] => ["chainsaws"]}
     end
 
     it "should be able to parse a string" do
-      @dictionary.parse_string "The cat likes pie and chainsaws"
+     @dictionary.parse_string "The cat likes pie and chainsaws!"
       @dictionary.dictionary.should eql(@twodictcompare)
     end
 
     it "should generate the right number of sentences" do
+      @dictionary.parse_string "Hey man. How are you doing? Let's get pie!"
+      sentence = @dictionary.generate_5_sentences
+      sentence.should have(5).scan(/[.?!]/)
     end
 
     it "should create the right number of words" do
+      @dictionary.parse_string "Hey man. How are you doing? Let's get pie!"
+      sentence = @dictionary.generate_10_words
+      sentence.split.should have(10).words
     end
   end
 
   context "PersistentDictionary" do
-    before(:each) do
-      @textsource = "spec/test.txt"
-      @dictionary = MarkyMarkov::Dictionary.new(@textsource)
-      @onedictcompare = { ["The"] => ["cat"],
-                       ["cat"] => ["likes"],
-                     ["likes"] => ["pie"],
-                       ["pie"] => ["and"],
-                       ["and"] => ["chainsaws"],
-                 ["chainsaws"] => []}
-      @twodictcompare = {["The", "cat"] => ["likes"],
-                   ["and", "chainsaws"] => [],
-                       ["cat", "likes"] => ["pie"],
-                       ["likes", "pie"] => ["and"],
-                         ["pie", "and"] => ["chainsaws"]}
+    before do
+      @dictionary = MarkyMarkov::Dictionary.new("spec/data/temptextdict")
+      @dictionary.parse_file "spec/data/test.txt"
     end
 
-    it "should load the saved dictionary" do
+    it "should be able to save a dictionary" do
+      @dictionary.save_dictionary!.should eql(true)
     end
 
-    it "should be able to parse a string" do
-      @dictionary.parse_string "The cat likes pie and chainsaws"
-      @dictionary.dictionary.should include(@twodictcompare)
+    it "should be able to load an existing dictionary" do
+      otherdict = MarkyMarkov::Dictionary.new("spec/data/textdictcompare")
+      @dictionary.dictionary.should eql(otherdict.dictionary)
     end
 
-    it "should generate the right number of sentences" do
+    it "should load the saved dictionary" do
+      @dictionary.dictionary.should include(@twodictcompare)
     end
 
-    it "should create the right number of words" do
+    after do
+      PersistentDictionary.delete_dictionary!(@dictionary)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marky_markov
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-12 00:00:00.000000000 Z
+date: 2012-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ox
-  requirement: &70164029504260 !ruby/object:Gem::Requirement
+  requirement: &70245354003740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70164029504260
+  version_requirements: *70245354003740
 description: ! "MarkyMarkov makes it easy to generate simply Markov Chains based upon
   input from\n  either a source file or a string. While usable as a module in your
   code it can also be called on\n  from the command line and piped into like a standard
@@ -40,14 +40,12 @@ files:
 - lib/marky_markov/markov_sentence_generator.rb
 - lib/marky_markov/persistent_dictionary.rb
 - marky_markov.gemspec
-- spec/marky_markov/markov_dictionary_spec.rb
-- spec/marky_markov/markov_sentence_generator_spec.rb
+- spec/data/onetextdictcompare.mmd
+- spec/data/test.txt
+- spec/data/textdictcompare.mmd
 - spec/marky_markov/marky_markov_spec.rb
-- spec/marky_markov/persistent_dictionary_spec.rb
 - spec/spec_helper.rb
-- spec/test.txt
-- spec/textdictcompare.mmd
-homepage: http://www.thefurd.com
+homepage: https://github.com/zolrath/marky_markov
 licenses: []
 post_install_message: 
 rdoc_options:
@@ -68,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: marky_markov
-rubygems_version: 1.8.15
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 2
 summary: Simple Markov Chain generation available in the command-line

data/spec/marky_markov/markov_dictionary_spec.rb

@@ -1,65 +0,0 @@
-require 'spec_helper.rb'
-
-describe MarkovDictionary do
-  context "One Word Depth Dictionary" do
-    before(:each) do
-      @onetextsource = "spec/test.txt"
-      @onedict = MarkovDictionary.new(1)
-      @onedict.parse_source("The cat likes pie and chainsaws", false)
-      @onetextdict = { ["The"] => ["cat"],
-                       ["cat"] => ["likes"],
-                     ["likes"] => ["pie"],
-                       ["pie"] => ["and"],
-                       ["and"] => ["chainsaws"],
-                 ["chainsaws"] => []}
-    end
-
-    it "can open a file" do
-      @onedict.open_source(@onetextsource).should_not be_nil
-    end
-
-    it "should give a FileNotFoundError if the file doesn't exist" do
-      expect { @onedict.open_source("thisisntreal") }.to 
-      raise_error(MarkovDictionary::FileNotFoundError,"thisisntreal does not exist!")
-    end
-
-    it "can add a word to the dictionary" do
-      @onedict.add_word(["to"], "be")
-      @onedict.dictionary.should include(["to"] => ["be"])
-    end
-
-    it "create a dictionary via parsing a text file" do
-      @onedict.dictionary = {}
-      @onedict.parse_source(@onetextsource)
-      @onedict.dictionary.should eql(@onetextdict)
-    end
-
-    it "builds a one word dictionary properly" do
-      @onedict.dictionary.should eql(@onetextdict)
-    end
-  end
-
-  context "Two Word Dictionary" do
-    before(:each) do
-      @twodict = MarkovDictionary.new
-      @twodict.parse_source("The cat likes pie and chainsaws", false)
-      @twotextsource = "spec/test.txt"
-      @twotextdict = {["The", "cat"] => ["likes"],
-                  ["and", "chainsaws"] => [],
-                      ["cat", "likes"] => ["pie"],
-                      ["likes", "pie"] => ["and"],
-                        ["pie", "and"] => ["chainsaws"]}
-    end
-
-    it "can add a word to the two-word dictionary" do
-      @twodict.add_word(["Zebras", "like"], "kung-fu")
-      @twodict.dictionary.should eql(@twotextdict.merge( {["Zebras", "like"] => ["kung-fu"]} ))
-    end
-
-    it "create a two-word dictionary via parsing a text file" do
-      @twodict.dictionary = {}
-      @twodict.parse_source(@twotextsource)
-      @twodict.dictionary.should eql(@twotextdict)
-    end
-  end
-end

data/spec/marky_markov/markov_sentence_generator_spec.rb

@@ -1,25 +0,0 @@
-require 'spec_helper.rb'
-
-describe MarkovSentenceGenerator do
-  before(:each) do
-    @dict = MarkovDictionary.new
-    @dict.parse_source("Hello man how are you today", false)
-    @sentence = MarkovSentenceGenerator.new(@dict)
-  end
-
-  it "can pick a random word" do
-
-  end
-
-  it "can choose a weighted random word" do
-
-  end
-
-  it "will use a random word if the word does not exist" do
-
-  end
-
-  it "generates a sentence of the appropriate length" do
-    @sentence.generate(20).split.count.should eql(20)
-  end
-end

data/spec/marky_markov/persistent_dictionary_spec.rb

@@ -1,22 +0,0 @@
-require 'spec_helper'
-
-describe PersistentDictionary do
-  before do
-    @dict = PersistentDictionary.new("spec/textdict.mmd")
-    @dict.parse_source("spec/test.txt")
-  end
-
-  it "should be able to save a dictionary" do
-     @dict.save_dictionary!.should eql(true)
-end
-
-  it "should be able to load an existing dictionary" do
-    otherdict = PersistentDictionary.new("spec/textdictcompare.mmd")
-     @dict.dictionary.should eql(otherdict.dictionary)
-  end
-
-  after do
-    PersistentDictionary.delete_dictionary!("spec/textdict.mmd")
-  end
-end
-

data/spec/test.txt

@@ -1 +0,0 @@
-The cat likes pie and chainsaws