jira-cli 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cde1ac20a643d00b9b6d3308c49a84b94db85281
-  data.tar.gz: 807d024db48e5b22661a588aa6290c2ba65c3cfc
+  metadata.gz: 0ca6267c77e326c0be178c9b35257a49553174d2
+  data.tar.gz: a0320f7c4ae0fc4196c6b4386b7efd3da643f98d
 SHA512:
-  metadata.gz: a1c9306b45a7f7126bafda539d153d6d20fecff6dd566b7c21007ab8b33f5ec2a3aa2f7f9e1ca80c830c22ae8e4a31c7a72b0afd91378c31da9feeaaba4e401a
-  data.tar.gz: 9d0cda918e9e06385c4ae62c5872a506c7c80104a4f250507ef4a1efc143623de42ae4f152d600e4a70836104437b5021cb068701ea3d1b290b259ad3aebd0fd
+  metadata.gz: 176917e6f4b0eb6773ea0ee302788b0b5957215ffa1deb3c48233c3d0ad867dce4a9f065b4cf8c829d83eb05de010cdc28d85e200de3a7df870db8557b5b1f54
+  data.tar.gz: 3578a7a0559bf7c51ff21a28d519a47ef571ab1c163f6d6cfcad1e3c8fb29fc091bcfb537938ebc838029cb531282dd823df554423e674aaca3218ce2c36930b

data/bin/jira

@@ -1,5 +1,11 @@
 #!/usr/bin/ruby
 
 require 'jira'
-
-Jira::CLI.start
+begin
+  Jira::CLI.start
+rescue GitException
+  puts "JIRA commands can only be run within a git repository."
+rescue InstallationException
+  puts "Please run #{Jira::Format.summary('jira install')} before "\
+      "running this command."
+end

data/lib/jira.rb

@@ -6,6 +6,7 @@ require 'jira/core'
 require 'jira/api'
 require 'jira/format'
 require 'jira/mixins'
+require 'jira/exceptions'
 # include jira/commands/*
 Dir.glob(
   File.dirname(File.absolute_path(__FILE__)) + '/jira/commands/*',
@@ -17,9 +18,17 @@ module Jira
 
     def initialize(args=[], options={}, config={})
       super
-      Jira::Core.setup
-      self.api
+      self.suppress{ Jira::Core.setup }
+      self.suppress{ self.api }
     end
 
+    protected
+
+      def suppress
+        yield
+      rescue GitException
+      rescue InstallationException
+      end
+
   end
 end

data/lib/jira/commands/comment.rb

@@ -7,6 +7,7 @@ module Jira
       if comment.strip.empty?
         puts "No comment posted."
       else
+        comment.gsub!(/\@[a-zA-Z]+/,'[~\0]').gsub!('[~@','[~')
         self.api.post("issue/#{ticket}/comment", { body: comment }) do |json|
           puts "Successfully posted your comment."
         end

data/lib/jira/commands/commit.rb

@@ -0,0 +1,14 @@
+module Jira
+  class CLI < Thor
+
+    desc "commit", "Commits uncommitted work with the ticket name and summary."
+    def commit(ticket=Jira::Core.ticket)
+      if Jira::Core.ticket?(ticket)
+        self.api.get("issue/#{ticket}") do |json|
+          `git commit -m '#{ticket}. #{json['fields']['summary'].periodize}'`
+        end
+      end
+    end
+
+  end
+end

data/lib/jira/commands/describe.rb

@@ -6,8 +6,6 @@ module Jira
       if Jira::Core.ticket?(ticket)
         output = description(ticket.strip, false, true)
         puts output if !output.strip.empty?
-      else
-        puts "The ticket #{ticket} is not a valid JIRA ticket."
       end
     end
 
@@ -22,7 +20,7 @@ module Jira
       branches = `git branch`.strip.split("\n")
       branches.each do |branch|
         ticket = branch.delete('*').strip
-        if Jira::Core.ticket?(ticket)
+        if Jira::Core.ticket?(ticket, false)
           if branch.include?('*')
             tickets[:current] = ticket
           else

data/lib/jira/commands/new.rb

@@ -30,6 +30,7 @@ module Jira
         self.api.post("issue", params) do |json|
           ticket = json['key']
           `git checkout -b #{ticket} 2> /dev/null`
+          `git checkout #{ticket} 2> /dev/null`
           puts "\nTicket and branch #{Jira::Format.ticket(ticket)} created."
           return
         end

data/lib/jira/commands/transition.rb

@@ -13,7 +13,7 @@ module Jira
         self.cli.choose do |menu|
           menu.index = :number
           menu.index_suffix = ") "
-          menu.header = "Transition #{Jira::Format.ticket(ticket)} to:"
+          menu.header = "Transition #{Jira::Format.ticket(ticket)} to"
           menu.prompt = "Transition to: "
           options.keys.each do |choice|
             menu.choice choice do

data/lib/jira/constants.rb

@@ -1,5 +1,5 @@
 module Jira
 
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 
 end

data/lib/jira/core.rb

@@ -42,14 +42,20 @@ module Jira
 
       #
       # Determines whether or not the input ticket matches the expected JIRA
-      # ticketing syntax.
+      # ticketing syntax. Outputs a warning that the input ticket isn't a valid
+      # ticket.
       #
       # @param ticket [String] input ticket name
+      # @param verbose [Boolean] verbose output of the ticket warning
       #
       # @return [Boolean] whether input string matches JIRA ticket syntax
       #
-      def ticket?(ticket)
-        !!ticket.to_s[/^[a-zA-Z]+-[0-9]+$/]
+      def ticket?(ticket, verbose=true)
+        !!ticket.to_s[/^[a-zA-Z]+-[0-9]+$/] and return true
+        if verbose
+          puts "#{Jira::Format.ticket(ticket)} is not a valid JIRA ticket."
+        end
+        return false
       end
 
       ### Relevant Paths
@@ -73,10 +79,7 @@ module Jira
       #
       def root_path
         return @root_path if !@root_path.nil?
-        if !system('git rev-parse 2> /dev/null')
-          puts "JIRA commands can only be run within a git repository."
-          abort
-        end
+        raise GitException.new if !system('git rev-parse 2> /dev/null')
         @root_path ||= `git rev-parse --show-toplevel`.strip
       end
 
@@ -89,7 +92,7 @@ module Jira
         # @return [String] JIRA password
         #
         def auth
-          self.read(self.auth_path).split(':')
+          @auth ||= self.read(self.auth_path).split(':')
         end
 
         ### Core Actions
@@ -99,6 +102,7 @@ module Jira
         #
         def discard_memoized
           @url = nil
+          @auth = nil
           @username = nil
           @password = nil
         end
@@ -121,10 +125,7 @@ module Jira
         # @param path [String] path to validate
         #
         def validate_path!(path)
-          if !File.exists?(path)
-            say "Please run `jira install` before running this command."
-            abort
-          end
+          raise InstallationException.new if !File.exists?(path)
         end
 
     end

data/lib/jira/exceptions.rb

@@ -0,0 +1,2 @@
+class InstallationException < Exception; end
+class GitException < Exception; end

data/lib/jira/mixins.rb

@@ -31,4 +31,8 @@ class String
     JSON.parse(self) rescue {}
   end
 
+  def periodize
+    self.strip[-1] == "." ? self : self + "."
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jira-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Darren Lin Cheng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -63,6 +63,7 @@ files:
 - lib/jira/api.rb
 - lib/jira/commands/browse.rb
 - lib/jira/commands/comment.rb
+- lib/jira/commands/commit.rb
 - lib/jira/commands/describe.rb
 - lib/jira/commands/install.rb
 - lib/jira/commands/log.rb
@@ -72,6 +73,7 @@ files:
 - lib/jira/commands/version.rb
 - lib/jira/constants.rb
 - lib/jira/core.rb
+- lib/jira/exceptions.rb
 - lib/jira/format.rb
 - lib/jira/mixins.rb
 - lib/jira.rb