gish 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfb7fb990c3cdb87b71e18e6c5222d3140267053
-  data.tar.gz: 50d20693d7686fcdc8b63d564f039f95584eab15
+  metadata.gz: e283a3ac502b0f0efd93450c90296764f0e9f01a
+  data.tar.gz: 20d202eaa7eabab441e4defa1db8d38df8930362
 SHA512:
-  metadata.gz: dcd82b98b59e716825b14783f3cec8f79db4a84f4057b4e65eaed86b32a27c3a607d0d491bd81caa287ddc1d6687421b0d5b636e5e00c09670f81a3adb0eef0c
-  data.tar.gz: dbbea0db7d48771fce4f63529f08212666613149bc7594b8db3d7e029a8d948816363abc58bd29277306922ae5e0687465d40349171f372ff6ee5324ede6417d
+  metadata.gz: 8c3bcbb5d692c97acbb1109c88417a8c92026def1112c636325068cded81c41e8ab141e68964fb2471de272f2cb4aef8b016e6f2534fc686f5fade89f74cfdd1
+  data.tar.gz: 0a7527664a089df782d2465b52ff63fe4840855159056ab5cd06e7fc7c06e076fee20818e36f5d5dbe2cc4cee967833f6979bcd4a8eeef7ca1cd4b4b9229117f

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# CHANGELOG
+
+## 0.9.2
+
+* Express issue/comment creation times in time passed rather than as a date.  Thanks to [despo](https://github.com/despo).
+
+## 0.9.1
+
+* Added a [PR] tag for issues in the list screen.
+
+## 0.9.0 
+
+* Initial release.

data/CONTRIBUTING.md

@@ -1,4 +1,4 @@
-Contributions are very welcome, whether it's refactoring or taking care of the [issues](http://github.com/gish/issues).
+Contributions are very welcome, whether it's refactoring or taking care of the [issues](http://github.com/barisbalic/gish/issues).
 
 Quick guide to contributing:
 

data/README.md

@@ -37,7 +37,7 @@ Here are some examples to get you started.
 
 |command|outcome|
 |-------|-------|
-|gish list | List 20 issues|
+|gish list | List 20 issues (default count) |
 |gish show 1 | Show issue #1|
 |gish show 1 -i| Show issue #1 and include comments|
 |gish comment 1 -m ":+1"| Comment on issue #1|
@@ -45,10 +45,10 @@ Here are some examples to get you started.
 |gish close 1| Close issue #1|
 |gish label 1 such-feature| Add the label such-feature to issue #1|
 
-When listing issues, the number of comments on an issue will be displayed at the end of a line.
+When listing issues, the number of comments on an issue will be displayed at the end of a line, along with a tag indicating if the issue is a pull request.
 
 ```
-#9 barisbalic           Emoji!                                                                 [2]
+#9 barisbalic           Emoji!                                                            [PR] [2]
 #8 barisbalic           Fix editor input for open command                                      [0]
 #7 barisbalic           Support API paging                                                     [0]
 #6 barisbalic           Current repository check is lame                                       [1]
@@ -62,10 +62,10 @@ When listing issues, the number of comments on an issue will be displayed at the
 
 ## Contributing
 
-Contributions are very welcome, whether it's refactoring or taking care of the [issues](http://github.com/gish/issues).
+Contributions are very welcome, whether it's refactoring or taking care of the [issues](http://github.com/barisbalic/gish/issues).
 
 1. Fork the repo.
-2. create your branch `git checkout -b branch-name` **bonus for feature branches**
+2. Create your branch `git checkout -b branch-name` **bonus for feature branches**
 3. Make your changes
 4. Test to make sure you have not broken any existing functionality
 4. Commit your changes

data/lib/gish/helpers/date_helpers.rb

@@ -0,0 +1,61 @@
+module Gish
+  module DateHelpers
+
+    A_DAY = 1440
+    A_MONTH = A_DAY*30
+    A_YEAR = A_MONTH*12
+
+    def time_in_words(now=Time.now, time)
+      minutes = ((now - time)/60).round
+
+      return format_year_string(minutes) if minutes >= A_YEAR
+
+      case minutes
+      when 0
+        "less than one minute ago"
+      when 1...50
+        "#{minutes} minutes ago"
+      when 51...90
+        "about 1 hour ago"
+      when 91...A_DAY
+        "about #{hours_ago(minutes)} hours ago"
+      when A_DAY...2520
+        "one day ago"
+      when 2521...A_MONTH
+        "#{days_ago(minutes)} days ago"
+      when A_MONTH...A_YEAR
+        "#{months_ago(minutes)} months ago"
+      end
+    end
+
+    private
+
+    def format_year_string(minutes)
+      remaining_minutes = minutes % A_YEAR
+
+      if remaining_minutes < A_YEAR*0.25
+        "about #{years_ago(minutes)} years ago"
+      elsif remaining_minutes < A_YEAR*0.75
+        "more than #{years_ago(minutes)} years ago"
+      else
+        "almost #{years_ago(minutes)+1} years ago"
+      end
+    end
+
+    def hours_ago(minutes)
+      minutes/60
+    end
+
+    def days_ago(minutes)
+      hours_ago(minutes)/24
+    end
+
+    def months_ago(minutes)
+      days_ago(minutes)/30
+    end
+
+    def years_ago(minutes)
+      months_ago(minutes)/12
+    end
+  end
+end

data/lib/gish/presentation/comment.rb

@@ -1,18 +1,19 @@
 module Gish
   class Comment
     include TerminalHelpers
+    include DateHelpers
 
     def initialize(github_comment)
       @body = github_comment.body.gsub("\r\n", "\n")
       @user = github_comment.user.login
       @id = github_comment.id
-      @created_at = github_comment.created_at
+      @created_at = time_in_words(github_comment.created_at)
     end
 
     def to_s
-      output = "\n#{@id} #{bold(@user)} commented on #{@created_at}"
+      output = "\n#{@id} #{bold(@user)} commented #{@created_at}"
       output << "\n\"#{@body}\"\n"
       output
     end
   end
-end
+end

data/lib/gish/presentation/issue.rb

@@ -1,7 +1,8 @@
 module Gish
   class Issue
     include TerminalHelpers
-    
+    include DateHelpers
+
     def initialize(github_issue)
       @url = github_issue.html_url
       @number = github_issue.number.to_s
@@ -12,13 +13,13 @@ module Gish
       @user = github_issue.user.login
       @comment_count = github_issue.comments
       @assignee = github_issue.assignee.login rescue nil
-      @created_at = github_issue.created_at
+      @created_at = time_in_words(github_issue.created_at)
       @pull_request = !github_issue.pull_request.rels.keys.empty?
     end
 
     def headline
       user = @user.ljust(20, ' ')
-      title = short_title.ljust(70, ' ') 
+      title = short_title.ljust(70, ' ')
       number = @number.ljust(5, ' ')
       type = @pull_request ? '[PR]' : '    '
       "##{number} #{bold(user)} #{title} #{bold(type)} [#{@comment_count}]"
@@ -27,7 +28,7 @@ module Gish
     def to_s
       output = underline("##{@number} #{@title}")
       output << " [#{@state}]"
-      output << "\nOpened by #{bold(@user)} on #{@created_at}"
+      output << "\nOpened by #{bold(@user)} #{@created_at}"
       output << "\nAssigned to #{bold(@assignee)}" unless @assignee.nil?
       output << "\n\n#{@body}\n\n"
       output << "#{label_names.join(' ')}" unless @labels.empty?
@@ -45,4 +46,4 @@ module Gish
       @labels.map{ |l| format_label(l.name) }
     end
   end
-end
+end

data/lib/gish/version.rb

@@ -1,3 +1,3 @@
 module Gish
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/lib/gish.rb

@@ -1,6 +1,7 @@
 require "gish/version"
 require "gish/helpers/input_helpers"
 require "gish/helpers/terminal_helpers"
+require "gish/helpers/date_helpers"
 require "gish/configuration"
 require "gish/commands/issue"
 require "gish/commands/comment"

data/test/gish/helpers/date_helpers_test.rb

@@ -0,0 +1,53 @@
+require_relative '../../test_helper'
+
+class DateTestClass
+  include Gish::DateHelpers
+end
+
+class TestDateHelpers < MiniTest::Test
+  def setup
+    @date_helper = DateTestClass.new
+    @now = Time.new(2013,12,27)
+  end
+
+  def time_in_words time
+    @date_helper.time_in_words(@now, time)
+  end
+
+  def test_seconds_ago
+    assert_equal(time_in_words(Time.new(2013,12,27)), "less than one minute ago")
+  end
+
+  def test_minutes_ago
+    assert_equal(time_in_words(Time.new(2013,12,26,23,58)), "2 minutes ago")
+  end
+
+  def test_about_an_hour_ago
+    assert_equal(time_in_words(Time.new(2013,12,26,23,8)), "about 1 hour ago")
+  end
+
+  def test_x_hours_ago
+    assert_equal(time_in_words(Time.new(2013,12,26,19)), "about 5 hours ago")
+  end
+
+  def test_x_days_ago
+    assert_equal(time_in_words(Time.new(2013,12,23)), "4 days ago")
+  end
+
+  def test_x_months_ago
+    assert_equal(time_in_words(Time.new(2013,9,23)), "3 months ago")
+  end
+
+  def test_about_x_years_ago
+    assert_equal(time_in_words(Time.new(2011,12,27)), "about 2 years ago")
+  end
+
+  def test_about_x_years_ago
+    assert_equal(time_in_words(Time.new(2011,9,27)), "more than 2 years ago")
+  end
+
+  def test_almost_x_years_ago
+    assert_equal(time_in_words(Time.new(2011,2,27)), "almost 3 years ago")
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,3 @@
+require 'minitest/autorun'
+
+require './lib/gish/helpers/date_helpers'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gish
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Baris Balic
@@ -75,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
@@ -90,6 +91,7 @@ files:
 - lib/gish/commands/issue.rb
 - lib/gish/commands/label.rb
 - lib/gish/configuration.rb
+- lib/gish/helpers/date_helpers.rb
 - lib/gish/helpers/input_helpers.rb
 - lib/gish/helpers/terminal_helpers.rb
 - lib/gish/presentation/comment.rb
@@ -97,6 +99,8 @@ files:
 - lib/gish/presentation/label.rb
 - lib/gish/runner.rb
 - lib/gish/version.rb
+- test/gish/helpers/date_helpers_test.rb
+- test/test_helper.rb
 homepage: http://github.com/barisbalic/gish
 licenses:
 - MIT
@@ -121,4 +125,6 @@ rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A fairly functional command-line interface for the most excellent Gitub Issues.
-test_files: []
+test_files:
+- test/gish/helpers/date_helpers_test.rb
+- test/test_helper.rb