jira-cli 0.2.2 → 0.3.0

data/lib/jira/commands/watch.rb

@@ -1,115 +1,12 @@
-require_relative '../command'
+require 'jira/commands/watch/add'
+require 'jira/commands/watch/delete'
+require 'jira/commands/watch/list'
 
 module Jira
   class CLI < Thor
 
-    desc "watch", "Watch against the input ticket"
-    def watch(ticket=Jira::Core.ticket)
-      Command::Watch.new(ticket).run
-    end
+    desc 'watch <command>', 'Commands for watching tickets in JIRA'
+    subcommand 'watch', Watch
 
-    desc "watchers", "List the watchers of the input ticket"
-    def watchers(ticket=Jira::Core.ticket)
-      Command::Watchers.new(ticket).run
-    end
-
-    desc "unwatch", "Unwatch against the input ticket"
-    def unwatch(ticket=Jira::Core.ticket)
-      Command::Unwatch.new(ticket).run
-    end
-
-  end
-
-  module Command
-    class Watch < Base
-
-      attr_accessor :ticket
-
-      def initialize(ticket)
-        self.ticket = ticket
-      end
-
-      def run
-        return if ticket.empty?
-
-        api.post "issue/#{ticket}/watchers",
-          params:  Jira::Core.username,
-          success: on_success,
-          failure: on_failure
-      end
-
-      private
-
-      def on_success
-        ->{ puts "Now watching ticket #{ticket}" }
-      end
-
-      def on_failure
-        ->{ puts "No watch." }
-      end
-
-    end
-
-
-    class Watchers < Base
-
-      attr_accessor :ticket
-
-      def initialize(ticket)
-        self.ticket = ticket
-      end
-
-      def run
-        return if ticket.empty?
-        return if metadata.empty?
-
-        watchers = metadata['watchers']
-        if !watchers.nil? and watchers.count > 0
-          watchers.each do |watcher|
-            displayName = watcher['displayName']
-
-            printf "[%2d]", watchers.index(watcher)
-            puts "  #{Jira::Format.user(displayName)}"
-          end
-        else
-          puts "There are no watchers on ticket #{ticket}."
-        end
-      end
-
-      private
-
-      def metadata
-        @metadata ||= api.get("issue/#{ticket}/watchers")
-      end
-    end
-
-    class Unwatch < Base
-
-      attr_accessor :ticket
-
-      def initialize(ticket)
-        self.ticket = ticket
-      end
-
-      def run
-        return if ticket.empty?
-
-        username = Jira::Core.username
-        api.delete "issue/#{ticket}/watchers?username=#{username}",
-          success: on_success,
-          failure: on_failure
-      end
-
-      private
-
-      def on_success
-        ->{ puts "Stopped watching ticket #{ticket}" }
-      end
-
-      def on_failure
-        ->{ puts "No unwatch." }
-      end
-
-    end
   end
 end

data/lib/jira/commands/watch/add.rb

@@ -0,0 +1,43 @@
+module Jira
+  class Watch < Thor
+
+    desc 'add', 'Watch the input ticket'
+    def add(ticket=Jira::Core.ticket)
+      Command::Watch::Add.new(ticket).run
+    end
+
+  end
+
+  module Command
+    module Watch
+      class Add < Base
+
+        attr_accessor :ticket
+
+        def initialize(ticket)
+          self.ticket = ticket
+        end
+
+        def run
+          return if ticket.empty?
+
+          api.post "issue/#{ticket}/watchers",
+            params:  "\"#{Jira::Core.username}\"",
+            success: on_success,
+            failure: on_failure
+        end
+
+      private
+
+        def on_success
+          ->{ puts "Now watching ticket #{ticket}" }
+        end
+
+        def on_failure
+          ->{ puts "No watch." }
+        end
+
+      end
+    end
+  end
+end

data/lib/jira/commands/watch/delete.rb

@@ -0,0 +1,46 @@
+module Jira
+  class Watch < Thor
+
+    desc 'delete', 'Stop watching the input ticket'
+    def delete(ticket=Jira::Core.ticket)
+      Command::Watch::Delete.new(ticket).run
+    end
+
+  end
+
+  module Command
+    module Watch
+      class Delete < Base
+
+        attr_accessor :ticket
+
+        def initialize(ticket)
+          self.ticket = ticket
+        end
+
+        def run
+          return if ticket.empty?
+
+          api.delete endpoint,
+            success: on_success,
+            failure: on_failure
+        end
+
+      private
+
+        def endpoint
+          "issue/#{ticket}/watchers?username=#{Jira::Core.username}"
+        end
+
+        def on_success
+          ->{ puts "Stopped watching ticket #{ticket}" }
+        end
+
+        def on_failure
+          ->{ puts "Did not stop watching ticket." }
+        end
+
+      end
+    end
+  end
+end

data/lib/jira/commands/watch/list.rb

@@ -0,0 +1,59 @@
+module Jira
+  class Watch < Thor
+
+    desc 'list', 'Lists the watchers of the input ticket'
+    def list(ticket=Jira::Core.ticket)
+      Command::Watch::List.new(ticket).run
+    end
+
+  end
+
+  module Command
+    module Watch
+      class List < Base
+
+        attr_accessor :ticket
+
+        def initialize(ticket)
+          self.ticket = ticket
+        end
+
+        def run
+          return if ticket.empty?
+          return if watchers.nil?
+          return if no_watchers?
+
+          watchers.each do |watcher|
+            self.watcher = watcher
+            display_watcher
+          end
+        end
+
+      private
+
+        attr_accessor :watcher
+
+        def no_watchers?
+          if watchers.count == 0
+            puts "Ticket #{ticket} has no watchers."
+            return true
+          end
+          false
+        end
+
+        def display_watcher
+          puts "[#{watchers.index(watcher).to_s.rjust(2)}]  #{display_name}"
+        end
+
+        def display_name
+          Jira::Format.user(watcher['displayName'])
+        end
+
+        def watchers
+          @watchers ||= api.get("issue/#{ticket}/watchers")['watchers']
+        end
+
+      end
+    end
+  end
+end

data/lib/jira/constants.rb

@@ -1,5 +1,5 @@
 module Jira
 
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 
 end

data/lib/jira/core.rb

@@ -27,7 +27,15 @@ module Jira
       # @return [String] JIRA token
       #
       def token
-        @token ||= ENV['JIRA_TOKEN'] || self.read(self.cli_path)[:global]['token']
+        @token ||= ENV['JIRA_TOKEN'] || config[:global]['token']
+      end
+
+      #
+      # @return [Hash] JIRA cookie
+      #
+      def cookie
+        return {} if config[:cookie].nil? || config[:cookie].empty?
+        { name: config[:cookie]['name'], value: config[:cookie]['value'] }
       end
 
       #

data/lib/jira/sprint_api.rb

@@ -1,8 +1,5 @@
-require 'faraday'
-require 'faraday_middleware'
-
 module Jira
-  class SprintAPI
+  class SprintAPI < API
 
     def sprint(rapid_view_id, sprint_id)
       response = client.get(
@@ -26,24 +23,11 @@ module Jira
       []
     end
 
-  private
-
-    def client
-      @client ||= Faraday.new(endpoint) do |faraday|
-        faraday.request  :basic_auth, Jira::Core.username, Jira::Core.password
-        faraday.request  :json
-        faraday.response :json
-        faraday.adapter  :net_http
-      end
-    end
+  protected
 
     def endpoint
       "#{Jira::Core.url}/rest/greenhopper/latest"
     end
 
-    def headers
-      { 'Content-Type' => 'application/json' }
-    end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jira-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Darren Cheng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -149,17 +149,25 @@ files:
 - bin/jira
 - lib/jira.rb
 - lib/jira/api.rb
+- lib/jira/auth_api.rb
 - lib/jira/command.rb
 - lib/jira/commands/all.rb
 - lib/jira/commands/assign.rb
 - lib/jira/commands/attachments.rb
 - lib/jira/commands/comment.rb
-- lib/jira/commands/commit.rb
+- lib/jira/commands/comment/add.rb
+- lib/jira/commands/comment/delete.rb
+- lib/jira/commands/comment/list.rb
+- lib/jira/commands/comment/update.rb
 - lib/jira/commands/delete.rb
 - lib/jira/commands/describe.rb
 - lib/jira/commands/install.rb
 - lib/jira/commands/link.rb
 - lib/jira/commands/log.rb
+- lib/jira/commands/log/add.rb
+- lib/jira/commands/log/delete.rb
+- lib/jira/commands/log/list.rb
+- lib/jira/commands/log/update.rb
 - lib/jira/commands/new.rb
 - lib/jira/commands/rename.rb
 - lib/jira/commands/sprint.rb
@@ -167,13 +175,17 @@ files:
 - lib/jira/commands/transition.rb
 - lib/jira/commands/version.rb
 - lib/jira/commands/vote.rb
+- lib/jira/commands/vote/add.rb
+- lib/jira/commands/vote/delete.rb
+- lib/jira/commands/vote/list.rb
 - lib/jira/commands/watch.rb
+- lib/jira/commands/watch/add.rb
+- lib/jira/commands/watch/delete.rb
+- lib/jira/commands/watch/list.rb
 - lib/jira/constants.rb
 - lib/jira/core.rb
 - lib/jira/exceptions.rb
 - lib/jira/format.rb
-- lib/jira/legacy_api.rb
-- lib/jira/mixins.rb
 - lib/jira/sprint_api.rb
 homepage: https://github.com/drn/jira-cli
 licenses:

data/lib/jira/commands/commit.rb

@@ -1,14 +0,0 @@
-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/legacy_api.rb

@@ -1,102 +0,0 @@
-require 'faraday'
-
-module Jira
-  class LegacyAPI
-
-    TYPES = [
-      :rest,
-      :agile
-    ].freeze
-
-    ENDPOINTS = {
-      rest:  'rest/api/2',
-      agile: 'rest/greenhopper/latest'
-    }.freeze
-
-    #
-    # Initialize Jira::API
-    #
-    # @param type [Symbol]
-    #
-    def initialize(type)
-      @type = type
-      @client = Faraday.new
-      @client.basic_auth(Jira::Core.username, Jira::Core.password)
-
-      self.define_actions
-    end
-
-    protected
-
-      #
-      # Defines the API DELETE, GET, POST, PUT interaction methods
-      #
-      def define_actions
-        #
-        # def method(path, params={})
-        #
-        # Issue an API DELETE, GET, POST, or PUT request and return parse JSON
-        #
-        # @param path [String] API path
-        # @param params [Hash] params to send
-        #
-        # @yield(Hash) yields to a success block
-        #
-        # @return [JSON] parased API response
-        #
-        [:delete, :get, :post, :put].each do |method|
-          self.class.send(:define_method, method) do |path, params=nil, verbose=true, &block|
-            params = params.to_json if !params.nil?
-            response = @client.send(
-              method,
-              self.endpoint(path),
-              params,
-              self.headers
-            )
-            json = response.body.to_s.from_json
-            if self.errorless?(json, verbose)
-              block.call(json)
-            end
-          end
-        end
-      end
-
-      #
-      # If any, outputs all API errors described by the input JSON
-      #
-      # @param json [Hash] API response JSON
-      # @param verbose [Boolean] true if errors should be output
-      #
-      # @return [Boolean] true if no errors exist
-      #
-      def errorless?(json, verbose=true)
-        errors = json['errorMessages']
-        if !errors.nil?
-          puts errors.join('. ') if verbose
-          return false
-        end
-        return true
-      end
-
-      #
-      # Returns the full JIRA REST API endpoint
-      #
-      # @param path [String] API path
-      #
-      # @return [String] API endpoint
-      #
-      def endpoint(path)
-        "#{Jira::Core.url}/#{ENDPOINTS[@type]}/#{path}"
-      end
-
-      #
-      # Returns the default API headers
-      #
-      # @return [Hash] API headers
-      #
-      def headers
-        { 'Content-Type' => 'application/json' }
-      end
-
-  end
-end