apiaryio 0.0.9 → 0.1.0

data/doc/Apiary/Command/Runner.html

@@ -191,7 +191,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan 25 12:41:41 2014 by
+  Generated on Thu Apr 17 13:30:52 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/Apiary/Command/Version.html

@@ -191,7 +191,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan 25 12:41:41 2014 by
+  Generated on Thu Apr 17 13:30:52 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/_index.html

@@ -205,7 +205,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan 25 12:41:41 2014 by
+  Generated on Thu Apr 17 13:30:51 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/file.README.html

@@ -89,12 +89,13 @@ Currently available apiary commands are:
 
   preview                                     Show API documentation in default browser
   preview --browser [chrome|safari|firefox]   Show API documentation in specified browser
+  preview --output [FILE]                     Write generated HTML into specified file
   preview --path [PATH]                       Specify path to blueprint file
   preview --api_host [HOST]                   Specify apiary host
   preview --server                            Start standalone web server on port 8080
   preview --server --port [PORT]              Start standalone web server on specified port
-  publish --api-name [API_NAME]               Publish apiary.apib on docs.API_NAME.apiary.io"
-  fetch --api-name [API_NAME]                 Fetch apiary.apib from API_NAME.apiary.io"
+  publish --api-name [API_NAME]               Publish apiary.apib on docs.API_NAME.apiary.io
+  fetch --api-name [API_NAME]                 Fetch apiary.apib from API_NAME.apiary.io
 
   help                                        Show help
 
@@ -125,7 +126,7 @@ Currently available apiary commands are:
 </div></div>
 
     <div id="footer">
-  Generated on Sat Jan 25 12:41:41 2014 by
+  Generated on Thu Apr 17 13:30:51 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/index.html

@@ -89,12 +89,13 @@ Currently available apiary commands are:
 
   preview                                     Show API documentation in default browser
   preview --browser [chrome|safari|firefox]   Show API documentation in specified browser
+  preview --output [FILE]                     Write generated HTML into specified file
   preview --path [PATH]                       Specify path to blueprint file
   preview --api_host [HOST]                   Specify apiary host
   preview --server                            Start standalone web server on port 8080
   preview --server --port [PORT]              Start standalone web server on specified port
-  publish --api-name [API_NAME]               Publish apiary.apib on docs.API_NAME.apiary.io"
-  fetch --api-name [API_NAME]                 Fetch apiary.apib from API_NAME.apiary.io"
+  publish --api-name [API_NAME]               Publish apiary.apib on docs.API_NAME.apiary.io
+  fetch --api-name [API_NAME]                 Fetch apiary.apib from API_NAME.apiary.io
 
   help                                        Show help
 
@@ -125,7 +126,7 @@ Currently available apiary commands are:
 </div></div>
 
     <div id="footer">
-  Generated on Sat Jan 25 12:41:41 2014 by
+  Generated on Thu Apr 17 13:30:51 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/method_list.html

@@ -72,14 +72,14 @@
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="Apiary/Command/Fetch.html#execute-class_method" title="Apiary::Command::Fetch.execute (method)">execute</a></span>
-    <small>Apiary::Command::Fetch</small>
+    <span class='object_link'><a href="Apiary/Command/Help.html#execute-class_method" title="Apiary::Command::Help.execute (method)">execute</a></span>
+    <small>Apiary::Command::Help</small>
   </li>
   
 
   <li class="r2 ">
-    <span class='object_link'><a href="Apiary/Command/Preview.html#execute-class_method" title="Apiary::Command::Preview.execute (method)">execute</a></span>
-    <small>Apiary::Command::Preview</small>
+    <span class='object_link'><a href="Apiary/Command/Publish.html#execute-class_method" title="Apiary::Command::Publish.execute (method)">execute</a></span>
+    <small>Apiary::Command::Publish</small>
   </li>
   
 
@@ -90,14 +90,14 @@
   
 
   <li class="r2 ">
-    <span class='object_link'><a href="Apiary/Command/Help.html#execute-class_method" title="Apiary::Command::Help.execute (method)">execute</a></span>
-    <small>Apiary::Command::Help</small>
+    <span class='object_link'><a href="Apiary/Command/Preview.html#execute-class_method" title="Apiary::Command::Preview.execute (method)">execute</a></span>
+    <small>Apiary::Command::Preview</small>
   </li>
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="Apiary/Command/Publish.html#execute-class_method" title="Apiary::Command::Publish.execute (method)">execute</a></span>
-    <small>Apiary::Command::Publish</small>
+    <span class='object_link'><a href="Apiary/Command/Fetch.html#execute-class_method" title="Apiary::Command::Fetch.execute (method)">execute</a></span>
+    <small>Apiary::Command::Fetch</small>
   </li>
   
 
@@ -114,14 +114,14 @@
   
 
   <li class="r2 ">
-    <span class='object_link'><a href="Apiary/Command/Fetch.html#initialize-instance_method" title="Apiary::Command::Fetch#initialize (method)">#initialize</a></span>
-    <small>Apiary::Command::Fetch</small>
+    <span class='object_link'><a href="Apiary/Command/Publish.html#initialize-instance_method" title="Apiary::Command::Publish#initialize (method)">#initialize</a></span>
+    <small>Apiary::Command::Publish</small>
   </li>
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="Apiary/Command/Publish.html#initialize-instance_method" title="Apiary::Command::Publish#initialize (method)">#initialize</a></span>
-    <small>Apiary::Command::Publish</small>
+    <span class='object_link'><a href="Apiary/CLI.html#initialize-instance_method" title="Apiary::CLI#initialize (method)">#initialize</a></span>
+    <small>Apiary::CLI</small>
   </li>
   
 
@@ -132,8 +132,8 @@
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="Apiary/CLI.html#initialize-instance_method" title="Apiary::CLI#initialize (method)">#initialize</a></span>
-    <small>Apiary::CLI</small>
+    <span class='object_link'><a href="Apiary/Command/Fetch.html#initialize-instance_method" title="Apiary::Command::Fetch#initialize (method)">#initialize</a></span>
+    <small>Apiary::Command::Fetch</small>
   </li>
   
 
@@ -144,20 +144,20 @@
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="Apiary/Command/Fetch.html#options-instance_method" title="Apiary::Command::Fetch#options (method)">#options</a></span>
-    <small>Apiary::Command::Fetch</small>
+    <span class='object_link'><a href="Apiary/Command/Preview.html#options-instance_method" title="Apiary::Command::Preview#options (method)">#options</a></span>
+    <small>Apiary::Command::Preview</small>
   </li>
   
 
   <li class="r2 ">
-    <span class='object_link'><a href="Apiary/Command/Preview.html#options-instance_method" title="Apiary::Command::Preview#options (method)">#options</a></span>
-    <small>Apiary::Command::Preview</small>
+    <span class='object_link'><a href="Apiary/Command/Publish.html#options-instance_method" title="Apiary::Command::Publish#options (method)">#options</a></span>
+    <small>Apiary::Command::Publish</small>
   </li>
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="Apiary/Command/Publish.html#options-instance_method" title="Apiary::Command::Publish#options (method)">#options</a></span>
-    <small>Apiary::Command::Publish</small>
+    <span class='object_link'><a href="Apiary/Command/Fetch.html#options-instance_method" title="Apiary::Command::Fetch#options (method)">#options</a></span>
+    <small>Apiary::Command::Fetch</small>
   </li>
   
 
@@ -269,6 +269,12 @@
   </li>
   
 
+  <li class="r2 ">
+    <span class='object_link'><a href="Apiary/Command/Fetch.html#write_generated_path-instance_method" title="Apiary::Command::Fetch#write_generated_path (method)">#write_generated_path</a></span>
+    <small>Apiary::Command::Fetch</small>
+  </li>
+  
+
       </ul>
     </div>
   </body>

data/doc/top-level-namespace.html

@@ -103,7 +103,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan 25 12:41:41 2014 by
+  Generated on Thu Apr 17 13:30:51 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/lib/apiary/cli.rb

@@ -7,57 +7,70 @@ module Apiary
 
     def initialize(args)
       options = parse_options!(args)
-      run(args, options)
+      @command = options.delete(:command)
+      run(options)
     end
 
-    def run(args, options)
-      command = args.first || :help
-      command = @command if @command
-      Apiary::Command::Runner.run(command, options)
+    def run(options)
+      Apiary::Command::Runner.run(@command, options)
     end
 
     def parse_options!(args)
-      @command = nil
       options = {}
+      command = nil
+      if args.first && !args.first.start_with?("-")
+        command = args.first
+      end
+
       options_parser = OptionParser.new do |opts|
         opts.on("--path [PATH]") do |path|
+          raise OptionParser::InvalidOption unless ["fetch", "preview", "publish"].include? command
           options[:path] = path
         end
 
         opts.on("--output [PATH]") do |path|
-          options[:output]  = path
+          raise OptionParser::InvalidOption unless ["fetch", "preview"].include? command
+          options[:output] = path
         end
 
         opts.on("--api_host API_HOST") do |api_host|
+          raise OptionParser::InvalidOption unless ["fetch", "preview", "publish"].include? command
           options[:api_host] = api_host
         end
 
         opts.on("--api-name API_HOST") do |api_name|
+          raise OptionParser::InvalidOption unless ["fetch", "publish"].include? command
           options[:api_name] = api_name
         end
 
         opts.on("--browser BROWSER") do |browser|
+          raise OptionParser::InvalidOption if command != "preview"
           options[:browser] = browser
         end
 
         opts.on("--server") do
+          raise OptionParser::InvalidOption if command != "preview"
           options[:server] = true
         end
 
         opts.on("--port [PORT]") do |port|
+          raise OptionParser::InvalidOption unless ["fetch", "preview", "publish"].include? command
           options[:port] = port
         end
 
         opts.on('-v', '--version') do
-          @command = :version
+          raise OptionParser::InvalidOption if command
+          command = :version
         end
 
         opts.on( '-h', '--help') do
-          @command = :help
+          raise OptionParser::InvalidOption if command
+          command = :help
         end
       end
 
       options_parser.parse!
+      options[:command] = command || :help
       options
 
     rescue OptionParser::InvalidOption => e

data/lib/apiary/command/fetch.rb

@@ -19,15 +19,16 @@ module Apiary
         @options.port         ||= 8080
         @options.api_name     ||= false
         @options.api_key      ||= ENV['APIARY_API_KEY']
+        @options.proxy        ||= ENV['http_proxy']
         @options.headers      ||= {
           :accept => "text/html",
           :content_type => "text/plain",
           :authentication => "Token #{@options.api_key}"
-        }        
+        }
       end
 
       def self.execute(args)
-        response = new(args).fetch_from_apiary        
+        response = new(args).fetch_from_apiary
         if response.instance_of? String
           puts response
         end
@@ -56,10 +57,14 @@ module Apiary
 
       def query_apiary(host, path)
         url  = "https://#{host}/blueprint/get/#{@options.api_name}"
-        response = RestClient.get url, @options.headers        
-        unless (200..299).include? response.code
-          abort "Request failed with code #{response.code}"
-        end        
+        RestClient.proxy = @options.proxy
+
+        begin
+          response = RestClient.get url, @options.headers
+        rescue RestClient::Exception => e
+          abort "Apiary service responded with an error: #{e.message}"
+        end
+
         JSON.parse response.body
       end
 

data/lib/apiary/command/preview.rb

@@ -2,6 +2,7 @@
 require 'rest_client'
 require 'rack'
 require 'ostruct'
+require 'json'
 
 module Apiary
   module Command
@@ -23,6 +24,7 @@ module Apiary
         @options.api_host     ||= "api.apiary.io"
         @options.headers      ||= {:accept => "text/html", :content_type => "text/plain"}
         @options.port         ||= 8080
+        @options.proxy        ||= ENV['http_proxy']
       end
 
       def self.execute(args)
@@ -73,7 +75,20 @@ module Apiary
       def query_apiary(host, path)
         url  = "https://#{host}/blueprint/generate"
         data = File.read(path)
-        RestClient.post(url, data, @options.headers)
+        RestClient.proxy = @options.proxy
+
+        begin
+          RestClient.post(url, data, @options.headers)
+        rescue RestClient::BadRequest => e
+          err = JSON.parse e.response
+          if err.has_key? 'parserError'
+            abort "#{err['message']}: #{err['parserError']}"
+          else
+            abort "Apiary service responded with an error: #{err['message']}"
+          end
+        rescue RestClient::Exception => e
+          abort "Apiary service responded with an error: #{e.message}"
+        end
       end
 
       # TODO: add linux and windows systems

data/lib/apiary/command/publish.rb

@@ -2,6 +2,7 @@
 require 'rest_client'
 require 'rack'
 require 'ostruct'
+require 'json'
 
 module Apiary
   module Command
@@ -18,6 +19,7 @@ module Apiary
         @options.port         ||= 8080
         @options.api_name     ||= false
         @options.api_key      ||= ENV['APIARY_API_KEY']
+        @options.proxy        ||= ENV['http_proxy']
         @options.headers      ||= {
           :accept => "text/html",
           :content_type => "text/plain",
@@ -57,10 +59,19 @@ module Apiary
         data = {
           :code => File.read(path)
         }
-        response = RestClient.post url, data, @options.headers
+        RestClient.proxy = @options.proxy
 
-        unless (200..299).include? response.code
-          abort "Request failed with code #{response.code}"
+        begin
+          RestClient.post url, data, @options.headers
+        rescue RestClient::BadRequest => e
+          err = JSON.parse e.response
+          if err.has_key? 'parserError'
+            abort "#{err['message']}: #{err['parserError']}"
+          else
+            abort "Apiary service responded with an error: #{err['message']}"
+          end
+        rescue RestClient::Exception => e
+          abort "Apiary service responded with an error: #{e.message}"
         end
       end
 

data/lib/apiary/version.rb

@@ -1,3 +1,3 @@
 module Apiary
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: apiaryio
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 9
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Apiary Ltd.
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-01-27 00:00:00 Z
+date: 2014-04-17 00:00:00 +00:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
@@ -167,6 +168,7 @@ files:
 - spec/cli_spec.rb
 - spec/command/fetch_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://apiary.io
 licenses: 
 - MIT
@@ -196,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Apiary.io CLI