serverspec 2.0.0.beta20 → 2.0.0.beta21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f5c21f68d3a593ac38c66936009b9b391d05981
-  data.tar.gz: b56991bd56276db1d0bfedc54117f8ad7edc12e2
+  metadata.gz: 83316b5641c09a7adf3281b26dacd8fa569dbd7e
+  data.tar.gz: 760c91e4b4391c744ac6dbe6eb04942c31fae8cc
 SHA512:
-  metadata.gz: a2d6724aa264a39827d3533c71f79aa3f5c90ff67ecbffd7dcc79d57e54951a41a0fd0df6e2fce7a6c12cd9f88002c997ff58443dda6e07b5ca7ca6d180e550e
-  data.tar.gz: 8c74196779ee1f396a9ae8c215aa4cdf2b6d56ab276460ccb08ace4a03f2a932d730465c41a77644b66b55af202a3389b3ef77ff00db3908c92cddde29700eee
+  metadata.gz: 47b30ee4a0c698d6ef27d986894a49589193add7047fad908dd9fcc106d773950309b3dfd66db1b4540e3230e2ff4d051bf63279a78aa56f82d86a8a6921b536
+  data.tar.gz: 5eb3f9635119fd3f30fd149da72c2aaa96728ad081281d561fa45476b3f44d4aebce0170b3095415c3f97b4f5dae83e8e2f59fe524ebf84ffae29b4c25c2755f

data/lib/serverspec.rb

@@ -16,7 +16,8 @@ module RSpec::Core::Notifications
       host = ENV['TARGET_HOST'] || Specinfra.configuration.host
       @failure_lines ||=
         begin
-          lines = ["On host `#{host}`"]
+          lines = []
+          lines << "On host `#{host}'" if host
           lines << "Failure/Error: #{read_failed_line.strip}"
           lines << "#{exception_class_name}:" unless exception_class_name =~ /RSpec/
           exception.message.to_s.split("\n").each do |line|

data/lib/serverspec/helper/type.rb

@@ -4,9 +4,9 @@ module Serverspec
       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 package
-        php_config port ppa process routing_table selinux service user
-        yumrepo windows_feature windows_hot_fix windows_registry_key
+        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/matcher.rb

@@ -23,7 +23,7 @@ require 'serverspec/matcher/be_running'
 require 'serverspec/matcher/belong_to_group'
 require 'serverspec/matcher/belong_to_primary_group'
 
-# ipfiter, ipnat, iptables
+# ipfiter, ipnat, iptables, ip6tables
 require 'serverspec/matcher/have_rule'
 
 # cron, routing_table

data/lib/serverspec/matcher/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/type/default_gateway.rb

@@ -1,15 +1,11 @@
 module Serverspec::Type
   class DefaultGateway < Base
     def ipaddress
-      ret = @runner.get_routing_table_entry(:destination => 'default')
-      ret.stdout =~ /^(\S+)(?: via (\S+))? dev (\S+).+(?:\r)?\n(?:default via (\S+))?/
-      $2 ? $2 : $4
+      @runner.get_default_gateway(:gateway)
     end
 
     def interface
-      ret = @runner.get_routing_table_entry(:destination => 'default')
-      ret.stdout =~ /^(\S+)(?: via (\S+))? dev (\S+).+(?:\r)?\n(?:default via (\S+))?/
-      $3
+      @runner.get_default_gateway(:interface)
     end
 
     def to_s

data/lib/serverspec/type/interface.rb

@@ -10,5 +10,9 @@ module Serverspec::Type
     def has_ipv4_address?(ip_address)
       @runner.check_interface_has_ipv4_address(@name, ip_address)
     end
+
+    def has_ipv6_address?(ip_address)
+      @runner.check_interface_has_ipv6_address(@name, ip_address)
+    end
   end
 end

data/lib/serverspec/type/ip6tables.rb

@@ -0,0 +1,13 @@
+module Serverspec
+  module Type
+    class Ip6tables < Base
+      def has_rule?(rule, table, chain)
+        @runner.check_ip6tables_has_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 = "2.0.0.beta20"
+  VERSION = "2.0.0.beta21"
 end

data/serverspec.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "rspec", "~> 3.0.0"
   spec.add_runtime_dependency "rspec-its"
-  spec.add_runtime_dependency "specinfra", "~> 2.0.0.beta30"
+  spec.add_runtime_dependency "specinfra", "~> 2.0.0.beta50"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.1"
 end

data/spec/spec_helper.rb

@@ -1,11 +1,7 @@
 require 'serverspec'
-require 'pathname'
-require 'rspec/mocks/standalone'
 
 set :backend, :exec
 
-PROJECT_ROOT = (Pathname.new(File.dirname(__FILE__)) + '..').expand_path
-
 module Specinfra
   module Backend
     class Exec < Base

data/spec/type/linux/interface_spec.rb

@@ -8,11 +8,15 @@ describe interface('eth0') do
 end
 
 describe interface('eth0') do
-  it { should have_ipv4_address("192.168.10.10") }
+  it { should have_ipv4_address('192.168.10.10') }
 end
 
 describe interface('eth0') do
-  it { should have_ipv4_address("192.168.10.10/24") }
+  it { should have_ipv4_address('192.168.10.10/24') }
+end
+
+describe interface('eth0') do
+  it { should have_ipv6_address('2001:0db8:bd05:01d2:288a:1fc0:0001:10ee') }
 end
 
 describe interface('invalid-interface') do

data/spec/type/linux/ip6tables_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+set :os, :family => 'linux'
+
+describe ip6tables do
+  it { should have_rule '-P INPUT ACCEPT' }
+end
+
+describe ip6tables do
+  it { should have_rule('-P INPUT ACCEPT').with_table('mangle').with_chain('INPUT') }
+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:
@@ -28,7 +28,7 @@ build:
         cwd: $WORKING_DIR
     - script:
         name: Run itamae
-        code: bundle exec ./itamae.rb centos65
+        code: bundle exec itamae ssh --host centos65 --vagrant recipe.rb
         cwd: $WORKING_DIR
     - script:
         name: Run vagrant reload centos65
@@ -36,7 +36,7 @@ build:
         cwd: $WORKING_DIR
     - script:
         name: Run rake spec:centos65
-        code: rake spec:centos65
+        code: DIGITALOCEAN=true rake spec:centos65
         cwd: $WORKING_DIR
     - script:
         name: Run vagrant up centos70
@@ -44,7 +44,7 @@ build:
         cwd: $WORKING_DIR
     - script:
         name: Run itamae
-        code: bundle exec ./itamae.rb centos70
+        code: bundle exec itamae ssh --host centos70 --vagrant recipe.rb
         cwd: $WORKING_DIR
     - script:
         name: Run vagrant reload centos70
@@ -52,7 +52,7 @@ build:
         cwd: $WORKING_DIR
     - script:
         name: Run rake spec:centos70
-        code: rake spec:centos70
+        code: DIGITALOCEAN=true rake spec:centos70
         cwd: $WORKING_DIR
     - script:
         name: Run vagrant up ubuntu1404
@@ -60,7 +60,7 @@ build:
         cwd: $WORKING_DIR
     - script:
         name: Run itamae
-        code: bundle exec ./itamae.rb ubuntu1404
+        code: bundle exec itamae ssh --host ubuntu1404 --vagrant recipe.rb
         cwd: $WORKING_DIR
     - script:
         name: Run vagrant reload ubuntu1404
@@ -68,7 +68,7 @@ build:
         cwd: $WORKING_DIR
     - script:
         name: Run rake spec:ubuntu1404
-        code: rake spec:ubuntu1404
+        code: DIGITALOCEAN=true rake spec:ubuntu1404
         cwd: $WORKING_DIR
 
   after-steps:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta20
+  version: 2.0.0.beta21
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta30
+        version: 2.0.0.beta50
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta30
+        version: 2.0.0.beta50
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,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
@@ -202,6 +203,7 @@ files:
 - spec/type/linux/cgroup_spec.rb
 - spec/type/linux/file_spec.rb
 - spec/type/linux/interface_spec.rb
+- spec/type/linux/ip6tables_spec.rb
 - spec/type/linux/iptables_spec.rb
 - spec/type/linux/kernel_module_spec.rb
 - spec/type/linux/linux_kernel_parameter_spec.rb
@@ -332,6 +334,7 @@ test_files:
 - spec/type/linux/cgroup_spec.rb
 - spec/type/linux/file_spec.rb
 - spec/type/linux/interface_spec.rb
+- spec/type/linux/ip6tables_spec.rb
 - spec/type/linux/iptables_spec.rb
 - spec/type/linux/kernel_module_spec.rb
 - spec/type/linux/linux_kernel_parameter_spec.rb