usaidwat 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef237332f70848558231f2efa1d72ae670c0b1d2
-  data.tar.gz: c79816dfb00af261f512ff612330a5e86d2b46b2
+  metadata.gz: 04536acd69f58116dbc58388d79dea104407598c
+  data.tar.gz: acb24952c11f213b5677808eda93bfe65329a4b9
 SHA512:
-  metadata.gz: f899ceb86532ec8f506f6318ac5afeeba0251b466a7c0bbe5c0289f3d9cd307924d1f63af14c408f646155dfe0d1b2299a23593568ea5b28bd069badd5177e3c
-  data.tar.gz: a91b962fe4a7de6bcc5c4ba69b6a8c695672fad3e895b59e175880efa5b415c3b309684cfd8df80c3a892da0ae6f56af0fc72d198786a82c1a20d96b783fa856
+  metadata.gz: 3c6b186e4d3f45c2697e4eb6e76b46187dfc9c1217757b3d3058af9319f9bb6b6910a17cd68abc29e7e2408b4c5966da308aa61150d77de93fa1ee5ab9a93de8
+  data.tar.gz: 85719e6d25ad91a891fd28478cf638a85ff7fd53600dc859f6f863451aef84f34424968ffe5064ea2c93e04eebac120ad96dfc27708378ab62906abccc22f1b4

data/Rakefile

@@ -6,10 +6,15 @@ GEMSPEC = `git ls-files | grep gemspec`.chomp
 GEM     = "usaidwat-#{USaidWat::VERSION}.gem"
 
 desc "Build usaidwat.gem"
-task :build do
+task :build => :perms do
   system "gem", "build", GEMSPEC
 end
 
+desc "Ensure correct permissions for usaidwat.gem"
+task :perms do
+  system "chmod", "-R", "a+rX", *`git ls-files`.chomp.split("\n")
+end
+
 desc "Install usaidwat.gem"
 task :install => :build do
   system "gem", "install", GEM

data/bin/usaidwat

@@ -1,5 +1,21 @@
 #!/usr/bin/env ruby
 
 require 'usaidwat'
+require 'mercenary'
 
-USaidWat::Application.start(ARGV)
+Mercenary.program(:usaidwat) do |p|
+  p.version USaidWat::VERSION
+  p.description 'Answers the age-old question, "Where does a Redditor comment the most?"'
+  p.syntax 'usaidwat <command> [options] <args>'
+
+  USaidWat::Application::Command.subclasses.each { |c| c.new(p) }
+
+  p.action do |args, options|
+    if args.empty?
+      puts p.to_s
+      exit 0
+    else
+      abort "Invalid command: #{args.first}"
+    end
+  end
+end

data/features/browse.feature

@@ -18,6 +18,36 @@ Feature: Browse comments
       Yep. My first experience with a Heisenbug occurred in a C++ program, and disappeared when I tried to print a variable with printf (only to reappear when that call was removed).
 
 
+      nyc
+      http://www.reddit.com/r/nyc/comments/141zqc/z/c79dxg6
+      NYC taxi roof lights get overhaul -  A light simply will mean the cab is availab
+      over 3 years ago
+
+      It has a fare when the lights are off.
+
+
+      worldnews
+      http://www.reddit.com/r/worldnews/comments/140mra/z/c797jq4
+      Palestinians win upgraded UN status by wide margin
+      over 3 years ago
+
+      The Judgment of Solomon Accords.
+      """
+
+  Scenario: List all comments with comment bodies unformatted
+    Given the Reddit service returns comments for the user "mipadi"
+    And time is frozen at Jun 24, 2015 11:05 AM
+    When I run `usaidwat log --raw mipadi`
+    Then it should pass with:
+      """
+      wikipedia
+      http://www.reddit.com/r/wikipedia/comments/142t4w/z/c79peed
+      Heisenbug: a software bug that seems to disappear or alter its behavior when one
+      over 3 years ago
+
+      Yep. My first experience with a Heisenbug occurred in a C++ program, and disappeared when I tried to print a variable with printf (only to reappear when that call was removed).
+
+
       nyc
       http://www.reddit.com/r/nyc/comments/141zqc/z/c79dxg6
       NYC taxi roof lights get overhaul -  A light simply will mean the cab is availab
@@ -34,6 +64,54 @@ Feature: Browse comments
       The Judgment of Solomon Accords.
       """
 
+  Scenario: Output comments on line line
+    Given the Reddit service returns comments for the user "mipadi"
+    And time is frozen at Jun 24, 2015 11:05 AM
+    When I run `usaidwat log --oneline mipadi`
+    Then it should pass with:
+      """
+      wikipedia Heisenbug: a software bug that seems to disappear or alter its behavio
+      nyc NYC taxi roof lights get overhaul -  A light simply will mean the cab is ava
+      worldnews Palestinians win upgraded UN status by wide margin
+      """
+
+  Scenario: Search for a specific comment
+    Given the Reddit service returns comments for the user "mipadi"
+    And time is frozen at Jun 24, 2015 11:05 AM
+    When I run `usaidwat log --grep='Heisenbug' mipadi`
+    Then it should pass with:
+      """
+      wikipedia
+      http://www.reddit.com/r/wikipedia/comments/142t4w/z/c79peed
+      Heisenbug: a software bug that seems to disappear or alter its behavior when one
+      over 3 years ago
+
+      Yep. My first experience with a Heisenbug occurred in a C++ program, and disappeared when I tried to print a variable with printf (only to reappear when that call was removed).
+      """
+
+  Scenario: Search for a specific comment with wrong case
+    Given the Reddit service returns comments for the user "mipadi"
+    And time is frozen at Jun 24, 2015 11:05 AM
+    When I run `usaidwat log --grep='heisenbug' mipadi`
+    Then it should pass with:
+      """
+      wikipedia
+      http://www.reddit.com/r/wikipedia/comments/142t4w/z/c79peed
+      Heisenbug: a software bug that seems to disappear or alter its behavior when one
+      over 3 years ago
+
+      Yep. My first experience with a Heisenbug occurred in a C++ program, and disappeared when I tried to print a variable with printf (only to reappear when that call was removed).
+      """
+
+  Scenario: Search for a specific comment with no matches
+    Given the Reddit service returns comments for the user "mipadi"
+    And time is frozen at Jun 24, 2015 11:05 AM
+    When I run `usaidwat log --grep='oogabooga' mipadi`
+    Then it should pass with:
+      """
+      mipadi has no comments matching /oogabooga/.
+      """
+
   Scenario: List all comments for a user that does not exist
     Given the Reddit service does not have a user "testuser"
     When I run `usaidwat log testuser`
@@ -50,6 +128,22 @@ Feature: Browse comments
       blank has no comments.
       """
 
+  Scenario: Search for a comment for a user that does not exist
+    Given the Reddit service does not have a user "testuser"
+    When I run `usaidwat log --grep='Heisenbug' testuser`
+    Then it should fail with:
+      """
+      No such user: testuser
+      """
+
+  Scenario: Search for a comment when user has no comments
+    Given the Reddit service returns comments for the user "blank"
+    When I run `usaidwat log --grep='Heisenbug' blank`
+    Then it should pass with:
+      """
+      blank has no comments matching /Heisenbug/.
+      """
+
   Scenario: Tally comments
     Given the Reddit service returns comments for the user "mipadi"
     When I run `usaidwat tally mipadi`
@@ -106,6 +200,22 @@ Feature: Browse comments
       blank has no comments.
       """
 
+  Scenario: Search for a comment when tallying
+    Given the Reddit service returns comments for the user "mipadi"
+    When I run `usaidwat tally --grep='Heisenbug' mipadi`
+    Then it should fail with:
+      """
+      invalid option: --grep=Heisenbug
+      """
+
+  Scenario: Search for a comment when sorting
+    Given the Reddit service returns comments for the user "mipadi"
+    When I run `usaidwat tally -c --grep='Heisenbug' mipadi`
+    Then it should fail with:
+      """
+      invalid option: --grep=Heisenbug
+      """
+
   Scenario: Sort comments when a user does not exist
     Given the Reddit service does not have a user "testuser"
     When I run `usaidwat tally testuser`
@@ -144,6 +254,34 @@ Feature: Browse comments
       You didn't slow down for very long though, did you?
       """
 
+  Scenario: Search in comments for a particular subreddit
+    Given the Reddit service returns comments for the user "mipadi"
+    And time is frozen at Jun 24, 2015 11:05 AM
+    When I run `usaidwat log --grep='New Jersey' mipadi AskReddit`
+    Then it should pass with:
+      """
+      AskReddit
+      http://www.reddit.com/r/AskReddit/comments/140t5c/z/c795nw3
+      I'm from Tennessee and most of our jokes are geared toward Mississippi and Alaba
+      over 3 years ago
+
+      You're from New Jersey? Which exit?
+      """
+
+  Scenario: Search in comments for a particular subreddit with wrong case
+    Given the Reddit service returns comments for the user "mipadi"
+    And time is frozen at Jun 24, 2015 11:05 AM
+    When I run `usaidwat log --grep='new jersey' mipadi AskReddit`
+    Then it should pass with:
+      """
+      AskReddit
+      http://www.reddit.com/r/AskReddit/comments/140t5c/z/c795nw3
+      I'm from Tennessee and most of our jokes are geared toward Mississippi and Alaba
+      over 3 years ago
+
+      You're from New Jersey? Which exit?
+      """
+
   Scenario: List comments for a particular subreddit specified with the wrong case
     Given the Reddit service returns comments for the user "mipadi"
     And time is frozen at Jun 24, 2015 11:05 AM
@@ -187,8 +325,7 @@ Feature: Browse comments
     When I run `usaidwat tally mipadi AskReddit`
     Then it should fail with:
       """
-      ERROR: "usaidwat tally" was called with arguments ["mipadi", "AskReddit"]
-      Usage: "usaidwat tally USERNAME"
+      You cannot specify a subreddit when tallying comments
       """
 
   Scenario: Sort comments with subreddit
@@ -196,16 +333,7 @@ Feature: Browse comments
     When I run `usaidwat tally -c mipadi AskReddit`
     Then it should fail with:
       """
-      ERROR: "usaidwat tally" was called with arguments ["mipadi", "AskReddit"]
-      Usage: "usaidwat tally USERNAME"
-      """
-
-  Scenario: Pass no arguments
-    Given the Reddit service returns comments for the user "mipadi"
-    When I run `usaidwat`
-    Then it should pass with:
-      """
-      Commands:
+      You cannot specify a subreddit when tallying comments
       """
 
   Scenario: Pass no arguments when tallying
@@ -213,8 +341,7 @@ Feature: Browse comments
     When I run `usaidwat tally`
     Then it should fail with:
       """
-      ERROR: "usaidwat tally" was called with no arguments
-      Usage: "usaidwat tally USERNAME"
+      You must specify a username
       """
 
   Scenario: Pass no arguments when sorting
@@ -222,6 +349,13 @@ Feature: Browse comments
     When I run `usaidwat tally -c`
     Then it should fail with:
       """
-      ERROR: "usaidwat tally" was called with no arguments
-      Usage: "usaidwat tally USERNAME"
+      You must specify a username
+      """
+
+  Scenario: Pass no arguments when searching
+    Given the Reddit service returns comments for the user "mipadi"
+    When I run `usaidwat log --grep mipadi`
+    Then it should fail with:
+      """
+      You must specify a username
       """

data/features/help.feature

@@ -4,17 +4,29 @@ Feature: Get help
   I want to be able to list help information for usaidwat
   In order to learn how to use it
   
+  Scenario: Pass no arguments
+    Given the Reddit service returns comments for the user "mipadi"
+    When I run `usaidwat`
+    Then it should pass with:
+      """
+      Usage:
+
+        usaidwat <command> [options] <args>
+      """
+
   Scenario: List usage details
     When I run `usaidwat --help`
     Then it should pass with:
       """
-      Commands:
+      Usage:
+
+        usaidwat <command> [options] <args>
       """
   
   Scenario: Get version
     When I run `usaidwat --version`
     Then the exit status should be 0
-    And the stdout should contain:
+    And the output should match:
       """
-      usaidwat v
+      usaidwat [0-9]+\.[0-9]+\.[0-9]+
       """

data/lib/usaidwat/application.rb

@@ -1,84 +1,130 @@
-require 'sysexits'
-require 'thor'
+require 'usaidwat/algo'
+require 'usaidwat/client'
 require 'usaidwat/pager'
+require 'sysexits'
 
 module USaidWat
-  class Application < Thor
-    include Pager
-    include Sysexits
+  module Application
+    class Command
+      include Pager
+      include Sysexits
+
+      attr_reader :client
+
+      class << self
+        def subclasses
+          @subclasses ||= []
+        end
 
-    class << self
-      def client
-        ENV['USAIDWAT_ENV'] == 'cucumber' ? USaidWat::Client::TestRedditor : USaidWat::Client::Redditor
+        def inherited(base)
+          subclasses << base
+          super
+        end
       end
 
-      def exit_on_failure?
-        true
+      def initialize(prog)
+        @client = cucumber? ? USaidWat::Client::TestRedditor : USaidWat::Client::Redditor
       end
-    end
 
-    map '--version' => :version
-    map 't' => :tally
-    map 'l' => :log
-
-    desc 'tally USERNAME', 'Count comments by subreddit'
-    option :count, :aliases => '-c', :type => :boolean, :desc => 'Sort output by number of comments'
-    def tally(username)
-      redditor = Application.client.new(username)
-      algo_cls = options[:count] ? USaidWat::Algorithms::CountAlgorithm : USaidWat::Algorithms::LexicographicalAlgorithm
-      quit "#{redditor.username} has no comments." if redditor.comments.empty?
-      # Unfortunately Snooby cannot return comments for a specific
-      # user in a specific subreddit, so for now we have to sort them
-      # ourself.
-      longest_subreddit = 0
-      buckets = Hash.new { |hash, key| hash[key] = 0 }
-      redditor.comments.each do |comment|
-        subreddit = comment.subreddit
-        longest_subreddit = subreddit.length if subreddit.length > longest_subreddit
-        buckets[subreddit] += 1
+      protected
+
+      def cucumber?
+        ENV['USAIDWAT_ENV'] == 'cucumber'
       end
-      algo = algo_cls.new(buckets)
-      subreddits = buckets.keys.sort { |a,b| algo.sort(a, b) }
-      subreddits.each do |subreddit|
-        tally = buckets[subreddit]
-        printf "%-*s  %3d\n", longest_subreddit, subreddit, tally
+
+      def quit(message, code=:ok)
+        puts message
+        exit code
       end
-    rescue USaidWat::Client::NoSuchUserError
-      quit "No such user: #{username}", :no_such_user
     end
 
-    desc 'log USERNAME [SUBREDDIT]', 'Show comments by a user'
-    def log(username, subreddit = nil)
-      redditor = Application.client.new(username)
-      if subreddit
+    class Log < Command
+      def initialize(prog)
+        prog.command(:log) do |c|
+          c.alias :l
+          c.option 'grep', '--grep STRING', 'Show only comments matching STRING'
+          c.option 'oneline', '--oneline', 'Output log in a more comptact form'
+          c.option 'raw', '--raw', 'Print raw comment bodies'
+
+          c.action do |args, options|
+            process(options, args)
+          end
+        end
+        super
+      end
+
+      def process(options, args)
+        raise ArgumentError.new('You must specify a username') if args.empty?
+        username = args.shift
+        subreddit = args.shift
+
+        redditor = client.new(username)
         comments = redditor.comments
-        comments = comments.group_by { |c| c.subreddit.downcase }
-        comments = comments[subreddit.downcase]
-        quit "No comments by #{redditor.username} for #{subreddit}." if comments.nil?
-        list_comments(comments)
-      else
-        quit "#{redditor.username} has no comments." if redditor.comments.empty?
-        list_comments(redditor.comments)
+        if subreddit
+          comments = comments.group_by { |c| c.subreddit.downcase }
+          comments = comments[subreddit.downcase]
+          quit "No comments by #{redditor.username} for #{subreddit}." if comments.nil?
+        end
+        comments = comments.select { |c| c.body =~ /#{options['grep']}/i } if options['grep']
+        if comments.empty?
+          msg = "#{redditor.username} has no comments"
+          msg = "#{msg} matching /#{options['grep']}/" if options['grep']
+          msg = "#{msg}."
+          quit msg
+        end
+        list_comments(comments, options['grep'], !options['oneline'].nil?, !options['raw'].nil?)
+      rescue USaidWat::Client::NoSuchUserError
+        quit "No such user: #{username}", :no_such_user
       end
-    rescue USaidWat::Client::NoSuchUserError
-      quit "No such user: #{username}", :no_such_user
-    end
 
-    desc 'version', 'Show version info and exit'
-    def version
-      puts "usaidwat v#{USaidWat::VERSION}"
-    end
+      private
 
-    no_commands do
-      def list_comments(comments)
-        formatter = USaidWat::CLI::CommentFormatter.new
+      def list_comments(comments, pattern = nil, oneline = false, raw = false)
+        formatter = (oneline ? USaidWat::CLI::CompactCommentFormatter : USaidWat::CLI::CommentFormatter).new(pattern, raw)
         page
         comments.each { |c| print formatter.format(c) }
       end
+    end
 
-      def quit(message, code=:ok)
-        puts message
-        exit code
+    class Tally < Command
+      def initialize(prog)
+        prog.command(:tally) do |c|
+          c.alias :t
+          c.option 'count', '-c', '--count', 'Sort output by number of comments'
+
+          c.action do |args, options|
+            process(options, args)
+          end
+        end
+        super
+      end
+
+      def process(options, args)
+        raise ArgumentError.new('You must specify a username') if args.empty?
+        raise ArgumentError.new('You cannot specify a subreddit when tallying comments') if args.count > 1
+        username = args.first
+
+        redditor = client.new(username)
+        algo_cls = options['count'] ? USaidWat::Algorithms::CountAlgorithm : USaidWat::Algorithms::LexicographicalAlgorithm
+        quit "#{redditor.username} has no comments." if redditor.comments.empty?
+        # Unfortunately Snooby cannot return comments for a specific
+        # user in a specific subreddit, so for now we have to sort them
+        # ourself.
+        longest_subreddit = 0
+        buckets = Hash.new { |hash, key| hash[key] = 0 }
+        redditor.comments.each do |comment|
+          subreddit = comment.subreddit
+          longest_subreddit = subreddit.length if subreddit.length > longest_subreddit
+          buckets[subreddit] += 1
+        end
+        algo = algo_cls.new(buckets)
+        subreddits = buckets.keys.sort { |a,b| algo.sort(a, b) }
+        subreddits.each do |subreddit|
+          tally = buckets[subreddit]
+          printf "%-*s  %3d\n", longest_subreddit, subreddit, tally
+        end
+      rescue USaidWat::Client::NoSuchUserError
+        quit "No such user: #{username}", :no_such_user
       end
     end
   end

data/lib/usaidwat/ext/string.rb

@@ -1,12 +1,10 @@
+require 'rainbow'
+
 class String
   def truncate(width)
     self[0, width]
   end
 
-  def convert_entities
-    self.gsub(/&gt;/, '>').gsub(/&lt;/, '<').gsub(/&amp;/, '&')
-  end
-
   def pluralize(n, suffix = 's', singular_suffix = '')
     if n == 1
       self + singular_suffix
@@ -14,4 +12,8 @@ class String
       self + suffix
     end
   end
+
+  def highlight(pattern)
+    gsub(/#{pattern}/i) { |m| Rainbow(m).red }
+  end
 end

data/lib/usaidwat/formatter.rb

@@ -1,7 +1,9 @@
 require 'date'
+require 'downterm'
 require 'highline'
-require 'stringio'
 require 'rainbow/ext/string'
+require 'redcarpet'
+require 'stringio'
 require 'usaidwat/ext/string'
 require 'usaidwat/ext/time'
 
@@ -9,27 +11,58 @@ Rainbow.enabled = true unless ENV['USAIDWAT_ENV'] == 'cucumber'
 
 module USaidWat
   module CLI
-    class CommentFormatter
-      def initialize
+    class BaseFormatter
+      attr_reader :pattern
+
+      def initialize(pattern = nil, raw = false)
+        @pattern = pattern
+        @raw = raw
         @count = 0
       end
-      
+
+      def pattern?
+        !@pattern.nil?
+      end
+
+      def raw?
+        @raw
+      end
+    end
+
+    class CommentFormatter < BaseFormatter
+      def initialize(pattern = nil, raw = false)
+        @markdown = Redcarpet::Markdown.new(Downterm::Render::Terminal, :autolink => true,
+                                                                        :strikethrough => true,
+                                                                        :superscript => true)
+        super
+      end
+
       def format(comment)
         cols = HighLine::SystemExtensions.terminal_size[0]
         out = StringIO.new
         out.write("\n\n") unless @count == 0
         out.write("#{comment.subreddit}\n".color(:green))
         out.write("#{comment_link(comment)}\n".color(:yellow))
-        out.write("#{comment.link_title.strip.truncate(cols)}\n".color(:red))
+        out.write("#{comment.link_title.strip.truncate(cols)}\n".color(:magenta))
         out.write("#{comment_date(comment)}\n".color(:blue))
         out.write("\n")
-        out.write("#{comment.body.strip.convert_entities}\n")
+        out.write("#{comment_body(comment)}\n")
         @count += 1
         out.rewind
         out.read
       end
       
       private
+        def comment_body(comment)
+          body = comment.body
+          body = @markdown.render(body) unless raw?
+          if pattern?
+            body.highlight(pattern)
+          else
+            body
+          end
+        end
+
         def comment_link(comment)
           link = comment.link_id.split("_")[-1]
           "http://www.reddit.com/r/#{comment.subreddit}/comments/#{link}/z/#{comment.id}"
@@ -39,5 +72,18 @@ module USaidWat
           DateTime.strptime(comment.created_utc.to_s, "%s").to_time.localtime.ago
         end
     end
+
+    class CompactCommentFormatter < BaseFormatter
+      def format(comment)
+        cols = HighLine::SystemExtensions.terminal_size[0]
+        out = StringIO.new
+        subreddit = comment.subreddit
+        cols -= subreddit.length + 1
+        out.write("#{subreddit}".color(:green))
+        out.write(" #{comment.link_title.strip.truncate(cols)}\n")
+        out.rewind
+        out.read
+      end
+    end
   end
 end

data/lib/usaidwat/version.rb

@@ -1,3 +1,3 @@
 module USaidWat
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/usaidwat/formatter_spec.rb

@@ -72,5 +72,28 @@ EXPECTED
         end
       end
     end
+
+    describe CompactCommentFormatter do
+      let (:formatter) { CompactCommentFormatter.new }
+
+      before do
+        Timecop.freeze(Time.new(2015, 6, 16, 17, 8))
+      end
+
+      after do
+        Timecop.return
+      end
+
+      describe "#format" do
+        it "should return a string containing the formatted comment" do
+          comment = double("comment")
+          expect(comment).to receive(:subreddit).and_return("programming")
+          expect(comment).to receive(:link_title).and_return("Why Brit Ruby 2013 was cancelled and why this is not ok - Gist")
+          expected = "programming Why Brit Ruby 2013 was cancelled and why this is not ok - Gist\n"
+          actual = formatter.format(comment).delete_ansi_color_codes
+          expect(actual).to eq(expected)
+        end
+      end
+    end
   end
 end

data/spec/usaidwat/string_spec.rb

@@ -1,38 +1,9 @@
+require 'rainbow'
 require 'spec_helper'
 
 module USaidWat
   module Ext
     describe String do
-      describe "#convert_entities" do
-        it "converts > to >" do
-          s = "-> look at this!"
-          expected = "-> look at this!"
-          actual = s.convert_entities
-          expect(actual).to eq(expected)
-        end
-
-        it "converts &lt; to <" do
-          s = "left &lt;&lt; shift!"
-          expected = "left << shift!"
-          actual = s.convert_entities
-          expect(actual).to eq(expected)
-        end
-
-        it "converts both &gt; and &lt; to > and <" do
-          s = "look -&gt; this string has both &lt;- awesome, huh?"
-          expected = "look -> this string has both <- awesome, huh?"
-          actual = s.convert_entities
-          expect(actual).to eq(expected)
-        end
-
-        it "converts &amp; to &" do
-          s = "i like cake &amp; ice cream"
-          expected = "i like cake & ice cream"
-          actual = s.convert_entities
-          expect(actual).to eq(expected)
-        end
-      end
-
       describe "#truncate" do
         it "truncates strings longer than the given width to the width" do
           n = 80
@@ -74,6 +45,43 @@ module USaidWat
           expect(s.pluralize(1, "ies", "y")).to eq("poppy")
         end
       end
+
+      describe "#highlight" do
+        it "should highlight matching parts of strings" do
+          s = "apple pie is made from apples"
+          expected = "#{Rainbow("apple").red} pie is made from #{Rainbow("apple").red}s"
+          actual = s.highlight("apple")
+          expect(actual).to eq(expected)
+        end
+
+        it "should return an identical string if no matches are found" do
+          s = "apple pie is made from apples"
+          expected = s.dup
+          actual = s.highlight("cherry")
+          expect(actual).to eq(expected)
+        end
+
+        it "should match parts insensitive to case" do
+          s = "Apple pie is made from Apples"
+          expected = "#{Rainbow("Apple").red} pie is made from #{Rainbow("Apple").red}s"
+          actual = s.highlight("apple")
+          expect(actual).to eq(expected)
+        end
+
+        it "should highlight matching parts of strings using a regex-like string" do
+          s = "pears are tastier than bears"
+          expected = "#{Rainbow("pears").red} are tastier than #{Rainbow("bears").red}"
+          actual = s.highlight("[b|p]ears")
+          expect(actual).to eq(expected)
+        end
+
+        it "should highlight matching parts of strings using an actual regex" do
+          s = "pears are tastier than bears"
+          expected = "#{Rainbow("pears").red} are tastier than #{Rainbow("bears").red}"
+          actual = s.highlight(/[b|p]ears/)
+          expect(actual).to eq(expected)
+        end
+      end
     end
   end
 end

data/usaidwat.gemspec

@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
 require 'usaidwat/version'
 
 Gem::Specification.new do |gem|
@@ -13,20 +15,27 @@ Gem::Specification.new do |gem|
   gem.description   = %q{View a user's last 100 Reddit comments, organized by subreddit.}
   gem.summary       = %q{Answers the age-old question, "Where does a Redditor comment the most?"}
 
+  gem.metadata      = {
+    'build_date' => Time.now.strftime("%Y-%m-%d %H:%M:%S.%L %Z"),
+  }
+
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.required_ruby_version = '>= 1.9.3'
+
+  gem.add_runtime_dependency('downterm', '~> 0.1.0')
   gem.add_runtime_dependency('highline', '~> 1.7')
+  gem.add_runtime_dependency('mercenary', '~> 0.3.5')
   gem.add_runtime_dependency('rainbow', '~> 2.0')
   gem.add_runtime_dependency('snooby', '~> 0.1.5')
   gem.add_runtime_dependency('sysexits', '~> 1.2')
-  gem.add_runtime_dependency('thor', '~> 0.19.1')
 
-  gem.add_development_dependency('aruba', '~> 0.8.1')
+  gem.add_development_dependency('aruba', '~> 0.9.0')
   gem.add_development_dependency('cucumber', '~> 2.0')
   gem.add_development_dependency('rspec', '~> 3.2')
-  gem.add_development_dependency('timecop', '~> 0.7.4')
+  gem.add_development_dependency('timecop', '~> 0.8.0')
   gem.add_development_dependency('webmock', '~> 1.21')
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: usaidwat
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Michael Dippery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: downterm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -25,75 +39,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: mercenary
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
-  name: snooby
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: sysexits
+  name: snooby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: sysexits
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +208,8 @@ files:
 homepage: https://github.com/mdippery/usaidwat
 licenses:
 - MIT
-metadata: {}
+metadata:
+  build_date: 2015-08-27 18:54:51.726 PDT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -203,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="