jirify 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb5f0f6dfffdfe5bf7ba883f13791a579a5defaaa5887cb210bb2c8d4022dbe6
-  data.tar.gz: 44f3bff0804ebe0a796d94417d690a3babb17fab8b3d3403a7882195defe8b67
+  metadata.gz: 6fa6f6e12d2dc9625fc0d7feff7a43bc6317bdfa3e65399183520fc1abaaf79a
+  data.tar.gz: e1b7cad8d84ca28e4c4a2f08eabbb37a14fbc519ca6c715e0b4aa075ad24b07b
 SHA512:
-  metadata.gz: 6d5069a25d999001f6e63a273d2ea32a3bd89b96b8586f77562cd4c16cd87806a892953a17e8656f460ed3b15c53ff58621a60120d95c689891f1eeecf83b85a
-  data.tar.gz: d4a806b94ab345ba3d89feb15f551ff8f3801a4713004331fc143b36b5abbd80ab24f1225b25561e7962c9eef8b72850413191898dd4a908e3c2b885688184a6
+  metadata.gz: 315d6b7ad7ec9d2a32f3b25ffb02836d80cb49fdbef0013715e63468bad235b371907ca7ba94bd4bd79f37c53820a32cdd98aa61d4f8ab27fb86e1b31046f4a0
+  data.tar.gz: 743c5029ad03b45ecb4d36a24035db2ba6e34d9163a8983e5db1dd62b37887a99257789e6d0ebea39488c2ea8ddae7c1efba7a42aed6470302242d41358bec42

data/lib/jirify/cli/issue.rb

@@ -55,7 +55,7 @@ module Jirify
         if issue.assignee.nil?
           say 'Unassigned'.yellow
         else
-          say issue.assignee.name
+          say issue.assignee.displayName
         end
       end
 

data/lib/jirify/cli/project.rb

@@ -5,7 +5,13 @@ module Jirify
 
       desc 'list', 'List all projects'
       def list
-        Models::Project.all.map(&:name).each { |name| say name }
+        projects = Models::ProjectList.all
+        longest_key = projects.keys.map(&:size).max
+
+        projects.each do |project|
+          key = "#{project.key}:".ljust(longest_key + 1)
+          say "#{key} #{project.name}"
+        end
       end
     end
   end

data/lib/jirify/cli/sprint.rb

@@ -2,12 +2,21 @@ module Jirify
   class CLI < Thor
     desc 'sprint', 'Show the current sprint table'
     method_option :mine, type: :boolean, aliases: '-m', desc: 'Show only issues assigned to me'
-    method_option :all_columns, type: :boolean, aliases: '-a', desc: 'Show all columns'
+    method_option :all_columns, type: :boolean, aliases: '-c', default: true, desc: 'Show all columns'
+    method_option :assignee, type: :boolean, aliases: '-a', desc: 'Show issue assignee'
+    method_option :summary, type: :boolean, aliases: '-s', desc: 'Show issue summary'
+    method_option :url, type: :boolean, aliases: '-u', desc: 'Show issue url'
     def sprint
       verbose = Config.always_verbose || options[:verbose]
       issues  = Models::Sprint.issues_in_current_sprint(options[:mine])
 
-      say UI::SprintTable.new(issues).to_table(options[:all_columns], verbose)
+      duplicate_options = options.dup
+      if verbose
+        duplicate_options[:assignee] = true
+        duplicate_options[:url] = true
+        duplicate_options[:summary] = true
+      end
+      say UI::SprintTable.new(issues).to_table(duplicate_options)
     rescue UI::WindowTooNarrow
       say 'ERROR: Your terminal window is too narrow to print the sprint table!'.red
     end

data/lib/jirify/models/base_list.rb

@@ -0,0 +1,13 @@
+module Jirify
+  module Models
+    class BaseList < Base
+      include Enumerable
+
+      attr_reader :list
+
+      def each(&block)
+        list.each(&block)
+      end
+    end
+  end
+end

data/lib/jirify/models/issue.rb

@@ -53,12 +53,13 @@ module Jirify
       end
 
       def to_s(verbose)
-        url = "#{Config.issue_browse_url}#{key}".blue
+        url = ColorizedString["#{Config.issue_browse_url}#{key}"].blue.underline
+        bold_key = ColorizedString["#{key.ljust(7)}:"].bold
 
         if verbose
-          "#{status.pretty_name} #{key.ljust(7)}: #{summary} (#{url})"
+          "#{status.pretty_name} #{bold_key} #{summary} (#{url})"
         else
-          "#{key.ljust(7)}: (#{url})"
+          "#{bold_key} #{url}"
         end
       end
 

data/lib/jirify/models/project.rb

@@ -1,11 +1,6 @@
 module Jirify
   module Models
     class Project < Base
-      class << self
-        def all
-          client.Project.all.map { |project| Project.new project }
-        end
-      end
     end
   end
 end

data/lib/jirify/models/project_list.rb

@@ -0,0 +1,27 @@
+module Jirify
+  module Models
+    class ProjectList < BaseList
+      def initialize(list)
+        @list = list.map { |project| Project.new project }
+      end
+
+      def find_by_name(name)
+        find { |project| project.name == name }
+      end
+
+      def keys
+        map(&:key)
+      end
+
+      def names
+        map(&:name)
+      end
+
+      class << self
+        def all
+          ProjectList.new client.Project.all
+        end
+      end
+    end
+  end
+end

data/lib/jirify/models/transition.rb

@@ -0,0 +1,6 @@
+module Jirify
+  module Models
+    class Transition < Base
+    end
+  end
+end

data/lib/jirify/models/transition_list.rb

@@ -1,18 +1,16 @@
 module Jirify
   module Models
-    class TransitionList < Base
-      attr_accessor :list
-
+    class TransitionList < BaseList
       def initialize(list)
-        @list = list
+        @list = list.map { |transition| Transition.new transition }
       end
 
       def find_by_name(name)
-        @list.find { |transition| transition.name == name }
+        find { |transition| transition.name == name }
       end
 
       def names
-        @list.map(&:name)
+        map(&:name)
       end
 
       Config.transitions.keys.each do |transition_name|

data/lib/jirify/ui/sprint_cell.rb

@@ -10,6 +10,18 @@ module Jirify
         @max_cell_length = max_cell_length
       end
 
+      def to_s(options)
+        raise UI::WindowTooNarrow, 'The terminal window is too narrow.' if max_cell_length <= key.size
+
+        row = ''
+        row << key_and_summary_lines(options, max_cell_length)
+        row << "\n#{ColorizedString[url].blue.underline}" if display_url?(options)
+        row << assignee_line(max_cell_length) if show_assignee?(options)
+        row
+      end
+
+      protected
+
       def key
         issue.key
       end
@@ -18,45 +30,58 @@ module Jirify
         issue.summary
       end
 
+      def show_assignee?(options)
+        options[:assignee] && !options[:mine]
+      end
+
+      def assignee
+        if issue.assignee.nil?
+          'Unassigned'
+        else
+          issue.assignee.displayName
+        end
+      end
+
       def url
         "#{Config.issue_browse_url}#{issue.key}"
       end
 
-      def to_s(verbose)
-        raise UI::WindowTooNarrow, 'The terminal window is too narrow.' if max_cell_length <= key.size
-
-        verbose ? to_verbose_cell : to_short_cell
+      def display_url?(options)
+        url.size <= max_cell_length && options[:url]
       end
 
-      protected
+      def wrap(string, columns, character = "\n")
+        start_pos = columns
+        while start_pos < string.length
+          space = string.rindex(' ', start_pos)
+          string.slice!(space)
+          string.insert(space, character)
+          start_pos = space + columns + 1
+        end
 
-      def display_url?
-        url.size <= max_cell_length
+        string
       end
 
-      def to_verbose_cell
-        key_and_summary = "#{key}: #{summary}"
+      def key_and_summary_lines(options, max_cell_length)
+        bold_key = ColorizedString[key].bold
+        return bold_key unless options[:summary]
+
+        key_and_summary = "#{bold_key}: #{summary}"
 
         if key_and_summary.size <= max_cell_length
-          row = key_and_summary
+          key_and_summary
         else
-          row = "#{key}\n#{summary[0...max_cell_length - 3]}..."
+          row = "#{bold_key}\n"
+          row << wrap(summary.strip, max_cell_length)
+          row
         end
-
-        row << "\n#{url.blue}" if display_url?
-        row
       end
 
-      def to_short_cell
-        return key unless display_url?
-
-        single_row = "#{key}: #{url}"
+      def assignee_line(max_cell_length)
+        assignee_line = assignee
+        assignee_line = "#{assignee[0...max_cell_length - 3]}..." if assignee_line.size >= max_cell_length
 
-        if single_row.size <= max_cell_length
-          "#{key}: #{url.blue}"
-        else
-          "#{key}\n#{url.blue}"
-        end
+        "\n#{assignee_line.magenta}"
       end
     end
   end

data/lib/jirify/ui/sprint_table.rb

@@ -9,12 +9,12 @@ module Jirify
         @issues = issues
       end
 
-      def to_table(all_columns, verbose)
+      def to_table(options)
         grouped_issues = issues.group_by do |issue|
-          all_columns ? issue.status.name : issue.status.statusCategory['name']
+          options[:all_columns] ? issue.status.name : issue.status.statusCategory['name']
         end
 
-        grouped_issues_as_table(grouped_issues, verbose)
+        grouped_issues_as_table(grouped_issues, options)
       end
 
       protected
@@ -28,7 +28,7 @@ module Jirify
       end
 
       def headings(grouped_issues)
-        grouped_issues.keys.sort_by do |name|
+        sorted_headings = grouped_issues.keys.sort_by do |name|
           status_index = Models::Status.status_order.index(name)
           if status_index.nil?
             grouped_issues.keys.length
@@ -36,10 +36,21 @@ module Jirify
             status_index
           end
         end
+
+        sorted_headings.map! do |name|
+          case name
+          when Config.statuses['todo']        then ColorizedString[name].white.on_black.bold
+          when Config.statuses['in_progress'] then ColorizedString[name].white.on_blue.bold
+          when Config.statuses['in_review']   then ColorizedString[name].white.on_yellow.bold
+          when Config.statuses['blocked']     then ColorizedString[name].white.on_red.bold
+          when Config.statuses['done']        then ColorizedString[name].white.on_green.bold
+          else                                     ColorizedString[name].white.on_green.bold
+          end
+        end
       end
 
-      def grouped_issues_as_table(grouped_issues, verbose)
-        transposed = transpose(grouped_issues.values, verbose)
+      def grouped_issues_as_table(grouped_issues, options)
+        transposed = transpose(grouped_issues.values, options)
         return nil if transposed.empty?
 
         Terminal::Table.new(
@@ -49,7 +60,7 @@ module Jirify
         )
       end
 
-      def transpose(grouped_issues, verbose)
+      def transpose(grouped_issues, options)
         col_padding_per_row = grouped_issues.size * 4
         max_cell_length     = (terminal_width - col_padding_per_row) / grouped_issues.size
 
@@ -67,7 +78,7 @@ module Jirify
         transposed.map! do |row|
           row.map do |issue|
             next if issue.nil?
-            SprintCell.new(issue, max_cell_length).to_s(verbose)
+            SprintCell.new(issue, max_cell_length).to_s(options)
           end
         end
 

data/lib/jirify/version.rb

@@ -1,3 +1,3 @@
 module Jirify
-  VERSION = '0.1.7'.freeze
+  VERSION = '0.1.8'.freeze
 end

data/lib/jirify.rb

@@ -1,17 +1,21 @@
 require 'jira-ruby'
 require 'thor'
 require 'colorize'
+require 'colorized_string'
 
 require 'jirify/version'
 require 'jirify/config'
 require 'jirify/monkey_patches/jira_issue'
 
 require 'jirify/models/base'
+require 'jirify/models/base_list'
 require 'jirify/models/status'
+require 'jirify/models/transition'
 require 'jirify/models/transition_list'
 require 'jirify/models/issue'
 require 'jirify/models/sprint'
 require 'jirify/models/project'
+require 'jirify/models/project_list'
 
 require 'jirify/ui/sprint_cell'
 require 'jirify/ui/sprint_table'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jirify
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Georgi Gardev
@@ -271,10 +271,13 @@ files:
 - lib/jirify/cli/sprint.rb
 - lib/jirify/config.rb
 - lib/jirify/models/base.rb
+- lib/jirify/models/base_list.rb
 - lib/jirify/models/issue.rb
 - lib/jirify/models/project.rb
+- lib/jirify/models/project_list.rb
 - lib/jirify/models/sprint.rb
 - lib/jirify/models/status.rb
+- lib/jirify/models/transition.rb
 - lib/jirify/models/transition_list.rb
 - lib/jirify/monkey_patches/jira_issue.rb
 - lib/jirify/ui/sprint_cell.rb