bl 0.5.11 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f561d7d01920939ff153cd28a4732f1a1c9103c
-  data.tar.gz: e29a1f79d225eb012ed4fd1a2a423519b6717bbe
+  metadata.gz: 4d76c1fa3d3501015e87be05a03ff5b6fe694ad9
+  data.tar.gz: bd1d24d7fd6740ce1275aa2fcb269a43ea1f00bf
 SHA512:
-  metadata.gz: 9aed15e68ccda4de5c0c9aee00a0729a516385fb0059195b14d01e1f24385b6c1ead803f857dbd029db0d365eb9cb40dbb1758bf11ab7ac6a12e811e26db558d
-  data.tar.gz: ca472cc27a71fa58d5b88971713b33e89f519854ef7517a0454aa84ac2801532b90c089ad1a32ae150eca7b20d1e712c9931a1f17b911cca27934b592eb308d0
+  metadata.gz: cabd93779373d7a938b5d1c0be3bb1fee721a425af260417ed176eadbc663370e514e0f7e3663a18890375694d4537f55402bd80c51d54a66a48390ff3170311
+  data.tar.gz: 4f2121b52394a1a77b6457b3a51e80dc2b8b7d838e1983c5dd1101f4e2f239c4bf6f6719311f1e1ea7ecac64e7b4b72f09d349f8001b5e9845244fe18865706a

data/lib/bl.rb

@@ -4,9 +4,11 @@ require 'backlog_kit'
 require 'paint'
 require 'thor'
 require 'bl/version'
+require 'bl/constants'
 require 'bl/config'
 require 'bl/requestable'
 require 'bl/formatting'
+require 'bl/printer'
 require 'bl/command'
 require 'bl/space'
 require 'bl/type'

data/lib/bl/category.rb

@@ -9,14 +9,14 @@ module Bl
 
     desc 'list', 'list categories'
     def list
-      res = client.get(@url)
+      res = request(:get, @url)
       print_response(res)
     end
 
     desc 'add [NAME...]', 'add categories'
     def add(*names)
       names.each do |name|
-        res = client.post(@url, name: name)
+        res = request(:post, @url, name: name)
         puts 'category added'
         print_response(res)
       end
@@ -26,7 +26,7 @@ module Bl
     option :name, type: :string
     def update(*ids)
       ids.each do |id|
-        res = client.patch("#{@url}/#{id}", delete_class_options(options))
+        res = request(:patch, "#{@url}/#{id}", delete_class_options(options))
         puts 'category updated'
         print_response(res)
       end
@@ -35,7 +35,7 @@ module Bl
     desc 'delete [ID...]', 'delete categories'
     def delete(*ids)
       ids.each do |id|
-        res = client.delete("#{@url}/#{id}")
+        res = request(:delete, "#{@url}/#{id}")
         puts 'category deleted'
         print_response(res)
       end

data/lib/bl/cli.rb

@@ -35,13 +35,13 @@ module Bl
           space_id: space_id,
           api_key: api_key
         )
-        res = client.get('projects')
+        res = request(:get, 'projects')
         project_key = res.body[0].projectKey
         config[:project_key] = project_key
         config[:issue][:default][:projectId] = res.body[0].id
-        res = client.get("projects/#{project_key}/issueTypes")
+        res = request(:get, "projects/#{project_key}/issueTypes")
         config[:issue][:default][:issueTypeId] = res.body[0].id
-        res = client.get('priorities')
+        res = request(:get, 'priorities')
         config[:issue][:default][:priorityId] = res.body[1].id
         f.write(config.to_yaml)
         puts "#{filename} generated."
@@ -51,7 +51,7 @@ module Bl
     desc 'count', 'count issues'
     options ISSUES_PARAMS
     def count
-      puts client.get('issues/count', delete_class_options(options.to_h)).body.count
+      puts request(:get, 'issues/count', delete_class_options(options.to_h)).body.count
     end
 
     desc 'list', 'list issues by typical ways'
@@ -76,20 +76,20 @@ module Bl
         opts[:order] = "asc"
       end
       opts[:categoryId] = [-1] if options[:nocategory]
-      res = client.get('issues', opts)
-      print_issue_response(printable_issues(res.body))
+      res = request(:get, 'issues', opts)
+      print_response(res, :issue)
     end
 
     desc 'search', 'search issues'
     options ISSUES_PARAMS
     def search
-      res = client.get('issues', delete_class_options(options.to_h))
-      print_issue_response(printable_issues(res.body))
+      res = request(:get, 'issues', delete_class_options(options.to_h))
+      print_response(res, :issue)
     end
 
     desc 'show KEY', "show an issue's details"
     def show(key)
-      res  = client.get("issues/#{key}")
+      res  = request(:get, "issues/#{key}")
       body = printable_issues(res.body)
       additional_fileds = %w(
         description
@@ -127,7 +127,7 @@ module Bl
     def add(*subjects)
       subjects.each do |s|
         issue_default_options = @config[:issue][:default]
-        res = client.post(
+        res = request(:post,
           'issues',
           issue_default_options.merge({summary: s}).merge(delete_class_options(options.to_h))
         )
@@ -141,7 +141,7 @@ module Bl
     option :comment, type: :string
     def update(*keys)
       keys.each do |k|
-        res = client.patch("issues/#{k}", delete_class_options(options.to_h))
+        res = request(:patch, "issues/#{k}", delete_class_options(options.to_h))
         puts 'issue updated'
         print_issue_response(printable_issues(res.body))
       end
@@ -150,7 +150,7 @@ module Bl
     desc 'close [KEY...]', 'close issues'
     def close(*keys)
       keys.each do |k|
-        res = client.patch("issues/#{k}", statusId: 4)
+        res = request(:patch, "issues/#{k}", statusId: 4)
         puts '🎉 issue closed'
         print_issue_response(printable_issues(res.body))
       end
@@ -158,7 +158,7 @@ module Bl
 
     desc 'edit KEY', "edit issues' description by $EDITOR"
     def edit(key)
-      issue_description = client.get("issues/#{key}").body.description
+      issue_description = request(:get, "issues/#{key}").body.description
       file = Tempfile.new
       file.puts(issue_description)
       file.close
@@ -166,7 +166,7 @@ module Bl
         file.open
         system("$EDITOR #{file.path}")
         new_content = file.read
-        client.patch("issues/#{key}", description: new_content)
+        request(:patch, "issues/#{key}", description: new_content)
         puts "issue #{key} updated."
       ensure
         file.close
@@ -176,20 +176,20 @@ module Bl
 
     desc 'statuses', 'list statuses'
     def statuses
-      res = client.get('statuses')
-      puts formatter.render(res.body, fields: %i(id name))
+      res = request(:get, 'statuses')
+      print_response(res, :named)
     end
 
     desc 'priorities', 'list priorities'
     def priorities
-      res = client.get('priorities')
-      puts formatter.render(res.body, fields: %i(id name))
+      res = request(:get, 'priorities')
+      print_response(res, :named)
     end
 
     desc 'resolutions', 'list resolutions'
     def resolutions
-      res = client.get('resolutions')
-      puts formatter.render(res.body, fields: %i(id name))
+      res = request(:get, 'resolutions')
+      print_response(res, :named)
     end
 
     desc 'roles', 'list roles'
@@ -239,23 +239,5 @@ module Bl
     desc 'wiki SUBCOMMAND ...ARGS', 'manage wikis'
     subcommand 'wiki', Wiki
 
-    private
-
-    def print_issue_response(res)
-      puts formatter.render(res, fields: ISSUE_FIELDS)
-    end
-
-    def printable_issues(ary)
-      ary = Array(ary)
-      ary.each do |v|
-        v.issueType = v.issueType.name
-        v.assignee = v.assignee.name if v.assignee
-        v.status = v.status.name
-        v.priority = v.priority.name
-        v.created = format_datetime(v.created)
-        v.updated = format_datetime(v.updated)
-      end
-      ary
-    end
   end
 end

data/lib/bl/command.rb

@@ -2,204 +2,9 @@ module Bl
   class Command < Thor
     include Bl::Requestable
     include Bl::Formatting
+    include Bl::Printer
     class_option :format, type: :string, default: 'table', desc: 'set output format'
 
-    ACTIVITY_TYPES = {
-      1 => 'Issue Created',
-      2 => 'Issue Updated',
-      3 => 'Issue Commented',
-      4 => 'Issue Deleted',
-      5 => 'Wiki Created',
-      6 => 'Wiki Updated',
-      7 => 'Wiki Deleted',
-      8 => 'File Added',
-      9 => 'File Updated',
-      10 => 'File Deleted',
-      11 => 'SVN Committed',
-      12 => 'Git Pushed',
-      13 => 'Git Repository Created',
-      14 => 'Issue Multi Updated',
-      15 => 'Project User Added',
-      16 => 'Project User Deleted',
-      17 => 'Comment Notification Added',
-      18 => 'Pull Request Added',
-      19 => 'Pull Request Updated',
-      20 => 'Comment Added on Pull Request'
-    }
-    CATEGORY_FIELDS = %i(id name displayOrder)
-    FILE_FIELDS = %i(id type dir name size created updated)
-    GIT_REPO_FIELDS = %i(
-      id
-      projectId
-      name
-      sshUrl
-      pushedAt
-      created
-      updated
-    )
-    ISSUE_BASE_ATTRIBUTES = {
-      summary: :string,
-      parentIssueId: :numeric,
-      description: :string,
-      statusId: :numeric,
-      resolutionId: :numeric,
-      dueDate: :string,
-      issueTypeId: :numeric,
-      categoryId: :array,
-      versionId: :array,
-      milestoneId: :array,
-      priorityId: :numeric,
-      assigneeId: :numeric
-    }
-    ISSUE_FIELDS = %i(
-      issueType
-      issueKey
-      summary
-      assignee
-      status
-      priority
-      startDate
-      dueDate
-      created
-      updated
-    )
-    ISSUES_PARAMS = {
-      projectId: :array,
-      issueTypeId: :array,
-      categoryId: :array,
-      versionId: :array,
-      milestoneId: :array,
-      statusId: :array,
-      priorityId: :array,
-      assigneeId: :array,
-      createdUserId: :array,
-      resolutionId: :array,
-      parentChild: :numeric,
-      attachment: :boolean,
-      sharedFile: :boolean,
-      sort: :string,
-      order: :string,
-      offset: :numeric,
-      count: :numeric,
-      createdSince: :string,
-      createUntil: :string,
-      updatedSince: :string,
-      updatedUntil: :string,
-      startDateSince: :string,
-      startDateUntil: :string,
-      dueDateSince: :string,
-      dueDateUntil: :string,
-      id: :array,
-      parentIssueId: :array,
-      keyword: :string
-    }
-    MILESTONE_FIELDS = %i(id projectId name description startDate releaseDueDate archived)
-    MILESTONE_PARAMS = {
-      description: :string,
-      startDate: :string,
-      releaseDueDate: :string
-    }
-    PROJECT_FIELDS = %i(
-      id
-      projectKey
-      name
-      chartEnabled
-      subtaskingEnabled
-      projectLeaderCanEditProjectLeader
-      textFormattingRule
-      archived
-    )
-    PROJECT_PARAMS = {
-      name: :string,
-      key: :string,
-      chartEnabled: :boolean,
-      projectLeaderCanEditProjectLeader: :boolean,
-      subtaskingEnabled: :boolean,
-      textFormattingRule: :boolean
-    }
-    ROLES = [
-      {id: 1, name: 'Administrator'},
-      {id: 2, name: 'Normal User'},
-      {id: 3, name: 'Reporter'},
-      {id: 4, name: 'Viewer'},
-      {id: 5, name: 'Guest Reporter'},
-      {id: 6, name: 'Guest Viewer'}
-    ]
-    SPACE_DISK_USAGE = %i(
-      capacity
-      issue
-      wiki
-      file
-      subversion
-      git
-    )
-    SPACE_DISK_USAGE_DETAILS_FIELDS = %i(
-      projectId
-      issue
-      wiki
-      file
-      subversion
-      git
-    )
-    SPACE_FIELDS = %i(
-      spaceKey
-      name
-      ownerId
-      lang
-      timezone
-      reportSendTime
-      textFormattingRule
-      created
-      updated
-    )
-    SPACE_NOTIFICATION_FIELDS = %i(
-      content
-      updated
-    )
-    TYPE_COLORS = %w(
-      #e30000
-      #934981
-      #814fbc
-      #007e9a
-      #ff3265
-      #666665
-      #990000
-      #2779ca
-      #7ea800
-      #ff9200
-    )
-    USER_FIELDS = %i(
-      id
-      userId
-      name
-      roleType
-      lang
-      mailAddress
-    )
-    USER_PARAMS = {
-      password: :string,
-      name: :string,
-      mailAddress: :string,
-      roleType: :numeric
-    }
-    WATCHINGS_PARAMS = {
-      order: :string,
-      sort: :string,
-      count: :numeric,
-      offset: :numeric,
-      resourceAlreadyRead: :boolean,
-      issueId: :array
-    }
-    WEBHOOK_FIELDS = %i(id name description created updated)
-    WEBHOOK_PARAMS = {
-      name: :string,
-      description: :string,
-      hookUrl: :string,
-      allEvent: :boolean,
-      activityTypeIds: :array
-    }
-    WIKI_FIELDS = %i(id projectId name created updated)
-
     protected
 
     def delete_class_options(h)
@@ -209,7 +14,11 @@ module Bl
     end
 
     def format_datetime(str)
-      DateTime.parse(str).strftime('%Y-%m-%d %H:%M')
+      DateTime.parse(str).strftime('%Y-%m-%d %H:%M') if str
+    end
+
+    def format_date(str)
+      Date.parse(str).strftime('%Y-%m-%d') if  str
     end
   end
 end

data/lib/bl/constants.rb

@@ -0,0 +1,197 @@
+module Bl
+  ACTIVITY_TYPES = {
+    1 => 'Issue Created',
+    2 => 'Issue Updated',
+    3 => 'Issue Commented',
+    4 => 'Issue Deleted',
+    5 => 'Wiki Created',
+    6 => 'Wiki Updated',
+    7 => 'Wiki Deleted',
+    8 => 'File Added',
+    9 => 'File Updated',
+    10 => 'File Deleted',
+    11 => 'SVN Committed',
+    12 => 'Git Pushed',
+    13 => 'Git Repository Created',
+    14 => 'Issue Multi Updated',
+    15 => 'Project User Added',
+    16 => 'Project User Deleted',
+    17 => 'Comment Notification Added',
+    18 => 'Pull Request Added',
+    19 => 'Pull Request Updated',
+    20 => 'Comment Added on Pull Request'
+  }
+  CATEGORY_FIELDS = %i(id name displayOrder)
+  FILE_FIELDS = %i(id type dir name size created updated)
+  GIT_REPO_FIELDS = %i(
+    id
+    projectId
+    name
+    sshUrl
+    pushedAt
+    created
+    updated
+  )
+  ISSUE_BASE_ATTRIBUTES = {
+    summary: :string,
+    parentIssueId: :numeric,
+    description: :string,
+    statusId: :numeric,
+    resolutionId: :numeric,
+    dueDate: :string,
+    issueTypeId: :numeric,
+    categoryId: :array,
+    versionId: :array,
+    milestoneId: :array,
+    priorityId: :numeric,
+    assigneeId: :numeric
+  }
+  ISSUE_FIELDS = %i(
+    issueType
+    issueKey
+    summary
+    assignee
+    status
+    priority
+    startDate
+    dueDate
+    created
+    updated
+  )
+  ISSUES_PARAMS = {
+    projectId: :array,
+    issueTypeId: :array,
+    categoryId: :array,
+    versionId: :array,
+    milestoneId: :array,
+    statusId: :array,
+    priorityId: :array,
+    assigneeId: :array,
+    createdUserId: :array,
+    resolutionId: :array,
+    parentChild: :numeric,
+    attachment: :boolean,
+    sharedFile: :boolean,
+    sort: :string,
+    order: :string,
+    offset: :numeric,
+    count: :numeric,
+    createdSince: :string,
+    createUntil: :string,
+    updatedSince: :string,
+    updatedUntil: :string,
+    startDateSince: :string,
+    startDateUntil: :string,
+    dueDateSince: :string,
+    dueDateUntil: :string,
+    id: :array,
+    parentIssueId: :array,
+    keyword: :string
+  }
+  MILESTONE_FIELDS = %i(id projectId name description startDate releaseDueDate archived)
+  MILESTONE_PARAMS = {
+    description: :string,
+    startDate: :string,
+    releaseDueDate: :string
+  }
+  PROJECT_FIELDS = %i(
+    id
+    projectKey
+    name
+    chartEnabled
+    subtaskingEnabled
+    projectLeaderCanEditProjectLeader
+    textFormattingRule
+    archived
+  )
+  PROJECT_PARAMS = {
+    name: :string,
+    key: :string,
+    chartEnabled: :boolean,
+    projectLeaderCanEditProjectLeader: :boolean,
+    subtaskingEnabled: :boolean,
+    textFormattingRule: :boolean
+  }
+  ROLES = [
+    {id: 1, name: 'Administrator'},
+    {id: 2, name: 'Normal User'},
+    {id: 3, name: 'Reporter'},
+    {id: 4, name: 'Viewer'},
+    {id: 5, name: 'Guest Reporter'},
+    {id: 6, name: 'Guest Viewer'}
+  ]
+  SPACE_DISK_USAGE = %i(
+    capacity
+    issue
+    wiki
+    file
+    subversion
+    git
+  )
+  SPACE_DISK_USAGE_DETAILS_FIELDS = %i(
+    projectId
+    issue
+    wiki
+    file
+    subversion
+    git
+  )
+  SPACE_FIELDS = %i(
+    spaceKey
+    name
+    ownerId
+    lang
+    timezone
+    reportSendTime
+    textFormattingRule
+    created
+    updated
+  )
+  SPACE_NOTIFICATION_FIELDS = %i(
+    content
+    updated
+  )
+  TYPE_COLORS = %w(
+    #e30000
+    #934981
+    #814fbc
+    #007e9a
+    #ff3265
+    #666665
+    #990000
+    #2779ca
+    #7ea800
+    #ff9200
+  )
+  USER_FIELDS = %i(
+    id
+    userId
+    name
+    roleType
+    lang
+    mailAddress
+  )
+  USER_PARAMS = {
+    password: :string,
+    name: :string,
+    mailAddress: :string,
+    roleType: :numeric
+  }
+  WATCHINGS_PARAMS = {
+    order: :string,
+    sort: :string,
+    count: :numeric,
+    offset: :numeric,
+    resourceAlreadyRead: :boolean,
+    issueId: :array
+  }
+  WEBHOOK_FIELDS = %i(id name description created updated)
+  WEBHOOK_PARAMS = {
+    name: :string,
+    description: :string,
+    hookUrl: :string,
+    allEvent: :boolean,
+    activityTypeIds: :array
+  }
+  WIKI_FIELDS = %i(id projectId name created updated)
+end

data/lib/bl/file.rb

@@ -8,14 +8,14 @@ module Bl
 
     desc 'list PATH', 'list files on PATH'
     def list(path = '')
-      res = client.get("#{@url}/files/metadata/#{path}")
+      res = request(:get, "#{@url}/files/metadata/#{path}")
       print_response(res)
     end
 
     desc 'get [ID...]', 'get files'
     def get(*ids)
       ids.each do |id|
-        res = client.get("#{@url}/files/#{id}")
+        res = request(:get, "#{@url}/files/#{id}")
         f = ::File.new(res.body.filename, 'w')
         f.write(res.body.content)
         f.close

data/lib/bl/gitrepo.rb

@@ -9,13 +9,13 @@ module Bl
 
     desc 'list', 'list git repositories'
     def list
-      res = client.get(@url)
+      res = request(:get, @url)
       print_response(res)
     end
 
     desc 'show ID', 'show a git repository'
     def show(id)
-      res = client.get("#{@url}/#{id}")
+      res = request(:get, "#{@url}/#{id}")
       puts formatter.render(res.body, fields: GIT_REPO_FIELDS, vertical: true)
     end
 

data/lib/bl/groups.rb

@@ -10,20 +10,20 @@ module Bl
     desc 'list', ''
     options order: :string, offset: :numeric, count: :numeric
     def list
-      res = client.get(@url, options.to_h)
+      res = request(:get, @url, options.to_h)
       puts formatter.render(res.body, fields: %i(id name))
     end
 
     desc 'show GROUP_ID', ''
     def show(id)
-      res = client.get("#{@url}/#{id}")
+      res = request(:get, "#{@url}/#{id}")
       puts formatter.render(res.body.members, fields: USER_FIELDS)
     end
 
     desc 'add GROUP_NAME', ''
     options members: :array
     def add(name)
-      res = client.post(@url, {name: name}.merge(delete_class_options(options)))
+      res = request(:post, @url, {name: name}.merge(delete_class_options(options)))
       puts 'group added'
       print_group_and_members(res.body)
     end
@@ -31,14 +31,14 @@ module Bl
     desc 'update GROUP_ID', ''
     options name: :string, members: :array
     def update(id)
-      res = client.patch("#{@url}/#{id}", delete_class_options(options.to_h))
+      res = request(:patch, "#{@url}/#{id}", delete_class_options(options.to_h))
       puts 'group updated'
       print_group_and_members(res.body)
     end
 
     desc 'delete GROUP_ID', ''
     def delete(id)
-      res = client.delete("#{@url}/#{id}")
+      res = request(:delete, "#{@url}/#{id}")
       puts 'group deleted'
       print_group_and_members(res.body)
     end

data/lib/bl/milestone.rb

@@ -10,7 +10,7 @@ module Bl
     desc 'list', 'list milestones'
     option :all
     def list
-      res = client.get(@url)
+      res = request(:get, @url)
       if options[:all]
       else
         res.body.select! { |m| m.archived == false } unless options[:all]
@@ -22,7 +22,7 @@ module Bl
     options MILESTONE_PARAMS
     def add(*names)
       names.each do |name|
-        res = client.post(
+        res = request(:post, 
           @url,
           name: name,
           description: options[:description],
@@ -39,7 +39,7 @@ module Bl
     options MILESTONE_PARAMS
     def update(*ids)
       ids.each do |id|
-        res = client.patch("#{@url}/#{id}", delete_class_options(options))
+        res = request(:patch, "#{@url}/#{id}", delete_class_options(options))
         puts 'milestone updated'
         print_response(res)
       end
@@ -48,7 +48,7 @@ module Bl
     desc 'delete [ID...]', 'delete milestones'
     def delete(*ids)
       ids.each do |id|
-        res = client.delete("#{@url}/#{id}")
+        res = request(:delete, "#{@url}/#{id}")
         puts 'milestone deleted'
         print_response(res)
       end

data/lib/bl/notifications.rb

@@ -10,27 +10,27 @@ module Bl
     desc 'list', ''
     options minId: :numeric, maxId: :numeric, count: :numeric, order: :string
     def list
-      res = client.get(@url, options.to_h)
+      res = request(:get, @url, options.to_h)
       res.body.map { |n| puts n.pretty_inspect }
     end
 
     desc 'count', ''
     options alreadyRead: :boolean, resourceAlreadyRead: :boolean
     def count
-      # puts client.get("#{@url}/count").body.count
+      # puts request(:get, "#{@url}/count").body.count
       # TODO fix nil error
     end
 
     desc 'mark-as-read', ''
     def mark_as_read
-      res = client.post("#{@url}/markAsRead")
+      res = request(:post, "#{@url}/markAsRead")
       puts 'notifications mark as readed'
       puts res.body.count
     end
 
     desc 'read NOTIFICATIONS_ID', ''
     def read(id)
-      res = client.post("#{@url}/#{id}/markAsRead")
+      res = request(:post, "#{@url}/#{id}/markAsRead")
       puts "notifications #{id} readed"
       puts res.pretty_inspect
     end

data/lib/bl/printer.rb

@@ -0,0 +1,31 @@
+module Bl
+  module Printer
+    module_function
+
+    def print_response(res, resource)
+      case resource
+      when :issue
+        puts formatter.render(printable_issues(res.body), fields: ISSUE_FIELDS)
+      when :named
+        puts formatter.render(res.body, fields: %i(id name))
+      else
+        raise 'invalid resource error'
+      end
+    end
+
+    def printable_issues(ary)
+      ary = Array(ary)
+      ary.each do |v|
+        v.issueType = v.issueType.name
+        v.assignee = v.assignee.name if v.assignee
+        v.status = v.status.name
+        v.priority = v.priority.name
+        v.startDate = format_date(v.startDate)
+        v.dueDate = format_date(v.dueDate)
+        v.created = format_datetime(v.created)
+        v.updated = format_datetime(v.updated)
+      end
+      ary
+    end
+  end
+end

data/lib/bl/project.rb

@@ -8,7 +8,7 @@ module Bl
 
     desc 'activities ID', 'show project activities'
     def activities(id)
-      res = client.get("#{@url}/#{id}/activities")
+      res = request(:get, "#{@url}/#{id}/activities")
       res.body.each do |a|
         p a.pretty_inspect
       end
@@ -16,18 +16,16 @@ module Bl
 
     desc 'list', 'list projects'
     def list
-      res = client.get(@url)
+      res = request(:get, @url)
       print_response(res)
     end
 
     desc 'show', 'show project'
     def show(id)
-      begin
-        res = client.get("#{@url}/#{id}")
-        print_response(res)
-      rescue => e
-        puts e.message
-      end
+      res = request(:get, "#{@url}/#{id}")
+      print_response(res)
+    rescue => e
+      puts e.message
     end
 
     desc 'add', 'add project'
@@ -37,7 +35,7 @@ module Bl
     option :subtaskingEnabled, type: :boolean, default: false
     option :textFormattingRule, type: :string, default: 'markdown'
     def add(name)
-      res = client.post(@url, {name: name}.merge(delete_class_options(options.to_h)))
+      res = request(:post, @url, {name: name}.merge(delete_class_options(options.to_h)))
       puts 'project added'
       print_response(res)
     end
@@ -45,14 +43,14 @@ module Bl
     desc 'update', 'update project'
     options PROJECT_PARAMS
     def update(id)
-      res = client.patch("#{@url}/#{id}", delete_class_options(options.to_h))
+      res = request(:patch, "#{@url}/#{id}", delete_class_options(options.to_h))
       puts 'project updated'
       print_response(res)
     end
 
     desc 'delete', 'delete project'
     def delete(id)
-      res = client.delete("#{@url}/#{id}")
+      res = request(:delete, "#{@url}/#{id}")
       puts 'project deleted'
       print_response(res)
     end
@@ -78,14 +76,14 @@ module Bl
       closed_issues_count = count_issues(id, statusId: [4])
       puts "#{closed_issues_count} / #{all_issues_count}"
       puts '--milestone--'
-      versions = client.get("projects/#{@config[:project_key]}/versions").body
+      versions = request(:get, "projects/#{@config[:project_key]}/versions").body
       versions.each do |version|
         all_issues_count = count_issues(id, milestoneId: [version.id])
         closed_issues_count = count_issues(id, milestoneId: [version.id], statusId: [4])
         puts "#{version.name}: #{closed_issues_count} / #{all_issues_count}"
       end
       puts '--category--'
-      categories = client.get("projects/#{@config[:project_key]}/categories").body
+      categories = request(:get, "projects/#{@config[:project_key]}/categories").body
       categories.each do |category|
         all_issues_count = count_issues(id, categoryId: [category.id])
         closed_issues_count = count_issues(id, categoryId: [category.id], statusId: [4])
@@ -95,13 +93,13 @@ module Bl
 
     desc 'users ID', 'show project users'
     def users(id)
-      res = client.get("#{@url}/#{id}/users")
+      res = request(:get, "#{@url}/#{id}/users")
       puts formatter.render(res.body, fields: USER_FIELDS)
     end
 
     desc 'image ID', 'get project image file'
     def image(id)
-      res = client.get("#{@url}/#{id}/image")
+      res = request(:get, "#{@url}/#{id}/image")
       ::File.open(res.body.filename, 'wb') { |f| f.write(res.body.content) }
       puts "#{res.body.filename} generated"
     end
@@ -112,7 +110,7 @@ module Bl
       args = {
         projectId: [project_id],
       }.merge(args)
-      client.get(
+      request(:get, 
         'issues/count',
         args
       ).body.count

data/lib/bl/recent.rb

@@ -8,20 +8,16 @@ module Bl
 
     desc 'issues COUNT', 'list recently viewed issues'
     def issues(count = nil)
-      client.get(
-        'users/myself/recentlyViewedIssues',
-        count: count
-      ).body.each do |i|
+      res = request(:get, 'users/myself/recentlyViewedIssues', count: count)
+      res.body.each do |i|
         puts [i.issue.issueKey, i.issue.summary].join("\t")
       end
     end
 
     desc 'wikis COUNT', 'list recently viewed wikis'
     def wikis(count = nil)
-      client.get(
-        'users/myself/recentlyViewedWikis',
-        count: count
-      ).body.each do |w|
+      res = request(:get, 'users/myself/recentlyViewedWikis', count: count)
+      res.body.each do |w|
         puts [w.page.id, w.page.name].join("\t")
       end
     end

data/lib/bl/requestable.rb

@@ -12,5 +12,22 @@ module Bl
     def formatter
       @formatter ||= Formatter.new(format: options[:format])
     end
+
+    def request(method, url, opts = nil)
+      case method
+      when :get
+        client.get(url, opts.to_h)
+      when :post
+        client.post(url, opts.to_h)
+      when :patch
+        client.patch(url, opts.to_h)
+      when :delete
+        client.delete(url, opts.to_h)
+      else
+        raise 'invalid method error'
+      end
+    rescue => e
+      puts e.message
+    end
   end
 end

data/lib/bl/space.rb

@@ -8,27 +8,27 @@ module Bl
 
     desc 'info', 'show space info'
     def info
-      res = client.get('space')
+      res = request(:get, 'space')
       puts formatter.render(res.body, fields: SPACE_FIELDS)
     end
 
     desc 'activities', 'show space activities'
     def activities
-      client.get('space/activities').body.each do |a|
+      request(:get, 'space/activities').body.each do |a|
         p a.pretty_inspect
       end
     end
 
     desc 'image', 'get space image file'
     def image
-      body = client.get('space/image').body
+      body = request(:get, 'space/image').body
       ::File.open(body.filename, "wb") {|f| f.write(body.content)}
       puts "#{body.filename} generated."
     end
 
     desc 'get-notification', 'get space notification'
     def get_notification
-      res = client.get('space/notification')
+      res = request(:get, 'space/notification')
       print_space_notification(res)
     end
 
@@ -41,7 +41,7 @@ module Bl
 
     desc 'disk-usage', 'get space disk usage'
     def disk_usage
-      res = client.get('space/diskUsage')
+      res = request(:get, 'space/diskUsage')
       print_space_disk_usage(res)
     end
 

data/lib/bl/type.rb

@@ -9,7 +9,7 @@ module Bl
 
     desc 'list', 'list issue types'
     def list
-      res = client.get(@url)
+      res = request(:get, @url)
       print_response(res)
     end
 
@@ -17,7 +17,7 @@ module Bl
     option :color, type: :string, required: true
     def add(*names)
       names.each do |name|
-        res = client.post(@url, name: name, color: options[:color])
+        res = request(:post, @url, name: name, color: options[:color])
         puts 'type added'
         print_response(res)
       end
@@ -28,7 +28,7 @@ module Bl
     option :color, color: :color
     def update(*ids)
       ids.each do |id|
-        res = client.patch("#{@url}/#{id}", options)
+        res = request(:patch, "#{@url}/#{id}", delete_class_options(options))
         puts 'type updated'
         print_response(res)
       end
@@ -38,7 +38,7 @@ module Bl
     option :substituteIssueTypeId, type: :numeric, required: true
     def delete(*ids)
       ids.each do |id|
-        res = client.delete("#{@url}/#{id}", options)
+        res = request(:delete, "#{@url}/#{id}", delete_class_options(options))
         puts 'type deleted'
         print_response
       end

data/lib/bl/users.rb

@@ -9,19 +9,19 @@ module Bl
 
     desc 'list', 'list users'
     def list
-      res = client.get('users')
+      res = request(:get, 'users')
       print_response(res)
     end
 
     desc 'show USER_ID', ''
     def show(id)
-      res = client.get("#{@url}/#{id}")
+      res = request(:get, "#{@url}/#{id}")
       puts formatter.render(res.body, fields: USER_FIELDS)
     end
 
     desc 'add USER_ID PASSWORD NAME MAIL_ADDRESS ROLE_TYPE', ''
     def add(id, pass, name, mail_address, role_type)
-      res = client.post("#{@url}", userId: id, password: pass, name: name, mailAddress: mail_address, roleType: role_type)
+      res = request(:post, "#{@url}", userId: id, password: pass, name: name, mailAddress: mail_address, roleType: role_type)
       puts 'user added'
       print_response(res)
     end
@@ -29,34 +29,34 @@ module Bl
     desc 'update USER_ID', ''
     options USER_PARAMS
     def update(id)
-      res = client.patch("#{@url}/#{id}", delete_class_options(options.to_h))
+      res = request(:patch, "#{@url}/#{id}", delete_class_options(options.to_h))
       puts 'user updated:'
       print_response(res)
     end
 
     desc 'delete', ''
     def delete(id)
-      res = client.delete("#{@url}/#{id}")
+      res = request(:delete, "#{@url}/#{id}")
       puts 'user deleted'
       print_response(res)
     end
 
     desc 'myself', ''
     def myself
-      res = client.get("#{@url}/myself")
+      res = request(:get, "#{@url}/myself")
       print_response(res)
     end
 
     desc 'icon ID', ''
     def icon(id)
-      # res = client.get("#{@url}/#{id}/icon")
+      # res = request(:get, "#{@url}/#{id}/icon")
       # TODO fix nil error
     end
 
     desc 'activities USER_ID', "list user's activities"
     options activityTypeId: :array, minId: :numeric, maxId: :numeric, count: :numeric, order: :string
     def activities(user_id)
-      res = client.get("/users/#{user_id}/activities")
+      res = request(:get, "/users/#{user_id}/activities")
       res.body.map { |a| print_activity(a) }
     end
 
@@ -64,7 +64,7 @@ module Bl
     options minId: :numeric, maxId: :numeric, count: :numeric, order: :string
     def stars(*user_ids)
       user_ids.each do |user_id|
-        res = client.get("/users/#{user_id}/stars", options.to_h)
+        res = request(:get, "/users/#{user_id}/stars", options.to_h)
         res.body.map { |s| p s }
       end
     end
@@ -73,7 +73,7 @@ module Bl
     options since: :string, until: :string
     def stars_count(*user_ids)
       user_ids.each do |user_id|
-        p client.get("/users/#{user_id}/stars/count", options.to_h).body.count
+        p request(:get, "/users/#{user_id}/stars/count", options.to_h).body.count
       end
     end
 

data/lib/bl/version.rb

@@ -1,3 +1,3 @@
 module Bl
-  VERSION = '0.5.11'.freeze
+  VERSION = '0.6.0'.freeze
 end

data/lib/bl/watchings.rb

@@ -10,27 +10,27 @@ module Bl
     desc 'list USER_ID', ''
     options WATCHINGS_PARAMS
     def list(id)
-      res = client.get("/users/#{id}/#{@url}", delete_class_options(options.to_h))
+      res = request(:get, "/users/#{id}/#{@url}", delete_class_options(options.to_h))
       res.body.map { |t| print_watch_target(t) }
     end
 
     desc 'count USER_ID', ''
     options resourceAlreadyRead: :boolean, alreadyRead: :boolean
     def count(id)
-      res = client.get("/users/#{id}/#{@url}/count")
+      res = request(:get, "/users/#{id}/#{@url}/count")
       puts res.body.count
     end
 
     desc 'show WATCHING_ID', ''
     def show(id)
-      res = client.get("watchings/#{id}")
+      res = request(:get, "watchings/#{id}")
       print_watch_target(res.body)
     end
 
     desc 'add', ''
     options issueIdOrKey: :required, note: :string
     def add
-      res = client.post('watchings', options.to_h)
+      res = request(:post, 'watchings', options.to_h)
       puts 'watch added'
       print_watch_target(res.body)
     end
@@ -39,27 +39,27 @@ module Bl
     option note: :string
     def update(id)
       # TODO fix conflict with issue update command
-      # res = client.patch("watchings/#{id}", option.to_h)
+      # res = request(:patch, "watchings/#{id}", option.to_h)
       # puts 'watch updated'
       # print_watch_target(res.body)
     end
 
     desc 'delete WATCHING_ID', ''
     def delete(id)
-      res = client.delete("watchings/#{id}")
+      res = request(:delete, "watchings/#{id}")
       puts 'watch deleted'
       print_watch_target(res.body)
     end
 
     desc 'mark-as-read WATCHING_ID', ''
     def mark_as_read(id)
-      res = client.post("watchings/#{id}/markAsRead")
+      res = request(:post, "watchings/#{id}/markAsRead")
       puts 'watch mark as read'
     end
 
     desc 'mark-as-checked USER_ID', ''
     def mark_as_checked(id)
-      res = client.post("/users/#{id}/watchings/markAsChecked")
+      res = request(:post, "/users/#{id}/watchings/markAsChecked")
       puts 'watch mark as checked'
     end
 

data/lib/bl/webhooks.rb

@@ -9,20 +9,20 @@ module Bl
 
     desc 'list', ''
     def list
-      res = client.get(@url)
+      res = request(:get, @url)
       print_response(res)
     end
 
     desc 'show WEBHOOK_ID', ''
     def show(id)
-      res = client.get("#{@url}/#{id}")
+      res = request(:get, "#{@url}/#{id}")
       print_response(res)
     end
 
     desc 'add', ''
     options WEBHOOK_PARAMS
     def add
-      res = client.post(@url, options.to_h)
+      res = request(:post, @url, options.to_h)
       puts 'webhook added'
       print_response(res)
     end
@@ -30,14 +30,14 @@ module Bl
     desc 'update WEBHOOK_ID', ''
     options WEBHOOK_PARAMS
     def update(id)
-      res = client.patch("#{@url}/#{id}", options.to_h)
+      res = request(:patch, "#{@url}/#{id}", options.to_h)
       puts 'webhook updated'
       print_response(res)
     end
 
     desc 'delete WEBHOOK_ID', ''
     def delete(id)
-      res = client.delete("#{@url}/#{id}")
+      res = request(:delete, "#{@url}/#{id}")
       puts 'webhook deleted'
       print_response(res)
     end

data/lib/bl/wiki.rb

@@ -9,13 +9,13 @@ module Bl
 
     desc 'list', 'list wikis'
     def list
-      res = client.get(@url, projectIdOrKey: @config[:project_key])
+      res = request(:get, @url, projectIdOrKey: @config[:project_key])
       puts formatter.render(res.body, fields: WIKI_FIELDS)
     end
 
     desc 'show ID', "show a wiki's content"
     def show(id)
-      body = client.get("#{@url}/#{id}").body
+      body = request(:get, "#{@url}/#{id}").body
       puts "id: #{body.id}"
       puts "projectId: #{body.projectId}"
       puts "name: #{body.name}"
@@ -27,7 +27,7 @@ module Bl
 
     desc 'edit ID', 'edit a wiki by $EDITOR'
     def edit(id)
-      wiki_content = client.get("#{@url}/#{id}").body.content
+      wiki_content = request(:get, "#{@url}/#{id}").body.content
       file = Tempfile.new
       file.puts(wiki_content)
       file.close
@@ -35,7 +35,7 @@ module Bl
         file.open
         system("$EDITOR #{file.path}")
         new_content = file.read
-        client.patch("#{@url}/#{id}", content: new_content)
+        request(:patch, "#{@url}/#{id}", content: new_content)
         puts "wiki #{id} updated."
       ensure
         file.close

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bl
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.6.0
 platform: ruby
 authors:
 - saki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -182,6 +182,7 @@ files:
 - lib/bl/cli.rb
 - lib/bl/command.rb
 - lib/bl/config.rb
+- lib/bl/constants.rb
 - lib/bl/file.rb
 - lib/bl/formatter.rb
 - lib/bl/formatting.rb
@@ -189,6 +190,7 @@ files:
 - lib/bl/groups.rb
 - lib/bl/milestone.rb
 - lib/bl/notifications.rb
+- lib/bl/printer.rb
 - lib/bl/project.rb
 - lib/bl/recent.rb
 - lib/bl/requestable.rb