herdic 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e293ef971ac5b07472c541fa6b6348183cdaf105
-  data.tar.gz: 2f0904dcdc7ecf20317d44e41434615ad8a856fb
+  metadata.gz: 76bb219a1e205279d9c5fe7ea6387d028e6f7d61
+  data.tar.gz: 26bfb9573646e1fef72de5d946fff6d118fa3746
 SHA512:
-  metadata.gz: e7a737516853ed8aca699b0b5ccdf4a86235c67aa4c7eb7f0d5d80911bd23df7f246ae4d4c0edd52338296001f1c10363d17197d6d6a8dbe6b0f5bbd75a47aad
-  data.tar.gz: 68317f866a290521f3b8a5075aaf3712069a19ab2f9e63bd53f9f737a4b997ee505beb18ff10402fd42b132206c03de98b7c6d38dd129a5ab2495851e3d4cbe0
+  metadata.gz: 954aa0df95280a8232b542a714895a453a9d2a0919a2637692e1b0df668561ec7809bfeec58d8c85f88cbc8c0e20996a8f5c920c8ee69c7cc6516699c12af942
+  data.tar.gz: 0d969818ec0da955b19b4086d3aded6dfb691eb081bbaa868e71f060b99d83e8edd6fbaa6995fc3e015b3c880a8d058dfe860e5de2d1ac5325379bacb916e1f5

data/lib/herdic.rb

@@ -16,7 +16,8 @@ module Herdic
       :herdic_path,
       :store_path,
       :edit_request_file,
-      :config_filename
+      :config_filename,
+      :editor
 
     def initialize
       @pwd               = File.expand_path '.'
@@ -24,6 +25,7 @@ module Herdic
       @store_path        = File.join @herdic_path, 'store'
       @edit_request_file = File.join @herdic_path, 'edit_request.yaml'
       @config_filename   = 'herdic.yaml'
+      @editor            = '/usr/bin/env vim'
     end
 
   end

data/lib/herdic/client.rb

@@ -42,7 +42,7 @@ module Herdic
     def run_all
       if @options['e']
         FileUtils.cp @file, Herdic.edit_request_file
-        system "$EDITOR '%s'" % Herdic.edit_request_file
+        system "%s '%s'" % [Herdic.editor, Herdic.edit_request_file]
 
         @specs = Loader.new Herdic.edit_request_file, @file
       else
@@ -64,11 +64,27 @@ module Herdic
     private def run(spec)
       setup_spec spec
 
+      @printer.title @meta
+      @printer.request @header, @body
+
+      response = get_response
+
+      body = response.body
+
+      if 'application/json' == response.content_type
+        body = JSON.parse body
+        register response, body
+      end
+
+      @printer.response response, body
+    end
+
+    private def get_response
       uri = URI.parse @meta['endpoint']
       http = Net::HTTP.new uri.host, uri.port
       http.use_ssl = @options['use-ssl']
 
-      response = http.start do
+      http.start do
         case @meta['method']
         when 'GET', 'POST', 'PATCH', 'PUT', 'DELETE'
           http.send_request @meta['method'], uri.request_uri, @body.to_query, @header
@@ -76,15 +92,6 @@ module Herdic
           raise "Unsupported method: #{@meta['method']}"
         end
       end
-
-      body = response.body
-      body = JSON.parse body if 'application/json' == response.content_type
-
-      @printer.title @meta
-      @printer.request @header, @body
-      @printer.response response, body
-
-      register response, body
     end
 
     private def setup_spec(spec)
@@ -98,8 +105,6 @@ module Herdic
     end
 
     private def register(response, body)
-      return unless 'application/json' == response.content_type
-
       @register.each do |name, path|
         next if path.empty?
 

data/lib/herdic/printer.rb

@@ -58,7 +58,7 @@ module Herdic
 
       hr
 
-      if body.empty?
+      if !body || body.empty?
         puts Util.color('no body', :white)
       elsif 'application/json' == response.content_type
         print_json body

data/lib/herdic/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: herdic
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Yuki Iwanaga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport