serverspec 1.14.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da3525e9160c788ed5777a236493ca7738080551
-  data.tar.gz: 0b2f699a4e38a269233f4f024629b509aab2fa4d
+  metadata.gz: 64e83a8af2f88bd8cecf1aa15e554277041c8182
+  data.tar.gz: 4da38d7a40d696e45efdfbfa2e6ab8649d45f3fc
 SHA512:
-  metadata.gz: a6ef8f1ab5337dd03dfd4e5b5974bc92fe51804bcf9638ffc048cdbb8bcbbfe89c0b6d5aefcf1f4b391bbd31d1494d192dbb2d5a44bc5d692f428b7651e325c9
-  data.tar.gz: 939edb54183b55d98f2268883165c6ea468a94693f2a4ab25940639729643e42abaf075e5aa1329d00d8b7d8d73377f6201038867603d95b59217b27191482e8
+  metadata.gz: a0ad8ad16b4bdfd9daa5a01840402559be0fd35e5b0fb496ae796ece2cc283eb699bd1eeab8bda2f2565ab53ae46ce91388547e2775c7dbba5f4ce807d17dab0
+  data.tar.gz: c7ec968683d46d22df50f85feda73a2594bbaeff16bb9ac40fa49ddbf9ee64014816ff97600c4443d993b199d113686ac908b414c1dc5828f4bfe87d917068a6

data/lib/serverspec/helper/type.rb

@@ -3,7 +3,7 @@ module Serverspec
     module Type
       types = %w(
         base cgroup command cron default_gateway file group host iis_website iis_app_pool interface
-        ipfilter ipnat iptables kernel_module linux_kernel_parameter lxc mail_alias
+        ipfilter ipnat iptables ip6tables kernel_module linux_kernel_parameter lxc mail_alias
         package php_config port ppa process routing_table selinux service user yumrepo
         windows_feature windows_hot_fix windows_registry_key windows_scheduled_task zfs
       )

data/lib/serverspec/matchers/have_rule.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :have_rule do |rule|
   match do |subject|
-    if subject.class.name == 'Serverspec::Type::Iptables'
+    if subject.class.name == 'Serverspec::Type::Iptables' || subject.class.name == 'Serverspec::Type::Ip6tables'
       subject.has_rule?(rule, @table, @chain)
     else
       subject.has_rule?(rule)

data/lib/serverspec/matchers.rb

@@ -29,7 +29,7 @@ require 'serverspec/matchers/return_exit_status'
 require 'serverspec/matchers/return_stdout'
 require 'serverspec/matchers/return_stderr'
 
-# ipfiter, ipnat, iptables
+# ipfiter, ipnat, iptables, ip6tables
 require 'serverspec/matchers/have_rule'
 
 # cron, routing_table
@@ -38,4 +38,4 @@ require 'serverspec/matchers/have_entry'
 # iis_website
 require 'serverspec/matchers/have_site_application'
 require 'serverspec/matchers/have_site_bindings'
-require 'serverspec/matchers/have_virtual_dir'
+require 'serverspec/matchers/have_virtual_dir'

data/lib/serverspec/type/ip6tables.rb

@@ -0,0 +1,13 @@
+module Serverspec
+  module Type
+    class Ip6tables < Base
+      def has_rule?(rule, table, chain)
+        backend.check_ip6tables_rule(rule, table, chain)
+      end
+
+      def to_s
+        'ip6tables'
+      end
+    end
+  end
+end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "1.14.0"
+  VERSION = "1.15.0"
 end

data/serverspec.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rspec", "~> 2.99"
   spec.add_runtime_dependency "rspec-its"
   spec.add_runtime_dependency "highline"
-  spec.add_runtime_dependency "specinfra", "~> 1.25"
+  spec.add_runtime_dependency "specinfra", "~> 1.26"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.1"
 end

data/spec/debian/ip6tables_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+include SpecInfra::Helper::Debian
+
+describe ip6tables do
+  it { should have_rule '-P INPUT ACCEPT'  }
+  its(:command) { should eq "ip6tables -S | grep -- -P\\ INPUT\\ ACCEPT || ip6tables-save | grep -- -P\\ INPUT\\ ACCEPT" }
+end
+
+describe ip6tables do
+  it { should_not have_rule 'invalid-rule' }
+end
+
+describe ip6tables do
+  it { should have_rule('-P INPUT ACCEPT').with_table('mangle').with_chain('INPUT') }
+  its(:command) { should eq "ip6tables -t mangle -S INPUT | grep -- -P\\ INPUT\\ ACCEPT || ip6tables-save -t mangle | grep -- -P\\ INPUT\\ ACCEPT" }
+end
+
+describe ip6tables do
+  it { should_not have_rule('invalid-rule').with_table('mangle').with_chain('INPUT') }
+end

data/spec/fedora/ip6tables_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+include SpecInfra::Helper::Fedora
+
+describe ip6tables do
+  it { should have_rule '-P INPUT ACCEPT'  }
+  its(:command) { should eq "ip6tables -S | grep -- -P\\ INPUT\\ ACCEPT || ip6tables-save | grep -- -P\\ INPUT\\ ACCEPT" }
+end
+
+describe ip6tables do
+  it { should_not have_rule 'invalid-rule' }
+end
+
+describe ip6tables do
+  it { should have_rule('-P INPUT ACCEPT').with_table('mangle').with_chain('INPUT') }
+  its(:command) { should eq "ip6tables -t mangle -S INPUT | grep -- -P\\ INPUT\\ ACCEPT || ip6tables-save -t mangle | grep -- -P\\ INPUT\\ ACCEPT" }
+end
+
+describe ip6tables do
+  it { should_not have_rule('invalid-rule').with_table('mangle').with_chain('INPUT') }
+end

data/spec/gentoo/ip6tables_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+include SpecInfra::Helper::Gentoo
+
+describe ip6tables do
+  it { should have_rule '-P INPUT ACCEPT'  }
+  its(:command) { should eq "ip6tables -S | grep -- -P\\ INPUT\\ ACCEPT || ip6tables-save | grep -- -P\\ INPUT\\ ACCEPT" }
+end
+
+describe ip6tables do
+  it { should_not have_rule 'invalid-rule' }
+end
+
+describe ip6tables do
+  it { should have_rule('-P INPUT ACCEPT').with_table('mangle').with_chain('INPUT') }
+  its(:command) { should eq "ip6tables -t mangle -S INPUT | grep -- -P\\ INPUT\\ ACCEPT || ip6tables-save -t mangle | grep -- -P\\ INPUT\\ ACCEPT" }
+end
+
+describe ip6tables do
+  it { should_not have_rule('invalid-rule').with_table('mangle').with_chain('INPUT') }
+end

data/spec/plamo/ip6tables_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+include SpecInfra::Helper::Plamo
+
+describe ip6tables do
+  it { should have_rule '-P INPUT ACCEPT'  }
+  its(:command) { should eq "ip6tables -S | grep -- -P\\ INPUT\\ ACCEPT || ip6tables-save | grep -- -P\\ INPUT\\ ACCEPT" }
+end
+
+describe ip6tables do
+  it { should_not have_rule 'invalid-rule' }
+end
+
+describe ip6tables do
+  it { should have_rule('-P INPUT ACCEPT').with_table('mangle').with_chain('INPUT') }
+  its(:command) { should eq "ip6tables -t mangle -S INPUT | grep -- -P\\ INPUT\\ ACCEPT || ip6tables-save -t mangle | grep -- -P\\ INPUT\\ ACCEPT" }
+end
+
+describe ip6tables do
+  it { should_not have_rule('invalid-rule').with_table('mangle').with_chain('INPUT') }
+end

data/spec/redhat/ip6tables_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+include SpecInfra::Helper::RedHat
+
+describe ip6tables do
+  it { should have_rule '-P INPUT ACCEPT'  }
+  its(:command) { should eq "ip6tables -S | grep -- -P\\ INPUT\\ ACCEPT || ip6tables-save | grep -- -P\\ INPUT\\ ACCEPT" }
+end
+
+describe ip6tables do
+  it { should_not have_rule 'invalid-rule' }
+end
+
+describe ip6tables do
+  it { should have_rule('-P INPUT ACCEPT').with_table('mangle').with_chain('INPUT') }
+  its(:command) { should eq "ip6tables -t mangle -S INPUT | grep -- -P\\ INPUT\\ ACCEPT || ip6tables-save -t mangle | grep -- -P\\ INPUT\\ ACCEPT" }
+end
+
+describe ip6tables do
+  it { should_not have_rule('invalid-rule').with_table('mangle').with_chain('INPUT') }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2014-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.26'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.26'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -170,6 +170,7 @@ files:
 - lib/serverspec/type/iis_app_pool.rb
 - lib/serverspec/type/iis_website.rb
 - lib/serverspec/type/interface.rb
+- lib/serverspec/type/ip6tables.rb
 - lib/serverspec/type/ipfilter.rb
 - lib/serverspec/type/ipnat.rb
 - lib/serverspec/type/iptables.rb
@@ -237,6 +238,7 @@ files:
 - spec/debian/group_spec.rb
 - spec/debian/host_spec.rb
 - spec/debian/interface_spec.rb
+- spec/debian/ip6tables_spec.rb
 - spec/debian/iptables_spec.rb
 - spec/debian/kernel_module_spec.rb
 - spec/debian/linux_kernel_parameter_spec.rb
@@ -259,6 +261,7 @@ files:
 - spec/fedora/group_spec.rb
 - spec/fedora/host_spec.rb
 - spec/fedora/interface_spec.rb
+- spec/fedora/ip6tables_spec.rb
 - spec/fedora/iptables_spec.rb
 - spec/fedora/kernel_module_spec.rb
 - spec/fedora/linux_kernel_parameter_spec.rb
@@ -295,6 +298,7 @@ files:
 - spec/gentoo/group_spec.rb
 - spec/gentoo/host_spec.rb
 - spec/gentoo/interface_spec.rb
+- spec/gentoo/ip6tables_spec.rb
 - spec/gentoo/iptables_spec.rb
 - spec/gentoo/kernel_module_spec.rb
 - spec/gentoo/linux_kernel_parameter_spec.rb
@@ -322,6 +326,7 @@ files:
 - spec/plamo/group_spec.rb
 - spec/plamo/host_spec.rb
 - spec/plamo/interface_spec.rb
+- spec/plamo/ip6tables_spec.rb
 - spec/plamo/iptables_spec.rb
 - spec/plamo/kernel_module_spec.rb
 - spec/plamo/linux_kernel_parameter_spec.rb
@@ -343,6 +348,7 @@ files:
 - spec/redhat/group_spec.rb
 - spec/redhat/host_spec.rb
 - spec/redhat/interface_spec.rb
+- spec/redhat/ip6tables_spec.rb
 - spec/redhat/iptables_spec.rb
 - spec/redhat/kernel_module_spec.rb
 - spec/redhat/linux_kernel_parameter_spec.rb
@@ -483,6 +489,7 @@ test_files:
 - spec/debian/group_spec.rb
 - spec/debian/host_spec.rb
 - spec/debian/interface_spec.rb
+- spec/debian/ip6tables_spec.rb
 - spec/debian/iptables_spec.rb
 - spec/debian/kernel_module_spec.rb
 - spec/debian/linux_kernel_parameter_spec.rb
@@ -505,6 +512,7 @@ test_files:
 - spec/fedora/group_spec.rb
 - spec/fedora/host_spec.rb
 - spec/fedora/interface_spec.rb
+- spec/fedora/ip6tables_spec.rb
 - spec/fedora/iptables_spec.rb
 - spec/fedora/kernel_module_spec.rb
 - spec/fedora/linux_kernel_parameter_spec.rb
@@ -541,6 +549,7 @@ test_files:
 - spec/gentoo/group_spec.rb
 - spec/gentoo/host_spec.rb
 - spec/gentoo/interface_spec.rb
+- spec/gentoo/ip6tables_spec.rb
 - spec/gentoo/iptables_spec.rb
 - spec/gentoo/kernel_module_spec.rb
 - spec/gentoo/linux_kernel_parameter_spec.rb
@@ -568,6 +577,7 @@ test_files:
 - spec/plamo/group_spec.rb
 - spec/plamo/host_spec.rb
 - spec/plamo/interface_spec.rb
+- spec/plamo/ip6tables_spec.rb
 - spec/plamo/iptables_spec.rb
 - spec/plamo/kernel_module_spec.rb
 - spec/plamo/linux_kernel_parameter_spec.rb
@@ -589,6 +599,7 @@ test_files:
 - spec/redhat/group_spec.rb
 - spec/redhat/host_spec.rb
 - spec/redhat/interface_spec.rb
+- spec/redhat/ip6tables_spec.rb
 - spec/redhat/iptables_spec.rb
 - spec/redhat/kernel_module_spec.rb
 - spec/redhat/linux_kernel_parameter_spec.rb