xway 0.0.1.beta → 0.0.2.beta

data/.travis.yml

@@ -1,3 +1,3 @@
 rvm:
-  - rbx-19mode
+  - 2.0.0
   

data/README.md

@@ -34,6 +34,12 @@ Or install it yourself as:
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+### Development
+
+To run the binary from the repository use the following command with ruby libray path:
+
+    RUBYLIB=lib bin/xway
+
 ### Coding guide
 
 * Using global methods like `Xway.parameter`

data/lib/xway/api/endpoints.rb

@@ -9,36 +9,67 @@ module Xway
         Request.new 'post', '/applications', options
       end
 
-      def find options={app: ':name'}
-        Request.new 'get', "/applications/#{options[:app]}"
+      def find options={}
+        require_options options, :name
+        options[:name] ||= ':name'
+        Request.new 'get', "/applications/#{options[:name]}"
       end
 
-      def update options={app: ':name'}
-        Request.new 'put', "/applications/#{options[:app]}"
+      def update options={}
+        require_options options, :name
+        options[:name] ||= ':name'
+        Request.new 'put', "/applications/#{options[:name]}"
       end
 
-      def delete options={app: ':name'}
-        Request.new 'delete', "/applications/#{options[:app]}"
+      def delete options={}
+        require_options options, :name
+        options[:name] ||= ':name'
+        Request.new 'delete', "/applications/#{options[:name]}"
       end
 
-      def log options={app: ':name'}
-        Request.new 'get', "/applications/#{options[:app]}/log"
+      def log options={}
+        require_options options, :name
+        options[:name] ||= ':name'
+        Request.new 'get', "/applications/#{options[:name]}/log"
       end
 
-      def start options={app: ':name'}
-        Request.new 'post', "/applications/#{options[:app]}/start"
+      def start options={}
+        require_options options, :name
+        options[:name] ||= ':name'
+        Request.new 'post', "/applications/#{options[:name]}/start"
       end
 
-      def stop options={app: ':name'}
-        Request.new 'post', "/applications/#{options[:app]}/stop"
+      def stop options={}
+        require_options options, :name
+        options[:name] ||= ':name'
+        Request.new 'post', "/applications/#{options[:name]}/stop"
       end
 
-      def restart options={app: ':name'}
-        Request.new 'post', "/applications/#{options[:app]}/restart"
+      def restart options={}
+        require_options options, :name
+        options[:name] ||= ':name'
+        Request.new 'post', "/applications/#{options[:name]}/restart"
       end
 
-      def redeploy options={app: ':name'}
-        Request.new 'post', "/applications/#{options[:app]}/redeploy"
+      def redeploy options={}
+        require_options options, :name
+        options[:name] ||= ':name'
+        Request.new 'post', "/applications/#{options[:name]}/redeploy"
+      end
+
+    private
+
+      def require_options options, *keys
+        missing_keys = []
+        keys.each do |key|
+          if !options || options[key] == nil || options[key] == ''
+            missing_keys << key
+          end
+        end
+        unless missing_keys.empty?
+          raise MissingParameter, "Missing app parameter(s): "\
+                                  "#{missing_keys.map(&:to_s).join(', ')}"
+        end
       end
     end
   end

data/lib/xway/api/http.rb

@@ -10,7 +10,7 @@ module Xway
         end
         HTTParty.send(request.method_name, uri, http_options)
       rescue => e
-        raise Error, ["#{server} appears offline", e]
+        raise ConnectionError, ["#{server} appears offline", e]
       end
     end
   end

data/lib/xway/cli.rb

@@ -14,6 +14,8 @@ module Xway
       else
         @out.puts @api.request(*commands)
       end
+    rescue MissingParameter => e
+      @out.puts e.message
     end
   end
 end

data/lib/xway/error.rb

@@ -4,4 +4,8 @@ module Xway
 
   class ManifestFileNotFound < Error; end
   class ManifestFileTypeUnsupported < Error; end
+
+  class MissingParameter < Error; end
+
+  class ConnectionError < Error; end
 end

data/lib/xway/parameter.rb

@@ -8,11 +8,9 @@ module Xway
                                     flag: 's',
                                     description: 'all appway servers',
                                     default: ['http://localhost:8000']
-      @param.define 'app.name',     type: String,
-                                    flag: 'a',
+      @param.define 'app.name',     flag: 'a',
                                     description: 'name of your app'
-      @param.define 'app.manifest', type: String,
-                                    flag: 'm',
+      @param.define 'app.manifest', flag: 'm',
                                     description: 'path to your app.way file'
       @param.define :debug,         flag: 'd',
                                     description: 'print debug info to stdout',

data/lib/xway/version.rb

@@ -1,3 +1,3 @@
 module Xway
-  VERSION = "0.0.1.beta"
+  VERSION = "0.0.2.beta"
 end

data/spec/lib/xway/api/endpoints_spec.rb

@@ -1,89 +1,125 @@
 require 'spec_helper'
+require 'xway/error'
 require 'xway/api/endpoints'
 require 'xway/api/request'
 
 describe Xway::Api::Endpoints do
   subject('endpoints') { described_class.new }
 
-  describe 'list' do
-    subject            { endpoints.list({}) }
-    its('method_name') { should eq 'get' }
-    its('path')        { should eq '/applications' }
-    its('headers')     { should eq('X-App' => 'appway') }
-    its('body')        { should eq(nil) }
+  specify 'list doesnt require_options' do
+    expect{ subject.list }.not_to raise_error(Xway::MissingParameter)
   end
-
-  describe 'create' do
-    let('manifest') { File.join(ASSETS_PATH, 'appway-example.json') }
-    subject            { endpoints.create manifest: manifest }
-    its('method_name') { should eq 'post' }
-    its('path')        { should eq '/applications' }
-    its('headers')     { should eq('X-App' => 'appway',
-                                   'Content-Type' => 'application/json') }
-    its('body')        { should be_kind_of(Xway::Api::Request::Body) }
+  specify 'create doesnt require_options' do
+    expect{ subject.create }.not_to raise_error(Xway::MissingParameter)
   end
-
-  describe 'find' do
-    subject            { endpoints.find app: 'foo' }
-    its('method_name') { should eq 'get' }
-    its('path')        { should eq '/applications/foo' }
-    its('headers')     { should eq('X-App' => 'appway') }
-    its('body')        { should eq(nil) }
+  specify 'find does require_options' do
+    expect{ subject.find }.to raise_error(Xway::MissingParameter)
   end
-
-  describe 'update' do
-    subject            { endpoints.update app: 'foo' }
-    its('method_name') { should eq 'put' }
-    its('path')        { should eq '/applications/foo' }
-    its('headers')     { should eq('X-App' => 'appway') }
-    its('body')        { should eq(nil) }
+  specify 'update does require_options' do
+    expect{ subject.update }.to raise_error(Xway::MissingParameter)
   end
-
-  describe 'delete' do
-    subject            { endpoints.delete app: 'foo' }
-    its('method_name') { should eq 'delete' }
-    its('path')        { should eq '/applications/foo' }
-    its('headers')     { should eq('X-App' => 'appway') }
-    its('body')        { should eq(nil) }
+  specify 'delete does require_options' do
+    expect{ subject.delete }.to raise_error(Xway::MissingParameter)
   end
-
-  describe 'log' do
-    subject            { endpoints.log app: 'foo' }
-    its('method_name') { should eq 'get' }
-    its('path')        { should eq '/applications/foo/log' }
-    its('headers')     { should eq('X-App' => 'appway') }
-    its('body')        { should eq(nil) }
+  specify 'log does require_options' do
+    expect{ subject.log }.to raise_error(Xway::MissingParameter)
   end
-
-  describe 'start' do
-    subject            { endpoints.start app: 'foo' }
-    its('method_name') { should eq 'post' }
-    its('path')        { should eq '/applications/foo/start' }
-    its('headers')     { should eq('X-App' => 'appway') }
-    its('body')        { should eq(nil) }
+  specify 'start does require_options' do
+    expect{ subject.start }.to raise_error(Xway::MissingParameter)
   end
-
-  describe 'stop' do
-    subject            { endpoints.stop app: 'foo' }
-    its('method_name') { should eq 'post' }
-    its('path')        { should eq '/applications/foo/stop' }
-    its('headers')     { should eq('X-App' => 'appway') }
-    its('body')        { should eq(nil) }
+  specify 'stop does require_options' do
+    expect{ subject.stop }.to raise_error(Xway::MissingParameter)
   end
-
-  describe 'restart' do
-    subject            { endpoints.restart app: 'foo' }
-    its('method_name') { should eq 'post' }
-    its('path')        { should eq '/applications/foo/restart' }
-    its('headers')     { should eq('X-App' => 'appway') }
-    its('body')        { should eq(nil) }
+  specify 'restart does require_options' do
+    expect{ subject.restart }.to raise_error(Xway::MissingParameter)
   end
+  specify 'redeploy does require_options' do
+    expect{ subject.redeploy }.to raise_error(Xway::MissingParameter)
+  end
+
+  context 'mock require_options' do
+    before { endpoints.stub('require_options') }
+
+    describe 'list' do
+      subject            { endpoints.list({}) }
+      its('method_name') { should eq 'get' }
+      its('path')        { should eq '/applications' }
+      its('headers')     { should eq('X-App' => 'appway') }
+      its('body')        { should eq(nil) }
+    end
+
+    describe 'create' do
+      let('manifest')    { File.join(ASSETS_PATH, 'appway-example.json') }
+      subject            { endpoints.create manifest: manifest }
+      its('method_name') { should eq 'post' }
+      its('path')        { should eq '/applications' }
+      its('headers')     { should eq('X-App' => 'appway',
+                                     'Content-Type' => 'application/json') }
+      its('body')        { should be_kind_of(Xway::Api::Request::Body) }
+    end
+
+    describe 'find' do
+      subject            { endpoints.find name: 'foo' }
+      its('method_name') { should eq 'get' }
+      its('path')        { should eq '/applications/foo' }
+      its('headers')     { should eq('X-App' => 'appway') }
+      its('body')        { should eq(nil) }
+    end
+
+    describe 'update' do
+      subject            { endpoints.update name: 'foo' }
+      its('method_name') { should eq 'put' }
+      its('path')        { should eq '/applications/foo' }
+      its('headers')     { should eq('X-App' => 'appway') }
+      its('body')        { should eq(nil) }
+    end
+
+    describe 'delete' do
+      subject            { endpoints.delete name: 'foo' }
+      its('method_name') { should eq 'delete' }
+      its('path')        { should eq '/applications/foo' }
+      its('headers')     { should eq('X-App' => 'appway') }
+      its('body')        { should eq(nil) }
+    end
+
+    describe 'log' do
+      subject            { endpoints.log name: 'foo' }
+      its('method_name') { should eq 'get' }
+      its('path')        { should eq '/applications/foo/log' }
+      its('headers')     { should eq('X-App' => 'appway') }
+      its('body')        { should eq(nil) }
+    end
+
+    describe 'start' do
+      subject            { endpoints.start name: 'foo' }
+      its('method_name') { should eq 'post' }
+      its('path')        { should eq '/applications/foo/start' }
+      its('headers')     { should eq('X-App' => 'appway') }
+      its('body')        { should eq(nil) }
+    end
+
+    describe 'stop' do
+      subject            { endpoints.stop name: 'foo' }
+      its('method_name') { should eq 'post' }
+      its('path')        { should eq '/applications/foo/stop' }
+      its('headers')     { should eq('X-App' => 'appway') }
+      its('body')        { should eq(nil) }
+    end
+
+    describe 'restart' do
+      subject            { endpoints.restart name: 'foo' }
+      its('method_name') { should eq 'post' }
+      its('path')        { should eq '/applications/foo/restart' }
+      its('headers')     { should eq('X-App' => 'appway') }
+      its('body')        { should eq(nil) }
+    end
 
-  describe 'redeploy' do
-    subject            { endpoints.redeploy app: 'foo' }
-    its('method_name') { should eq 'post' }
-    its('path')        { should eq '/applications/foo/redeploy' }
-    its('headers')     { should eq('X-App' => 'appway') }
-    its('body')        { should eq(nil) }
+    describe 'redeploy' do
+      subject            { endpoints.redeploy name: 'foo' }
+      its('method_name') { should eq 'post' }
+      its('path')        { should eq '/applications/foo/redeploy' }
+      its('headers')     { should eq('X-App' => 'appway') }
+      its('body')        { should eq(nil) }
+    end
   end
 end

data/spec/lib/xway/api/http_spec.rb

@@ -15,7 +15,7 @@ describe Xway::Api::Http do
   it 'wraps errors' do
     HTTParty.stub('get') { raise StandardError, 'foo' }
     expect { subject.request 'http://foo', request }.to\
-      raise_error(Xway::Error)
+      raise_error(Xway::ConnectionError)
   end
 
   describe 'calls HTTParty' do

data/spec/lib/xway/parameter_spec.rb

@@ -63,7 +63,6 @@ describe Xway::Parameter do
 
       it 'defines app.name' do
         param.should_receive('define').with('app.name',
-                                            type: String,
                                             flag: 'a',
                                             description: 'name of your app')
         subject.reload!
@@ -71,7 +70,6 @@ describe Xway::Parameter do
 
       it 'defines app.manifest' do
         param.should_receive('define').with('app.manifest',
-                                            type: String,
                                             flag: 'm',
                                             description: 'path to your app.way file')
         subject.reload!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xway
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta
+  version: 0.0.2.beta
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-12 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere