usaidwat 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40cfe670a21fe2f65549c77c5ac84f06e1114b2b
-  data.tar.gz: ffe351f3831ca31ad960b148c630ca442c1b9ea7
+  metadata.gz: cb020c71be1b1132ce622e958ce732fd29ef086b
+  data.tar.gz: 629f6f970557e968bab7d850d4ee1c101f1c66a7
 SHA512:
-  metadata.gz: 68be66ec279c06be4c8c56a009eb2ae4bc1b3f8aa2e0c12d84f83d5e81198f7468bc350f403dd3eedfca119c98255ec6e4637df68b7d3b9495822231c95a72cb
-  data.tar.gz: b5636dd3f2d95e734c3684054fa0919e750696d366a792be832778c0a42833e920c96a3512b4fb97fbfa070491c6b9f346055282b2b3a9d092ef1e476806cce7
+  metadata.gz: de40783e531b166a72f99c401a05007383b2f237dbe1717679fbd4ac6ed2750865e66bec4c5520cd25963faf4c4e6bfe0bf703f11fc7860ef712125573c89309
+  data.tar.gz: e825e1c9517ce21aea8ec086c1e23aec34ee2062cdb46ac0bd61f2aeb24c03677a6429d7b4b465eaf13496b5ab931c7273993b9576f3d89a3c5de355af8ed4d7

data/features/browse.feature

@@ -3,26 +3,32 @@ Feature: Browse comments
   As a Redditor
   I want to quickly be able to list another Redditor's comments
   In order to see what they like to talk about
-  
+
   Scenario: List all comments
     Given the Reddit service returns comments for the user "mipadi"
-    When I run `usaidwat mipadi | head -n 16`
+    When I run `usaidwat 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
+      01 Dec 2012, 12:14 PM
 
       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
+      30 Nov 2012, 04:44 PM
 
       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
+      30 Nov 2012, 10:09 AM
 
       The Judgment of Solomon Accords.
       """
@@ -34,7 +40,7 @@ Feature: Browse comments
       """
       No such user: palorchild
       """
-  
+
   Scenario: List all comments when user has no comments
     Given the Reddit service returns comments for the user "blank"
     When I run `usaidwat blank`
@@ -42,7 +48,7 @@ Feature: Browse comments
       """
       blank has no comments.
       """
-  
+
   Scenario: Tally comments
     Given the Reddit service returns comments for the user "mipadi"
     When I run `usaidwat -t mipadi`
@@ -62,7 +68,7 @@ Feature: Browse comments
       wikipedia          1
       worldnews          2
       """
-    
+
   Scenario: Tally comments when user has no comments
     Given the Reddit service returns comments for the user "blank"
     When I run `usaidwat -t blank`
@@ -70,49 +76,61 @@ Feature: Browse comments
       """
       blank has no comments.
       """
-  
+
   Scenario: List comments for a particular subreddit
     Given the Reddit service returns comments for the user "mipadi"
-    When I run `usaidwat mipadi AskReddit | head -n 16`
+    When I run `usaidwat mipadi AskReddit`
     Then it should pass with:
       """
       AskReddit
       http://www.reddit.com/r/AskReddit/comments/141kt9/z/c795rwz
+      Do colleges actually teach students how to think critically? Or even to think/qu
+      30 Nov 2012, 08:27 AM
 
       I think it depends on where you go and what you study, but yes, I think they do teach you to think critically, especially in humanities courses and seminars. Maybe it's just because I went to a small, private liberal arts college rather than a huge school, but critical thinking was definitely a part of my education.
 
 
       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
+      30 Nov 2012, 08:20 AM
 
       You're from New Jersey? Which exit?
 
 
       AskReddit
       http://www.reddit.com/r/AskReddit/comments/140h3z/z/c795muo
+      Today I was going 80mph in a 55 when an unmarked police car pulled up next to me
+      30 Nov 2012, 08:19 AM
 
       You didn't slow down for very long though, did you?
       """
-  
+
   Scenario: List comments for a particular subreddit specified with the wrong case
     Given the Reddit service returns comments for the user "mipadi"
-    When I run `usaidwat mipadi askreddit | head -n 16`
+    When I run `usaidwat mipadi askreddit`
     Then it should pass with:
       """
       AskReddit
       http://www.reddit.com/r/AskReddit/comments/141kt9/z/c795rwz
+      Do colleges actually teach students how to think critically? Or even to think/qu
+      30 Nov 2012, 08:27 AM
 
       I think it depends on where you go and what you study, but yes, I think they do teach you to think critically, especially in humanities courses and seminars. Maybe it's just because I went to a small, private liberal arts college rather than a huge school, but critical thinking was definitely a part of my education.
 
 
       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
+      30 Nov 2012, 08:20 AM
 
       You're from New Jersey? Which exit?
 
 
       AskReddit
       http://www.reddit.com/r/AskReddit/comments/140h3z/z/c795muo
+      Today I was going 80mph in a 55 when an unmarked police car pulled up next to me
+      30 Nov 2012, 08:19 AM
 
       You didn't slow down for very long though, did you?
       """
@@ -124,7 +142,7 @@ Feature: Browse comments
       """
       No comments by mipadi for nsfw.
       """
-  
+
   Scenario: Tally comments with subreddit
     Given the Reddit service returns comments for the user "mipadi"
     When I run `usaidwat -t mipadi AskReddit`
@@ -132,7 +150,7 @@ Feature: Browse comments
       """
       Usage: usaidwat [-t] <user> [<subreddit>]
       """
-  
+
   Scenario: Pass no arguments
     Given the Reddit service returns comments for the user "mipadi"
     When I run `usaidwat`
@@ -140,7 +158,7 @@ Feature: Browse comments
       """
       Usage: usaidwat [-t] <user> [<subreddit>]
       """
-  
+
   Scenario: Pass no arguments when tallying
     Given the Reddit service returns comments for the user "mipadi"
     When I run `usaidwat -t`

data/lib/usaidwat/application.rb

@@ -9,6 +9,7 @@ module USaidWat
   class Application
     def initialize(client)
       @client = client
+      Signal.trap("PIPE", "EXIT")
     end
 
     def run(argv)
@@ -17,7 +18,7 @@ module USaidWat
       username = args.first
       @redditor = @client.new(username)
       begin
-        return tally_comments if opts[:tally]
+        return tally_comments if opts.tally
         return list_comments_for_subreddit(args[1]) if args.length == 2
         return list_all_comments
       rescue USaidWat::Client::NoSuchUserError
@@ -77,12 +78,13 @@ module USaidWat
 
     private
       def handle_arguments(argv)
+        opts = OpenStruct.new
+        opts.tally = false
         usage(1) if argv.length == 0
         usage if argv.first == "--help"
         version if argv.first == "--version"
-        opts = {:tally => false}
         if argv.first == "-t"
-          opts[:tally] = true
+          opts.tally = true
           argv.shift
           usage(1) unless argv.length == 1
         end

data/lib/usaidwat/ext/string.rb

@@ -1,4 +1,8 @@
 class String
+  def truncate(width)
+    self[0, width]
+  end
+
   def convert_entities
     self.gsub(/&gt;/, '>').gsub(/&lt;/, '<')
   end

data/lib/usaidwat/formatter.rb

@@ -1,3 +1,5 @@
+require 'date'
+require 'highline'
 require 'stringio'
 require 'rainbow/ext/string'
 require 'usaidwat/ext/string'
@@ -12,10 +14,13 @@ module USaidWat
       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_date(comment)}\n".color(:blue))
         out.write("\n")
         out.write("#{comment.body.strip.convert_entities}\n")
         @count += 1
@@ -28,6 +33,11 @@ module USaidWat
           link = comment.link_id.split("_")[-1]
           "http://www.reddit.com/r/#{comment.subreddit}/comments/#{link}/z/#{comment.id}"
         end
+
+        def comment_date(comment)
+          fmt = ENV['USAIDWAT_TIME_FORMAT'] || '%d %b %Y, %I:%M %p'
+          DateTime.strptime(comment.created_utc.to_s, "%s").to_time.localtime.strftime(fmt)
+        end
     end
   end
 end

data/lib/usaidwat/service.rb

@@ -1,7 +1,7 @@
 module USaidWat
   module Service
     class MockComment
-      attr_reader :subreddit, :body, :id, :link_id
+      attr_reader :subreddit, :body, :id, :link_id, :created_utc, :link_title
 
       def initialize(dict)
         data = dict['data']
@@ -9,6 +9,8 @@ module USaidWat
         @body = data['body']
         @id = data['id']
         @link_id = data['link_id']
+        @created_utc = data['created_utc']
+        @link_title = data['link_title']
       end
     end
 

data/lib/usaidwat/version.rb

@@ -1,3 +1,3 @@
 module USaidWat
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/usaidwat/formatter_spec.rb

@@ -11,10 +11,14 @@ module USaidWat
           expect(comment).to receive(:subreddit).twice.and_return("programming")
           expect(comment).to receive(:link_id).and_return("t3_13f783")
           expect(comment).to receive(:id).and_return("c73qhxi")
+          expect(comment).to receive(:link_title).and_return("Why Brit Ruby 2013 was cancelled and why this is not ok - Gist")
+          expect(comment).to receive(:created_utc).and_return(1433378314.0)
           expect(comment).to receive(:body).and_return("Welcome to the wonderful world of Python drama!")
           expected = <<-EXPECTED
 programming
 http://www.reddit.com/r/programming/comments/13f783/z/c73qhxi
+Why Brit Ruby 2013 was cancelled and why this is not ok - Gist
+03 Jun 2015, 05:38 PM
 
 Welcome to the wonderful world of Python drama!
 EXPECTED
@@ -27,11 +31,15 @@ EXPECTED
           expect(comment1).to receive(:subreddit).twice.and_return("programming")
           expect(comment1).to receive(:link_id).and_return("t3_13f783")
           expect(comment1).to receive(:id).and_return("c73qhxi")
+          expect(comment1).to receive(:created_utc).and_return(1433378314.0)
+          expect(comment1).to receive(:link_title).and_return("Why Brit Ruby 2013 was cancelled and why this is not ok - Gist")
           expect(comment1).to receive(:body).and_return("Welcome to the wonderful world of Python drama!")
           comment2 = double("second comment")
           expect(comment2).to receive(:subreddit).twice.and_return("programming")
           expect(comment2).to receive(:link_id).and_return("t3_13f783")
           expect(comment2).to receive(:id).and_return("c73qhxi")
+          expect(comment2).to receive(:created_utc).and_return(1433378314.0)
+          expect(comment2).to receive(:link_title).and_return("Why Brit Ruby 2013 was cancelled and why this is not ok - Gist")
           expect(comment2).to receive(:body).and_return("Welcome to the wonderful world of Python drama!")
           s = formatter.format(comment1)
           s = formatter.format(comment2)
@@ -46,6 +54,8 @@ EXPECTED
           expect(comment).to receive(:subreddit).twice.and_return("test")
           expect(comment).to receive(:link_id).and_return("t3_13f783")
           expect(comment).to receive(:id).and_return("c73qhxi")
+          expect(comment).to receive(:created_utc).and_return(1433378314.0)
+          expect(comment).to receive(:link_title).and_return("Why Brit Ruby 2013 was cancelled and why this is not ok - Gist")
           expect(comment).to receive(:body).and_return("This is a comment.\n\nIt has two lines.\n\n\n")
           s = formatter.format(comment)
           lines = s.split("\n")

data/usaidwat.gemspec

@@ -18,11 +18,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency('snooby', '~> 0.1.5')
-  gem.add_dependency('rainbow', '~> 2.0', '>= 2.0.0')
+  gem.add_runtime_dependency('snooby', '~> 0.1.5')
+  gem.add_runtime_dependency('rainbow', '~> 2.0')
+  gem.add_runtime_dependency('highline', '~> 1.7', '>= 1.7.2')
 
-  gem.add_development_dependency('rspec', '~> 3.2', '>= 3.2.0')
-  gem.add_development_dependency('cucumber', '~> 2.0', '>= 2.0.0')
+  gem.add_development_dependency('rspec', '~> 3.2')
+  gem.add_development_dependency('cucumber', '~> 2.0')
   gem.add_development_dependency('aruba', '~> 0.6.2')
-  gem.add_development_dependency('webmock', '~> 1.21', '>= 1.21.0')
+  gem.add_development_dependency('webmock', '~> 1.21')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usaidwat
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Michael Dippery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: snooby
@@ -31,19 +31,33 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -51,9 +65,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -61,9 +72,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -71,9 +79,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -81,9 +86,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -105,9 +107,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.21'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -115,9 +114,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.21'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.21.0
 description: View a user's last 100 Reddit comments, organized by subreddit.
 email:
 - michael@monkey-robot.com