purest 0.1.0 → 1.0.1

data/lib/purest/messages.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Purest
+  class Messages < Purest::APIMethods
+    @access_methods = %i[get update]
+
+    GET_PARAMS = %i[audit flagged login open recent user].freeze
+
+    def get(options = nil)
+      super(options, 'message', GET_PARAMS)
+    end
+
+    def update(options = nil)
+      # In this case, 'id' is the identifier of a message,
+      # not its name
+      appended_path = options.delete(:id) if options[:id]
+      super(options, 'message', appended_path)
+    end
+  end
+end

data/lib/purest/network.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Purest
+  class Network < Purest::APIMethods
+    @access_methods = %i[get create update delete]
+
+    GET_PARAMS = [].freeze
+
+    def get(options = nil)
+      super(options, 'network', GET_PARAMS)
+    end
+
+    def create(options = nil)
+      super(options, 'network/vif')
+    end
+
+    def update(options = nil)
+      super(options, 'network')
+    end
+
+    def delete(options = nil)
+      super(options, 'network')
+    end
+  end
+end

data/lib/purest/physical_array.rb

@@ -1,52 +1,21 @@
 # frozen_string_literal: true
 
 module Purest
-  class PhysicalArray < Purest::Rest
+  class PhysicalArray < Purest::APIMethods
     @access_methods = %i[get create update delete]
 
-    GET_PARAMS = [:action, :banner, :connection_key, :controllers, :historical,
-      :idle_timeout, :ntpserver, :phonehome, :proxy, :relayhost, :scsi_timeout,
-      :senderdomain, :space, :syslogserver, :throttle]
+    GET_PARAMS = %i[action banner connection_key controllers historical
+                    idle_timeout ntpserver phonehome proxy relayhost scsi_timeout
+                    senderdomain space syslogserver throttle].freeze
 
     # Get a list of hosts, GET
     # @param options [Hash] options to pass
     def get(options = nil)
-      @options = options
-      create_session unless authenticated?
-
-      raw_resp = @conn.get do |req|
-        url = ["/api/#{Purest.configuration.api_version}/array"]
-
-        # Map /connection, /console_lock, /phonehome, /remoteassist
-        # depending on what was passed in
-        [:connection, :console_lock, :phonehome, :remoteassist].each do |path|
-          url.map!{|u| u + "/#{path.to_s}"} if !@options.nil? && @options[path]
-        end
-
-        # Generate array, consisting of url parts, to be built
-        # by concat_url method below
-        GET_PARAMS.each do |param|
-          url += self.send(:"use_#{param}",@options)
-        end
-
-        # Build url from array of parts, send request
-        req.url concat_url url
-      end
-
-      JSON.parse(raw_resp.body, :symbolize_names => true)
+      super(options, 'array', GET_PARAMS, %i[show_connection show_console_lock show_phonehome show_remoteassist])
     end
 
-    # Create a connection between two arrays
-    # @param options [Hash] options to pass
     def create(options = nil)
-      @options = options
-
-      raw_resp = @conn.post do |req|
-        req.url "/api/#{Purest.configuration.api_version}/array/connection"
-        req.body = @options.to_json
-      end
-
-      JSON.parse(raw_resp.body, :symbolize_names => true)
+      super(options, 'array/connection')
     end
 
     # Update attributes on an array, PUT
@@ -58,19 +27,19 @@ module Purest
         url = ["/api/#{Purest.configuration.api_version}/array"]
 
         if !@options.nil? && @options[:connected_array]
-          url.map!{|u| u + "/connection/#{@options[:connected_array]}"}
+          url.map! { |u| u + "/connection/#{@options[:connected_array]}" }
         end
 
         # Small conditional to ease remote assistance connecting/disconnecting
         if !@options.nil? && @options[:remote_assist]
-          url.map!{|u| u + "/remoteassist"}
+          url.map! { |u| u + '/remoteassist' }
           @options[:action] = @options.delete(:remote_assist)
         end
 
         # Small loop to ease console locking and home phoning
-        [:console_lock, :phonehome].each do |path|
+        %i[console_lock phonehome].each do |path|
           if !@options.nil? && @options[path]
-            url.map!{|u| u + "/#{path.to_s}"}
+            url.map! { |u| u + "/#{path}" }
             @options[:enabled] = @options.delete(path)
           end
         end
@@ -86,7 +55,7 @@ module Purest
         req.url concat_url url
       end
 
-      JSON.parse(raw_resp.body, :symbolize_names => true)
+      JSON.parse(raw_resp.body, symbolize_names: true)
     end
 
     # Disconnect one array from another

data/lib/purest/port.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Purest
+  class Port < Purest::APIMethods
+    @access_methods = %i[get]
+
+    GET_PARAMS = [:initiators].freeze
+
+    def get(options = nil)
+      super(options, 'port', GET_PARAMS)
+    end
+  end
+end

data/lib/purest/protection_group.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Purest
+  class ProtectionGroup < Purest::APIMethods
+    @access_methods = %i[get create update delete]
+
+    GET_PARAMS = %i[names pending pending_only retention schedule
+                    snap source space target total transfer].freeze
+
+    def get(options = nil)
+      super(options, 'pgroup', GET_PARAMS)
+    end
+
+    def create(options = nil)
+      super(options, 'pgroup')
+    end
+
+    def update(options = nil)
+      super(options, 'pgroup')
+    end
+
+    def delete(options = nil)
+      super(options, 'pgroup')
+    end
+  end
+end

data/lib/purest/rest.rb

@@ -2,9 +2,8 @@
 
 module Purest
   # Base class for interacting with PURE storage REST API
-  class Rest < Purest::CustomExceptions
+  class Rest
     @access_methods = []
-    @get_params = []
 
     # Initialize the fadaray connection, create session unless one exists
     def initialize
@@ -15,11 +14,7 @@ module Purest
     # Check if session exists, and whether or not it's expired
     def authenticated?
       if defined? @session_expire
-        if Time.now.utc < @session_expire
-          true
-        else
-          false
-        end
+        Time.now.utc < @session_expire
       else
         false
       end

data/lib/purest/snmp.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Purest
+  class SNMP < Purest::APIMethods
+    @access_methods = %i[get create update delete]
+
+    GET_PARAMS = [:engine_id].freeze
+
+    def get(options = nil)
+      super(options, 'snmp', GET_PARAMS)
+    end
+
+    def create(options = nil)
+      super(options, 'snmp')
+    end
+
+    def update(options = nil)
+      super(options, 'snmp')
+    end
+
+    def delete(options = nil)
+      super(options, 'snmp')
+    end
+  end
+end

data/lib/purest/subnet.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Purest
+  class Subnet < Purest::APIMethods
+    @access_methods = %i[get create update delete]
+
+    GET_PARAMS = [].freeze
+
+    def get(options = nil)
+      super(options, 'subnet', GET_PARAMS)
+    end
+
+    def create(options = nil)
+      super(options, 'subnet')
+    end
+
+    def update(options = nil)
+      super(options, 'subnet')
+    end
+
+    def delete(options = nil)
+      super(options, 'subnet')
+    end
+  end
+end

data/lib/purest/users.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Purest
+  class Users < Purest::APIMethods
+    @access_methods = %i[get create update delete]
+
+    GET_PARAMS = %i[api_token expose publickey].freeze
+
+    def get(options = nil)
+      if !options.nil? && options[:name] && options[:api_token]
+        path = "admin/#{options[:name]}/apitoken"
+        options.delete_if { |k| k == :name || k == :api_token }
+      else
+        path = 'admin'
+      end
+
+      super(options, path, GET_PARAMS)
+    end
+
+    def create(options = nil)
+      path = "admin/#{options.delete(:name)}/apitoken"
+      super(options, path)
+    end
+
+    def update(options = nil)
+      super(options, 'admin')
+    end
+
+    def delete(options = nil)
+      path = "admin/#{options.delete(:name)}/apitoken"
+      super(options, path)
+    end
+  end
+end

data/lib/purest/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Purest
+  VERSION = '1.0.1'
+end

data/lib/purest/volume.rb

@@ -1,108 +1,39 @@
 # frozen_string_literal: true
 
 module Purest
-  class Volume < Purest::Rest
+  class Volume < Purest::APIMethods
     @access_methods = %i[get create update delete]
 
-    GET_PARAMS = [:action, :block_size, :connect, :historical, :length, :names,
-                  :pending, :pending_only, :pgrouplist, :private, :protect,
-                  :shared, :snap, :space]
+    GET_PARAMS = %i[action block_size connect historical length names
+                    pending pending_only pgrouplist private protect
+                    shared snap space].freeze
 
     # Get a list of volumes, GET
     # @param options [Hash] options to pass
     def get(options = nil)
-      @options = options
-      create_session unless authenticated?
-
-      # Build up a url from parts, allowing for dynamic http calls
-      # by simply passing in params accepted by Pure's API
-      raw_resp = @conn.get do |req|
-        url = ["/api/#{Purest.configuration.api_version}/volume"]
-
-        url.map!{|u| u + "/#{@options[:name]}"} if !@options.nil? && @options[:name]
-
-        # Map /diff, /hgroup, or /host depending on option passed
-        [:show_diff, :show_hgroup, :show_host].each do |path|
-          new_path = path.to_s.gsub('show_', '')
-          url.map!{|u| u + "/#{new_path}"} if !@options.nil? && @options[path]
-        end
-
-        # Generate array, consisting of url parts, to be built
-        # by concat_url method below
-        GET_PARAMS.each do |param|
-          url += self.send(:"use_#{param}",@options)
-        end
-
-        # Build url from array of parts, send request
-        req.url concat_url url
-      end
-
-      JSON.parse(raw_resp.body, :symbolize_names => true)
+      super(options, 'volume', GET_PARAMS, %i[show_diff show_hgroup show_host])
     end
 
-    # Create a volume, POST
-    # @param options [Hash] options to pass
     def create(options = nil)
-      @options = options
-
-      raw_resp = @conn.post do |req|
-        url = "/api/#{Purest.configuration.api_version}/volume"
-        url += "/#{@options[:name]}" if @options[:name]
-        url += "/pgroup/#{@options[:pgroup]}" if @options[:pgroup]
-        req.body = @options.to_json
-
-        req.url url
+      if options[:name] && options[:protection_group]
+        appended_path = "#{options.delete(:name)}/pgroup/#{options.delete(:protection_group)}"
       end
 
-      JSON.parse(raw_resp.body, :symbolize_names => true)
+      super(options, 'volume', appended_path)
     end
 
-    # Update a volume, PUT
-    # @param options [Hash] options to pass
     def update(options = nil)
-      @options = options
-
-      raw_resp = @conn.put do |req|
-        # Here we construct the url first, because the options hash
-        # may have to be manipulated below
-        req.url "/api/#{Purest.configuration.api_version}/volume/#{@options[:name]}"
-
-        # Repurpose @options[:name] so that it is now set to the new_name
-        # allowing us to rename a volume.
-        @options[:name] = @options.delete(:new_name) if @options[:new_name]
-
-        # Remove name from @options which is sent in the body,
-        # if size is passed in, because those two cannot be sent together.
-        @options.delete(:name) if @options[:size]
-
-        req.body = @options.to_json
-      end
-
-      JSON.parse(raw_resp.body, :symbolize_names => true)
+      super(options, 'volume')
     end
 
     # Delete a volume, DELETE
     # @param options [Hash] options to pass
     def delete(options = nil)
-      @options = options
-
-      raw_resp = @conn.delete do |req|
-        url = "/api/#{Purest.configuration.api_version}/volume/#{@options[:name]}"
-        url += "/pgroup/#{@options[:pgroup]}" if @options[:pgroup]
-
-        req.url url
-      end
-
-      if @options[:eradicate]
-        raw_resp = @conn.delete do |req|
-          url = ["/api/#{Purest.configuration.api_version}/volume/#{@options[:name]}"]
-          req.body = @options.to_json
-
-          req.url concat_url url
-        end
+      if options[:name] && options[:protection_group]
+        appended_path = "#{options.delete(:name)}/pgroup/#{options.delete(:protection_group)}"
       end
 
-      JSON.parse(raw_resp.body, :symbolize_names => true)
+      super(options, 'volume', appended_path)
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: purest
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Sean McKinley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-29 00:00:00.000000000 Z
+date: 2018-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -25,47 +25,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: fakes-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: fivemat
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: fakes-rspec
+  name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.3
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -109,33 +137,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.15.2
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-cookie_jar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
-  name: faraday-cookie_jar
+  name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.12.2
 description: 
 email: sean.mckinley@outlook.com
 executables: []
@@ -144,12 +172,27 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/purest.rb
+- lib/purest/alerts.rb
+- lib/purest/api_methods.rb
+- lib/purest/app.rb
+- lib/purest/cert.rb
 - lib/purest/configuration.rb
-- lib/purest/custom_exceptions.rb
+- lib/purest/directory_service.rb
+- lib/purest/dns.rb
+- lib/purest/drive.rb
+- lib/purest/hardware.rb
 - lib/purest/host.rb
 - lib/purest/host_group.rb
+- lib/purest/messages.rb
+- lib/purest/network.rb
 - lib/purest/physical_array.rb
+- lib/purest/port.rb
+- lib/purest/protection_group.rb
 - lib/purest/rest.rb
+- lib/purest/snmp.rb
+- lib/purest/subnet.rb
+- lib/purest/users.rb
+- lib/purest/version.rb
 - lib/purest/volume.rb
 homepage: 
 licenses: