apiaryio 0.3.4 → 0.3.5

data/lib/apiary/command/fetch.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'rest_client'
+require 'rest-client'
 require 'rack'
 require 'ostruct'
 require 'json'
@@ -21,7 +21,8 @@ module Apiary
         @options.headers      ||= {
           :accept => "text/html",
           :content_type => "text/plain",
-          :authentication => "Token #{@options.api_key}"
+          :authentication => "Token #{@options.api_key}",
+          :user_agent => "Apiary Client Gem (https://help.apiary.io/tools/apiary-cli/)"
         }
       end
 
@@ -61,8 +62,7 @@ module Apiary
           response = RestClient.get url, @options.headers
         rescue RestClient::Exception => e
           abort "Apiary service responded with an error: #{e.message}"
-        end
-
+        end      
         JSON.parse response.body
       end
 

data/lib/apiary/command/preview.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'rest_client'
+require 'rest-client'
 require 'rack'
 require 'ostruct'
 require 'json'
@@ -30,11 +30,15 @@ module Apiary
         @options = OpenStruct.new(opts)
         @options.path         ||= 'apiary.apib'
         @options.api_host     ||= 'api.apiary.io'
-        @options.headers      ||= {:accept => 'text/html', :content_type => 'text/plain'}
         @options.port         ||= 8080
         @options.proxy        ||= ENV['http_proxy']
         @options.server       ||= false
-	@options.host	      ||= '127.0.0.1'
+        @options.host         ||= '127.0.0.1'
+        @options.headers      ||= {
+          :accept => 'text/html',
+          :content_type => 'text/plain',
+          :user_agent => "Apiary Client Gem (https://help.apiary.io/tools/apiary-cli/)"
+        }
 
         validate_apib_file
       end

data/lib/apiary/command/publish.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'rest_client'
+require 'rest-client'
 require 'rack'
 require 'ostruct'
 require 'json'
@@ -22,7 +22,8 @@ module Apiary
         @options.headers        ||= {
           :accept => "text/html",
           :content_type => "text/plain",
-          :authentication => "Token #{@options.api_key}"
+          :authentication => "Token #{@options.api_key}",
+          :user_agent => "Apiary Client Gem (https://help.apiary.io/tools/apiary-cli/)"
         }
         @options.message ||= "Saving blueprint from apiary-client"
       end
@@ -77,7 +78,12 @@ module Apiary
               abort "Apiary service responded with an error: #{err['message']}"
             end
           rescue RestClient::Exception => e
-            abort "Apiary service responded with an error: #{e.message}"
+            err = JSON.parse e.response
+            if err.has_key? 'message'
+              abort "Apiary service responded with an error: #{err['message']}"
+            else
+              abort "Apiary service responded with an error: #{e.message}"
+            end
           end
         end
       end

data/lib/apiary/version.rb

@@ -1,3 +1,3 @@
 module Apiary
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apiaryio
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client