herdic 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db085b78a8df105d3eb982a5b834d7304c1a8260
-  data.tar.gz: 5c30a1b5ec2a9f5eaa5d40f011fd84276942392a
+  metadata.gz: ef268be629514bf377f23553f43f248b81b4be1d
+  data.tar.gz: 5650ca841a9f2755592bd60175970edf92bd7ace
 SHA512:
-  metadata.gz: 2ddd65a6cbc49daa112c8cb94afd8be6b94aefd1d6b3788f3e8ea4615a9eea5f409f9a094751a5e964e52a8758410e9f077050332bf14f41099639e44f913f32
-  data.tar.gz: 5d2cfe473cbef993e072f529a14bd00cfcf39569a7bf3e4f2de55bea794adb219ad5095806c56cdd9a1c01f6ea6f4a02d33a2b113f7b542e82c4b19fbc4fdc38
+  metadata.gz: f43967abd1f488067ab213c43401b1e5bd2e66fd85f53c87965c6359e19133632780a52588f71af2fb37c945b2a8efc767ec4334e2ad3660afcdf04f1cb90ed8
+  data.tar.gz: fe1f500659727cb2fb901720673c467eb8dc82aa3c956af6212315e4d4f2ee3b5c3d8396f5a8ba500ef42175cc6cb1abb7ac7018a76bc8b9dede286d09cd1329

data/herdic.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport', '~> 4.1', '>= 3.2'
-  spec.add_dependency 'awesome_print', '~> 1.2'
+  spec.add_dependency "pygments.rb"
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 10.3'

data/lib/herdic.rb

@@ -1,9 +1,9 @@
-require 'herdic/version'
-require 'herdic/util'
-require 'herdic/store'
-require 'herdic/loader'
-require 'herdic/printer'
-require 'herdic/client'
+require_relative 'herdic/version'
+require_relative 'herdic/util'
+require_relative 'herdic/store'
+require_relative 'herdic/loader'
+require_relative 'herdic/printer'
+require_relative 'herdic/client'
 
 require 'fileutils'
 
@@ -23,7 +23,7 @@ module Herdic
       @herdic_path       = File.expand_path '~/.herdic'
       @store_path        = File.join @herdic_path, 'store'
       @edit_request_file = File.join @herdic_path, 'edit_request.yml'
-      @config_filename   = 'api_config.yml'
+      @config_filename   = 'herdic.yml'
     end
 
   end

data/lib/herdic/client.rb

@@ -78,15 +78,8 @@ module Herdic
 
       response = http.start do
         case @meta['method']
-        when 'GET'
-          uri.query = @body.to_query
-          http.get uri.request_uri, @header
-        when 'POST'
-          http.post uri.request_uri, @body.to_query, @header
-        when 'PATCH'
-          http.patch uri.request_uri, @body.to_query, @header
-        when 'DELETE'
-          http.delete uri.request_uri, @header
+        when 'GET', 'POST', 'PATCH', 'PUT', 'DELETE'
+          http.send_request @meta['method'], uri.request_uri, @body.to_query, @header
         else
           raise "Unsupported method: #{@meta['method']}"
         end
@@ -105,7 +98,7 @@ module Herdic
     private def setup_spec(spec)
       @meta     = spec.slice 'title', 'method', 'endpoint'
       @register = spec['register'] || {}
-      @header  = spec['header'] || {}
+      @header   = spec['header'] || {}
       @body     = spec['body'] || {}
 
       @meta['method'].upcase!

data/lib/herdic/color.rb

@@ -0,0 +1 @@
+class Her

data/lib/herdic/printer.rb

@@ -1,4 +1,5 @@
-require 'ap'
+require 'json'
+require 'pygments'
 
 
 module Herdic
@@ -16,11 +17,11 @@ module Herdic
       puts "\n\n"
       hr rule: '=', color: :green
 
-      puts [meta['method'].green, meta['endpoint']].join('  ')
+      puts [Util.color(meta['method'], :green), meta['endpoint']].join('  ')
 
       if meta['title']
         indent = ' ' * meta['method'].size
-        puts [indent, meta['title'].white].join('  ')
+        puts [indent, Util.color(meta['title'], :white)].join('  ')
       end
 
       hr rule: '=', color: :green
@@ -28,22 +29,22 @@ module Herdic
 
     def subtitle(text)
       puts
-      puts "==> #{text}".blue
-      puts
+      puts Util.color(text, :green)
+      hr color: :green
     end
 
     def request(header, body)
       subtitle 'Request'
 
       if header.empty?
-        puts 'no header'.white
+        puts Util.color('no header', :white)
       else
         print_header header
       end
 
       hr
 
-      ap body
+      print_json body
     end
 
     def response(response, body)
@@ -54,25 +55,36 @@ module Herdic
       hr
 
       if body.empty?
-        puts 'no body'.white
+        puts Util.color('no body', :white)
       elsif 'application/json' == response.content_type
-        ap body
-      elsif @options['html']
-        puts body
+        print_json body
       else
-        puts 'N/A'.white
+        puts body
       end
     end
 
     private def print_header(header)
       max_cols = header.keys.map(&:size).max
       header.each do |k, v|
-        puts [("%#{max_cols}s" % k).white, v].join ' '
+        puts [Util.color("%#{max_cols}s" % k, :white), v].join ' '
       end
     end
 
+    private def print_json(json)
+      if json.empty?
+        puts '{}'
+        return
+      end
+
+      puts Pygments.highlight(JSON.pretty_generate(json), {
+        formatter: 'terminal',
+        lexer:     'json',
+        options:   { encoding: 'utf-8' },
+      })
+    end
+
     private def hr(rule: '-', color: :black)
-      puts (rule * terminal_cols).send(color)
+      puts Util.color(rule * terminal_cols, color)
     end
 
     private def terminal_cols

data/lib/herdic/util.rb

@@ -1,24 +1,45 @@
+require 'cgi'
+
+
 module Herdic
   module Util
+    class << self
+
+      def find_files_upward(filename, base, count = 0)
+        found = []
+        found_count = 0
+
+        while count == 0 || found_count <= count
+          file = File.join base, filename
 
-    def self.find_files_upward(filename, base, count = 0)
-      found = []
+          if File.exists? file
+            found << file
+            found_count += 1
+          end
 
-      while count >= 1 || count < 0
-        file = File.join base, filename
+          break if '.' == base || '/' == base
 
-        if File.exists? file
-          found << file
-          count -= 1
+          base = File.dirname base
         end
 
-        break if '.' == base
+        found
+      end
+
+      COLORS = {
+        black:   0,
+        red:     1,
+        green:   2,
+        yellow:  3,
+        blue:    4,
+        magenta: 5,
+        cyan:    6,
+        white:   7,
+      }
 
-        base = File.dirname base
+      def color(str, c)
+        "\e[1;#{30+COLORS[c]}m#{str}\e[0m"
       end
 
-      found
     end
-
   end
 end

data/lib/herdic/version.rb

@@ -2,7 +2,7 @@ module Herdic
 
   MAJOR    = 1
   MINOR    = 0
-  REVISION = 0
+  REVISION = 1
 
   VERSION = [MAJOR, MINOR, REVISION].compact.join '.'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: herdic
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Yuki Iwanaga
@@ -31,19 +31,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: pygments.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +91,7 @@ files:
 - herdic.gemspec
 - lib/herdic.rb
 - lib/herdic/client.rb
+- lib/herdic/color.rb
 - lib/herdic/loader.rb
 - lib/herdic/printer.rb
 - lib/herdic/store.rb