vestacp 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15b1b629a74550b2c26b71b0bb7097f75a1d1eb7
-  data.tar.gz: 54df1114e6fced6ea19a0225534a637d8ab42573
+  metadata.gz: b4f32a13eaa09b2bc9ca6612f8281cc12a86b911
+  data.tar.gz: af5bf3ef6c92df6aa11f809d383826e4653586df
 SHA512:
-  metadata.gz: 7d3f7c445f1cbd68d53b6693d4f7686ce2ee7b55def06b6205c26859819ad6d2c4785462c03016b02861759b0faca334aaedded088620ebfea0f523f479810e4
-  data.tar.gz: e9cc9587fd638f722aa34a72c202f824fd9554c16f9995e862f9ed86febd1e1f3ffe9adf027c1508696c54ebd1e3af74ceafc4457f0f8264d4fd7d77e572f15e
+  metadata.gz: b2d62353a4af574ec5ac7493a3908cccecf0776ec793f25543b1c070d7c34c79fa4d5f4dc4e8f957d70077af792131492968d5977652ef9551d09394121cf17f
+  data.tar.gz: 2892bbd153234608da0577943b123eb2db20d98318395e12275ea042dcec8d06becf3cdafd99002fc225dab9499b284b60b6905a24acf6643350f10db9416b2d

data/lib/vestacp/account.rb

@@ -16,7 +16,7 @@ module Vestacp
     # See:
     #
     # http://vestacp.com/docs/api/#add_user
-    def self.add_client(raw = {})
+    def self.add(raw = {})
       args = {
         username: 'arg1',
         password: 'arg2',
@@ -36,14 +36,81 @@ module Vestacp
     # Parameters:
     #
     # * <tt>:username</tt>
-    def self.delete_user(raw = {})
+    def self.delete(raw = {})
       args = {
-        username: 'arg1',
+        username: 'arg1'
       }
       params = {}
       raw.each {|key, value| params[args[key].to_sym] = value }
       params.merge!(cmd: 'v-delete-user')
       send_request(params, raw)
     end
+
+
+    # Suspend User Account
+    #
+    # Parameters:
+    #
+    # * <tt>:username</tt>
+    def self.suspend(raw = {})
+      args = {
+        username: 'arg1'
+      }
+      params = {}
+      raw.each {|key, value| params[args[key].to_sym] = value }
+      params.merge!(cmd: 'v-suspend-user')
+      send_request(params, raw)
+    end
+
+
+    # Suspend User Account
+    #
+    # Parameters:
+    #
+    # * <tt>:username</tt>
+    def self.unsuspend(raw = {})
+      args = {
+        username: 'arg1'
+      }
+      params = {}
+      raw.each {|key, value| params[args[key].to_sym] = value }
+      params.merge!(cmd: 'v-unsuspend-user')
+      send_request(params, raw)
+    end
+
+
+    # List User Account Information
+    #
+    # Returns JSON.
+    #
+    # Parameters:
+    #
+    # * <tt>:username</tt>
+    def self.information(raw = {})
+      args = {
+        username: 'arg1'
+      }
+      params = {}
+      raw.each {|key, value| params[args[key].to_sym] = value }
+      params.merge!(cmd: 'v-list-user', arg2: 'json')
+      send_request(params, raw, true)
+    end
+
+    # Check User Account Credentials
+    #
+    # Parameters:
+    #
+    # * <tt>:username</tt>
+    # * <tt>:password</tt>
+    def self.check_credentials(raw = {})
+      args = {
+        username: 'arg1',
+        password: 'arg2'
+      }
+      params = {}
+      raw.each {|key, value| params[args[key].to_sym] = value }
+      params.merge!(cmd: 'v-list-user')
+      send_request(params, raw)
+    end
   end
 end

data/lib/vestacp/base.rb

@@ -1,4 +1,5 @@
 require 'faraday'
+require 'json'
 
 module Vestacp
   # Vestacp::Base is the main class used to subclass Vestacp API resources
@@ -10,28 +11,28 @@ module Vestacp
     # * <tt>:cmd</tt> - The API action to perform
     #
     # All other paramters are passed along as HTTP POST variables
-    def self.send_request(params = {}, raw = {})
+    def self.send_request(params = {}, raw = {}, json_response = false)
       if params[:cmd].blank?
         raise "No API command set"
       end
 
-      if raw.server && raw.server.api_username && raw.server.api_password && aw.server.api_url
-        params.merge!(
-          :user => raw.server.api_username,
-          :password => raw.server.api_password
-        )
+      if !raw[:server]
+        raise "No server as argument and server configuration!" unless Vestacp.config
+        raw[:server] = {
+          api_username: Vestacp.config.api_username,
+          api_password: Vestacp.config.api_password,
+          api_url: Vestacp.config.api_url
+        }
+      end
 
-        url = URI.parse(raw.server.api_url)
-      else
-        params.merge!(
-          :user => Vestacp.config.api_username,
-          :password => Vestacp.config.api_password
-        )
+      params.merge!(
+        user: raw[:server][:api_username],
+        password: raw[:server][:api_password]
+      )
 
-        url = URI.parse(Vestacp.config.api_url)
-      end
+      # params.merge!(returncode: 'yes') unless params[:returncode]
 
-      params.merge!(returncode: 'yes')
+      url = URI.parse(raw[:server][:api_url])
 
       # SSL without is really bad design. In order to support even self-signed
       # certificates I should do that.
@@ -45,41 +46,51 @@ module Vestacp
         req.body = params
       end
 
-      parse_response(response.body)
+      binding.pry
+      parse_response(json_response ? JSON.parse(response.body) : response.body)
     end
 
     # Parse VestaCP responses.
     # TODO: add more responses.
     #
     # See: http://vestacp.com/docs/api/#return_codes
-    def self.parse_response(raw)
+    def self.parse_response(raw, json_response = false)
       case raw
-      when '0'
-        {
-          error: false, value: raw, name: 'OK',
-          comment: 'Command has been successfuly performed.'
-        }
-      when '1'
-        {
-          error: true, value: raw, name: 'E_ARGS',
-          comment: 'Not enough arguments provided.'
-        }
-      when '2'
-        {
-          error: true, value: raw, name: 'E_INVALID',
-          comment: 'Object or argument is not valid.'
-        }
-      when '3'
-        {
-          error: true, value: raw, name: 'E_NOTEXIST',
-          comment: "Object doesn't exist."
-        }
+      when 'OK'
+        {error: false, response: raw}
+      when /^Error/
+        {error: true, response: raw}
       else
-        {
-          error: true, value: '-1', name: 'E_UNKNOWN',
-          comment: "Unknown response: #{raw}"
-        }
+        {error: false, response: raw}
       end
+
+      # case raw
+      # when '0'
+      #   {
+      #     error: false, value: raw, name: 'OK',
+      #     comment: 'Command has been successfuly performed.'
+      #   }
+      # when '1'
+      #   {
+      #     error: true, value: raw, name: 'E_ARGS',
+      #     comment: 'Not enough arguments provided.'
+      #   }
+      # when '2'
+      #   {
+      #     error: true, value: raw, name: 'E_INVALID',
+      #     comment: 'Object or argument is not valid.'
+      #   }
+      # when '3'
+      #   {
+      #     error: true, value: raw, name: 'E_NOTEXIST',
+      #     comment: "Object doesn't exist."
+      #   }
+      # else
+      #   {
+      #     error: true, value: '-1', name: 'E_UNKNOWN',
+      #     comment: "Unknown response: #{raw}"
+      #   }
+      # end
     end
   end
 end

data/lib/vestacp/version.rb

@@ -1,3 +1,3 @@
 module Vestacp
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/vestacp.gemspec

@@ -6,10 +6,10 @@ require 'vestacp/version'
 Gem::Specification.new do |spec|
   spec.name          = "vestacp"
   spec.version       = Vestacp::VERSION
-  spec.authors       = ["Dmitry K."]
+  spec.authors       = ["Dmitry Knyazev"]
   spec.email         = ["a@kdas.me"]
   spec.summary       = %q{VestaCP API bindings}
-  spec.description   = %q{Developed and tested on version 0.9.8-14}
+  spec.description   = %q{Developed and tested on version 0.9.8-14. Only to do simple things with user accounts. That's not a problem to make them more complicated :)}
   spec.homepage      = ""
   spec.license       = "MIT"
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: vestacp
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
-- Dmitry K.
+- Dmitry Knyazev
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -52,7 +52,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Developed and tested on version 0.9.8-14
+description: Developed and tested on version 0.9.8-14. Only to do simple things with
+  user accounts. That's not a problem to make them more complicated :)
 email:
 - a@kdas.me
 executables: []