specinfra 2.11.10 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a97071348ad54dcf08b8b05371a50992e91b39e
-  data.tar.gz: c366cc26ab8cbbe89fb81fba534627149b6f1982
+  metadata.gz: 45b0dd4144407ae23367d089d595d93e24a52780
+  data.tar.gz: e2fc78cba42b70f379fb8c1b45d6a6bdb92c5035
 SHA512:
-  metadata.gz: 420b3b8494ce8404e88f4072b184fbcb456f4dab7673e52788220d108cbc00dd4e0cb149e47def44adf9b85f910995db57f38c0e2dd5253017bcce0a4746b7b2
-  data.tar.gz: de2355776cce731781721402a60071f0b815e9f9dba0f41ff9d970e6809bf1f6d8fdb6002bcd37eb397a61d2b06e478f0418b0baf88254035a45aaa355f9a636
+  metadata.gz: bf3bbf50b30218cb9d286804b16121f7b2a6d5180dc14c7e2e96e14d1596e9c7139963a44749fee7657f784a4a5d2afa19255a13f71b09e5d22127fde91c3800
+  data.tar.gz: 86c4208d0fedd6178c15f7f4d5b97b77be7f8090ef786bf4bf52890182f8eddd9d43ea0237129aa3061c4268c4e608bac7a7a3e93e495d1f11a4ce933b7a0c4a

data/lib/specinfra/command.rb

@@ -10,6 +10,7 @@ require 'specinfra/command/base'
 require 'specinfra/command/base/bridge'
 require 'specinfra/command/base/cron'
 require 'specinfra/command/base/file'
+require 'specinfra/command/base/fstab'
 require 'specinfra/command/base/group'
 require 'specinfra/command/base/host'
 require 'specinfra/command/base/interface'
@@ -39,6 +40,7 @@ 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/fstab'
 require 'specinfra/command/linux/base/interface'
 require 'specinfra/command/linux/base/inventory'
 require 'specinfra/command/linux/base/iptables'

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

@@ -2,10 +2,11 @@ class Specinfra::Command::Base::Cron < Specinfra::Command::Base
   class << self
     def check_has_entry(user, entry)
       entry_escaped = entry.gsub(/\*/, '\\*').gsub(/\[/, '\\[').gsub(/\]/, '\\]')
+      grep_command = "grep -v '^[[:space:]]*#' | grep -- ^#{escape(entry_escaped)}$"
       if user.nil?
-        "crontab -l | grep -v \"#\" -- | grep -- #{escape(entry_escaped)}"
+        "crontab -l | #{grep_command}"
       else
-        "crontab -u #{escape(user)} -l | grep -v \"#\" | grep -- #{escape(entry_escaped)}"
+        "crontab -u #{escape(user)} -l | #{grep_command}"
       end
     end
   end

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

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

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

@@ -8,5 +8,20 @@ class Specinfra::Command::Base::Group < Specinfra::Command::Base
       regexp = "^#{group}"
       "getent group | grep -w -- #{escape(regexp)} | cut -f 3 -d ':' | grep -w -- #{escape(gid)}"
     end
+
+    def get_gid(group)
+      "getent group #{escape(group)} | cut -f 3 -d ':'"
+    end
+
+    def update_gid(group, gid)
+      "groupmod -g #{escape(gid)} #{escape(group)}"
+    end
+
+    def add(group, options)
+      command = ['groupadd']
+      command << '-g' << escape(options[:gid])  if options[:gid]
+      command << escape(group)
+      command.join(' ')
+    end
   end
 end

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

@@ -0,0 +1,9 @@
+class Specinfra::Command::Linux::Base::Fstab < Specinfra::Command::Base::Fstab
+  class << self
+    def check_has_entry(mount_point)
+      %Q(awk '{if($2=="#{escape(mount_point)}")print}' /etc/fstab | grep -v '^[[:space:]]*#')
+    end
+
+    alias :get_entry :check_has_entry
+  end
+end

data/lib/specinfra/processor.rb

@@ -117,6 +117,41 @@ module Specinfra
       end
     end
 
+    def self.check_fstab_has_entry(expected_attr)
+      return false unless expected_attr[:mount_point]
+      cmd = Specinfra.command.get(:get_fstab_entry, expected_attr[:mount_point])
+      ret = Specinfra.backend.run_command(cmd)
+      return false if ret.failure?
+
+      fstab = ret.stdout.scan(/\S+/)
+      actual_attr = {
+        :device      => fstab[0],
+        :mount_point => fstab[1],
+        :type        => fstab[2],
+        :dump        => fstab[4].to_i,
+        :pass        => fstab[5].to_i
+      }
+      fstab[3].split(',').each do |option|
+        name, val = option.split('=')
+        if val.nil?
+          actual_attr[name.to_sym] = true
+        else
+          val = val.to_i if val.match(/^\d+$/)
+          actual_attr[name.to_sym] = val
+        end
+      end
+
+      unless expected_attr[:options].nil?
+        expected_attr.merge!(expected_attr[:options])
+        expected_attr.delete(:options)
+      end
+
+      expected_attr.each do |key, val|
+        return false if actual_attr[key] != val
+      end
+      true
+    end
+
     def self.check_routing_table_has_entry(expected_attr)
       return false if ! expected_attr[:destination]
       cmd = Specinfra.command.get(:get_routing_table_entry, expected_attr[:destination])

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.11.10"
+  VERSION = "2.12.0"
 end

data/spec/command/base/group_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+set :os, { :family => nil }
+
+describe get_command(:get_group_gid, 'foo') do
+  it { should eq "getent group foo | cut -f 3 -d ':'" }
+end
+
+describe get_command(:update_group_gid, 'foo', 1234) do
+  it { should eq "groupmod -g 1234 foo" }
+end
+
+describe get_command(:add_group, 'foo', :gid => 1234) do
+  it { should eq 'groupadd -g 1234 foo' }
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.11.10
+  version: 2.12.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -153,6 +153,7 @@ files:
 - lib/specinfra/command/base/bridge.rb
 - lib/specinfra/command/base/cron.rb
 - lib/specinfra/command/base/file.rb
+- lib/specinfra/command/base/fstab.rb
 - lib/specinfra/command/base/group.rb
 - lib/specinfra/command/base/host.rb
 - lib/specinfra/command/base/interface.rb
@@ -212,6 +213,7 @@ files:
 - 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/fstab.rb
 - lib/specinfra/command/linux/base/interface.rb
 - lib/specinfra/command/linux/base/inventory.rb
 - lib/specinfra/command/linux/base/ip6tables.rb
@@ -347,6 +349,7 @@ files:
 - spec/backend/exec/env_spec.rb
 - spec/backend/ssh/build_command_spec.rb
 - spec/command/base/file_spec.rb
+- spec/command/base/group_spec.rb
 - spec/command/base/localhost_spec.rb
 - spec/command/base/package_spec.rb
 - spec/command/base/user_spec.rb
@@ -402,6 +405,7 @@ test_files:
 - spec/backend/exec/env_spec.rb
 - spec/backend/ssh/build_command_spec.rb
 - spec/command/base/file_spec.rb
+- spec/command/base/group_spec.rb
 - spec/command/base/localhost_spec.rb
 - spec/command/base/package_spec.rb
 - spec/command/base/user_spec.rb