bl 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeee077cf059738c1ec061b1edfafd1334d2b45b
-  data.tar.gz: c9ddb7d6fea0d12a3921a9086b4c0f49ba866b6e
+  metadata.gz: fc4154b13eadcea9ee471f9bd72e578d4050cbf5
+  data.tar.gz: ca2a158bd9ed0c124e580a7ae91d477c72216e0c
 SHA512:
-  metadata.gz: d8bdc72960808ec076c6e98690cf49ebd77b7d11fd020e30b976bff4419a3052245d68d1f59c77b6c49bf005c7f7f059525c31fe5faf606aaee2f90fe310de31
-  data.tar.gz: 4742a7482eea14dde49be3226febd11336db4feb9b58523cd418319ec251c3334913199b49c6629014cc072807d803e0d534369daa9a803c5f03dc15347a9069
+  metadata.gz: 36f3757ac201bb78263826ec67f00511e7c63762d64b193f5e8c5487f3c24470d22963778f7fa0e35bac526bd8c4878e737820b413bed73537a9b88d1ab04f01
+  data.tar.gz: 597304f8282502130a6a3dc6daedf8c9eb7d9387063cf5f260f5ac4221a5acd88691f46daf6de3bc199da6cd214ad5889e9e958bf3ddcd17ad0e0316005ccb06

data/bl.gemspec

@@ -24,6 +24,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor', '~> 0.19.4'
   spec.add_dependency 'backlog_kit', '~> 0.15.0'
   spec.add_dependency 'paint', '~> 2.0'
+  spec.add_dependency 'hirb', '~> 0.7.3'
+  spec.add_dependency 'hirb-unicode', '~> 0.0.5'
+
   spec.add_development_dependency 'bundler', '~> 1.14.6'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'minitest', '~> 5.10'

data/lib/bl.rb

@@ -7,6 +7,7 @@ require 'bl/version'
 require 'bl/config'
 require 'bl/requestable'
 require 'bl/formatting'
+require 'bl/command'
 require 'bl/space'
 require 'bl/type'
 require 'bl/category'
@@ -21,6 +22,7 @@ require 'bl/groups'
 require 'bl/webhooks'
 require 'bl/notifications'
 require 'bl/watchings'
+require 'bl/formatter'
 require 'bl/cli'
 
 Bl::CLI.start(ARGV)

data/lib/bl/category.rb

@@ -1,6 +1,5 @@
 module Bl
-  class Category < Thor
-    include Bl::Requestable
+  class Category < Command
 
     def initialize(*)
       @config = Bl::Config.instance
@@ -10,9 +9,8 @@ module Bl
 
     desc 'list', 'list categories'
     def list
-      client.get(@url).body.each do |c|
-        puts [c.id, c.name].join("\t")
-      end
+      res = client.get(@url)
+      puts formatter.render(res.body, fields: %i(id name))
     end
 
     desc 'add [NAME...]', 'add categories'

data/lib/bl/cli.rb

@@ -1,8 +1,6 @@
 module Bl
 
-  class CLI < Thor
-    include Bl::Requestable
-    include Bl::Formatting
+  class CLI < Command
 
     ISSUES_PARAMS = {
       projectId: :array,
@@ -111,7 +109,7 @@ module Bl
     desc 'search', 'search issues'
     options ISSUES_PARAMS
     def search
-      client.get('issues', options.to_h).body.map {|i| print_issue(i)}
+      client.get('issues', delete_format(options.to_h)).body.map {|i| print_issue(i)}
     end
 
     desc 'show KEY', "show an issue's details"
@@ -159,7 +157,7 @@ module Bl
         issue_default_options = @config[:issue][:default]
         res = client.post(
           'issues',
-          issue_default_options.merge({summary: s}).merge(options)
+          issue_default_options.merge({summary: s}).merge(delete_format(options.to_h))
         )
         puts "issue added: #{res.body.issueKey}\t#{res.body.summary}"
       end
@@ -170,7 +168,7 @@ module Bl
     option :comment, type: :string
     def update(*keys)
       keys.each do |k|
-        res = client.patch("issues/#{k}", options.to_h)
+        res = client.patch("issues/#{k}", delete_format(options.to_h))
         puts "issue updated: #{res.body.issueKey}\t#{res.body.summary}"
       end
     end
@@ -203,23 +201,20 @@ module Bl
 
     desc 'statuses', 'list statuses'
     def statuses
-      client.get('statuses').body.each do |s|
-        puts [s.id, colorize_status(s.id, s.name)].join("\t")
-      end
+      res = client.get('statuses')
+      puts formatter.render(res.body, fields: %i(id name))
     end
 
     desc 'priorities', 'list priorities'
     def priorities
-      client.get('priorities').body.each do |p|
-        puts [p.id, colorize_priority(p.id, p.name)].join("\t")
-      end
+      res = client.get('priorities')
+      puts formatter.render(res.body, fields: %i(id name))
     end
 
     desc 'resolutions', 'list resolutions'
     def resolutions
-      client.get('resolutions').body.each do |r|
-        puts [r.id, r.name].join("\t")
-      end
+      res = client.get('resolutions')
+      puts formatter.render(res.body, fields: %i(id name))
     end
 
     desc 'doctor', 'check issues'
@@ -283,5 +278,12 @@ module Bl
 
     desc 'watchings SUBCOMMAND ...ARGS', ''
     subcommand 'watchings', Watchings
+
+    private
+
+    def delete_format(h)
+      h.delete('format')
+      h
+    end
   end
 end

data/lib/bl/command.rb

@@ -0,0 +1,7 @@
+module Bl
+  class Command < Thor
+    include Bl::Requestable
+    include Bl::Formatting
+    class_option :format, type: :string, default: 'table', desc: 'set output format'
+  end
+end

data/lib/bl/file.rb

@@ -1,6 +1,5 @@
 module Bl
-  class File < Thor
-    include Bl::Requestable
+  class File < Command
 
     def initialize(*)
       @config = Bl::Config.instance
@@ -9,9 +8,8 @@ module Bl
 
     desc 'list PATH', 'list files on PATH'
     def list(path='')
-      client.get("projects/#{@config[:project_key]}/files/metadata/#{path}").body.each do |f|
-        puts [f.id, f.type, f.dir, f.name, f.size, f.created, f.updated].join("\t")
-      end
+      res = client.get("projects/#{@config[:project_key]}/files/metadata/#{path}")
+      puts formatter.render(res.body, fields: %i(id type dir name size created updated))
     end
 
     desc 'get [ID...]', 'get files'

data/lib/bl/formatter.rb

@@ -0,0 +1,39 @@
+require 'hirb'
+require 'hirb-unicode'
+require 'json'
+
+module Bl
+  class Formatter
+    def initialize(format: 'table')
+      @format = case format
+      when 'table'
+        Format::Hirb
+      when 'json'
+        Format::Json
+      else
+        abort 'format must be set to \'table\' or \'json\''
+      end
+    end
+
+    def render(*args)
+      @format.render(*args)
+    end
+
+    module Format
+      class Hirb < Hirb::Helpers::AutoTable
+      end
+
+      class Json
+        def self.render(objects, fields: [])
+          result = []
+          objects.each do |obj|
+            h = {}
+            fields.map { |f| h.store(f, obj.send(f)) }
+            result << h
+          end
+          result.to_json
+        end
+      end
+    end
+  end
+end

data/lib/bl/gitrepo.rb

@@ -1,6 +1,5 @@
 module Bl
-  class GitRepo < Thor
-    include Bl::Requestable
+  class GitRepo < Command
 
     def initialize(*)
       @config = Bl::Config.instance
@@ -10,15 +9,8 @@ module Bl
 
     desc 'list', 'list git repositories'
     def list
-      client.get(@url).body.each do |repo|
-        puts [
-          repo.id,
-          repo.projectId,
-          repo.name,
-          repo.description,
-          repo.sshUrl
-        ].join("\t")
-      end
+      res = client.get(@url)
+      puts formatter.render(res.body, fields: %i(id projectId name description sshUrl))
     end
 
     desc 'show ID', 'show a git repository'

data/lib/bl/groups.rb

@@ -1,7 +1,5 @@
 module Bl
-  class Groups < Thor
-    include Bl::Requestable
-    include Bl::Formatting
+  class Groups < Command
 
     def initialize(*)
       @config = Bl::Config.instance
@@ -13,13 +11,13 @@ module Bl
     options order: :string, offset: :numeric, count: :numeric
     def list
       res = client.get(@url, options.to_h)
-      res.body.map { |g| print_group(g) }
+      puts formatter.render(res.body, fields: %i(id name))
     end
 
     desc 'show GROUP_ID', ''
     def show(id)
       res = client.get("#{@url}/#{id}")
-      print_group_and_members(res.body)
+      puts formatter.render(res.body.members, fields: %i(id userId name roleType lang mailAddress))
     end
 
     desc 'add GROUP_NAME', ''

data/lib/bl/milestone.rb

@@ -1,6 +1,11 @@
 module Bl
-  class Milestone < Thor
-    include Bl::Requestable
+  class Milestone < Command
+
+    MILESTONE_PARAMS = {
+      description: :string,
+      startDate: :string,
+      releaseDueDate: :string
+    }
 
     def initialize(*)
       @config = Bl::Config.instance
@@ -10,23 +15,12 @@ module Bl
 
     desc 'list', 'list milestones'
     def list
-      client.get(@url).body.each do |v|
-        puts [
-          v.id,
-          v.projectId,
-          v.name,
-          v.description,
-          v.startDate,
-          v.releaseDueDate,
-          v.archived
-        ].join("\t")
-      end
+      res = client.get(@url)
+      puts formatter.render(res.body, fields: %i(id projectId name description startDate releaseDueDate archived))
     end
 
     desc 'add [NAME...]', 'add milestones'
-    option :description, type: :string
-    option :startDate, type: :string
-    option :releaseDate, type: :string
+    options MILESTONE_PARAMS
     def add(*names)
       names.each do |name|
         res = client.post(
@@ -34,7 +28,7 @@ module Bl
           name: name,
           description: options[:description],
           startDate: options[:startDate],
-          releaseDate: options[:releaseDate]
+          releaseDueDate: options[:releaseDueDate]
         )
         puts "milestone added: #{res.body.id}\t#{res.body.name}"
       end
@@ -42,9 +36,7 @@ module Bl
 
     desc 'update [ID...]', 'update milestones'
     option :name, type: :string
-    option :description, type: :string
-    option :startDate, type: :string
-    option :releaseDate, type: :string
+    options MILESTONE_PARAMS
     def update(*ids)
       ids.each do |id|
         res = client.patch("#{@url}/#{id}", options)

data/lib/bl/notifications.rb

@@ -1,6 +1,5 @@
 module Bl
-  class Notifications < Thor
-    include Bl::Requestable
+  class Notifications < Command
 
     def initialize(*)
       @config = Bl::Config.instance

data/lib/bl/project.rb

@@ -1,6 +1,5 @@
 module Bl
-  class Project < Thor
-    include Bl::Requestable
+  class Project < Command
 
     def initialize(*)
       @config = Bl::Config.instance
@@ -10,9 +9,8 @@ module Bl
 
     desc 'list', 'list projects'
     def list
-      client.get(@url).body.each do |p|
-        puts [p.id, p.projectKey, p.name].join("\t")
-      end
+      res = client.get(@url)
+      puts formatter.render(res.body, fields: %i(id projectKey name))
     end
 
     desc 'status ID', 'show project status'

data/lib/bl/recent.rb

@@ -1,6 +1,5 @@
 module Bl
-  class Recent < Thor
-    include Bl::Requestable
+  class Recent < Command
 
     def initialize(*)
       @config = Bl::Config.instance

data/lib/bl/requestable.rb

@@ -8,5 +8,9 @@ module Bl
         api_key: @config[:api_key]
       )
     end
+
+    def formatter
+      @formatter ||= Formatter.new(format: options[:format])
+    end
   end
 end

data/lib/bl/space.rb

@@ -1,7 +1,5 @@
 module Bl
-  class Space < Thor
-    include Bl::Requestable
-    include Bl::Formatting
+  class Space < Command
 
     def initialize(*)
       @config = Bl::Config.instance

data/lib/bl/type.rb

@@ -1,7 +1,5 @@
 module Bl
-  class Type < Thor
-    include Bl::Requestable
-    include Bl::Formatting
+  class Type < Command
 
     def initialize(*)
       @config = Bl::Config.instance
@@ -11,9 +9,8 @@ module Bl
 
     desc 'list', 'list issue types'
     def list
-      client.get(@url).body.each do |t|
-        puts [t.id, colorize_type(t.name, t.color), t.color].join("\t")
-      end
+      res = client.get(@url)
+      puts formatter.render(res.body, fields: %i(id name color))
     end
 
     desc 'add [NAME...]', 'add types'

data/lib/bl/users.rb

@@ -1,7 +1,5 @@
 module Bl
-  class Users < Thor
-    include Bl::Requestable
-    include Bl::Formatting
+  class Users < Command
 
     def initialize(*)
       @config = Bl::Config.instance
@@ -11,7 +9,8 @@ module Bl
 
     desc 'list', 'list users'
     def list
-      client.get('users').body.map { |u| print_user(u) }
+      res = client.get('users')
+      puts formatter.render(res.body, fields: %i(id userId name roleType lang mailAddress))
     end
 
     desc 'show USER_ID', ''

data/lib/bl/version.rb

@@ -1,3 +1,3 @@
 module Bl
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/lib/bl/watchings.rb

@@ -1,7 +1,5 @@
 module Bl
-  class Watchings < Thor
-    include Bl::Requestable
-    include Bl::Formatting
+  class Watchings < Command
 
     WATCHINGS_PARAMS = {
       order: :string,
@@ -21,7 +19,7 @@ module Bl
     desc 'list USER_ID', ''
     options WATCHINGS_PARAMS
     def list(id)
-      res = client.get("/users/#{id}/#{@url}", options.to_h)
+      res = client.get("/users/#{id}/#{@url}", delete_format(options.to_h))
       res.body.map { |t| print_watch_target(t) }
     end
 
@@ -73,5 +71,12 @@ module Bl
       res = client.post("/users/#{id}/watchings/markAsChecked")
       puts 'watch mark as checked'
     end
+
+    private
+
+    def delete_format(h)
+      h.delete('format')
+      h
+    end
   end
 end

data/lib/bl/webhooks.rb

@@ -1,7 +1,5 @@
 module Bl
-  class Webhooks < Thor
-    include Bl::Requestable
-    include Bl::Formatting
+  class Webhooks < Command
 
     WEBHOOK_PARAMS = {
       name: :string,
@@ -20,7 +18,7 @@ module Bl
     desc 'list', ''
     def list
       res = client.get(@url)
-      res.body.map { |w| print_webhook(w) }
+      puts formatter.render(res.body, fields: %i(id name description hookUrl))
     end
 
     desc 'show WEBHOOK_ID', ''

data/lib/bl/wiki.rb

@@ -1,6 +1,5 @@
 module Bl
-  class Wiki < Thor
-    include Bl::Requestable
+  class Wiki < Command
 
     def initialize(*)
       @config = Bl::Config.instance
@@ -10,9 +9,8 @@ module Bl
 
     desc 'list', 'list wikis'
     def list
-      client.get(@url, projectIdOrKey: @config[:project_key]).body.each do |w|
-        puts [w.id, w.projectId, w.name, w.updated].join("\t")
-      end
+      res = client.get(@url, projectIdOrKey: @config[:project_key])
+      puts formatter.render(res.body, fields: %i(id projectId name updated))
     end
 
     desc 'show ID', "show a wiki's content"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bl
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - saki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-08 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: hirb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.3
+- !ruby/object:Gem::Dependency
+  name: hirb-unicode
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -143,8 +171,10 @@ files:
 - lib/bl.rb
 - lib/bl/category.rb
 - lib/bl/cli.rb
+- lib/bl/command.rb
 - lib/bl/config.rb
 - lib/bl/file.rb
+- lib/bl/formatter.rb
 - lib/bl/formatting.rb
 - lib/bl/gitrepo.rb
 - lib/bl/groups.rb