serverspec-extra-types 0.4.0 → 0.4.1

data/lib/serverspec_extra_types/types/jenkins_job.rb

@@ -17,7 +17,7 @@ module Serverspec::Type
     end
 
     def url
-      jobname = @name.gsub('/','/job/')
+      jobname = @name.gsub('/', '/job/')
       "#{@url_base}/job/#{jobname}/api/json"
     end
 
@@ -91,11 +91,10 @@ module Serverspec::Type
       inspection['fullName'] == text
     end
 
-    def has_job?(job)
-      inspection['jobs'].find { |job| job['name'] == job }
+    def has_job?(_job)
+      inspection['jobs'].find { |job| job['name'] == _job }
     end
 
-
     def has_job_count?(count)
       inspection['jobs'].length == count
     end
@@ -109,15 +108,17 @@ module Serverspec::Type
     end
 
     def has_empty_job_list?
-      inspection['jobs'].length == 0
+      inspection['jobs'].empty?
     end
 
     private
 
+    # rubocop:disable Naming/AccessorMethodName
     def get_inspection
-      userpass = @user ? "-u #{@user}:#{@password}" : ""
+      userpass = @user ? "-u #{@user}:#{@password}" : ''
       command = "curl -s  #{userpass} #{url} #{@insecure ? '-k' : ''} #{@redirects ? '-L' : ''}"
       @get_inspection ||= @runner.run_command(command)
     end
+    # rubocop:enable Naming/AccessorMethodName
   end
 end

data/lib/serverspec_extra_types/types/jenkins_plugin.rb

@@ -16,8 +16,12 @@ module Serverspec::Type
       @inspection ||= ::MultiJson.load(get_inspection.stdout)['plugins'].find { |plugin| plugin['shortName'] == @name }
     end
 
-    def installed?
-      inspection != nil
+    def installed?(_provider = nil, version = nil)
+      if version
+        !inspection.nil? && inspection['version'].to_s == version.to_s
+      else
+        !inspection.nil?
+      end
     end
 
     def exist?
@@ -42,14 +46,14 @@ module Serverspec::Type
       end
     end
 
-
-
     private
 
+    # rubocop:disable Naming/AccessorMethodName
     def get_inspection
       userpass = @user ? "-u #{@user}:#{@password}" : ''
       command = "curl -s  #{userpass} #{url} #{@insecure ? '-k' : ''} #{@redirects ? '-L' : ''}"
       @get_inspection ||= @runner.run_command(command)
     end
+    # rubocop:enable Naming/AccessorMethodName
   end
 end

data/lib/serverspec_extra_types/types/nfs_export.rb

@@ -17,11 +17,10 @@ module Serverspec::Type
 
     def has_host?(host_id, option = nil)
       if option
-        host(host_id).include?(option)
+        check_options(host_id, option)
       else
-        hosts.has_key?(host_id)
+        hosts.key?(host_id)
       end
-
     end
 
     def hosts
@@ -43,9 +42,22 @@ module Serverspec::Type
       @inspection ||= get_inspection.stdout
     end
 
+    # rubocop:disable Naming/AccessorMethodName
     def get_inspection
       command = "grep #{@export} /etc/exports"
       @get_inspection ||= @runner.run_command(command)
     end
+    # rubocop:enable Naming/AccessorMethodName
+
+    private
+
+    def check_options(host_id, opts)
+      options = opts.include?(',') ? opts.spilt(',') : opts
+      if options.is_a? Array
+        host(host_id).split(',').include?(options)
+      else
+        host(host_id).include?(options)
+      end
+   end
   end
-end
+end

data/lib/serverspec_extra_types/types/rabbitmq_base.rb

@@ -29,17 +29,17 @@ module Serverspec::Type
       end
     end
 
-
-
     private
 
     def extra_args
       "-u #{@user}:#{@password}"
     end
 
+    # rubocop:disable Naming/AccessorMethodName
     def get_inspection
       command = curl_command
       @get_inspection ||= @runner.run_command(command)
     end
+    # rubocop:enable Naming/AccessorMethodName
   end
 end

data/lib/serverspec_extra_types/types/rabbitmq_node_list.rb

@@ -9,7 +9,7 @@ module Serverspec::Type
     end
 
     def to_s
-      "RabbitMQ node list"
+      'RabbitMQ node list'
     end
 
     def inspection

data/lib/serverspec_extra_types/types/rabbitmq_vhost_list.rb

@@ -9,7 +9,7 @@ module Serverspec::Type
     end
 
     def to_s
-      "RabbitMQ VHosts List"
+      'RabbitMQ VHosts List'
     end
 
     def url

data/lib/serverspec_extra_types/types/rabbitmq_vhost_policy.rb

@@ -50,7 +50,19 @@ module Serverspec::Type
     end
 
     def mirror_all?
-      inspection['apply-to'] == 'all'
+      apply_to?('all')
+    end
+
+    def mirror_queues?
+      apply_to?('queues')
+    end
+
+    def mirror_exchanges?
+      apply_to?('exchanges')
+    end
+
+    def apply_to?(arg)
+      inspection['apply-to'] == arg
     end
 
     # TODO: priority method and matcher

data/lib/serverspec_extra_types/types/sudo_user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'serverspec'
 require 'serverspec/type/base'
 require 'multi_json'
@@ -5,7 +7,6 @@ require 'serverspec_extra_types/helpers/properties'
 
 module Serverspec::Type
   class SudoUser < Base
-
     def initialize(name)
       super
       @user = name
@@ -19,8 +20,6 @@ module Serverspec::Type
       end
     end
 
-
-
     def allowed_to_run_command?(command, user = nil, checkpw = false)
       perm = permission(command)
       if user
@@ -34,10 +33,8 @@ module Serverspec::Type
       end
     end
 
-
-
     def permission(command)
-      permissions.find {|x| x[:command] == command}
+      permissions.find { |x| x[:command] == command }
     end
 
     def permissions
@@ -52,39 +49,45 @@ module Serverspec::Type
       @inspection ||= get_sudo_perms(get_inspection.stdout)
     end
 
-
     private
+
+    # rubocop:disable Naming/AccessorMethodName
     def get_inspection
       @get_inspection ||= @runner.run_command("sudo -l -U #{@user}")
     end
+    # rubocop:enable Naming/AccessorMethodName
 
     def chunk_permission(perm)
       chunks = {}
-      parts = perm.sub(' : ', ':').split(/\s+/).reject{ |x| x == '' || x == "\n"}
+      parts = perm.sub(' : ', ':').split(/\s+/).reject { |x| x == '' || x == "\n" }
       user = parts[0].sub('(', '').sub(')', '')
+      chunk(chunks, parts, perm, user)
+      chunks
+    end
+
+    def chunk(chunks, parts, perm, user)
       if user.include?(':')
         chunks[:user] = user.split(':')[0]
         chunks[:group] = user.split(':')[1]
       else
         chunks[:user] = user
       end
-      if /NOPASSWD:/.match perm
+      if /NOPASSWD:/.match? perm
         chunks[:nopasswd] = true
-        chunks[:command] = parts[2..-1].join(" ")
+        chunks[:command] = parts[2..-1].join(' ')
       else
         chunks[:nopasswd] = false
         chunks[:command] = parts[1..-1].join(' ')
       end
-      chunks
     end
 
     def get_sudo_perms(output)
       matches = /Matching Defaults entries for #{@user} on .*\n(.*)\n/.match output
-      defaults = matches[1].split(', ').map(&:strip)
-      matches = (/User #{@user} may run the following commands on .*\n((\W.*\n)*)/).match output
+      defaults = matches ? matches[1].split(', ').map(&:strip) : {}
+      matches = /User #{@user} may run the following commands on .*\n((\W.*\n)*)/.match output
 
-      permissions = matches[1].split("\n").map{ |x| chunk_permission(x.strip) }
+      permissions = matches ? matches[1].split("\n").map { |x| chunk_permission(x.strip) } : {}
       { defaults: defaults, permissions: permissions }
     end
   end
-end
+end

data/lib/serverspec_extra_types/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ServerspecExtraTypes
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/properties.yml

@@ -26,8 +26,6 @@ targets:
     backend: exec
     spec_type: docker_network
 
-
-
   rabbitmq:
     backend: exec
     spec_type: rabbit
@@ -51,11 +49,39 @@ targets:
 
   sudo:
     backend: docker
-    docker_build_dir: spec/resources
+    docker_build_dir: spec/resources/dockerfiles/sudo
     spec_type: sudo
 
+  sudo_matchers:
+    backend: docker
+    docker_build_dir: spec/resources/dockerfiles/sudo
+    spec_type: matchers/sudo_matcher
+
 
   sudo_user:
     backend: docker
-    docker_build_dir: spec/resources
-    spec_type: sudo_user
+    docker_build_dir: spec/resources/dockerfiles/sudo
+    spec_type: sudo_user
+
+  nfs_export:
+    backend: docker
+    docker_build_dir: spec/resources/dockerfiles/nfs
+    spec_type: nfs_export
+
+  jenkins_plugin:
+    backend: exec
+    spec_type: jenkins_plugin
+    variables:
+      jenkins_url: http://localhost:38080
+
+  jenkins_credential:
+    backend: exec
+    spec_type: jenkins_credential
+    variables:
+      jenkins_url: http://localhost:38080
+
+  jenkins_job:
+    backend: exec
+    spec_type: jenkins_job
+    variables:
+      jenkins_url: http://localhost:38080

data/serverspec-extra-types.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.8.0'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'serverspec_launcher', '~> 0.3.0'
+  spec.add_development_dependency 'serverspec_launcher', '~> 0.4.0'
   spec.add_development_dependency  'rspec-collection_matchers'
   spec.add_development_dependency  'rest-client'
   spec.add_development_dependency 'docker-swarm-sdk'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec-extra-types
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrew Wardrobe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-11 00:00:00.000000000 Z
+date: 2019-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -172,8 +172,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rspec"
 - ".rubocop.yml"
+- ".simplecov"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -185,11 +187,13 @@ files:
 - bin/http_doc_gem.rb
 - bin/setup
 - http_matchers.md
+- lib/serverspec-extra-types.rb
 - lib/serverspec_extra_types.rb
 - lib/serverspec_extra_types/helpers/properties.rb
 - lib/serverspec_extra_types/matchers.rb
 - lib/serverspec_extra_types/matchers/allowed_to_run_anything.rb
 - lib/serverspec_extra_types/matchers/allowed_to_run_command.rb
+- lib/serverspec_extra_types/matchers/apply_to.rb
 - lib/serverspec_extra_types/matchers/be_a_manager_node.rb
 - lib/serverspec_extra_types/matchers/be_a_worker_node.rb
 - lib/serverspec_extra_types/matchers/be_active.rb