specinfra 2.8.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55cb68343e9c2923e6b49be0ba591f0ec43c02c9
-  data.tar.gz: fbe502290327c0423a1193ac131a8d5e80f2beae
+  metadata.gz: e9ad5b7fca872a23d4b8b7901c803dab42175c82
+  data.tar.gz: 6ddb62bc6c82082a48b87c3bb567b47a0b827df9
 SHA512:
-  metadata.gz: a135e5273a70a5284f442e275c925e675f095098abebc397434dcaaa3dfcd0e4c9a5b1ed085b09860beed46e305604e4415bf6e70b2d1e398efc53fecc7d2b5f
-  data.tar.gz: af7c2c0e6d5e20757ba99dc5be709175ab2c981da0561352e4904b53cedea4a5ad9e2761ba3953bce141fa487e5768f86acf8bcc2dea95a16159381005ab3f6e
+  metadata.gz: ec293647a82c7c3ff9d5ebb10c6033d01541eb8bcec423e3e73f1e53799bcf2e75eac169c3ea90d3665b64a837ab9f507eb0d5be4d56cc59423929211c3a3d76
+  data.tar.gz: 1e0ca4bc2b90bfa54f432fc77d138cc7aa8ecaabad3358900b3bf1e0ee750be18001a4b9212785521fc6a4a80484b899b1e6a1e782ad790964bd13d8839ed300

data/lib/specinfra/command.rb

@@ -7,6 +7,7 @@ require 'specinfra/command/module/zfs'
 
 # Base
 require 'specinfra/command/base'
+require 'specinfra/command/base/bridge'
 require 'specinfra/command/base/cron'
 require 'specinfra/command/base/file'
 require 'specinfra/command/base/group'
@@ -36,6 +37,7 @@ require 'specinfra/command/base/zfs'
 # Linux (inhefit Base)
 require 'specinfra/command/linux'
 require 'specinfra/command/linux/base'
+require 'specinfra/command/linux/base/bridge'
 require 'specinfra/command/linux/base/file'
 require 'specinfra/command/linux/base/interface'
 require 'specinfra/command/linux/base/inventory'

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

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

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

@@ -12,6 +12,10 @@ class Specinfra::Command::Base::File < Specinfra::Command::Base
       "test -S #{escape(file)}"
     end
 
+    def check_is_symlink(file)
+      "test -L #{escape(file)}"
+    end
+
     def check_contains(file, expected_pattern)
       "#{check_contains_with_regexp(file, expected_pattern)} || #{check_contains_with_fixed_strings(file, expected_pattern)}"
     end

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

@@ -0,0 +1,11 @@
+class Specinfra::Command::Linux::Base::Bridge < Specinfra::Command::Base::Bridge
+  class << self
+    def check_exists(name)
+      "ip link show #{name}"
+    end
+
+    def check_has_interface(name, interface)
+      "brctl show #{name} | grep -o #{interface}"
+    end
+  end
+end

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

@@ -9,7 +9,7 @@ class Specinfra::Command::Linux::Base::Inventory < Specinfra::Command::Base::Inv
     end
 
     def get_domain
-      'dnsdomainame'
+      'dnsdomainname'
     end
 
     def get_fqdn

data/lib/specinfra/command/ubuntu/base/ppa.rb

@@ -1,11 +1,11 @@
 class Specinfra::Command::Ubuntu::Base::Ppa < Specinfra::Command::Debian::Base::Ppa
   class << self
     def check_exists(package)
-      %Q{find /etc/apt/ -name \*.list | xargs grep -o "deb +http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
+      %Q{find /etc/apt/ -name \*.list | xargs grep -o -E "deb +http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
     end
 
     def check_is_enabled(package)
-      %Q{find /etc/apt/ -name \*.list | xargs grep -o "^deb +http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
+      %Q{find /etc/apt/ -name \*.list | xargs grep -o -E "^deb +http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
     end
 
     private

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.8.0"
+  VERSION = "2.9.0"
 end

data/spec/command/base/file_spec.rb

@@ -6,6 +6,10 @@ describe get_command(:check_file_is_directory, '/tmp') do
   it { should eq 'test -d /tmp' }
 end
 
+describe get_command(:check_file_is_symlink, '/tmp') do
+  it { should eq 'test -L /tmp' }
+end
+
 describe get_command(:change_file_mode, '/tmp', '0644') do
   it { should eq 'chmod 0644 /tmp' }
 end

data/spec/command/linux/bridge_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'linux'
+
+describe get_command(:check_bridge_exists, 'br0') do
+  it { should eq "ip link show br0" }
+end
+
+describe get_command(:check_bridge_has_interface, 'br0', 'eth0') do
+  it { should eq "brctl show br0 | grep -o eth0" }
+end

data/spec/command/ubuntu/ppa_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'ubuntu'
+
+describe get_command(:check_ppa_exists, 'nginx/stable') do
+  it { should eq 'find /etc/apt/ -name *.list | xargs grep -o -E "deb +http://ppa.launchpad.net/nginx/stable"' }
+end
+
+describe get_command(:check_ppa_is_enabled, 'nginx/stable') do
+  it { should eq 'find /etc/apt/ -name *.list | xargs grep -o -E "^deb +http://ppa.launchpad.net/nginx/stable"' }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -150,6 +150,7 @@ files:
 - lib/specinfra/command/arch/base/package.rb
 - lib/specinfra/command/arch/base/service.rb
 - lib/specinfra/command/base.rb
+- lib/specinfra/command/base/bridge.rb
 - lib/specinfra/command/base/cron.rb
 - lib/specinfra/command/base/file.rb
 - lib/specinfra/command/base/group.rb
@@ -209,6 +210,7 @@ files:
 - lib/specinfra/command/gentoo/base/service.rb
 - lib/specinfra/command/linux.rb
 - lib/specinfra/command/linux/base.rb
+- lib/specinfra/command/linux/base/bridge.rb
 - lib/specinfra/command/linux/base/file.rb
 - lib/specinfra/command/linux/base/interface.rb
 - lib/specinfra/command/linux/base/inventory.rb
@@ -345,6 +347,7 @@ files:
 - spec/command/debian/service_spec.rb
 - spec/command/factory_spec.rb
 - spec/command/freebsd/file_spec.rb
+- spec/command/linux/bridge_spec.rb
 - spec/command/linux/interface_spec.rb
 - spec/command/linux/inventory_spec.rb
 - spec/command/linux/ip6tables_spec.rb
@@ -353,6 +356,7 @@ files:
 - spec/command/redhat/package_spec.rb
 - spec/command/redhat/service_spec.rb
 - spec/command/redhat7/service_spec.rb
+- spec/command/ubuntu/ppa_spec.rb
 - spec/configuration_spec.rb
 - spec/helper/os_spec.rb
 - spec/helper/properties_spec.rb
@@ -395,6 +399,7 @@ test_files:
 - spec/command/debian/service_spec.rb
 - spec/command/factory_spec.rb
 - spec/command/freebsd/file_spec.rb
+- spec/command/linux/bridge_spec.rb
 - spec/command/linux/interface_spec.rb
 - spec/command/linux/inventory_spec.rb
 - spec/command/linux/ip6tables_spec.rb
@@ -403,6 +408,7 @@ test_files:
 - spec/command/redhat/package_spec.rb
 - spec/command/redhat/service_spec.rb
 - spec/command/redhat7/service_spec.rb
+- spec/command/ubuntu/ppa_spec.rb
 - spec/configuration_spec.rb
 - spec/helper/os_spec.rb
 - spec/helper/properties_spec.rb