specinfra 2.0.0.beta44 → 2.0.0.beta45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e06e2085c8a22f674bc94c57c8915bb79029774
-  data.tar.gz: 07b5050a0cd064f0aa9a4a56a1258b2aae747bbb
+  metadata.gz: da34115f7301508e58d4ce39282f0424d6f2ca9b
+  data.tar.gz: fe5b623278cdebae40aaec7dad64ed3e676be930
 SHA512:
-  metadata.gz: 2d15fb703b1b5894fcbc5ab87ca8571482a0b06abd704d0a15a727e3d19c18c14976bf51017e558298a71d103dd1d20c2c83595ad25c8ac51d3ecdbf93313fc5
-  data.tar.gz: ac34fb786f096fd8024665dc8ee07b47e21ff591ada409d0a3a61a4a444c9d13a53a7a960cd098bc145bc9df9ab7e77458efb298d136ccaea1f24848897444a0
+  metadata.gz: dfdbfe7d21fd49334d4b27cd5088cea06f89528a1ff342e2f95997be59c7bc26d929ef50dae149c5db7e542423fb126114c909c9912201b0b28087e0de47982c
+  data.tar.gz: 60e692b38a48cd2f040b452ddf4bb474c604fd118288822a76db4ebe07d4058fddaf2a42f83dbe9d692b4a3be188bf12e616d5a698efc91e2937ef81912e3cc8

data/lib/specinfra/command/base/ip6tables.rb

@@ -0,0 +1,2 @@
+class Specinfra::Command::Base::Ip6tables < Specinfra::Command::Base
+end

data/lib/specinfra/command/linux/base/ip6tables.rb

@@ -0,0 +1,15 @@
+class Specinfra::Command::Linux::Base::Ip6tables < Specinfra::Command::Base::Ip6tables
+  class << self
+    def check_has_rule(rule, table=nil, chain=nil)
+      cmd = "ip6tables"
+      cmd += " -t #{escape(table)}" if table
+      cmd += " -S"
+      cmd += " #{escape(chain)}" if chain
+      cmd += " | grep -- #{escape(rule)}"
+      cmd += " || ip6tables-save"
+      cmd += " -t #{escape(table)}" if table
+      cmd += " | grep -- #{escape(rule)}"
+      cmd
+    end
+  end
+end

data/lib/specinfra/command.rb

@@ -15,6 +15,7 @@ require 'specinfra/command/base/interface'
 require 'specinfra/command/base/ipfilter'
 require 'specinfra/command/base/ipnat'
 require 'specinfra/command/base/iptables'
+require 'specinfra/command/base/ip6tables'
 require 'specinfra/command/base/kernel_module'
 require 'specinfra/command/base/lxc_container'
 require 'specinfra/command/base/mail_alias'
@@ -35,6 +36,7 @@ require 'specinfra/command/linux/base'
 require 'specinfra/command/linux/base/file'
 require 'specinfra/command/linux/base/interface'
 require 'specinfra/command/linux/base/iptables'
+require 'specinfra/command/linux/base/ip6tables'
 require 'specinfra/command/linux/base/kernel_module'
 require 'specinfra/command/linux/base/lxc_container'
 require 'specinfra/command/linux/base/package'

data/lib/specinfra/helper/detect_os/arch.rb

@@ -1,6 +1,6 @@
 class Specinfra::Helper::DetectOs::Arch < Specinfra::Helper::DetectOs
   def self.detect
-    if run_command('uname -sr').stdout =~ /Arch/i
+    if File.exist?('/etc/arch-release')
       { :family => 'arch', :release => nil }
     end
   end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.0.0.beta44"
+  VERSION = "2.0.0.beta45"
 end

data/spec/command/linux/ip6tables_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+set :os, :family => 'linux'
+
+describe get_command(:check_ip6tables_has_rule, 'rule') do
+  it { should eq 'ip6tables -S | grep -- rule || ip6tables-save | grep -- rule' }
+end

data/wercker.yml

@@ -1,4 +1,4 @@
-box: mizzy/serverspec-base@0.0.3
+box: mizzy/serverspec-base@0.0.5
 build:
   steps:
     - script:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta44
+  version: 2.0.0.beta45
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -155,6 +155,7 @@ files:
 - lib/specinfra/command/base/group.rb
 - lib/specinfra/command/base/host.rb
 - lib/specinfra/command/base/interface.rb
+- lib/specinfra/command/base/ip6tables.rb
 - lib/specinfra/command/base/ipfilter.rb
 - lib/specinfra/command/base/ipnat.rb
 - lib/specinfra/command/base/iptables.rb
@@ -203,6 +204,7 @@ files:
 - lib/specinfra/command/linux/base.rb
 - lib/specinfra/command/linux/base/file.rb
 - lib/specinfra/command/linux/base/interface.rb
+- lib/specinfra/command/linux/base/ip6tables.rb
 - lib/specinfra/command/linux/base/iptables.rb
 - lib/specinfra/command/linux/base/kernel_module.rb
 - lib/specinfra/command/linux/base/lxc_container.rb
@@ -327,6 +329,7 @@ files:
 - spec/command/base/user_spec.rb
 - spec/command/debian/service_spec.rb
 - spec/command/factory_spec.rb
+- spec/command/linux/ip6tables_spec.rb
 - spec/command/module/systemd_spec.rb
 - spec/command/redhat/interface_spec.rb
 - spec/command/redhat/package_spec.rb
@@ -371,6 +374,7 @@ test_files:
 - spec/command/base/user_spec.rb
 - spec/command/debian/service_spec.rb
 - spec/command/factory_spec.rb
+- spec/command/linux/ip6tables_spec.rb
 - spec/command/module/systemd_spec.rb
 - spec/command/redhat/interface_spec.rb
 - spec/command/redhat/package_spec.rb