jiraa 1.0.4 → 1.0.5

data/bin/jiraa

@@ -3,14 +3,7 @@ require 'gli'
 require 'jira_client'
 require 'yaml'
 require 'colorize'
-begin # XXX: Remove this begin/rescue before distributing your app
 require 'jiraa'
-rescue LoadError
-  STDERR.puts "In development, you need to use `bundle exec bin/jiraa` to run your app"
-  STDERR.puts "At install-time, RubyGems will make sure lib, etc. are in the load path"
-  STDERR.puts "Feel free to remove this message from bin/jiraa now"
-  exit 64
-end
 
 include GLI::App
 
@@ -19,7 +12,6 @@ program_desc 'Command line application for accessing the Jira 5 API'
 desc 'Display version information'
 version Jiraa::VERSION
 
-
 desc 'The base URL of your Jira instance (e.g. https://jira.company.com)'
 arg_name 'URL'
 flag [:U,:url]
@@ -169,39 +161,13 @@ command :show do |c|
 
   c.action do |global_options,options,args|
     help_now! "Missing issue key" if args.length == 0
-    fields = [:summary, :status, :issuetype]
+    fields = [:summary, :status, :issuetype, :assignee]
     fields << :description if options[:description]
     fields << :subtasks if options[:subtasks]
     fields << :comment if options[:comments]
     issue = JiraClient.find_issue_by_key(args[0], :fields => fields)
-    color = issue_color(issue)
-    header = "#{issue.key}\t#{issue.summary}".colorize(color)
-    puts "#{header} [#{issue.status.name.upcase}]"
-    if options[:subtasks]
-      puts
-      puts "SUBTASKS"
-      puts
-      issue.subtasks.each do |subtask|
-        puts "    #{subtask.key}\t#{subtask.summary} [#{subtask.status.name.upcase}]"
-      end
-      puts
-    end
-    if options[:description]
-      puts
-      puts "DESCRIPTION"
-      puts
-      puts "    #{issue.description}".gsub("\n", "\n    ") if options[:description]
-    end
-    if options[:comments]
-      puts
-      puts "COMMENTS"
-      puts
-      issue.comments.each do |comment|
-        puts "    #{comment.author}: #{comment.created.strftime("%e-%b-%Y (%H:%M)")}"
-        puts "    #{comment.body}"
-        puts
-      end
-    end
+    formatter = Jiraa::Formatters::Issue.new(issue, options)
+    formatter.format
   end
 end
 
@@ -210,23 +176,28 @@ arg_name 'JQL'
 command :search do |c|
   c.action do |global_options,options,args|
     help_now! "Missing JQL statement" if args.length == 0
-    issues = JiraClient.find_issues(:jql => args[0], :fields => [:summary, :status, :issuetype])
-    issues.each do |issue|
-      color = issue_color(issue)
-      puts "#{issue.key}\t#{issue.summary}".colorize(color)
-    end
-    puts "No issues found" if issues.empty?
+    issues = JiraClient.find_issues(:jql => args[0], :fields => [:summary, :status, :issuetype, :assignee])
+    formatter = Jiraa::Formatters::IssueList.new(issues)
+    formatter.format
   end
 end
 
 desc 'Display issues currently in progress and assigned to you'
 command :current do |c|
   c.action do |global_options,options,args|
-    issues = JiraClient.find_issues(:jql => "assignee = currentUser() AND status = 'In Progress'", :fields => [:summary, :status])
-    issues.each do |issue|
-      puts "#{issue.key}\t#{issue.summary}"
-    end
-    puts "No issues found" if issues.empty?
+    issues = JiraClient.find_issues(:jql => "assignee = currentUser() AND status = 'In Progress'", :fields => [:summary, :status, :issuetype, :assignee])
+    formatter = Jiraa::Formatters::IssueList.new(issues)
+    formatter.format
+  end
+end
+
+desc 'Comment on an issue'
+arg_name 'ISSUE COMMENT'
+command :comment do |c|
+  c.action do |global_options, options, args|
+    help_now! unless args.length == 2
+    JiraClient.comment_on_issue(args[0], args[1])
+    puts "Commented on #{args[0]}"
   end
 end
 
@@ -294,16 +265,4 @@ def configure_client(config)
   end
 end
 
-def issue_color(issue)
-  color = case issue.issuetype.name
-  when "Bug"
-    :red
-  when "Task"
-    :blue
-  when "Story"
-    :green
-  end
-  color
-end
-
 exit run(ARGV)

data/jiraa.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "aruba"
   spec.add_development_dependency "cucumber"
 
-  spec.add_runtime_dependency "jira_client", ">= 1.0.1"
+  spec.add_runtime_dependency "jira_client", ">= 1.0.2"
   spec.add_runtime_dependency "gli", "2.5.6"
   spec.add_runtime_dependency "colorize", "0.5.8"
 end

data/lib/jiraa.rb

@@ -1,4 +1,3 @@
 require 'jiraa/version.rb'
-
-# Add requires for other files you add to your project here, so
-# you just need to require this one file in your bin file
+require 'jiraa/formatters/issue'
+require 'jiraa/formatters/issue_list'

data/lib/jiraa/formatters/issue.rb

@@ -0,0 +1,52 @@
+module Jiraa
+  module Formatters
+    class Issue
+      def initialize(issue, opts)
+        @issue = issue
+        @options = opts
+      end
+
+      def format
+        color = issue_color(@issue.issuetype)
+        puts "#{@issue.key}\t#{@issue.summary} [#{@issue.status.name.upcase}] (#{@issue.assignee})".colorize(color)
+        if @options[:subtasks]
+          puts
+          puts "SUBTASKS"
+          puts
+          @issue.subtasks.each do |subtask|
+            puts "    #{subtask.key}\t#{subtask.summary} [#{subtask.status.name.upcase}]"
+          end
+          puts
+        end
+        if @options[:description]
+          puts
+          puts "DESCRIPTION"
+          puts
+          puts "    #{@issue.description}".gsub("\n", "\n    ") if @options[:description]
+        end
+        if @options[:comments]
+          puts
+          puts "COMMENTS"
+          puts
+          @issue.comments.each do |comment|
+            puts "    #{comment.author}: #{comment.created.strftime("%e-%b-%Y (%H:%M)")}"
+            puts "    #{comment.body}".gsub("\n", "\n    ")
+            puts
+          end
+        end
+      end
+
+      def issue_color(type)
+        color = case type.name
+        when "Bug"
+          :red
+        when "Task"
+          :blue
+        when "Story"
+          :green
+        end
+        color
+      end
+    end
+  end
+end

data/lib/jiraa/formatters/issue_list.rb

@@ -0,0 +1,30 @@
+module Jiraa
+  module Formatters
+    class IssueList
+      def initialize(issues)
+        @issues = issues
+      end
+
+      def format
+        @issues.each do |issue|
+          color = issue_color(issue.issuetype)
+          puts "#{issue.key}\t#{issue.summary} [#{issue.status.name.upcase}] (#{issue.assignee})".colorize(color)
+        end
+        puts "No issues found" if @issues.empty?
+      end
+
+      def issue_color(type)
+        color = case type.name
+        when "Bug"
+          :red
+        when "Task"
+          :blue
+        when "Story"
+          :green
+        end
+        color
+      end
+
+    end
+  end
+end

data/lib/jiraa/version.rb

@@ -1,3 +1,3 @@
 module Jiraa
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jiraa
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +143,8 @@ files:
 - jiraa.gemspec
 - jiraa.rdoc
 - lib/jiraa.rb
+- lib/jiraa/formatters/issue.rb
+- lib/jiraa/formatters/issue_list.rb
 - lib/jiraa/version.rb
 - test/default_test.rb
 - test/test_helper.rb