usaidwat 1.1.1 → 1.2.0

data/spec/usaidwat/either_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+require 'usaidwat/either'
+
+module USaidWat
+  describe Either do
+    it 'should return the initial value if all operations are successful' do
+      e = Right.new("value") >>
+          lambda { |res| Right.new(res.value.upcase) }
+      expect(e).to be_kind_of(Right)
+      expect(e.right?).to be true
+      expect(e.value).to eq('VALUE')
+    end
+
+    it 'should return an error value if an operation is not successful' do
+      e = Right.new("value") >>
+          lambda { |res| Right.new(res.value.count) rescue Left.new('No such method') }
+      expect(e).to be_kind_of(Left)
+      expect(e.left?).to be true
+      expect(e.value).to eq('No such method')
+    end
+
+    it 'should return an error value if any operation in the chain fails' do
+      e = Right.new("value") >>
+          lambda { |res| Right.new(res.value.upcase) } >>
+          lambda { |res| Right.new(res.value.count) rescue Left.new('No such method') } >>
+          lambda { |res| Right.new(res.value.capitalize) rescue Left.new('Chain failed') }
+      expect(e).to be_kind_of(Left)
+      expect(e.left?).to be true
+      expect(e.value).to eq('No such method')
+    end
+
+    it 'should say it is left if it is a Left value' do
+      e = Left.new('value')
+      expect(e.left?).to be true
+    end
+
+    it 'should say it is not right if it is a Left value' do
+      e = Left.new('value')
+      expect(e.right?).to be false
+    end
+
+    it 'should say it is not left if it is a Right value' do
+      e = Right.new('value')
+      expect(e.left?).to be false
+    end
+
+    it 'should say it is right if it is a Right value' do
+      e = Right.new('value')
+      expect(e.right?).to be true
+    end
+  end
+end

data/spec/usaidwat/formatter_spec.rb

@@ -3,6 +3,91 @@ require 'timecop'
 
 module USaidWat
   module CLI
+    describe BaseFormatter do
+      describe "options" do
+        describe "date formats" do
+          describe "#relative_dates?" do
+            it "should return true if a relative date formatter" do
+              f = BaseFormatter.new(:date_format => :relative)
+              expect(f.relative_dates?).to be true
+            end
+
+            it "should return true if relative date option is passed as a string" do
+              f = BaseFormatter.new(:date_format => 'relative')
+              expect(f.relative_dates?).to be true
+            end
+
+            it "should return false if date format is absolute" do
+              f = BaseFormatter.new(:date_format => :absolute)
+              expect(f.relative_dates?).to be false
+            end
+
+            it "should return false if date format is absolute and is passed as a string" do
+              f = BaseFormatter.new(:date_format => 'absolute')
+              expect(f.relative_dates?).to be false
+            end
+
+            it "should use relative dates by default" do
+              f = BaseFormatter.new
+              expect(f.relative_dates?).to be true
+            end
+
+            it "should use relative dates when a date format is invalid" do
+              f = BaseFormatter.new(:date_format => :iso)
+              expect(f.relative_dates?).to be true
+            end
+          end
+        end
+
+        describe "patterns" do
+          let (:formatter) { BaseFormatter.new(:pattern => /[0-9]+/) }
+          describe "#pattern" do
+            it "should return its pattern" do
+              expect(formatter.pattern).to eq(/[0-9]+/)
+            end
+
+            it "should return nil if it does not have a pattern" do
+              f = BaseFormatter.new
+              expect(f.pattern).to be nil
+            end
+          end
+
+          describe "#pattern?" do
+            it "should return true if it has a pattern" do
+              expect(formatter.pattern?).to be true
+            end
+
+            it "should return false if it does not have a pattern" do
+              f = BaseFormatter.new
+              expect(f.pattern?).to be false
+            end
+
+            it "should return false by default" do
+              f = BaseFormatter.new
+              expect(f.pattern?).to be false
+            end
+          end
+        end
+
+        describe "#raw?" do
+          it "should return true if it is a raw formatter" do
+            f = BaseFormatter.new(:raw => true)
+            expect(f.raw?).to be true
+          end
+
+          it "should return false if it is not a raw formatter" do
+            f = BaseFormatter.new(:raw => false)
+            expect(f.raw?).to be false
+          end
+
+          it "should return false by default" do
+            f = BaseFormatter.new
+            expect(f.raw?).to be false
+          end
+        end
+      end
+    end
+
     describe CommentFormatter do
       let(:formatter) { CommentFormatter.new }
 
@@ -22,12 +107,14 @@ module USaidWat
           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(:ups).and_return(12)
+          expect(comment).to receive(:downs).and_return(1)
           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
-about 2 weeks ago
+about 2 weeks ago \u2022 +11
 
 Welcome to the wonderful world of Python drama!
 EXPECTED
@@ -41,6 +128,8 @@ EXPECTED
           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(:ups).and_return(12)
+          expect(comment1).to receive(:downs).and_return(1)
           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")
@@ -48,6 +137,8 @@ EXPECTED
           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(:ups).and_return(12)
+          expect(comment2).to receive(:downs).and_return(1)
           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)
@@ -64,6 +155,8 @@ EXPECTED
           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(:ups).and_return(12)
+          expect(comment).to receive(:downs).and_return(1)
           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)

data/spec/usaidwat/time_spec.rb

@@ -55,6 +55,144 @@ module USaidWat
       end
     end
 
+    describe Float do
+      describe "#seconds_ago" do
+        it "returns the elapsed seconds between now and then" do
+          then_ = 5.0
+          expect(then_.seconds_ago).to be_within(0.01).of(5.0)
+        end
+      end
+
+      describe "#minutes_ago" do
+        it "returns the elapsed minutes between now and then" do
+          then_ = 90.0
+          expect(then_.minutes_ago).to be_within(0.01).of(1.5)
+        end
+      end
+
+      describe "#hours_ago" do
+        it "returns the elapsed hours between now and then" do
+          then_ = 14976.0
+          expect(then_.hours_ago).to be_within(0.01).of(4.16)
+        end
+      end
+
+      describe "#days_ago" do
+        it "returns the elapsed days between now and then" do
+          then_ = 464832.0
+          expect(then_.days_ago).to be_within(0.01).of(5.38)
+        end
+      end
+
+      describe "#weeks_ago" do
+        it "returns the elapsed weeks between now and then" do
+          then_ = 2437344.0
+          expect(then_.weeks_ago).to be_within(0.01).of(4.03)
+        end
+      end
+
+      describe "#months_ago" do
+        it "returns the elapsed months between now and then" do
+          then_ = 47096640.0
+          expect(then_.months_ago).to be_within(0.01).of(18.17)
+        end
+      end
+
+      describe "#years_ago" do
+        it "returns the elapsed years between now and then" do
+          then_ = 859040640.0
+          expect(then_.years_ago).to be_within(0.01).of(27.24)
+        end
+      end
+
+      describe "#ago" do
+        it "should respond when then was a few seconds ago" do
+          then_ = 5.0
+          expect(then_.ago).to eq("less than 5 seconds ago")
+        end
+
+        it "should respond when then was less than 10 seconds ago" do
+          then_ = 10.0
+          expect(then_.ago).to eq("less than 10 seconds ago")
+        end
+
+        it "should respond when then was less than 20 seconds ago" do
+          then_ = 20.0
+          expect(then_.ago).to eq("less than 20 seconds ago")
+        end
+
+        it "should respond when then was less than a half minute ago" do
+          then_ = 40.0
+          expect(then_.ago).to eq("half a minute ago")
+        end
+
+        it "should respond when then was less than a minute ago" do
+          then_ = 59.0
+          expect(then_.ago).to eq("less than a minute ago")
+        end
+
+        it "should respond when then was a minute ago" do
+          then_ = 1.minute.to_f
+          expect(then_.ago).to eq("a minute ago")
+        end
+
+        it "should respond when then was several minutes ago" do
+          then_ = 45.minutes.to_f
+          expect(then_.ago).to eq("45 minutes ago")
+        end
+
+        it "should respond when then was an hour ago" do
+          then_ = 90.minutes.to_f
+          expect(then_.ago).to eq("about an hour ago")
+        end
+
+        it "should respond when then was several hours ago" do
+          then_ = 1440.minutes.to_f
+          expect(then_.ago).to eq("about 24 hours ago")
+        end
+
+        it "should respond when then was a day ago" do
+          then_ = 2880.minutes.to_f
+          expect(then_.ago).to eq("a day ago")
+        end
+
+        it "should respond when then was several days ago" do
+          then_ = 10080.minutes.to_f
+          expect(then_.ago).to eq("about 7 days ago")
+        end
+
+        it "should respond when then was a week ago" do
+          then_ = (1.week + 1.minute).to_f
+          expect(then_.ago).to eq("about 1 week ago")
+        end
+
+        it "should respond when then was several weeks ago" do
+          then_ = 43220.minutes.to_f
+          expect(then_.ago).to eq("about 4 weeks ago")
+        end
+
+        it "should respond when then was a month ago" do
+          then_ = 43221.minutes.to_f
+          expect(then_.ago).to eq("about 1 month ago")
+        end
+
+        it "should respond when then was several months ago" do
+          then_ = 180.days.to_f
+          expect(then_.ago).to eq("about 6 months ago")
+        end
+
+        it "should respond when then was a year ago" do
+          then_ = 1051920.minutes.to_f
+          expect(then_.ago).to eq("about a year ago")
+        end
+
+        it "should respond when then was several years ago" do
+          then_ = 1051921.minutes.to_f
+          expect(then_.ago).to eq("over 2 years ago")
+        end
+      end
+    end
+
     describe Time do
       before do
         Timecop.freeze(2015, 6, 23, 17, 22, 0)
@@ -195,10 +333,36 @@ module USaidWat
         end
 
         it "should respond when then was several years ago" do
-          then_ = Time.now - 1051920.minutes - 1
+          then_ = Time.now - 1051921.minutes
           expect(then_.ago).to eq("over 2 years ago")
         end
       end
     end
+
+    describe "Special Time cases" do
+      it "should respond when then was almost but not quite 8 years ago" do
+        now = Time.new(2015, 9, 15, 16, 13, 0)
+        Timecop.freeze(now)
+        then_ = Time.new(2007, 11, 19, 10, 4)
+        expect(then_.ago).to eq("over 7 years ago")
+        Timecop.return
+      end
+
+      it "should respond when the delta is between 1 and 2 minutes" do
+        now = Time.new(2015, 9, 18, 10, 05, 20)
+        Timecop.freeze(now)
+        then_ = Time.new(2015, 9, 18, 10, 04, 0)
+        expect(then_.ago).to eq("a minute ago")
+        Timecop.return
+      end
+
+      it "should throw an exception if the delta is negative" do
+        now = Time.new(2015, 9, 18, 10, 04, 0)
+        Timecop.freeze(now)
+        then_ = Time.new(2015, 9, 18, 10, 05, 20)
+        expect { then_.ago }.to raise_error(ArgumentError, /negative/)
+        Timecop.return
+      end
+    end
   end
 end

data/usaidwat.gemspec

@@ -16,7 +16,9 @@ Gem::Specification.new do |gem|
   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"),
+    'build_date' => Time.now.strftime("%Y-%m-%d %H:%M:%S %Z"),
+    'commit' => `git describe`.chomp,
+    'commit_hash' => `git rev-parse HEAD`.chomp,
   }
 
   gem.files         = `git ls-files`.split($/)
@@ -26,12 +28,12 @@ Gem::Specification.new do |gem|
 
   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('downterm', '~> 0.1.2')
   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('cucumber', '~> 2.0')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usaidwat
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Michael Dippery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-30 00:00:00.000000000 Z
+date: 2015-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: downterm
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.2
   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
-    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'
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: mercenary
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +80,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
@@ -178,19 +178,24 @@ files:
 - README.textile
 - Rakefile
 - bin/usaidwat
-- features/browse.feature
 - features/fixtures/blank.json
 - features/fixtures/mipadi.json
 - features/fixtures/testuser.json
+- features/fixtures/user_mipadi.json
+- features/fixtures/user_testuser.json
 - features/help.feature
+- features/log.feature
 - features/step_definitions/reddit_steps.rb
 - features/step_definitions/time_steps.rb
 - features/support/aruba.rb
 - features/support/time.rb
+- features/tally.feature
+- features/user.feature
 - lib/usaidwat.rb
 - lib/usaidwat/algo.rb
 - lib/usaidwat/application.rb
 - lib/usaidwat/client.rb
+- lib/usaidwat/either.rb
 - lib/usaidwat/ext/string.rb
 - lib/usaidwat/ext/time.rb
 - lib/usaidwat/formatter.rb
@@ -200,6 +205,7 @@ files:
 - spec/spec_helper.rb
 - spec/usaidwat/algo_spec.rb
 - spec/usaidwat/client_spec.rb
+- spec/usaidwat/either_spec.rb
 - spec/usaidwat/formatter_spec.rb
 - spec/usaidwat/service_spec.rb
 - spec/usaidwat/string_spec.rb
@@ -209,7 +215,9 @@ homepage: https://github.com/mdippery/usaidwat
 licenses:
 - MIT
 metadata:
-  build_date: 2015-08-29 22:33:13.367 PDT
+  build_date: 2015-09-19 10:09:24 PDT
+  commit: v1.2.0
+  commit_hash: e869e79b24c70ce12fa06be61f67b3c982da734f
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -231,18 +239,23 @@ signing_key:
 specification_version: 4
 summary: Answers the age-old question, "Where does a Redditor comment the most?"
 test_files:
-- features/browse.feature
 - features/fixtures/blank.json
 - features/fixtures/mipadi.json
 - features/fixtures/testuser.json
+- features/fixtures/user_mipadi.json
+- features/fixtures/user_testuser.json
 - features/help.feature
+- features/log.feature
 - features/step_definitions/reddit_steps.rb
 - features/step_definitions/time_steps.rb
 - features/support/aruba.rb
 - features/support/time.rb
+- features/tally.feature
+- features/user.feature
 - spec/spec_helper.rb
 - spec/usaidwat/algo_spec.rb
 - spec/usaidwat/client_spec.rb
+- spec/usaidwat/either_spec.rb
 - spec/usaidwat/formatter_spec.rb
 - spec/usaidwat/service_spec.rb
 - spec/usaidwat/string_spec.rb