usaidwat 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cee5e3074ed0c1494df8b93773ddc846a169e2d0
-  data.tar.gz: 518e15089d071d24074726d811cb368726cc9f1f
+  metadata.gz: a8e0d58a8806f6f9f2de8668e04b5e6deddee9b2
+  data.tar.gz: f2d2e61621eb9997243031e12ee78c087569fa04
 SHA512:
-  metadata.gz: caac90a393995ac867f4301875512d3f710de36badf79ce7d54d0cd890d5494936ee931d61ed9405f769c0ef9233e0bf43ed5a2aac3bacc5a4ab2ba020fce7b0
-  data.tar.gz: 83df727948a67445cec59a3f88c66e2a96d9ef01ec66104e3ebca83302c10399a73c76217afeda8c6c9e899ac2f517b238870bfa1b612cd8090f1a4b9fd43839
+  metadata.gz: d98a2134b5857f5b6e1e2e725ae5b0e00f371564828b33ad99ed8a35ef0c28ad548c784cf5aafd4c15acad00468a0639a6d6d0f7082953801d825662d86ecf12
+  data.tar.gz: a74bbb9e8aaef91c4d07a9a8c933e31d3bbf6c68ad17307d5216b495d52950994b08598ccdba462f1e9bcefe77502af45a5654fcaaa452f4ceeac208ff4f8fd7

data/features/log.feature

@@ -287,6 +287,87 @@ Feature: Browse comments
       nyc NYC taxi roof lights get overhaul -  A light simply will mean the cab is ava
       """
 
+  Scenario: One-line comments should be collapsed into unique titles
+    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 exactly:
+      """
+      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
+      AskReddit Do colleges actually teach students how to think critically? Or even t
+      AskReddit I'm from Tennessee and most of our jokes are geared toward Mississippi
+      AskReddit Today I was going 80mph in a 55 when an unmarked police car pulled up 
+      AskReddit Why should I pay for a college degree when all of the information they
+      apple iTunes 11 finally available for download - The Verge
+      Games The True Story of Battlefield 3, the Battlefield Franchise, Its Community,
+      AskReddit Professors/Students of Reddit- What are your feelings towards shit Pro
+      books I was saddened hearing this story on the Takeaway this morning- "Is litera
+      AskReddit My friends give me crap about not watching "good" movies. Such as I've
+      AskReddit Reddit, what is the worst thing about your city?
+      AskReddit What is it like to own a decommissioned police car?
+      AskReddit When Microsoft was found guilty of violating antitrust law by bundling
+      django I need a little help understanding billing and payment
+      programming Why software engineers are vastly undervalued
+      AskReddit Is Germany racist?
+      apple Report: Apple bumps Android from top spot in U.S. smartphone market on str
+      AskReddit I got stood up by a girl for the first date. I have to go to work tomm
+      AskReddit How much does 'life' costs in your country/city/area?
+      programming Apple's proposal for modules in C(++) [PDF slides]
+      AskReddit Half of my facebook newsfeed is of people posting this quoted copyrigh
+      AskReddit I'm lying in my warm bed with my fiance as my jetpack while Redditing 
+      AskReddit I found out tonight that my dad's great grandfather was a Civil War PO
+      AskReddit This morning on the way home from walking my dogs I shit myself. What'
+      AskReddit Is it just me or do women have less genuine friendships than men?
+      programming RubyMonk
+      AskReddit How many government officials would have to die in an accident or atta
+      programming The X.Org CodingStyle
+      AskReddit How would you stop people from pushing others into oncoming subways? C
+      worldnews How Israeli Drone Pilots Made Their Life-and-Death Choices Over Gaza -
+      AskReddit This entire semester I thought my TA was a girl named Kayla...it's a b
+      AskReddit Why is it that mathematical "illiteracy" is ok, but being unable to re
+      AskReddit What's your brand of cigarette, and why?
+      AskReddit Accomplished Adults of Reddit: Honestly, is it more important to do wh
+      AskReddit I m a nutritionist. I often over hear people talk about nutrition like
+      personalfinance What's the most expensive mistake you ever made financially?
+      AskReddit I want to quit college and enlist in the Air Force. Am I throwing away
+      AskReddit Reddit, my boyfriend is abroad for a year. I'm trying to subtly work f
+      AskReddit Why is everyone naming Israel as the "aggressor"?? Am I missing someth
+      programming Why Brit Ruby 2013 was cancelled and why this is not ok — Gist
+      battlefield3 Can't argue with those rules..
+      AskReddit Who thinks "Mens Gift Ideas" are always super lame? Men of reddit what
+      redditcasual Submissions for new clan tag...
+      programming How To Package Your Python Code - The Right Way…
+      programming Hounded By Recruiters, Coders Put Themselves Up For Auction - Forbes
+      photography Do you travel? If so, what camera do you use/prefer?
+      AskReddit I want to go to college for music even though it's not the most financ
+      AskReddit Reddit, what popular opinions about films do you think the complete op
+      AskReddit If someone writes "Should of" instead of "Should have", I immediately 
+      AskReddit I'm A Mixed Race Teen (Black Dad, White Mum) And I Constantly Get Peop
+      AskReddit Do the James Bond films features occur in any sort of chronological or
+      apple iMessage down?
+      AskReddit Reddit, how old were you when you officially moved out? I'm 24 and fee
+      AskReddit Guys, what do girls wear that you absolutely can't stand?
+      AskReddit Looking into getting Windows 8 (Don't really like the looks of it from
+      AskReddit My stepdaughter is acting (sexually) inappropriately around me - what 
+      programming FizzBuzz Still Works
+      AskReddit Reddit, what is your most expensive mistake?
+      AskReddit Were you a part of the Occupy Wall Street movement?
+      AskReddit I'm coming up on my 6th year free from cocaine.  Anybody else had or h
+      programming UserManager.isUserAGoat() -- Oh you silly goat
+      AskReddit in regards to choosing a future career, should salary or enjoy-ability
+      AskReddit Guy I like asks me out to have coffee; gives me tips on how to get a b
+      AskReddit Men of Reddit: How much pressure is there for you guys to look good?
+      AskReddit Reddit, what custom ringtone do you use?
+      AskReddit Reddit: A lot of talk happens here about taxing the rich at a higher p
+      AskReddit I'm dropping out of college and joining the workforce for a while, hav
+      AskReddit What ever happened to the cent sign (¢)?
+      AskReddit I ask you this reddit, what is your most prized possession in this wor
+      AskReddit Reddit seems to hate Papa Johns and Chik-Fil-A with a passion. What ar
+      AskReddit Men of Reddit: Do you get turned off when a girl says she is a feminis
+      """
+
   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

data/lib/usaidwat/formatter.rb

@@ -2,8 +2,8 @@ require 'date'
 require 'downterm'
 require 'rainbow/ext/string'
 require 'redcarpet'
+require 'set'
 require 'stringio'
-require 'tty-screen'
 require 'usaidwat/ext/string'
 require 'usaidwat/ext/time'
 
@@ -35,19 +35,12 @@ module USaidWat
 
       protected
 
-        def tty
-          @tty || TTY::Screen.new
-        end
+      def tty
+        @tty ||= USaidWat::Application::Terminal.new
+      end
     end
 
     class CommentFormatter < BaseFormatter
-      def initialize(options = {})
-        @markdown = Redcarpet::Markdown.new(Downterm::Render::Terminal, :autolink => true,
-                                                                        :strikethrough => true,
-                                                                        :superscript => true)
-        super
-      end
-
       def format(comment)
         cols = tty.width
         out = StringIO.new
@@ -66,9 +59,15 @@ module USaidWat
       end
       
       private
+        def markdown
+          @markdown ||= Redcarpet::Markdown.new(Downterm::Render::Terminal, :autolink => true,
+                                                                            :strikethrough => true,
+                                                                            :superscript => true)
+        end
+
         def comment_body(comment)
           body = comment.body.strip
-          body = @markdown.render(body) unless raw?
+          body = markdown.render(body) unless raw?
           if pattern?
             body.highlight(pattern)
           else
@@ -103,11 +102,30 @@ module USaidWat
         out = StringIO.new
         subreddit = comment.subreddit
         cols -= subreddit.length + 1
-        out.write("#{subreddit}".color(:green))
-        out.write(" #{comment.link_title.strip.truncate(cols)}\n")
+        title = comment.link_title.strip.truncate(cols)
+        key = "#{subreddit} #{title}"
+        if !seen?(key)
+          out.write("#{subreddit}".color(:green))
+          out.write(" #{title}\n")
+        end
+        mark_seen(key)
         out.rewind
         out.read
       end
+
+      private
+
+      def comments
+        @comments ||= Set.new
+      end
+
+      def mark_seen(comment)
+        comments << comment
+      end
+
+      def seen?(comment)
+        comments.include?(comment)
+      end
     end
   end
 end

data/lib/usaidwat/terminal.rb

@@ -0,0 +1,19 @@
+require 'highline'
+
+module USaidWat
+  module Application
+    class Terminal
+      def initialize
+        @term = HighLine.new
+      end
+
+      def width
+        @term.output_cols
+      end
+
+      def height
+        @term.output_rows
+      end
+    end
+  end
+end

data/lib/usaidwat/version.rb

@@ -1,3 +1,3 @@
 module USaidWat
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/usaidwat.rb

@@ -2,4 +2,5 @@ require "usaidwat/algo"
 require "usaidwat/application"
 require "usaidwat/formatter"
 require "usaidwat/client"
+require "usaidwat/terminal"
 require "usaidwat/version"

data/spec/usaidwat/formatter_spec.rb

@@ -186,6 +186,18 @@ EXPECTED
           actual = formatter.format(comment).delete_ansi_color_codes
           expect(actual).to eq(expected)
         end
+
+        it "should return an empty string if a comment has already been printed" do
+          comment1 = double("comment")
+          comment2 = double("comment")
+          expect(comment1).to receive(:subreddit).and_return("programming")
+          expect(comment1).to receive(:link_title).and_return("Why Brit Ruby 2013 was cancelled and why this is not ok - Gist")
+          _ = formatter.format(comment1).delete_ansi_color_codes
+          expect(comment2).to receive(:subreddit).and_return("programming")
+          expect(comment2).to receive(:link_title).and_return("Why Brit Ruby 2013 was cancelled and why this is not ok - Gist")
+          actual = formatter.format(comment2).delete_ansi_color_codes
+          expect(actual).to eq("")
+        end
       end
     end
   end

data/spec/usaidwat/terminal_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+module USaidWat
+  module Application
+    describe Terminal do
+      let (:terminal) { Terminal.new }
+
+      describe "#width" do
+        it "should return a positive integer" do
+          expect(terminal.width).to be > 0
+        end
+      end
+
+      describe "#height" do
+        it "should return a positive integer" do
+          expect(terminal.height).to be > 0
+        end
+      end
+    end
+  end
+end

data/usaidwat.gemspec

@@ -28,14 +28,14 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.3'
 
-  gem.add_runtime_dependency('downterm', '~> 0.1.2')
+  gem.add_runtime_dependency('downterm', '~> 0.1.3')
+  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('tty-screen', '~> 0.4.0')
 
-  gem.add_development_dependency('aruba', '~> 0.9.0')
+  gem.add_development_dependency('aruba', '~> 0.9')
   gem.add_development_dependency('cucumber', '~> 2.0')
   gem.add_development_dependency('rspec', '~> 3.2')
   gem.add_development_dependency('timecop', '~> 0.8.0')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usaidwat
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Michael Dippery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-19 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: downterm
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: mercenary
   requirement: !ruby/object:Gem::Requirement
@@ -80,34 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: tty-screen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +201,7 @@ files:
 - lib/usaidwat/formatter.rb
 - lib/usaidwat/pager.rb
 - lib/usaidwat/service.rb
+- lib/usaidwat/terminal.rb
 - lib/usaidwat/version.rb
 - spec/spec_helper.rb
 - spec/usaidwat/algo_spec.rb
@@ -209,15 +210,16 @@ files:
 - spec/usaidwat/formatter_spec.rb
 - spec/usaidwat/service_spec.rb
 - spec/usaidwat/string_spec.rb
+- spec/usaidwat/terminal_spec.rb
 - spec/usaidwat/time_spec.rb
 - usaidwat.gemspec
 homepage: https://github.com/mdippery/usaidwat
 licenses:
 - MIT
 metadata:
-  build_date: 2015-09-19 10:09:24 PDT
-  commit: v1.2.0
-  commit_hash: e869e79b24c70ce12fa06be61f67b3c982da734f
+  build_date: 2015-11-03 19:55:52 PST
+  commit: v1.3.0
+  commit_hash: 2ac920497d08c42b67f40bda4e78496e1b9ad6c4
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -234,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Answers the age-old question, "Where does a Redditor comment the most?"
@@ -259,4 +261,5 @@ test_files:
 - spec/usaidwat/formatter_spec.rb
 - spec/usaidwat/service_spec.rb
 - spec/usaidwat/string_spec.rb
+- spec/usaidwat/terminal_spec.rb
 - spec/usaidwat/time_spec.rb