usaidwat 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f60bbafb7dc38ce3ba607557393b5be840110def
-  data.tar.gz: 265fc8c863875b82178991a44f3e11cb040e00e7
+  metadata.gz: 9f12ca3f12a32eeee431b4f589c7d4454f5b941e
+  data.tar.gz: 9a295db51fbef5c135b1145ddc9330581668b9b9
 SHA512:
-  metadata.gz: 0601d41a7aefeda88672eba637015ad703de34618cf41535938d4f8d83e72a077bbebfef0317938be94d88498acc95395ee2f46244d6a91fc301fc5a49d4d0d9
-  data.tar.gz: b20001b8c0a9fee51df926b464d90b51922a244028d9124119f2803e573de2935ba22551c338ffb71e13c177348bd89fb68c2574c688d0e4fb853dfc7dfb8cb7
+  metadata.gz: f86b9208cf4d10cc156daa37f12423be5325d6be89eaf91346e1437523d25ac8b18ad16b0cf3cdff3996aa8368aac9e9112db7e2c473862df3cdb47c313f7326
+  data.tar.gz: a1eb4808dc6f614b2d477a9d247743755923ccccfa68535168b912dfc457f6a050d0c02b8096e25c160a8910efa5c274a0d075023b0c00f9a90bd806177ae56d

data/lib/usaidwat.rb

@@ -1,5 +1,14 @@
+def require_all(path)
+  glob = File.join(File.dirname(__FILE__), path, '*.rb')
+  Dir[glob].each do |f|
+    require f
+  end
+end
+
 require "usaidwat/algo"
-require "usaidwat/application"
 require "usaidwat/client"
+require "usaidwat/command"
 require "usaidwat/formatter"
 require "usaidwat/version"
+
+require_all "usaidwat/commands"

data/lib/usaidwat/client.rb

@@ -19,7 +19,7 @@ module USaidWat
         user.comments(100)
       rescue NoMethodError
         raise NoSuchUserError, username
-      rescue TypeError
+      rescue TypeError, Net::HTTP::Persistent::Error
         raise ReachabilityError, "Reddit unreachable"
       end
 
@@ -47,7 +47,7 @@ module USaidWat
         user.posts
       rescue NoMethodError
         raise NoSuchUserError, username
-      rescue TypeError
+      rescue TypeError, Net::HTTP::Persistent::Error
         raise ReachabilityError, "Reddit unreachable"
       end
 
@@ -61,7 +61,7 @@ module USaidWat
         user.about[key]
       rescue NoMethodError
         raise NoSuchUserError, username
-      rescue TypeError
+      rescue TypeError, Net::HTTP::Persistent::Error
         raise ReachabilityError, "Reddit unreachable"
       end
     end

data/lib/usaidwat/command.rb

@@ -0,0 +1,48 @@
+require 'sysexits'
+require 'usaidwat/client'
+require 'usaidwat/pager'
+
+require 'timecop' if ENV['USAIDWAT_ENV'] == 'cucumber'
+
+module USaidWat
+  module Application
+    class Command
+      include Pager
+      include Sysexits
+
+      attr_reader :client
+
+      class << self
+        def subclasses
+          @subclasses ||= []
+        end
+
+        def inherited(base)
+          subclasses << base
+          super
+        end
+      end
+
+      def initialize(prog)
+        @client = cucumber? ? USaidWat::Client::TestRedditor : USaidWat::Client::Redditor
+        Timecop.freeze(Time.parse(ENV['USAIDWAT_CURRENT_TIME'])) if cucumber_time?
+      end
+
+      def quit(message, code=:ok)
+        stream = code == :ok ? $stdout : $stderr
+        stream.puts message
+        exit code
+      end
+
+      protected
+
+      def cucumber?
+        ENV['USAIDWAT_ENV'] == 'cucumber'
+      end
+
+      def cucumber_time?
+        cucumber? && !ENV['USAIDWAT_CURRENT_TIME'].nil?
+      end
+    end
+  end
+end

data/lib/usaidwat/commands/info.rb

@@ -0,0 +1,30 @@
+require 'usaidwat/client'
+require 'usaidwat/command'
+
+module USaidWat
+  module Application
+    class Info < Command
+      def initialize(prog)
+        prog.command(:info) do |c|
+          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
+
+        redditor = client.new(username)
+        created_at = redditor.created_at.strftime("%b %d, %Y %H:%M %p")
+        puts "Created: #{created_at} (#{redditor.age})"
+        printf "Link Karma: %d\n", redditor.link_karma
+        printf "Comment Karma: %d\n", redditor.comment_karma
+      rescue USaidWat::Client::NoSuchUserError
+        quit "No such user: #{username}", :no_such_user
+      end
+    end
+  end
+end

data/lib/usaidwat/commands/log.rb

@@ -0,0 +1,64 @@
+require 'usaidwat/client'
+require 'usaidwat/command'
+require 'usaidwat/filter'
+require 'usaidwat/formatter'
+require 'usaidwat/ext/array'
+
+module USaidWat
+  module Application
+    class Log < Command
+      include FilterCommand
+
+      def initialize(prog)
+        prog.command(:log) do |c|
+          c.alias :l
+          c.option 'date', '--date FORMAT', 'Show dates in "absolute" or "relative" format'
+          c.option 'grep', '--grep STRING', 'Show only comments matching STRING'
+          c.option 'limit', '--limit LIMIT', '-n LIMIT', 'Only show n comments'
+          c.option 'oneline', '--oneline', 'Output log in a more compact 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
+        subreddits = args.subreddits
+
+        redditor = client.new(username)
+        comments = redditor.comments
+
+        res = filter_entries('comments', redditor, comments, subreddits) >>
+              lambda { |r| grep_entries('comments', redditor, r.value, options['grep']) } >>
+              lambda { |r| limit_entries('comments', redditor, r.value, options['limit']) } >>
+              lambda { |r| ensure_entries('comments', redditor, r.value) }
+
+        quit res.value if res.left?
+
+        opts = {
+          :date_format => (options['date'] || :relative).to_sym,
+          :oneline => !options['oneline'].nil?,
+          :pattern => options['grep'],
+          :raw => !options['raw'].nil?,
+        }
+        list_comments(res.value, opts)
+      rescue USaidWat::Client::NoSuchUserError
+        quit "No such user: #{username}", :no_such_user
+      end
+
+      private
+
+      def list_comments(comments, options = {})
+        oneline = options[:oneline]
+        formatter = (oneline ? USaidWat::CLI::CompactCommentFormatter : USaidWat::CLI::CommentFormatter).new(options)
+        page
+        comments.each { |c| print formatter.format(c) }
+      end
+    end
+  end
+end

data/lib/usaidwat/commands/posts.rb

@@ -0,0 +1,77 @@
+require 'usaidwat/client'
+require 'usaidwat/command'
+require 'usaidwat/count'
+require 'usaidwat/filter'
+require 'usaidwat/formatter'
+
+module USaidWat
+  module Application
+    class Posts < Command
+      include CountCommand
+      include FilterCommand
+
+      def initialize(prog)
+        prog.command(:posts) do |c|
+          c.action do |args, options|
+            process(options, args)
+          end
+
+          c.command(:log) do |s|
+            s.description "Show a user's submitted posts"
+            s.option 'oneline', '--oneline', 'Output log in a more compact form'
+            s.action do |args, options|
+              process_log(options, args)
+            end
+          end
+
+          c.command(:tally) do |s|
+            s.description "Tally a user's posts by subreddit"
+            s.option 'count', '-c', '--count', 'Sort output by number of comments'
+            s.action do |args, options|
+              process_tally(options, args)
+            end
+          end
+        end
+        super
+      end
+
+      def process(options, args)
+        quit "Do you want to tally or log posts?", :usage
+      end
+
+      def process_log(options, args)
+        raise ArgumentError.new('You must specify a username') if args.empty?
+        oneline = !!options['oneline']
+        username = args.shift
+        subreddits = args.subreddits
+
+        redditor = client.new(username)
+        posts = redditor.posts
+
+        res = filter_entries('posts', redditor, posts, subreddits) >>
+              lambda { |r| ensure_entries('posts', redditor, r.value) }
+
+        quit res.value if res.left?
+        posts = res.value
+
+        formatter = (oneline ? USaidWat::CLI::CompactPostFormatter : USaidWat::CLI::PostFormatter).new
+        page
+        posts.each { |p| print formatter.format(p) }
+      end
+
+      def process_tally(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)
+        quit "#{redditor.username} has no posts." if redditor.posts.empty?
+        partition_data = partition(redditor.posts, options['count'])
+        formatter = USaidWat::CLI::TallyFormatter.new
+        print formatter.format(partition_data)
+      rescue USaidWat::Client::NoSuchUserError
+        quit "No such user: #{username}", :no_such_user
+      end
+    end
+  end
+end

data/lib/usaidwat/commands/tally.rb

@@ -0,0 +1,37 @@
+require 'usaidwat/client'
+require 'usaidwat/command'
+require 'usaidwat/count'
+
+module USaidWat
+  module Application
+    class Tally < Command
+      include CountCommand
+
+      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)
+        quit "#{redditor.username} has no comments." if redditor.comments.empty?
+        partition_data = partition(redditor.comments, options['count'])
+        formatter = USaidWat::CLI::TallyFormatter.new
+        print formatter.format(partition_data)
+      rescue USaidWat::Client::NoSuchUserError
+        quit "No such user: #{username}", :no_such_user
+      end
+    end
+  end
+end

data/lib/usaidwat/ext/string.rb

@@ -17,7 +17,7 @@ class String
     gsub(/#{pattern}/i) { |m| Rainbow(m).red }
   end
 
-  def transform_html_entities
+  def unescape_html
     gsub(/&gt;/, '>').gsub(/&lt;/, '<').gsub(/&amp;/, '&')
   end
 end

data/lib/usaidwat/filter.rb

@@ -1,3 +1,5 @@
+require 'usaidwat/either'
+
 module USaidWat
   module Application
     module FilterCommand

data/lib/usaidwat/formatter.rb

@@ -48,7 +48,7 @@ module USaidWat
         out.write("\n\n\n") unless @count == 0
         out.write("#{post.subreddit}\n".color(:green))
         out.write("#{post_link(post)}\n".color(:yellow))
-        out.write("#{post.title.strip.transform_html_entities.truncate(cols)}\n".color(:magenta))
+        out.write("#{post.title.strip.unescape_html.truncate(cols)}\n".color(:magenta))
         out.write("#{post_date(post)}".color(:blue))
         out.write("\n#{post.url}") unless post.url.end_with?(post.permalink)
         @count += 1
@@ -73,7 +73,7 @@ module USaidWat
         out = StringIO.new
         subreddit = post.subreddit
         cols -= subreddit.length + 1
-        title = post.title.strip.transform_html_entities.truncate(cols)
+        title = post.title.strip.unescape_html.truncate(cols)
         out.write(subreddit.color(:green))
         out.write(" #{title}\n")
         out.rewind
@@ -88,7 +88,7 @@ module USaidWat
         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.transform_html_entities.truncate(cols)}\n".color(:magenta))
+        out.write("#{comment.link_title.strip.unescape_html.truncate(cols)}\n".color(:magenta))
         out.write("#{comment_date(comment)}".color(:blue))
         out.write(" \u2022 ".color(:cyan))
         out.write(sprintf("%+d\n", comment_karma(comment)).color(:blue))
@@ -107,7 +107,7 @@ module USaidWat
         end
 
         def comment_body(comment)
-          body = comment.body.strip
+          body = comment.body.strip.unescape_html
           body = markdown.render(body) unless raw?
           if pattern?
             body.highlight(pattern)
@@ -143,7 +143,7 @@ module USaidWat
         out = StringIO.new
         subreddit = comment.subreddit
         cols -= subreddit.length + 1
-        title = comment.link_title.strip.transform_html_entities.truncate(cols)
+        title = comment.link_title.strip.unescape_html.truncate(cols)
         key = "#{subreddit} #{title}"
         if !seen?(key)
           out.write("#{subreddit}".color(:green))

data/lib/usaidwat/version.rb

@@ -1,3 +1,3 @@
 module USaidWat
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

data/spec/usaidwat/client_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'timecop'
 
 module USaidWat
   module Client
@@ -125,6 +126,46 @@ module USaidWat
         end
       end
 
+      context "when Reddit requests timeout" do
+        before(:each) do
+          WebMock.disable_net_connect!
+          WebMock.reset!
+          stub_request(:get, "http://www.reddit.com/user/mipadi/comments.json?after=&limit=100").to_timeout
+          stub_request(:get, "http://www.reddit.com/user/mipadi/about.json").to_timeout
+          stub_request(:get, "http://www.reddit.com/user/mipadi/submitted.json?after=&limit=25").to_timeout
+        end
+
+        describe "#posts" do
+          it "raises 'Reddit unreachable' error" do
+            expect { redditor.comments }.to raise_error(ReachabilityError, /Reddit unreachable/)
+          end
+        end
+
+        describe "#link_karma" do
+          it "raises 'Reddit unreachable' error" do
+            expect { redditor.link_karma }.to raise_error(ReachabilityError, /Reddit unreachable/)
+          end
+        end
+
+        describe "#comment_karma" do
+          it "raises 'Reddit unreachable' error" do
+            expect { redditor.comment_karma }.to raise_error(ReachabilityError, /Reddit unreachable/)
+          end
+        end
+
+        describe "#created_at" do
+          it "raises 'Reddit unreachable' error" do
+            expect { redditor.created_at }.to raise_error(ReachabilityError, /Reddit unreachable/)
+          end
+        end
+
+        describe "#age" do
+          it "raises 'Reddit unreachable' error" do
+            expect { redditor.age }.to raise_error(ReachabilityError, /Reddit unreachable/)
+          end
+        end
+      end
+
       context "when Reddit is down" do
         before(:each) do
           WebMock.disable_net_connect!

data/spec/usaidwat/string_spec.rb

@@ -19,20 +19,20 @@ module USaidWat
         end
       end
 
-      describe "#transform_html_entities" do
+      describe "#unescape_html" do
         it "transforms & to &" do
           s = "this & that"
-          expect(s.transform_html_entities).to eq("this & that")
+          expect(s.unescape_html).to eq("this & that")
         end
 
         it "transform &lt; to <" do
           s = "chocolate &lt; vanilla"
-          expect(s.transform_html_entities).to eq("chocolate < vanilla")
+          expect(s.unescape_html).to eq("chocolate < vanilla")
         end
 
         it "transforms &gt; to >" do
           s = "cats &gt; dogs"
-          expect(s.transform_html_entities).to eq("cats > dogs")
+          expect(s.unescape_html).to eq("cats > dogs")
         end
       end
 

data/usaidwat.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.3'
 
-  gem.add_runtime_dependency('downterm', '~> 0.1.4')
-  gem.add_runtime_dependency('mercenary', '~> 0.3.5')
+  gem.add_runtime_dependency('downterm', '~> 0.1.5')
+  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')
@@ -39,5 +39,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('cucumber', '~> 2.0')
   gem.add_development_dependency('rspec', '~> 3.2')
   gem.add_development_dependency('timecop', '~> 0.8.0')
-  gem.add_development_dependency('webmock', '~> 1.21')
+  gem.add_development_dependency('webmock', '~> 2.0')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usaidwat
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Michael Dippery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: downterm
@@ -16,26 +16,26 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: mercenary
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.3.5
 - !ruby/object:Gem::Dependency
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '2.0'
 description: View a user's last 100 Reddit comments, organized by subreddit.
 email:
 - michael@monkey-robot.com
@@ -197,8 +197,12 @@ files:
 - features/user.feature
 - lib/usaidwat.rb
 - lib/usaidwat/algo.rb
-- lib/usaidwat/application.rb
 - lib/usaidwat/client.rb
+- lib/usaidwat/command.rb
+- lib/usaidwat/commands/info.rb
+- lib/usaidwat/commands/log.rb
+- lib/usaidwat/commands/posts.rb
+- lib/usaidwat/commands/tally.rb
 - lib/usaidwat/count.rb
 - lib/usaidwat/either.rb
 - lib/usaidwat/ext/array.rb
@@ -226,9 +230,9 @@ homepage: https://github.com/mdippery/usaidwat
 licenses:
 - MIT
 metadata:
-  build_date: 2016-04-06 19:24:55 PDT
-  commit: v1.4.2
-  commit_hash: babb216c8e4a29a58fa00518a9cf164ab827fc73
+  build_date: 2016-05-04 19:02:53 PDT
+  commit: v1.4.3
+  commit_hash: fd36eb801d54c12c92948d00c082a700bd5228a5
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/usaidwat/application.rb

@@ -1,229 +0,0 @@
-require 'sysexits'
-require 'usaidwat/client'
-require 'usaidwat/count'
-require 'usaidwat/either'
-require 'usaidwat/filter'
-require 'usaidwat/pager'
-require 'usaidwat/ext/array'
-
-require 'timecop' if ENV['USAIDWAT_ENV'] == 'cucumber'
-
-module USaidWat
-  module Application
-    class Command
-      include Pager
-      include Sysexits
-
-      attr_reader :client
-
-      class << self
-        def subclasses
-          @subclasses ||= []
-        end
-
-        def inherited(base)
-          subclasses << base
-          super
-        end
-      end
-
-      def initialize(prog)
-        @client = cucumber? ? USaidWat::Client::TestRedditor : USaidWat::Client::Redditor
-        Timecop.freeze(Time.parse(ENV['USAIDWAT_CURRENT_TIME'])) if cucumber_time?
-      end
-
-      protected
-
-      def cucumber?
-        ENV['USAIDWAT_ENV'] == 'cucumber'
-      end
-
-      def cucumber_time?
-        cucumber? && !ENV['USAIDWAT_CURRENT_TIME'].nil?
-      end
-
-      def quit(message, code=:ok)
-        stream = code == :ok ? $stdout : $stderr
-        stream.puts message
-        exit code
-      end
-    end
-
-    class Info < Command
-      def initialize(prog)
-        prog.command(:info) do |c|
-          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
-
-        redditor = client.new(username)
-        created_at = redditor.created_at.strftime("%b %d, %Y %H:%M %p")
-        puts "Created: #{created_at} (#{redditor.age})"
-        printf "Link Karma: %d\n", redditor.link_karma
-        printf "Comment Karma: %d\n", redditor.comment_karma
-      rescue USaidWat::Client::NoSuchUserError
-        quit "No such user: #{username}", :no_such_user
-      end
-    end
-
-    class Log < Command
-      include FilterCommand
-
-      def initialize(prog)
-        prog.command(:log) do |c|
-          c.alias :l
-          c.option 'date', '--date FORMAT', 'Show dates in "absolute" or "relative" format'
-          c.option 'grep', '--grep STRING', 'Show only comments matching STRING'
-          c.option 'limit', '--limit LIMIT', '-n LIMIT', 'Only show n comments'
-          c.option 'oneline', '--oneline', 'Output log in a more compact 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
-        subreddits = args.subreddits
-
-        redditor = client.new(username)
-        comments = redditor.comments
-
-        res = filter_entries('comments', redditor, comments, subreddits) >>
-              lambda { |r| grep_entries('comments', redditor, r.value, options['grep']) } >>
-              lambda { |r| limit_entries('comments', redditor, r.value, options['limit']) } >>
-              lambda { |r| ensure_entries('comments', redditor, r.value) }
-
-        quit res.value if res.left?
-
-        opts = {
-          :date_format => (options['date'] || :relative).to_sym,
-          :oneline => !options['oneline'].nil?,
-          :pattern => options['grep'],
-          :raw => !options['raw'].nil?,
-        }
-        list_comments(res.value, opts)
-      rescue USaidWat::Client::NoSuchUserError
-        quit "No such user: #{username}", :no_such_user
-      end
-
-      private
-
-      def list_comments(comments, options = {})
-        oneline = options[:oneline]
-        formatter = (oneline ? USaidWat::CLI::CompactCommentFormatter : USaidWat::CLI::CommentFormatter).new(options)
-        page
-        comments.each { |c| print formatter.format(c) }
-      end
-    end
-
-    class Posts < Command
-      include CountCommand
-      include FilterCommand
-
-      def initialize(prog)
-        prog.command(:posts) do |c|
-          c.action do |args, options|
-            process(options, args)
-          end
-
-          c.command(:log) do |s|
-            s.description "Show a user's submitted posts"
-            s.option 'oneline', '--oneline', 'Output log in a more compact form'
-            s.action do |args, options|
-              process_log(options, args)
-            end
-          end
-
-          c.command(:tally) do |s|
-            s.description "Tally a user's posts by subreddit"
-            s.option 'count', '-c', '--count', 'Sort output by number of comments'
-            s.action do |args, options|
-              process_tally(options, args)
-            end
-          end
-        end
-        super
-      end
-
-      def process(options, args)
-        quit "Do you want to tally or log posts?", :usage
-      end
-
-      def process_log(options, args)
-        raise ArgumentError.new('You must specify a username') if args.empty?
-        oneline = !!options['oneline']
-        username = args.shift
-        subreddits = args.subreddits
-
-        redditor = client.new(username)
-        posts = redditor.posts
-
-        res = filter_entries('posts', redditor, posts, subreddits) >>
-              lambda { |r| ensure_entries('posts', redditor, r.value) }
-
-        quit res.value if res.left?
-        posts = res.value
-
-        formatter = (oneline ? USaidWat::CLI::CompactPostFormatter : USaidWat::CLI::PostFormatter).new
-        page
-        posts.each { |p| print formatter.format(p) }
-      end
-
-      def process_tally(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)
-        quit "#{redditor.username} has no posts." if redditor.posts.empty?
-        partition_data = partition(redditor.posts, options['count'])
-        formatter = USaidWat::CLI::TallyFormatter.new
-        print formatter.format(partition_data)
-      rescue USaidWat::Client::NoSuchUserError
-        quit "No such user: #{username}", :no_such_user
-      end
-    end
-
-    class Tally < Command
-      include CountCommand
-
-      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)
-        quit "#{redditor.username} has no comments." if redditor.comments.empty?
-        partition_data = partition(redditor.comments, options['count'])
-        formatter = USaidWat::CLI::TallyFormatter.new
-        print formatter.format(partition_data)
-      rescue USaidWat::Client::NoSuchUserError
-        quit "No such user: #{username}", :no_such_user
-      end
-    end
-  end
-end