bl 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d20d3678c35119bbab68027cdd10ba5dc75e4490
-  data.tar.gz: cb4a885c2d366087ae8533344f307a1750cdd215
+  metadata.gz: 55f1e902cbc7a85e120ad076f71f125c5228eb4b
+  data.tar.gz: 1e65288f69871539a379a1b8edf6bd92f99def0b
 SHA512:
-  metadata.gz: 57a13bd38a912c91c9be4deab150196c983d966ce5cfa3c4113c30b390a8a787b62df9b70af9744a9af20b8bbe31e3604ff1207c7580b91acf1c9e8e3c5cf93b
-  data.tar.gz: 65a669111cee35f1719aafd872c489c5b7ad0b6fdf71c6ca4a3d28dd0649c3bde9a6d686c89633b4f7b1c7bc21f1d769efa5ed046bd8bf455db6ef6d28a98d17
+  metadata.gz: a564cf036ac05442c1f882b949ae14f7760e7ddf7891b892233c9f2534ff7a5264c10dba12ec4daaeefe6673abf2b7b4ee808df4e0f8382b2618ce80c6b3aa5b
+  data.tar.gz: d506a364760865d6c0d3388fac93c34c8ee1bc0e5da0c97b31af9d2db9716d67c039c557f7ffbd6795a6b41bf5577aa8afda9f894f0425c159ddef8b7318667f

data/lib/bl/category.rb

@@ -10,14 +10,15 @@ module Bl
     desc 'list', 'list categories'
     def list
       res = client.get(@url)
-      puts formatter.render(res.body, fields: %i(id name))
+      print_response(res)
     end
 
     desc 'add [NAME...]', 'add categories'
     def add(*names)
       names.each do |name|
         res = client.post(@url, name: name)
-        puts "category added: #{res.body.id}\t#{res.body.name}"
+        puts 'category added'
+        print_response(res)
       end
     end
 
@@ -26,7 +27,8 @@ module Bl
     def update(*ids)
       ids.each do |id|
         res = client.patch("#{@url}/#{id}", delete_class_options(options))
-        puts "category updated: #{res.body.id}\t#{res.body.name}"
+        puts 'category updated'
+        print_response(res)
       end
     end
 
@@ -34,8 +36,15 @@ module Bl
     def delete(*ids)
       ids.each do |id|
         res = client.delete("#{@url}/#{id}")
-        puts "category deleted: #{res.body.id}\t#{res.body.name}"
+        puts 'category deleted'
+        print_response(res)
       end
     end
+
+    private
+
+    def print_response(res)
+      puts formatter.render(res.body, fields: CATEGORY_FIELDS)
+    end
   end
 end

data/lib/bl/cli.rb

@@ -2,69 +2,6 @@ module Bl
 
   class CLI < Command
 
-    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
-    }
-
-    ISSUE_BASE_ATTRIBUTES = {
-      summary: :string,
-      description: :string,
-      statusId: :numeric,
-      resolutionId: :numeric,
-      dueDate: :string,
-      issueTypeId: :numeric,
-      categoryId: :array,
-      versionId: :array,
-      milestoneId: :array,
-      priorityId: :numeric,
-      assigneeId: :numeric
-    }
-
-    ISSUE_FIELDS = %i(
-      issueKey
-      summary
-      startDate
-      dueDate
-      created
-      updated
-    )
-
-    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'}
-    ]
-
     def initialize(*)
       @config = Bl::Config.instance
       super

data/lib/bl/command.rb

@@ -4,7 +4,169 @@ module Bl
     include Bl::Formatting
     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,
+      description: :string,
+      statusId: :numeric,
+      resolutionId: :numeric,
+      dueDate: :string,
+      issueTypeId: :numeric,
+      categoryId: :array,
+      versionId: :array,
+      milestoneId: :array,
+      priorityId: :numeric,
+      assigneeId: :numeric
+    }
+    ISSUE_FIELDS = %i(
+      issueKey
+      summary
+      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
+    )
+    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_FIELDS = %i(
+      spaceKey
+      name
+      ownerId
+      lang
+      timezone
+      reportSendTime
+      textFormattingRule
+      created
+      updated
+    )
     TPUT_COLS = `tput cols`.to_i
+    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
 

data/lib/bl/file.rb

@@ -1,26 +1,32 @@
 module Bl
   class File < Command
-
     def initialize(*)
       @config = Bl::Config.instance
+      @url = "projects/#{@config[:project_key]}"
       super
     end
 
     desc 'list PATH', 'list files on PATH'
-    def list(path='')
-      res = client.get("projects/#{@config[:project_key]}/files/metadata/#{path}")
-      puts formatter.render(res.body, fields: %i(id type dir name size created updated))
+    def list(path = '')
+      res = client.get("#{@url}/files/metadata/#{path}")
+      print_response(res)
     end
 
     desc 'get [ID...]', 'get files'
     def get(*ids)
       ids.each do |id|
-        res = client.get("projects/#{@config[:project_key]}/files/#{id}")
-        f = ::File.new(res.body.filename, "w")
+        res = client.get("#{@url}/files/#{id}")
+        f = ::File.new(res.body.filename, 'w')
         f.write(res.body.content)
         f.close
         puts "file #{id} #{res.body.filename} downloaded."
       end
     end
+
+    private
+
+    def print_response(res)
+      puts formatter.render(res.body, fields: FILE_FIELDS)
+    end
   end
 end

data/lib/bl/formatting.rb

@@ -2,29 +2,6 @@ module Bl
   module Formatting
     module_function
 
-    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'
-    }
-
     def colorize_type(name, color)
       Paint[name, :white, color]
     end

data/lib/bl/gitrepo.rb

@@ -10,25 +10,19 @@ module Bl
     desc 'list', 'list git repositories'
     def list
       res = client.get(@url)
-      puts formatter.render(res.body, fields: %i(id projectId name description sshUrl))
+      print_response(res)
     end
 
     desc 'show ID', 'show a git repository'
     def show(id)
-      body = client.get("#{@url}/#{id}").body
-      puts "id: #{body.id}"
-      puts "projectId: #{body.projectId}"
-      puts "name: #{body.name}"
-      puts "description: #{body.description}"
-      puts "hookUrl: #{body.hookUrl}"
-      puts "httpUrl: #{body.httpUrl}"
-      puts "sshUrl: #{body.sshUrl}"
-      puts "displayOrder: #{body.displayOrder}"
-      puts "pushedAt: #{body.pushedAt}"
-      puts "createdUser: #{body.createdUser.name}"
-      puts "created: #{body.created}"
-      puts "updatedUser: #{body.updatedUser.name}"
-      puts "updated: #{body.updated}"
+      res = client.get("#{@url}/#{id}")
+      puts formatter.render(res.body, fields: GIT_REPO_FIELDS, vertical: true)
+    end
+
+    private
+
+    def print_response(res)
+      puts formatter.render(res.body, fields: GIT_REPO_FIELDS)
     end
   end
 end

data/lib/bl/groups.rb

@@ -17,7 +17,7 @@ module Bl
     desc 'show GROUP_ID', ''
     def show(id)
       res = client.get("#{@url}/#{id}")
-      puts formatter.render(res.body.members, fields: %i(id userId name roleType lang mailAddress))
+      puts formatter.render(res.body.members, fields: USER_FIELDS)
     end
 
     desc 'add GROUP_NAME', ''

data/lib/bl/milestone.rb

@@ -1,12 +1,6 @@
 module Bl
   class Milestone < Command
 
-    MILESTONE_PARAMS = {
-      description: :string,
-      startDate: :string,
-      releaseDueDate: :string
-    }
-
     def initialize(*)
       @config = Bl::Config.instance
       @url = "projects/#{@config[:project_key]}/versions"
@@ -18,11 +12,10 @@ module Bl
     def list
       res = client.get(@url)
       if options[:all]
-        body = res.body
       else
-        body = res.body.select { |m| m.archived == false } unless options[:all]
+        res.body.select! { |m| m.archived == false } unless options[:all]
       end
-      puts formatter.render(body, fields: %i(id projectId name description startDate releaseDueDate archived))
+      print_response(res)
     end
 
     desc 'add [NAME...]', 'add milestones'
@@ -36,7 +29,8 @@ module Bl
           startDate: options[:startDate],
           releaseDueDate: options[:releaseDueDate]
         )
-        puts "milestone added: #{res.body.id}\t#{res.body.name}"
+        puts 'milestone added'
+        print_response(res)
       end
     end
 
@@ -46,7 +40,8 @@ module Bl
     def update(*ids)
       ids.each do |id|
         res = client.patch("#{@url}/#{id}", delete_class_options(options))
-        puts "milestone updated: #{res.body.id}\t#{res.body.name}"
+        puts 'milestone updated'
+        print_response(res)
       end
     end
 
@@ -54,8 +49,15 @@ module Bl
     def delete(*ids)
       ids.each do |id|
         res = client.delete("#{@url}/#{id}")
-        puts "milestone deleted: #{res.body.id}\t#{res.body.name}"
+        puts 'milestone deleted'
+        print_response(res)
       end
     end
+
+    private
+
+    def print_response(res)
+      puts formatter.render(res.body, fields: MILESTONE_FIELDS)
+    end
   end
 end

data/lib/bl/project.rb

@@ -1,6 +1,5 @@
 module Bl
   class Project < Command
-
     def initialize(*)
       @config = Bl::Config.instance
       @url = 'projects'
@@ -10,7 +9,7 @@ module Bl
     desc 'list', 'list projects'
     def list
       res = client.get(@url)
-      puts formatter.render(res.body, fields: %i(id projectKey name))
+      puts formatter.render(res.body, fields: PROJECT_FIELDS)
     end
 
     desc 'status ID', 'show project status'
@@ -51,16 +50,8 @@ module Bl
 
     desc 'users ID', 'show project users'
     def users(id)
-      client.get("#{@url}/#{id}/users").body.each do |u|
-        puts [
-          u.id,
-          u.userId,
-          u.name,
-          u.roleType,
-          u.lang,
-          u.mailAddress
-        ].join("\t")
-      end
+      res = client.get("#{@url}/#{id}/users")
+      puts formatter.render(res.body, fields: USER_FIELDS)
     end
 
     private

data/lib/bl/space.rb

@@ -8,7 +8,8 @@ module Bl
 
     desc 'info', 'show space info'
     def info
-      puts client.get('space').body.inspect
+      res = client.get('space')
+      puts formatter.render(res.body, fields: SPACE_FIELDS)
     end
 
     desc 'activities', 'show space activities'

data/lib/bl/type.rb

@@ -1,19 +1,6 @@
 module Bl
   class Type < Command
 
-    TYPE_COLORS = %w(
-      #e30000
-      #934981
-      #814fbc
-      #007e9a
-      #ff3265
-      #666665
-      #990000
-      #2779ca
-      #7ea800
-      #ff9200
-    )
-
     def initialize(*)
       @config = Bl::Config.instance
       @url = "projects/#{@config[:project_key]}/issueTypes"
@@ -23,7 +10,7 @@ module Bl
     desc 'list', 'list issue types'
     def list
       res = client.get(@url)
-      puts formatter.render(res.body, fields: %i(id name color))
+      print_response(res)
     end
 
     desc 'add [NAME...]', 'add types'
@@ -31,7 +18,8 @@ module Bl
     def add(*names)
       names.each do |name|
         res = client.post(@url, name: name, color: options[:color])
-        puts "type added: #{res.body.id}\t#{res.body.name}\t#{res.body.color}"
+        puts 'type added'
+        print_response(res)
       end
     end
 
@@ -41,7 +29,8 @@ module Bl
     def update(*ids)
       ids.each do |id|
         res = client.patch("#{@url}/#{id}", options)
-        puts "type updated: #{res.body.id}\t#{res.body.name}\t#{res.body.color}"
+        puts 'type updated'
+        print_response(res)
       end
     end
 
@@ -50,7 +39,8 @@ module Bl
     def delete(*ids)
       ids.each do |id|
         res = client.delete("#{@url}/#{id}", options)
-        puts "type deleted: #{res.body.id}\t#{res.body.name}\t#{res.body.color}"
+        puts 'type deleted'
+        print_response
       end
     end
 
@@ -60,5 +50,11 @@ module Bl
         puts Paint[color, '#ffffff', color]
       end
     end
+
+    private
+
+    def print_response(res)
+      puts formatter.render(res.body, fields: %i(id name color))
+    end
   end
 end

data/lib/bl/users.rb

@@ -1,22 +1,6 @@
 module Bl
   class Users < Command
 
-    USER_FIELDS = %i(
-      id
-      userId
-      name
-      roleType
-      lang
-      mailAddress
-    )
-
-    USER_PARAMS = {
-      password: :string,
-      name: :string,
-      mailAddress: :string,
-      roleType: :numeric
-    }
-
     def initialize(*)
       @config = Bl::Config.instance
       @url = 'users'
@@ -26,7 +10,7 @@ module Bl
     desc 'list', 'list users'
     def list
       res = client.get('users')
-      puts formatter.render(res.body, fields: USER_FIELDS)
+      print_response(res)
     end
 
     desc 'show USER_ID', ''
@@ -38,7 +22,8 @@ module Bl
     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)
-      puts formatter.render(res.body, fields: USER_FIELDS)
+      puts 'user added'
+      print_response(res)
     end
 
     desc 'update USER_ID', ''
@@ -46,20 +31,20 @@ module Bl
     def update(id)
       res = client.patch("#{@url}/#{id}", delete_class_options(options.to_h))
       puts 'user updated:'
-      puts formatter.render(res.body, fields: USER_FIELDS)
+      print_response(res)
     end
 
     desc 'delete', ''
     def delete(id)
       res = client.delete("#{@url}/#{id}")
       puts 'user deleted'
-      puts formatter.render(res.body, fields: USER_FIELDS)
+      print_response(res)
     end
 
     desc 'myself', ''
     def myself
       res = client.get("#{@url}/myself")
-      puts formatter.render(res.body, fields: USER_FIELDS)
+      print_response(res)
     end
 
     desc 'icon ID', ''
@@ -91,5 +76,11 @@ module Bl
         p client.get("/users/#{user_id}/stars/count", options.to_h).body.count
       end
     end
+
+    private
+
+    def print_response(res)
+      formatter.render(res.body, fields: USER_FIELDS)
+    end
   end
 end

data/lib/bl/version.rb

@@ -1,3 +1,3 @@
 module Bl
-  VERSION = '0.5.3'.freeze
+  VERSION = '0.5.4'.freeze
 end

data/lib/bl/watchings.rb

@@ -1,15 +1,6 @@
 module Bl
   class Watchings < Command
 
-    WATCHINGS_PARAMS = {
-      order: :string,
-      sort: :string,
-      count: :numeric,
-      offset: :numeric,
-      resourceAlreadyRead: :boolean,
-      issueId: :array
-    }
-
     def initialize(*)
       @config = Bl::Config.instance
       @url = 'watchings'

data/lib/bl/webhooks.rb

@@ -1,14 +1,6 @@
 module Bl
   class Webhooks < Command
 
-    WEBHOOK_PARAMS = {
-      name: :string,
-      description: :string,
-      hookUrl: :string,
-      allEvent: :boolean,
-      activityTypeIds: :array
-    }
-
     def initialize(*)
       @config = Bl::Config.instance
       @url = "projects/#{@config[:project_key]}/webhooks"
@@ -18,13 +10,13 @@ module Bl
     desc 'list', ''
     def list
       res = client.get(@url)
-      puts formatter.render(res.body, fields: %i(id name description hookUrl))
+      print_response(res)
     end
 
     desc 'show WEBHOOK_ID', ''
     def show(id)
       res = client.get("#{@url}/#{id}")
-      print_webhook(res.body)
+      print_response(res)
     end
 
     desc 'add', ''
@@ -32,7 +24,7 @@ module Bl
     def add
       res = client.post(@url, options.to_h)
       puts 'webhook added'
-      print_webhook(res.body)
+      print_response(res)
     end
 
     desc 'update WEBHOOK_ID', ''
@@ -40,14 +32,20 @@ module Bl
     def update(id)
       res = client.patch("#{@url}/#{id}", options.to_h)
       puts 'webhook updated'
-      print_webhook(res.body)
+      print_response(res)
     end
 
     desc 'delete WEBHOOK_ID', ''
     def delete(id)
       res = client.delete("#{@url}/#{id}")
       puts 'webhook deleted'
-      print_webhook(res.body)
+      print_response(res)
+    end
+
+    private
+
+    def print_response(res)
+      puts formatter.render(res.body, fields: WEBHOOK_FIELDS)
     end
   end
 end

data/lib/bl/wiki.rb

@@ -10,7 +10,7 @@ module Bl
     desc 'list', 'list wikis'
     def list
       res = client.get(@url, projectIdOrKey: @config[:project_key])
-      puts formatter.render(res.body, fields: %i(id projectId name updated))
+      puts formatter.render(res.body, fields: WIKI_FIELDS)
     end
 
     desc 'show ID', "show a wiki's content"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bl
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - saki