inspec 2.0.16 → 2.0.17

data/lib/resources/docker_container.rb

@@ -1,89 +1,89 @@
-# encoding: utf-8
-#
-# Copyright 2017, Christoph Hartmann
-
-require_relative 'docker_object'
-
-module Inspec::Resources
-  class DockerContainer < Inspec.resource(1)
-    include Inspec::Resources::DockerObject
-
-    name 'docker_container'
-    supports platform: 'unix'
-    desc ''
-    example "
-      describe docker_container('an-echo-server') do
-        it { should exist }
-        it { should be_running }
-        its('id') { should_not eq '' }
-        its('image') { should eq 'busybox:latest' }
-        its('repo') { should eq 'busybox' }
-        its('tag') { should eq 'latest' }
-        its('ports') { should eq [] }
-        its('command') { should eq 'nc -ll -p 1234 -e /bin/cat' }
-      end
-
-      describe docker_container(id: 'e2c52a183358') do
-        it { should exist }
-        it { should be_running }
-      end
-    "
-
-    def initialize(opts = {})
-      # if a string is provided, we expect it is the name
-      if opts.is_a?(String)
-        @opts = { name: opts }
-      else
-        @opts = opts
-      end
-    end
-
-    def running?
-      status.downcase.start_with?('up') if object_info.entries.length == 1
-    end
-
-    def status
-      object_info.status[0] if object_info.entries.length == 1
-    end
-
-    def labels
-      object_info.labels[0] if object_info.entries.length == 1
-    end
-
-    def ports
-      object_info.ports[0] if object_info.entries.length == 1
-    end
-
-    def command
-      return unless object_info.entries.length == 1
-
-      cmd = object_info.commands[0]
-      cmd.slice(1, cmd.length - 2)
-    end
-
-    def image
-      object_info.images[0] if object_info.entries.length == 1
-    end
-
-    def repo
-      parse_components_from_image(image)[:repo] if object_info.entries.size == 1
-    end
-
-    def tag
-      parse_components_from_image(image)[:tag] if object_info.entries.size == 1
-    end
-
-    def to_s
-      name = @opts[:name] || @opts[:id]
-      "Docker Container #{name}"
-    end
-
-    private
-
-    def object_info
-      return @info if defined?(@info)
-      opts = @opts
-      @info = inspec.docker.containers.where { names == opts[:name] || (!id.nil? && !opts[:id].nil? && (id == opts[:id] || id.start_with?(opts[:id]))) }
-    end
-  end
-end
+# encoding: utf-8
+#
+# Copyright 2017, Christoph Hartmann
+
+require_relative 'docker_object'
+
+module Inspec::Resources
+  class DockerContainer < Inspec.resource(1)
+    include Inspec::Resources::DockerObject
+
+    name 'docker_container'
+    supports platform: 'unix'
+    desc ''
+    example "
+      describe docker_container('an-echo-server') do
+        it { should exist }
+        it { should be_running }
+        its('id') { should_not eq '' }
+        its('image') { should eq 'busybox:latest' }
+        its('repo') { should eq 'busybox' }
+        its('tag') { should eq 'latest' }
+        its('ports') { should eq [] }
+        its('command') { should eq 'nc -ll -p 1234 -e /bin/cat' }
+      end
+
+      describe docker_container(id: 'e2c52a183358') do
+        it { should exist }
+        it { should be_running }
+      end
+    "
+
+    def initialize(opts = {})
+      # if a string is provided, we expect it is the name
+      if opts.is_a?(String)
+        @opts = { name: opts }
+      else
+        @opts = opts
+      end
+    end
+
+    def running?
+      status.downcase.start_with?('up') if object_info.entries.length == 1
+    end
+
+    def status
+      object_info.status[0] if object_info.entries.length == 1
+    end
+
+    def labels
+      object_info.labels[0] if object_info.entries.length == 1
+    end
+
+    def ports
+      object_info.ports[0] if object_info.entries.length == 1
+    end
+
+    def command
+      return unless object_info.entries.length == 1
+
+      cmd = object_info.commands[0]
+      cmd.slice(1, cmd.length - 2)
+    end
+
+    def image
+      object_info.images[0] if object_info.entries.length == 1
+    end
+
+    def repo
+      parse_components_from_image(image)[:repo] if object_info.entries.size == 1
+    end
+
+    def tag
+      parse_components_from_image(image)[:tag] if object_info.entries.size == 1
+    end
+
+    def to_s
+      name = @opts[:name] || @opts[:id]
+      "Docker Container #{name}"
+    end
+
+    private
+
+    def object_info
+      return @info if defined?(@info)
+      opts = @opts
+      @info = inspec.docker.containers.where { names == opts[:name] || (!id.nil? && !opts[:id].nil? && (id == opts[:id] || id.start_with?(opts[:id]))) }
+    end
+  end
+end

data/lib/resources/docker_image.rb

@@ -1,83 +1,83 @@
-# encoding: utf-8
-#
-# Copyright 2017, Christoph Hartmann
-
-require_relative 'docker_object'
-
-module Inspec::Resources
-  class DockerImage < Inspec.resource(1)
-    include Inspec::Resources::DockerObject
-
-    name 'docker_image'
-    supports platform: 'unix'
-    desc ''
-    example "
-      describe docker_image('alpine:latest') do
-        it { should exist }
-        its('id') { should_not eq '' }
-        its('image') { should eq 'alpine:latest' }
-        its('repo') { should eq 'alpine' }
-        its('tag') { should eq 'latest' }
-      end
-
-      describe docker_image('alpine:latest') do
-        it { should exist }
-      end
-
-      describe docker_image(id: '4a415e366388') do
-        it { should exist }
-      end
-    "
-
-    def initialize(opts = {})
-      # do sanitizion of input values
-      o = opts.dup
-      o = { image: opts } if opts.is_a?(String)
-      @opts = sanitize_options(o)
-    end
-
-    def image
-      "#{repo}:#{tag}" if object_info.entries.size == 1
-    end
-
-    def repo
-      object_info.repositories[0] if object_info.entries.size == 1
-    end
-
-    def tag
-      object_info.tags[0] if object_info.entries.size == 1
-    end
-
-    def to_s
-      img = @opts[:image] || @opts[:id]
-      "Docker Image #{img}"
-    end
-
-    private
-
-    def sanitize_options(opts)
-      opts.merge!(parse_components_from_image(opts[:image]))
-
-      # assume a "latest" tag if we don't have one
-      opts[:tag] ||= 'latest'
-
-      # if the ID isn't nil and doesn't contain a hash indicator (indicated by the presence
-      # of a colon, which separates the indicator from the actual hash), we assume it's sha256.
-      opts[:id] = 'sha256:' + opts[:id] unless opts[:id].nil? || opts[:id].include?(':')
-
-      # Assemble/reassemble the image from the repo and tag
-      opts[:image] = "#{opts[:repo]}:#{opts[:tag]}" unless opts[:repo].nil?
-
-      # return the santized opts back to the caller
-      opts
-    end
-
-    def object_info
-      return @info if defined?(@info)
-      opts = @opts
-      @info = inspec.docker.images.where {
-        (repository == opts[:repo] && tag == opts[:tag]) || (!id.nil? && !opts[:id].nil? && (id == opts[:id] || id.start_with?(opts[:id])))
-      }
-    end
-  end
-end
+# encoding: utf-8
+#
+# Copyright 2017, Christoph Hartmann
+
+require_relative 'docker_object'
+
+module Inspec::Resources
+  class DockerImage < Inspec.resource(1)
+    include Inspec::Resources::DockerObject
+
+    name 'docker_image'
+    supports platform: 'unix'
+    desc ''
+    example "
+      describe docker_image('alpine:latest') do
+        it { should exist }
+        its('id') { should_not eq '' }
+        its('image') { should eq 'alpine:latest' }
+        its('repo') { should eq 'alpine' }
+        its('tag') { should eq 'latest' }
+      end
+
+      describe docker_image('alpine:latest') do
+        it { should exist }
+      end
+
+      describe docker_image(id: '4a415e366388') do
+        it { should exist }
+      end
+    "
+
+    def initialize(opts = {})
+      # do sanitizion of input values
+      o = opts.dup
+      o = { image: opts } if opts.is_a?(String)
+      @opts = sanitize_options(o)
+    end
+
+    def image
+      "#{repo}:#{tag}" if object_info.entries.size == 1
+    end
+
+    def repo
+      object_info.repositories[0] if object_info.entries.size == 1
+    end
+
+    def tag
+      object_info.tags[0] if object_info.entries.size == 1
+    end
+
+    def to_s
+      img = @opts[:image] || @opts[:id]
+      "Docker Image #{img}"
+    end
+
+    private
+
+    def sanitize_options(opts)
+      opts.merge!(parse_components_from_image(opts[:image]))
+
+      # assume a "latest" tag if we don't have one
+      opts[:tag] ||= 'latest'
+
+      # if the ID isn't nil and doesn't contain a hash indicator (indicated by the presence
+      # of a colon, which separates the indicator from the actual hash), we assume it's sha256.
+      opts[:id] = 'sha256:' + opts[:id] unless opts[:id].nil? || opts[:id].include?(':')
+
+      # Assemble/reassemble the image from the repo and tag
+      opts[:image] = "#{opts[:repo]}:#{opts[:tag]}" unless opts[:repo].nil?
+
+      # return the santized opts back to the caller
+      opts
+    end
+
+    def object_info
+      return @info if defined?(@info)
+      opts = @opts
+      @info = inspec.docker.images.where {
+        (repository == opts[:repo] && tag == opts[:tag]) || (!id.nil? && !opts[:id].nil? && (id == opts[:id] || id.start_with?(opts[:id])))
+      }
+    end
+  end
+end

data/lib/resources/docker_object.rb

@@ -1,57 +1,57 @@
-# encoding: utf-8
-#
-# Copyright 2017, Christoph Hartmann
-#
-# author: Christoph Hartmann
-# author: Patrick Muench
-# author: Dominik Richter
-# author: Matt Kulka
-
-module Inspec::Resources::DockerObject
-  def exist?
-    object_info.exists?
-  end
-
-  def id
-    object_info.ids[0] if object_info.entries.size == 1
-  end
-
-  private
-
-  def parse_components_from_image(image_string)
-    # if the user did not supply an image string, they likely supplied individual
-    # option parameters, such as repo and tag. Return empty data back to the caller.
-    return {} if image_string.nil?
-
-    first_colon = image_string.index(':') || -1
-    first_slash = image_string.index('/') || -1
-
-    if image_string.count(':') == 2
-      # If there are two colons in the image string, it contains a repo-with-port and a tag.
-      # example: localhost:5000/chef/inspec:1.46.3
-      partitioned_string = image_string.rpartition(':')
-      repo = partitioned_string.first
-      tag = partitioned_string.last
-      image_name = repo.split('/')[1..-1].join
-    elsif image_string.count(':') == 1 && first_colon < first_slash
-      # If there's one colon in the image string, and it comes before a forward-slash,
-      # it contains a repo-with-port but no tag.
-      # example: localhost:5000/ubuntu
-      repo = image_string
-      tag = nil
-      image_name = repo.split('/')[1..-1].join
-    else
-      # If there's one colon in the image string and it doesn't preceed a slash, or if
-      # there is no colon at all, then it separates the repo from the tag, if there is a tag.
-      # example: chef/inspec:1.46.3
-      # example: chef/inspec
-      # example: ubuntu:14.04
-      repo, tag = image_string.split(':')
-      image_name = repo
-    end
-
-    # return the repo, image_name and tag parsed from the string, which can be merged into
-    # the rest of the user-supplied options
-    { repo: repo, image_name: image_name, tag: tag }
-  end
-end
+# encoding: utf-8
+#
+# Copyright 2017, Christoph Hartmann
+#
+# author: Christoph Hartmann
+# author: Patrick Muench
+# author: Dominik Richter
+# author: Matt Kulka
+
+module Inspec::Resources::DockerObject
+  def exist?
+    object_info.exists?
+  end
+
+  def id
+    object_info.ids[0] if object_info.entries.size == 1
+  end
+
+  private
+
+  def parse_components_from_image(image_string)
+    # if the user did not supply an image string, they likely supplied individual
+    # option parameters, such as repo and tag. Return empty data back to the caller.
+    return {} if image_string.nil?
+
+    first_colon = image_string.index(':') || -1
+    first_slash = image_string.index('/') || -1
+
+    if image_string.count(':') == 2
+      # If there are two colons in the image string, it contains a repo-with-port and a tag.
+      # example: localhost:5000/chef/inspec:1.46.3
+      partitioned_string = image_string.rpartition(':')
+      repo = partitioned_string.first
+      tag = partitioned_string.last
+      image_name = repo.split('/')[1..-1].join
+    elsif image_string.count(':') == 1 && first_colon < first_slash
+      # If there's one colon in the image string, and it comes before a forward-slash,
+      # it contains a repo-with-port but no tag.
+      # example: localhost:5000/ubuntu
+      repo = image_string
+      tag = nil
+      image_name = repo.split('/')[1..-1].join
+    else
+      # If there's one colon in the image string and it doesn't preceed a slash, or if
+      # there is no colon at all, then it separates the repo from the tag, if there is a tag.
+      # example: chef/inspec:1.46.3
+      # example: chef/inspec
+      # example: ubuntu:14.04
+      repo, tag = image_string.split(':')
+      image_name = repo
+    end
+
+    # return the repo, image_name and tag parsed from the string, which can be merged into
+    # the rest of the user-supplied options
+    { repo: repo, image_name: image_name, tag: tag }
+  end
+end