sah 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4ce5e276d4ed9cf5530715653dcd53ebfb3d85a
-  data.tar.gz: cbde0a3c90358917d784c1c21809c8c8f8d7290b
+  metadata.gz: 393a7e6d9875efdaee240fb172dc5dc599093bb2
+  data.tar.gz: 26d09b3e0890833aea94d1663e4c7e5c67e14767
 SHA512:
-  metadata.gz: 6f8a902d17c4f785a5edc0b8c73f962d325efbe2e6c303bf2796d8111b24f0925f86b8f84954e6a8c5cfc9f16b071e0569d5a3a205e374706d79bd09587b6e86
-  data.tar.gz: b1c0c66496e0232d7d4d0fda0ecf910a523df626020f76fbfc29e01d72d1e5d93cb4baf191bf8ffa3c00b3196cd495ea767f3bd948ebd2db92b9b1ba285352f7
+  metadata.gz: d9fbc09cb692d722a82a067a2fb2376e0e3b1aae0e0e2478314326dcfe8417e6c79a694128ebc3fc94e05e3f1de7931b1ec2d5f33c76759310575e75e62c872a
+  data.tar.gz: 4ecaa80f5c5bbc32ab86c5cf3ac5105ebd6ac5221c63ebfeb8a0f6e8659a2808f9b722fd3c44fd5964b4cdf591e4ee4fec7c71db32b5a6ccd36d9d6dcf61a8e6

data/README.md

@@ -10,6 +10,9 @@ This project was heavily inspired by the [hub](https://hub.github.com/).
 
 ## Configuration
 
+
+### profile
+
     git config [--global] sah.profile.default.user "f440"
     git config [--global] sah.profile.default.password "freq440@gmail.com"
     git config [--global] sah.profile.default.url "https://exmaple.com"
@@ -25,6 +28,16 @@ If you use multiple Bitbucket Server, define profile(s) and specify it.
     export SAH_DEFAULT_PROFILE=my_company
     sah SUB_COMMAND
 
+### format
+
+The formatting output can use either table(default) or json.
+
+    sah SUB_COMMAND --format json
+    or
+    export SAH_DEFAULT_FORMAT=json
+    sah SUB_COMMAND
+
+
 ## Usage
 
 ### browse

data/lib/sah/cli.rb

@@ -2,8 +2,6 @@ require "sah"
 require "open3"
 require "tempfile"
 require "thor"
-require "hirb"
-require "hirb-unicode"
 require "launchy"
 
 module Sah
@@ -14,6 +12,9 @@ module Sah
     class_option :verbose,
       type: :boolean, default: false,
       desc: "Turn on/off verbose mode"
+    class_option :format,
+      type: :string, default: (ENV["SAH_DEFAULT_FORMAT"] || "table"),
+      desc: "Set output format"
 
     desc "browse [REPO]", "Browse repository"
     long_desc <<-LONG_DESCRIPTION
@@ -203,14 +204,14 @@ module Sah
           abort res.body["errors"].first["message"]
         end
         project = res.body
-        puts Hirb::Helpers::AutoTable.render(project, headers: false)
+        puts formatter.render(project, headers: false)
       else
         res = api.list_project
         if res.body.key? "errors"
           abort res.body["errors"].first["message"]
         end
         projects = res.body["values"].sort_by{|e| e["id"].to_i }
-        puts Hirb::Helpers::AutoTable.render(projects, fields: %w(id key name description))
+        puts formatter.render(projects, fields: %w(id key name description))
       end
     end
 
@@ -310,14 +311,14 @@ module Sah
           abort res.body["errors"].first["message"]
         end
         repository = res.body
-        puts Hirb::Helpers::AutoTable.render(repository, headers: false)
+        puts formatter.render(repository, headers: false)
       else
         res = api.list_repository(project_key)
         if res.body.key? "errors"
           abort res.body["errors"].first["message"]
         end
         repositories = (res.body["values"] || []).sort_by{|e| e["id"].to_i }
-        puts Hirb::Helpers::AutoTable.render(repositories, fields: %w(id slug name))
+        puts formatter.render(repositories, fields: %w(id slug name))
       end
     end
 
@@ -369,14 +370,14 @@ module Sah
           abort res.body["errors"].first["message"]
         end
         user = res.body
-        puts Hirb::Helpers::AutoTable.render(user, headers: false)
+        puts formatter.render(user, headers: false)
       else
         res = api.list_user
         if res.body.key? "errors"
           abort res.body["errors"].first["message"]
         end
         users = (res.body["values"] || []).sort_by{|e| e["id"].to_i }
-        puts Hirb::Helpers::AutoTable.render(users, fields: %w(id slug name displayName))
+        puts formatter.render(users, fields: %w(id slug name displayName))
       end
     end
 
@@ -388,13 +389,19 @@ module Sah
     private
 
     def config
-      @config ||= Config.new(options[:profile], verbose: options[:verbose])
+      @config ||= Config.new(options[:profile],
+                             verbose: options[:verbose],
+                             format: options[:format])
     end
 
     def api
       @api ||= API.new(config)
     end
 
+    def formatter
+      @formatter ||= Formatter.new(format: options[:format])
+    end
+
     def open_editor
       tmp = Tempfile.new('sah')
       editor = ENV['GIT_EDITOR'] || ENV['EDITOR'] || 'vi'

data/lib/sah/config.rb

@@ -5,14 +5,15 @@ module Sah
     attr_accessor :user, :password, :url,
       :upstream_fetch_pull_request, :upstream_prevent_push,
       :upstream_remote_name,
-      :protocol, :verbose
+      :protocol, :format, :verbose
 
-    def initialize(profile, verbose: false)
+    def initialize(profile, verbose: false, format: :table)
       @user, @password, @url = nil, nil, nil
       @upstream_fetch_pull_request = false
       @upstream_prevent_push = false
       @upstream_remote_name = "upstream"
       @protocol = "ssh"
+      @format = format
       @verbose = verbose
 
       profile_prefix = "sah\.profile\.#{profile}"
@@ -43,6 +44,9 @@ module Sah
       unless ["ssh", "http"].include? @protocol
         abort "protocol must be set to ssh or http: #{@protocol}"
       end
+      unless ["json", "table"].include? @format
+        abort "format must be set to json or table: #{@format}"
+      end
     end
   end
 end

data/lib/sah/formatter.rb

@@ -0,0 +1,38 @@
+require "hirb"
+require "hirb-unicode"
+
+module Sah
+  class Formatter
+    def initialize(format: "table")
+      @format = case format
+                when "table"
+                  Format::Hirb
+                when "json"
+                  Format::Json
+                else
+                  abort "format must be set to json or table: #{format}"
+                end
+    end
+
+    def render(*args)
+      @format.render(*args)
+    end
+
+    module Format
+      class Hirb < Hirb::Helpers::AutoTable
+      end
+
+      class Json
+        def self.render(objects, fields: [], headers: :_)
+          if fields.empty?
+            objects.to_json
+          else
+            objects.map do |object|
+              object.select{ |k, v| fields.nil? || fields.include?(k) }
+            end.to_json
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sah/version.rb

@@ -1,3 +1,3 @@
 module Sah
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/lib/sah.rb

@@ -2,5 +2,6 @@ require "sah/version"
 require "sah/api"
 require "sah/cli"
 require "sah/config"
+require "sah/formatter"
 
 module Sah; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sah
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - f440
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -185,6 +185,7 @@ files:
 - lib/sah/api.rb
 - lib/sah/cli.rb
 - lib/sah/config.rb
+- lib/sah/formatter.rb
 - lib/sah/version.rb
 - misc/zsh-completion/_sah
 - sah.gemspec
@@ -208,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Command line util for Atlassian Bitbucket Server