jiraMule 0.1.2 → 0.3.0

data/lib/JiraMule/commands.rb

@@ -0,0 +1,11 @@
+require 'JiraMule/commands/assign'
+require 'JiraMule/commands/attach'
+require 'JiraMule/commands/config'
+require 'JiraMule/commands/goto'
+require 'JiraMule/commands/kanban'
+require 'JiraMule/commands/link'
+require 'JiraMule/commands/logWork'
+require 'JiraMule/commands/next'
+require 'JiraMule/commands/open'
+require 'JiraMule/commands/query'
+require 'JiraMule/commands/statuses'

data/lib/{jiraMule → JiraMule}/commands/kanban.rb

@@ -3,6 +3,8 @@ require 'mustache'
 require 'yaml'
 require 'JiraMule/jiraUtils'
 
+# This takes the result of multiple queries and displays it.
+# `query` does this for a single.
 command :kanban do |c|
   extra_columns = []
   c.syntax = 'jm query [options] kanban'
@@ -57,20 +59,20 @@ Formatting is done with Mustash.
         :format => {
           :heading => "#### {{column}}",
           :item => "- {{key}} {{summary}}",
-          :order => [:Done, :Testing, :InProgress, :Todo],
+          :order => [:Done, :CodeReview, :InProgress, :Todo],
         },
         :columns => {
-          :Done => [%{status = 'Pending Release'}],
-          :Testing => [%{status = Testing}],
+          :Done => [%{(},
+            %{status = "Dev Complete" OR},
+            %{status = "Closed" OR},
+            %{status = "Ready for QA" OR},
+            %{status = "Ready for Release to Production" OR},
+            %{status = "Testing/QA"},
+            %{)}
+          ],
+          :CodeReview => [%{status = "Code Review"}],
           :InProgress => [%{status = "In Progress"}],
-          :Todo => [%{(status = Open OR},
-               %{status = Reopened OR},
-               %{status = "On Deck" OR},
-               %{status = "Waiting Estimation Approval" OR},
-               %{status = "Reopened" OR},
-               %{status = "Testing (Signoff)" OR},
-               %{status = "Testing (Review)" OR},
-               %{status = "Testing - Bug Found")}],
+          :Todo => [ %{status = "On Deck"}],
         },
 
       },
@@ -79,32 +81,21 @@ Formatting is done with Mustash.
         :format => {
           :heading => "{{column}}",
           :item => "{{key}}\n {{summary}}",
-          :order => [:Todo, :InProgress, :Done],
+          :order => [:Todo, :InProgress, :CodeReview, :Done],
           :usetable => true
         },
         :columns => {
-          :Done => [%{(status = Released OR status = "Not Needed - Closed")}],
-          :InProgress => [%{(status = "In Progress" OR},
-                          %{status = "In Dev" OR},
-                          %{status = "Pending Release" OR},
-                          %{status = "In QA" OR},
-                          %{status = "Integration QA" OR},
-                          %{status = "In Design")},
-                  ],
-          :Todo => [%{(status = Open OR},
-               %{status = Reopened OR},
-               %{status = "On Deck" OR},
-               %{status = "Waiting Estimation Approval" OR},
-               %{status = "Reopened" OR},
-               %{status = "Testing (Signoff)" OR},
-               %{status = "Testing (Review)" OR},
-               %{status = "Testing - Bug Found" OR},
-               %{status = "Backlog" OR},
-               %{status = "Ready For Dev" OR},
-               %{status = "Ready For QA" OR},
-               %{status = "To Do" OR},
-               %{status = "Release Package")},
-            ],
+          :Done => [%{(},
+            %{status = "Dev Complete" OR},
+            %{status = "Closed" OR},
+            %{status = "Ready for QA" OR},
+            %{status = "Ready for Release to Production" OR},
+            %{status = "Testing/QA"},
+            %{)}
+          ],
+          :InProgress => [%{status = "In Progress"}],
+          :Todo => [ %{(status = "On Deck")} ],
+          :CodeReview => [%{(status = "Code Review")}],
         },
       },
       :taskpaper => {
@@ -115,8 +106,7 @@ Formatting is done with Mustash.
         },
         :columns => {
           :InProgress => %{status = "In Progress"},
-          :Todo => [%{(status = Open OR},
-               %{status = "Testing - Bug Found")}],
+          :Todo => [%{status = "On Deck"}],
         }
       },
     }
@@ -173,7 +163,7 @@ Formatting is done with Mustash.
       qBase = []
       qBase.unshift("assignee = #{jira.username} AND") unless options.raw
       qBase.unshift("project = #{jira.project} AND") unless options.raw
-      qBase.unshift('(' + args.join(' ') + ') AND') unless args.empty? 
+      qBase.unshift('(' + args.join(' ') + ') AND') unless args.empty?
 
       results = {}
       columns.each_pair do |name, query|
@@ -194,7 +184,7 @@ Formatting is done with Mustash.
       cW = -1 if cW == 0
       cWR = cW
       if format[:usetable] and cW > 0 then
-        borders = 4 + (columns.count * 3);   # 2 on left, 2 on right, 3 for each internal
+        borders = 5 + (columns.count * 3);   # 2 on left, 3 on right, 3 for each internal
         cW = (cW - borders) / columns.count
         cWR = cW + ((cW - borders) % columns.count)
       end
@@ -206,9 +196,9 @@ Formatting is done with Mustash.
           line = Mustache.render(format[:item], issue.merge(issue[:fields]))
           #### Trim length?
           if format[:order].last == name
-            line[0..cWR]
+            line = line.split("\n").map{|l| l[0..cWR]}.join("\n")
           else
-            line[0..cW]
+            line = line.split("\n").map{|l| l[0..cW]}.join("\n")
           end
         end
       end

data/lib/JiraMule/commands/open.rb

@@ -0,0 +1,27 @@
+require 'shellwords'
+
+command :open do |c|
+  c.syntax = 'jm open [options] <keys...> '
+  c.summary = 'Open issues in web browser'
+
+  c.action do |args, options|
+    jira = JiraMule::JiraUtils.new(args, options)
+    keys = jira.expandKeys(args)
+    jira.printVars(:key=>keys)
+    urls = keys.map{|key| "#{$cfg['net.url']}/browse/#{key}"}
+
+    ocmd = $cfg['open-url.cmd']
+    if ocmd.nil? then
+      say_error "No open command!"
+      exit 2
+    end
+    ocmd = ocmd.shellsplit
+    urls.each do |url|
+      dcmd = ocmd + [url]
+      say "R: #{dcmd.join(' ')}" if $cfg['tool.verbose']
+      system(*dcmd) unless $cfg['tool.dry']
+    end
+  end
+end
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/JiraMule/commands/query.rb

@@ -0,0 +1,74 @@
+
+command :query do |c|
+  c.syntax = 'jm query [options] query'
+  c.summary = 'Get the keys from a jira query'
+  c.description = 'Run a JQL query. '
+  c.example 'Get all Open issues and dump everything', %{jm query status=Open --all_fields --json}
+  c.example 'Show info about an issue', %{jm query --style info BUG-24}
+  c.example 'Show info about an issue', %{jm info BUG-24}
+
+  c.option '--style STYLE', String, 'Which output style to use'
+
+  c.option '--[no-]json', 'Output json reply instead of styled output'
+
+  c.option '--fields FIELDS', Array, 'Which fields to return.'
+  c.option '--all_fields', 'Return all fields'
+
+  c.option '--[no-]prefix', %{Use the style's query prefix}
+  c.option '--[no-]suffix', %{Use the style's query suffix}
+
+  c.option '-d', '--dump', 'Dump the style to STDOUT as yaml'
+  c.option '-p', '--print', 'Show actual query being used'
+
+  c.action do |args, options|
+    options.default(
+      :json => false,
+      :all_fields => false,
+      :style => 'basic',
+      :prefix => true,
+      :suffix => true,
+    )
+
+    theStyle = JiraMule::Style.fetch(options.style).dup
+    if theStyle.nil? then
+      say_error "No style \"#{options.style}\""
+      say_error "Try one of: #{JiraMule::Style.list.join(', ')}"
+      exit 2
+    end
+    #### look for command line overrides
+    fields = theStyle.fields
+    fields = options.fields if options.fields
+    fields = [] if options.all_fields
+
+    if options.dump then
+      puts theStyle.to_yaml
+      exit 0
+    end
+
+    jira = JiraMule::JiraUtils.new(args, options)
+    if args.count == 1 and not args.first.include?('=') then
+      args = ["key=#{jira.expandKeys([args.first]).first}"]
+    end
+    opts = {}
+    opts[:noprefix] = true unless options.prefix
+    opts[:nosuffix] = true unless options.suffix
+    args.push(opts) unless opts.empty?
+    q = theStyle.build_query(*args)
+    puts q if options.print
+    issues = jira.getIssues(q, fields)
+
+    if options.json then
+      puts JSON.dump(issues)
+    else
+      puts theStyle.apply(issues)
+    end
+  end
+end
+alias_command :q, :query
+alias_command :info, :query, '--style', 'info'
+alias_command :progress, :query, '--style', 'progress'
+alias_command :todo, :query, '--style', 'todo'
+alias_command :comments, :query, '--style', 'comments'
+alias_command :c, :query, '--style', 'comments'
+
+#  vim: set sw=2 ts=2 :

data/lib/JiraMule/commands/statuses.rb

@@ -0,0 +1,30 @@
+
+command :statuses do |c|
+  c.syntax = 'jm statuses <project>'
+  c.summary = 'Get all of the status states for a project'
+  c.description = 'Get all of the status states for a project'
+  c.option '--with_type', "Include and groups statuses with issure type"
+
+  c.action do |args, options|
+    options.default :json=> false, :with_type=>false
+
+    jira = JiraMule::JiraUtils.new(args, options)
+    prj = args.shift
+    ret = jira.statusesFor(prj)
+
+    if options.with_type then
+      res = ret.map{|sts| {:name=>sts[:name], :statuses=>(sts[:statuses] or []).map{|sst| sst[:name]}}}
+      pp res
+    else
+      res = ret.map{|sts| (sts[:statuses] or []).map{|sst| sst[:name]}}.flatten.uniq
+      if options.json then
+        puts res.to_json
+      else
+        say res.join(', ')
+      end
+    end
+
+  end
+end
+
+#  vim: set sw=2 ts=2 :

data/lib/{jiraMule → JiraMule}/jiraUtils.rb

@@ -2,6 +2,7 @@ require 'uri'
 require 'net/http'
 require 'net/http/post/multipart'
 require 'json'
+require 'yaml'
 require 'date'
 require 'pp'
 require 'mime/types'
@@ -49,7 +50,7 @@ module JiraMule
         # So on project APP, from %w{1 56 BUG-78} you get %w{APP-1 APP-56 BUG-78}
         def expandKeys(keys)
             return keys.map do |k|
-                k.match(/([a-zA-Z]+-)?(\d+)/) do |m|
+                k.match(/([a-zA-Z0-9]+-)?(\d+)/) do |m|
                     if m[1].nil? then
                         "#{project}-#{m[2]}"
                     else
@@ -94,7 +95,8 @@ module JiraMule
         def getIssues(query, fields=[ 'key', 'summary' ])
             verbose "Get keys: #{query}"
             data = post('search', {:jql=>query, :fields=>fields})
-            data[:issues]
+            return data[:issues] if data.kind_of?(Hash) and data.has_key?(:issues)
+            []
         end
 
         ##
@@ -112,7 +114,7 @@ module JiraMule
         # Create a new version for release.
         # TODO: test this.
         def createVersion(project, version)
-            verbose "Creating #{request.body}"
+            verbose "Creating #{version} in #{project}"
             unless $cfg['tool.dry'] then
                 data = post('version', {
                     'name' => version,
@@ -136,15 +138,21 @@ module JiraMule
         # +description+:: Full details.
         def createIssue(type, summary, description)
             verbose "Creating #{type} issue for #{summary}"
+
+            customfields = {}
+            cust = $cfg['customfields.create']
+            customfields = YAML.load(cust, 'cfg->customfields.create') unless cust.nil?
+            verbose " With custom fields: #{cust.to_json}" unless cust.nil?
+
             unless $cfg['tool.dry'] then
                 post('issue', {
-                    :fields=>{
+                    :fields=>customfields.merge({
                         :issuetype=>{:name=>type},
                         :project=>{:key=>project},
                         :summary=>summary,
                         :description=>description,
                         :labels=>['auto-imported'],
-                    }
+                    })
                 })
             else
                 {:key=>'_'}
@@ -155,7 +163,7 @@ module JiraMule
         # Check this issue type in current project
         def checkIssueType(type='bug')
             rt = Regexp.new(type.gsub(/\s+/, '[-_\s]*'), Regexp::IGNORECASE)
-            cmeta = get('issue/createmeta')
+            cmeta = get("issue/createmeta?projectKeys=#{project}")
             prj = cmeta[:projects].select{|p| p[:key] == project}.first
             prj[:issuetypes].select{|it| it[:name] =~ rt}
         end
@@ -189,9 +197,10 @@ module JiraMule
 
         # Get the status for a project
         # +project+:: The project to fetch status from
-        def statusesFor(project)
-            verbose "Fetching statuses for #{project}"
-            get('project/' + project + '/statuses')
+        def statusesFor(prj=nil)
+            prj = project if prj.nil?
+            verbose "Fetching statuses for #{prj}"
+            get('project/' + prj + '/statuses')
         end
 
         # Assign issues to a user
@@ -219,7 +228,7 @@ module JiraMule
             }
             body[:started] = on.to_time.strftime('%FT%T.%3N%z') unless on.nil?
 
-            verbose "Logging #{timespent} of work to #{key} with note \"#{notes}\""
+            verbose "Logging #{timespent} of work on #{body[:started] or 'now'} to #{key} with note \"#{notes}\""
             post('issue/' + key + '/worklog', body) unless $cfg['tool.dry']
         end
 

data/lib/JiraMule/renderMagic.rb

@@ -0,0 +1,30 @@
+require 'mustache'
+
+module JiraMule
+  class IssueRender < Mustache
+    def initialize(hsh)
+      hsh.each_pair do |k,v|
+        self.class.send(:define_method, k.to_sym) {v}
+      end
+      @issue = hsh
+      self.class.send(:define_method, :issue) {@issue}
+    end
+
+    # We're not doing HTML, so never escape.
+    def escapeHTML(str)
+      str
+    end
+
+    def self.render(tmpl, issue, custom_tags={})
+      r = self.new(issue.dup)
+      custom_tags.each_pair do |name, blk|
+        r[name.to_sym] = lambda do
+          blk.call(issue.dup)
+        end
+      end
+      r.render(tmpl)
+    end
+  end
+end
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/jiraMule/commands/goto.rb

@@ -107,60 +107,5 @@ So these need to be added to your config.
 end
 alias_command :move, :goto
 
-command :mapGoto do |c|
-  c.syntax = 'jm mapGoto [options]'
-  c.summary = 'Attempt to build a goto map'
-  c.option '--dot', %{Output a dot graph}
-  c.description = %{
-  This command is incomplete.  The goal here is to auto-build the transision maps
-  for multi-step gotos.
-
-  Right now it is just dumping stuff.
-
-  }
-  c.action do |args, options|
-    options.defaults :dot => true
-    jira = JiraMule::JiraUtils.new(args, options)
-
-    # Get all of the states that issues can be in.
-    # Try to find an actual issue in each state, and load the next transitions from
-    # it.
-    #
-    types = jira.statusesFor(jira.project)
-
-    # There is only one workflow for all types it seems.
-
-    # We just need the names, so we'll merge down.
-    statusNames = {}
-
-    types.each do |type|
-      statuses = type[:statuses]
-      next if statuses.nil?
-      next if statuses.empty?
-      statuses.each {|status| statusNames[ status[:name] ] = 1}
-    end
-
-    puts "digraph #{jira.project} {"
-    statusNames.each_key do |status|
-      #puts "    #{status}"
-      query = %{project = #{jira.project} AND status = "#{status}"}
-      issues = jira.getIssues(query, ["key"])
-      if issues.empty? then
-        #?
-        puts %{/* Cannot find transitions for #{status} */}
-      else
-        key = issues.first[:key]
-        # get transisitons.
-        trans = jira.transitionsFor(key)
-        trans.each do |tr|
-          puts %{  "#{status}" -> "#{tr[:to][:name]}" [label="#{tr[:name]}"]} # [#{tr[:id]}]"]}
-        end
-      end
-    end
-    puts "}"
-
-  end
-end
-
 #  vim: set sw=2 ts=2 :