mosespa 1.2.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ab9e50e834b09d2a822bbc34ac6cf4ace9f6649
-  data.tar.gz: 43447a48f053dc9920cef38746e71042ae243932
+  metadata.gz: dd0208471aa893e7d2d538489efb87b67017987a
+  data.tar.gz: b8eb649271ee7e8be1dd3177119c891625c9ec62
 SHA512:
-  metadata.gz: a6da23a9675d6a222ee66f4fdf7aa8e92c2e56bcb1a319195fd7997fd3374d9c9959cf5a5c44a842d8c9b515acae9cb013b5bebb32ce9890c4f7bcec71ed34b4
-  data.tar.gz: 22d6896338e4b0b8deee5201fc930aee7d7461f0db3e2b5952682d81f03eb6403d5bde09ece0db45305da147086a2aa9a948ac0031be2cbe1ba7cbb646b24479
+  metadata.gz: e93f05829781190b5e9af8df9918e9eb42be50c814c3878ac60a612efd64bc7819d41ffae5bc7f3360efab0a8ae6a3ef4a19495e3c387ca7809d730d553b1102
+  data.tar.gz: ec1bf09581306fd832f169c4473af9b37539a9d335356943cd4ce56629b7696819948462d99e4b7ab54d5125cc7028b494c0257924d58120ff7e478610330cc7

data/Gemfile

@@ -0,0 +1,4 @@
+# A sample Gemfile
+source "https://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,30 @@
+PATH
+  remote: .
+  specs:
+    mosespa (1.4.2)
+      colorize
+      jira-ruby
+      table_print
+      trollop
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.17)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    colorize (0.7.3)
+    i18n (0.6.9)
+    jira-ruby (0.1.10)
+      activesupport
+      oauth
+    multi_json (1.10.1)
+    oauth (0.4.7)
+    table_print (1.5.2)
+    trollop (2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mosespa!

data/README.md

@@ -1,6 +1,9 @@
 mosespa
 =======
 
+[![gem version](https://badge.fury.io/rb/mosespa.png)](http://badge.fury.io/rb/mosespa)
+[![dependency status](https://gemnasium.com/kamaradclimber/mosespa.png)](https://gemnasium.com/kamaradclimber/mosespa)
+
 mosespa is very small lib on top of jira-ruby gem to interact with jira on command-line.
 This uses the REST interface of jira.
 
@@ -37,7 +40,7 @@ To see more information such as comments : ```mosespa show COOK-2878 --verbose``
 To add a comment:
 ```mosespa comment COOK-2878 It does not merge properly can you rebase```
 
-If some characters are nice to bash:
+If some characters aren't nice to bash:
 ```mosespa comment COOK-2878 "It does not merge properly, could you rebase?"```
 
 ### Creating tickets
@@ -58,6 +61,17 @@ To search for any jql:
 
 ```mosespa search 'reporter in (currentUser())'```
 
+If you add search in your config file under named_search section:
+
+```
+named_search:
+  mine: assignee = currentUser()
+  watched: watcher = currentUser()
+```
+
+you'll be able to search easily with ```mosespa search watched```
+
+
 Installation
 ------------
 

data/bin/mosespa

@@ -20,6 +20,7 @@ global_opts = Trollop::options do
   opt :login, "Set the username to connectio to jira", :short => '-l', :type => String
   opt :debug, "Output all possible information"
   opt :config, "Configuration file location", :short => '-f', :default => default_config
+  opt :colorize, "If relevant, add color to output", :short => '-c'
   stop_on SUB_COMMANDS
 end
 
@@ -65,15 +66,17 @@ options = {
   :site => global_opts[:url] || config['url'],
   :auth_type => :basic,
   :context_path => '',
-  :use_ssl => false
+  :use_ssl => config['use_ssl'] || true,
+  :ssl_verify_mode => config['ssl_verify_mode'] || OpenSSL::SSL::VERIFY_PEER,
 }
 
 
 client = JIRA::Client.new(options)
 
 $stderr.puts "Main argument is #{main_arg}" if global_opts[:debug]
-case main_arg
-when /[[:alpha:]]+-[[:digit:]]+/ #ticket
+
+case cmd
+when 'show','comment', 'browse'
   $stderr.puts "Using ticket mode" if global_opts[:debug]
   begin
     issue = main_arg
@@ -83,7 +86,7 @@ when /[[:alpha:]]+-[[:digit:]]+/ #ticket
     $stderr.puts e.inspect if global_opts[:debug]
     abort("Invalid issue? (use --debug to have more information)")
   end
-when /[[:alpha:]]+$/ #project
+when 'create'
   $stderr.puts "Using project mode" if global_opts[:debug]
   begin
     project_id = main_arg
@@ -92,11 +95,16 @@ when /[[:alpha:]]+$/ #project
     $stderr.puts e.inspect if global_opts[:debug]
     abort("Invalid project?(use --debug to have more information")
   end
-else # only search normally
+when 'search'
+  s = Mosespa::Search.new(client, config)
   begin
-    tickets = client.Issue.jql(search_str)
+    tickets = s.search(search_str)
   rescue JIRA::HTTPError => e
     $stderr.puts e.inspect if global_opts[:debug]
+    $stderr.puts e.code if global_opts[:debug]
+    $stderr.puts e.response if global_opts[:debug]
+    $stderr.puts e.message if global_opts[:debug]
+
     abort("No result for this search ?")
   end
 end
@@ -106,7 +114,7 @@ end
 m = Mosespa::Mosespa.new
 case cmd
 when 'show'
-  m.show(ticket, global_opts[:debug], cmd_opts[:verbose])
+  m.show(ticket, global_opts[:debug], cmd_opts[:verbose], global_opts[:colorize] || config['colorize'])
 when 'comment'
   m.comment(ticket, comment)
 when 'create'
@@ -114,5 +122,5 @@ when 'create'
 when 'browse'
   m.browse((options[:site] + '/browse/'+ticket.key))
 when 'search'
-  m.search(tickets, global_opts[:debug], cmd_opts[:verbose])
+  s.print_search
 end

data/lib/m.rb

@@ -0,0 +1,109 @@
+require 'thread'
+require 'colorize'
+require 'tempfile'
+
+module Mosespa
+  class Mosespa
+    def show(ticket, json, verbose, colorize)
+      p = Puts.new(colorize)
+      if json
+        puts ticket.to_json
+      else
+        puts "#{ticket.key} (#{ticket.status.name}) #{ticket.summary}"
+        if verbose
+          puts ticket.summary
+          ticket.comments.each do |c|
+            p.puts(c.author['name'], c.body)
+          end
+        end
+      end
+    end
+
+    def browse(url)
+      `#{ENV['BROWSER']} #{url}`
+    end
+
+    def comment(ticket, comment)
+      c = ticket.comments.build
+      c.save({'body' => comment})
+    end
+
+    def create(client, project, summary, description)
+      file = Tempfile.new('mosespa')
+      need_external_editor = summary.nil?
+      if need_external_editor
+        task_type, summary, description = create_get_options(file, project,'Task' ,summary, description)
+        $stderr.puts "Ticket type was: #{task_type}"
+        $stderr.puts "Summary was: #{summary}"
+      end
+      fail "Won't create a ticket without summary" if summary.nil? or summary.empty?
+      t = client.Issue.build
+      request = {'summary' => summary, 'description' => description, 'project' => {'key' => project.key}, 'issuetype' => {'name'=> task_type || 'Task'} }
+      begin
+      resp = t.save!({'fields' =>request})
+      rescue Exception => e
+        $stderr.puts "Error while creating your ticket"
+        $stderr.puts "Your ticket information was saved in #{file.path}" if need_external_editor
+        raise e
+      end
+      puts "Created #{t.key}"
+      file.unlink
+    end
+
+    def create_get_options(file, project, task_type, summary, description)
+      file.write(summary || "Task:")
+      file.write("\n")
+      file.write("\n")
+      file.write(description ||"")
+      file.write("\n")
+      file.write("# Here you can edit the ticket you want to create\n")
+      file.write("# Line starting with a # will be ignored\n")
+      file.write("# The format is the same as a git commit\n")
+      file.write("\n")
+      file.write("# Summary line follows this template : [TaskType]: [Title]\n")
+      file.write("# This means that if you write: Story: Create a prototype of SOA\n")
+      file.write("# You'll get a new story about creating a SOA prototype")
+      file.write("# The summary line is always followed by an empty line and may be followed by a description")
+      file.write("\n\n")
+      file.write("# /* vim: set filetype=gitcommit : */")
+      file.close #need to flush
+      file.open
+      system "$EDITOR #{file.path}"
+      all = file.read.lines.reject {|l| l.start_with? "#"}.map {|l| l.chop}
+      summary = all[0]
+      m = /^(\w+):(.*)/.match(summary)
+      task_type, summary = m.to_a.drop(1) if m
+
+      description = all.drop(2).join("\n")
+      $stderr.puts "Type: #{task_type}"
+      $stderr.puts "summary: #{summary}"
+      $stderr.puts "description: #{description}"
+      file.close
+      [task_type, summary, description]
+    end
+  end
+
+
+  class Puts
+    def initialize(colorize)
+      @colorize = colorize
+      @colors = Hash.new
+      @available_colors = Queue.new
+      String.colors
+      .select{ |c| not [:black, :light_black, :white].include? c}
+      .each { |c| @available_colors.push c }
+    end
+
+    def puts(author, text)
+      if @colorize
+        unless @colors.has_key? author
+          a_color = @available_colors.pop
+          @colors[author] = a_color
+        end
+        c = @colors[author]
+        author = author.colorize( c )
+      end
+      $stdout.puts "#{author}: #{text}"
+    end
+  end
+end

data/lib/mosespa.rb

@@ -1,110 +1,2 @@
-require 'thread'
-require 'colorize'
-require 'tempfile'
-
-module Mosespa
-  class Mosespa
-    def show(ticket, json, verbose)
-      p = Puts.new
-      if json
-        puts ticket.to_json
-      else
-        puts "#{ticket.key} (#{ticket.status.name}) #{ticket.summary}"
-        if verbose
-          puts ticket.summary
-          ticket.comments.each do |c|
-            p.puts(c.author['name'], c.body)
-          end
-        end
-      end
-    end
-
-    def browse(url)
-      `#{ENV['BROWSER']} #{url}`
-    end
-
-    def comment(ticket, comment)
-      c = ticket.comments.build
-      c.save({'body' => comment})
-    end
-
-    def search(tickets, json, verbose)
-      tickets.each { |t| show(t, json, verbose) }
-    end
-
-    def create(client, project, summary, description)
-      file = Tempfile.new('mosespa')
-      need_external_editor = summary.nil?
-      if need_external_editor
-        task_type, summary, description = create_get_options(file, project,'Task' ,summary, description)
-        $stderr.puts "Ticket type was: #{task_type}"
-        $stderr.puts "Summary was: #{summary}"
-      end
-      fail "Won't create a ticket without summary" if summary.nil? or summary.empty?
-      t = client.Issue.build
-      request = {'summary' => summary, 'description' => description, 'project' => {'key' => project.key}, 'issuetype' => {'name'=> task_type || 'Task'} }
-      begin
-      resp = t.save!({'fields' =>request})
-      rescue Exception => e
-        $stderr.puts "Error while creating your ticket"
-        $stderr.puts "Your ticket information was saved in #{file.path}" if need_external_editor
-        raise e
-      end
-      puts "Created #{t.key}"
-      file.unlink
-    end
-
-    def create_get_options(file, project, task_type, summary, description)
-      file.write(summary || "Task:")
-      file.write("\n")
-      file.write("\n")
-      file.write(description ||"")
-      file.write("\n")
-      file.write("# Here you can edit the ticket you want to create\n")
-      file.write("# Line starting with a # will be ignored\n")
-      file.write("# The format is the same as a git commit\n")
-      file.write("\n")
-      file.write("# Summary line follows this template : [TaskType]: [Title]\n")
-      file.write("# This means that if you write: Story: Create a prototype of SOA\n")
-      file.write("# You'll get a new story about creating a SOA prototype")
-      file.write("# The summary line is always followed by an empty line and may be followed by a description")
-      file.write("\n\n")
-      file.write("# /* vim: set filetype=gitcommit : */")
-      file.close #need to flush
-      file.open
-      system "$EDITOR #{file.path}"
-      all = file.read.lines.reject {|l| l.start_with? "#"}.map {|l| l.chop}
-      summary = all[0]
-      m = /^(\w+):(.*)/.match(summary)
-      task_type, summary = m.to_a.drop(1) if m
-
-      description = all.drop(2).join("\n")
-      $stderr.puts "Type: #{task_type}"
-      $stderr.puts "summary: #{summary}"
-      $stderr.puts "description: #{description}"
-      file.close
-      [task_type, summary, description]
-    end
-  end
-
-
-  class Puts
-    def initialize()
-      @colors = Hash.new
-      @available_colors = Queue.new
-      String.colors
-      .select{ |c| not [:black, :light_black, :white].include? c}
-      .each { |c| @available_colors.push c }
-    end
-
-    def puts(author, text)
-      unless @colors.has_key? author
-        a_color = @available_colors.pop
-        @colors[author] = a_color
-      end
-      c = @colors[author]
-      author = author.colorize( c )
-      $stdout.puts "#{author}: #{text}"
-    end
-  end
-end
+require_relative 'm.rb'
+require_relative 'search.rb'

data/lib/search.rb

@@ -0,0 +1,43 @@
+require 'colorize'
+require 'table_print'
+
+module Mosespa
+  class Search
+    def initialize(jira_client, config)
+      @client = jira_client
+      @named_search = config['named_search'] || {}
+    end
+
+    def search(search_string)
+      real_search = @named_search[search_string] || search_string
+      @issues = @client.Issue.jql(real_search).sort_by { |i| i.updated }
+    end
+
+    def print_search
+      tp @issues,
+        "key",
+        {:updated => {:formatters => [DateColorFormatter.new]}},
+        "status.name",
+        "summary"
+    end
+  end
+
+  class DateColorFormatter
+    def format(value)
+      date = Time.parse(value)
+      now = Time.now
+      two_weeks_ago = now - 14*86400
+      one_month_ago = now - 30*86400
+
+      c = if date > two_weeks_ago
+            :green
+          else if date > one_month_ago
+            :yellow
+          else
+            :red
+          end end
+      date.strftime('%D').colorize( c )
+    end
+  end
+
+end

data/mosespa.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "mosespa"
-  s.version     = '1.2.1'
+  s.version     = '1.4.2'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Grégoire Seux"]
   s.license     = "Apache License v2"
@@ -18,4 +18,5 @@ Gem::Specification.new do |s|
   s.add_dependency "jira-ruby"
   s.add_dependency 'trollop'
   s.add_dependency 'colorize'
+  s.add_dependency 'table_print'
 end

metadata

@@ -1,55 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: mosespa
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Grégoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jira-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: table_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
@@ -60,12 +74,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - bin/completion_mosespa
 - bin/mosespa
+- lib/m.rb
 - lib/mosespa.rb
+- lib/search.rb
 - mosespa.gemspec
 homepage: http://github.com/kamaradclimber/mosespa
 licenses:
@@ -77,17 +95,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Play on command line with JIRA