inspec 2.0.16 → 2.0.17

data/lib/inspec/objects/each_loop.rb

@@ -1,36 +1,36 @@
-# encoding:utf-8
-
-module Inspec
-  class EachLoop < List
-    attr_reader :variables
-    attr_accessor :tests
-    def initialize
-      super
-      @tests = []
-      @variables = []
-    end
-
-    def add_test(t = nil)
-      t ||= Test.new
-      t.qualifier[0] = ['entry']
-      @tests.push(t)
-      t
-    end
-
-    def negate!
-      @tests.each(&:negate!)
-    end
-
-    def to_hash
-      { qualifier: qualifier, test: @test }
-    end
-
-    def to_ruby
-      vars = variables.map(&:to_ruby).join("\n")
-      vars += "\n" unless vars.empty?
-      obj = super
-      all_tests = @tests.map(&:to_ruby).join("\n").gsub("\n", "\n  ")
-      format("%s%s.each do |entry|\n  %s\nend", vars, obj, all_tests)
-    end
-  end
-end
+# encoding:utf-8
+
+module Inspec
+  class EachLoop < List
+    attr_reader :variables
+    attr_accessor :tests
+    def initialize
+      super
+      @tests = []
+      @variables = []
+    end
+
+    def add_test(t = nil)
+      t ||= Test.new
+      t.qualifier[0] = ['entry']
+      @tests.push(t)
+      t
+    end
+
+    def negate!
+      @tests.each(&:negate!)
+    end
+
+    def to_hash
+      { qualifier: qualifier, test: @test }
+    end
+
+    def to_ruby
+      vars = variables.map(&:to_ruby).join("\n")
+      vars += "\n" unless vars.empty?
+      obj = super
+      all_tests = @tests.map(&:to_ruby).join("\n").gsub("\n", "\n  ")
+      format("%s%s.each do |entry|\n  %s\nend", vars, obj, all_tests)
+    end
+  end
+end

data/lib/inspec/objects/list.rb

@@ -1,15 +1,15 @@
-# encoding:utf-8
-
-module Inspec
-  class List < Value
-    def map
-      raise 'Inspec::List.map needs to be called with a block' unless block_given?
-      t = List.new
-      t.qualifier = [['x']]
-      yield(t)
-      return if t.qualifier == [['x']]
-      @qualifier.push(['map', "{ |x| #{t.to_ruby} }"])
-      self
-    end
-  end
-end
+# encoding:utf-8
+
+module Inspec
+  class List < Value
+    def map
+      raise 'Inspec::List.map needs to be called with a block' unless block_given?
+      t = List.new
+      t.qualifier = [['x']]
+      yield(t)
+      return if t.qualifier == [['x']]
+      @qualifier.push(['map', "{ |x| #{t.to_ruby} }"])
+      self
+    end
+  end
+end

data/lib/inspec/objects/or_test.rb

@@ -1,40 +1,40 @@
-# encoding:utf-8
-
-module Inspec
-  class OrTest
-    attr_reader :tests
-    def initialize(tests)
-      @tests = tests
-      @negated = false
-    end
-
-    def skip
-      nil
-    end
-
-    def negate!
-      @negated = !@negated
-    end
-
-    def to_ruby
-      if @negated
-        # We don't use the describe.one wrapper when negated because:
-        # !(test1 || test2)     same as    (!test1 && !test2)    where && is implicit in inspec
-        all_tests = @tests.map { |test|
-          test.negate!
-          test
-        }.map(&:to_ruby).join("\n")
-
-        all_tests
-      else
-        all_tests = @tests.map(&:to_ruby).join("\n").gsub("\n", "\n  ")
-
-        format("describe.one do\n  %s\nend", all_tests)
-      end
-    end
-
-    def to_hash
-      { describe_one: @tests.map(&:to_hash) }
-    end
-  end
-end
+# encoding:utf-8
+
+module Inspec
+  class OrTest
+    attr_reader :tests
+    def initialize(tests)
+      @tests = tests
+      @negated = false
+    end
+
+    def skip
+      nil
+    end
+
+    def negate!
+      @negated = !@negated
+    end
+
+    def to_ruby
+      if @negated
+        # We don't use the describe.one wrapper when negated because:
+        # !(test1 || test2)     same as    (!test1 && !test2)    where && is implicit in inspec
+        all_tests = @tests.map { |test|
+          test.negate!
+          test
+        }.map(&:to_ruby).join("\n")
+
+        all_tests
+      else
+        all_tests = @tests.map(&:to_ruby).join("\n").gsub("\n", "\n  ")
+
+        format("describe.one do\n  %s\nend", all_tests)
+      end
+    end
+
+    def to_hash
+      { describe_one: @tests.map(&:to_hash) }
+    end
+  end
+end

data/lib/inspec/objects/ruby_helper.rb

@@ -1,15 +1,15 @@
-# encoding: utf-8
-
-module Inspec
-  module RubyHelper
-    def ruby_qualifier(q)
-      if q.length <= 1
-        q[0]
-      elsif q[0] == 'map' && q.length == 2
-        q[0] + ' ' + q[1]
-      else
-        q[0] + '(' + q[1..-1].map(&:inspect).join(', ') + ')'
-      end
-    end
-  end
-end
+# encoding: utf-8
+
+module Inspec
+  module RubyHelper
+    def ruby_qualifier(q)
+      if q.length <= 1
+        q[0]
+      elsif q[0] == 'map' && q.length == 2
+        q[0] + ' ' + q[1]
+      else
+        q[0] + '(' + q[1..-1].map(&:inspect).join(', ') + ')'
+      end
+    end
+  end
+end

data/lib/inspec/objects/tag.rb

@@ -1,27 +1,27 @@
-# encoding:utf-8
-
-module Inspec
-  class Tag
-    attr_accessor :key, :value
-
-    def initialize(key, value)
-      @key = key
-      @value = value
-    end
-
-    def to_hash
-      {
-        name: key,
-        value: value,
-      }
-    end
-
-    def to_ruby
-      "tag #{key.inspect}: #{value.inspect}"
-    end
-
-    def to_s
-      "Tag #{key} with #{value}"
-    end
-  end
-end
+# encoding:utf-8
+
+module Inspec
+  class Tag
+    attr_accessor :key, :value
+
+    def initialize(key, value)
+      @key = key
+      @value = value
+    end
+
+    def to_hash
+      {
+        name: key,
+        value: value,
+      }
+    end
+
+    def to_ruby
+      "tag #{key.inspect}: #{value.inspect}"
+    end
+
+    def to_s
+      "Tag #{key} with #{value}"
+    end
+  end
+end

data/lib/inspec/objects/test.rb

@@ -1,87 +1,87 @@
-# encoding:utf-8
-
-module Inspec
-  class Test
-    attr_accessor :qualifier, :matcher, :expectation, :skip, :negated, :variables
-    include RubyHelper
-
-    def initialize
-      @qualifier = []
-      @negated = false
-      @variables = []
-    end
-
-    def negate!
-      @negated = !@negated
-    end
-
-    def to_ruby
-      return rb_skip if !skip.nil?
-      rb_describe
-    end
-
-    def to_hash
-      { qualifier: qualifier, matcher: matcher, expectation: expectation, skip: skip, negated: negated }
-    end
-
-    def resource
-      @resource ||=
-        if qualifier.empty? || qualifier[0].empty? || qualifier[0][0].empty?
-          nil
-        else
-          qualifier[0][0]
-        end
-    end
-
-    def remove_expectation
-      remove_instance_variable(:@expectation)
-    end
-
-    private
-
-    def describe_chain
-      return nil if @qualifier.empty?
-
-      resource = @qualifier.length > 1 ? @qualifier[0..-2] : [@qualifier[0]]
-      res = resource.map { |q| ruby_qualifier(q) }.join('.')
-      xres = nil
-
-      if @qualifier.length > 1
-        last = @qualifier[-1]
-        last_call = last.is_a?(Array) ? last[0].to_s : ''
-        if last.length == 1 && last_call !~ /^to_.$/ && !last_call.include?('[') && !last_call.empty?
-          # this will go in its()
-          xres = last_call
-        else
-          res += '.' + ruby_qualifier(last) unless last_call.empty?
-        end
-      end
-
-      [res, xres]
-    end
-
-    def rb_describe
-      vars = variables.map(&:to_ruby).join("\n")
-      vars += "\n" unless vars.empty?
-      res, xtra = describe_chain
-      itsy = xtra.nil? ? 'it' : 'its(' + xtra.to_s.inspect + ')'
-      naughty = @negated ? '_not' : ''
-      xpect = if !defined?(@expectation)
-                ''
-              elsif @expectation.class == Regexp
-                # without this, xpect values like / \/zones\// will not be parsed properly
-                "(#{@expectation.inspect})"
-              elsif xpect != ''
-                ' ' + expectation.inspect
-              end
-      format("%sdescribe %s do\n  %s { should%s %s%s }\nend",
-             vars, res, itsy, naughty, matcher, xpect)
-    end
-
-    def rb_skip
-      dc = describe_chain
-      obj = dc.nil? ? skip.inspect : dc[0]
-      format("describe %s do\n  skip %s\nend", obj, skip.inspect)
-    end
-  end
-end
+# encoding:utf-8
+
+module Inspec
+  class Test
+    attr_accessor :qualifier, :matcher, :expectation, :skip, :negated, :variables
+    include RubyHelper
+
+    def initialize
+      @qualifier = []
+      @negated = false
+      @variables = []
+    end
+
+    def negate!
+      @negated = !@negated
+    end
+
+    def to_ruby
+      return rb_skip if !skip.nil?
+      rb_describe
+    end
+
+    def to_hash
+      { qualifier: qualifier, matcher: matcher, expectation: expectation, skip: skip, negated: negated }
+    end
+
+    def resource
+      @resource ||=
+        if qualifier.empty? || qualifier[0].empty? || qualifier[0][0].empty?
+          nil
+        else
+          qualifier[0][0]
+        end
+    end
+
+    def remove_expectation
+      remove_instance_variable(:@expectation)
+    end
+
+    private
+
+    def describe_chain
+      return nil if @qualifier.empty?
+
+      resource = @qualifier.length > 1 ? @qualifier[0..-2] : [@qualifier[0]]
+      res = resource.map { |q| ruby_qualifier(q) }.join('.')
+      xres = nil
+
+      if @qualifier.length > 1
+        last = @qualifier[-1]
+        last_call = last.is_a?(Array) ? last[0].to_s : ''
+        if last.length == 1 && last_call !~ /^to_.$/ && !last_call.include?('[') && !last_call.empty?
+          # this will go in its()
+          xres = last_call
+        else
+          res += '.' + ruby_qualifier(last) unless last_call.empty?
+        end
+      end
+
+      [res, xres]
+    end
+
+    def rb_describe
+      vars = variables.map(&:to_ruby).join("\n")
+      vars += "\n" unless vars.empty?
+      res, xtra = describe_chain
+      itsy = xtra.nil? ? 'it' : 'its(' + xtra.to_s.inspect + ')'
+      naughty = @negated ? '_not' : ''
+      xpect = if !defined?(@expectation)
+                ''
+              elsif @expectation.class == Regexp
+                # without this, xpect values like / \/zones\// will not be parsed properly
+                "(#{@expectation.inspect})"
+              elsif xpect != ''
+                ' ' + expectation.inspect
+              end
+      format("%sdescribe %s do\n  %s { should%s %s%s }\nend",
+             vars, res, itsy, naughty, matcher, xpect)
+    end
+
+    def rb_skip
+      dc = describe_chain
+      obj = dc.nil? ? skip.inspect : dc[0]
+      format("describe %s do\n  skip %s\nend", obj, skip.inspect)
+    end
+  end
+end

data/lib/inspec/objects/value.rb

@@ -1,27 +1,27 @@
-# encoding:utf-8
-
-module Inspec
-  class Value
-    include ::Inspec::RubyHelper
-
-    attr_accessor :qualifier
-    attr_accessor :skip
-    attr_accessor :variable
-
-    def initialize(qualifiers = [])
-      @qualifier = qualifiers
-      @variable = nil
-    end
-
-    def to_ruby
-      res = @variable.nil? ? '' : "#{@variable} = "
-      res + @qualifier.map { |x| ruby_qualifier(x) }.join('.')
-    end
-
-    def name_variable(cache = [])
-      @variable = Array('a'..'z').find { |x| !cache.include?(x) }
-      cache.push(@variable)
-      @variable
-    end
-  end
-end
+# encoding:utf-8
+
+module Inspec
+  class Value
+    include ::Inspec::RubyHelper
+
+    attr_accessor :qualifier
+    attr_accessor :skip
+    attr_accessor :variable
+
+    def initialize(qualifiers = [])
+      @qualifier = qualifiers
+      @variable = nil
+    end
+
+    def to_ruby
+      res = @variable.nil? ? '' : "#{@variable} = "
+      res + @qualifier.map { |x| ruby_qualifier(x) }.join('.')
+    end
+
+    def name_variable(cache = [])
+      @variable = Array('a'..'z').find { |x| !cache.include?(x) }
+      cache.push(@variable)
+      @variable
+    end
+  end
+end