specinfra 2.0.0.beta42 → 2.0.0.beta43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ce10ce518d56b4792e183aaba73a154413af76b
-  data.tar.gz: 434a2c4affa297c0cc0e44a9a800922d7c48599c
+  metadata.gz: a06b77b911ce755c1986e00e888fe05daba5f26a
+  data.tar.gz: 254bfa7133035990605a1de17e1fa50875903bc7
 SHA512:
-  metadata.gz: 9447f91943ff1390a4a947d2459c921c0ab1705f2328da3152cf0ef9757512d339f5c4080ac9144220373ead8e68d98be4ba4f2b7c6208135ca58e6238ff29f5
-  data.tar.gz: bacc3ae0e859cfb985845866fd7d28a4766358550d3d7f074c0397e65724e2d96883550d2f36d8f7c23505ab2d70213127ab1989b55585c5f0656284c37fda4b
+  metadata.gz: 207c342c8bed16c798138c5123084bbf188de49372dc2ff6247798daa954da5ac152514c0ae68b1337e20801ef07110a9a06b8d3da213afa54c5b93e0da9d7ea
+  data.tar.gz: f43b065d0ec5f6126e04e50089dcdd19b74c3ea343acf325c19fde9976878b8f4ac2ba5b26f27282ff9abed8c07d00c5ee6b10bd633f9d9aa0fa001e30ec8d51

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

@@ -74,7 +74,7 @@ class Specinfra::Command::Base::File < Specinfra::Command::Base
 
     def check_is_mounted(path)
       regexp = "on #{path} "
-      "mount | grep -w -- #{escape(regexp)}"
+      "mount | grep -- '#{escape(regexp)}'"
     end
 
     def get_mode(file)
@@ -93,6 +93,14 @@ class Specinfra::Command::Base::File < Specinfra::Command::Base
       "stat -c %N #{escape(link)} | egrep -e \"-> .#{escape(target)}.\""
     end
 
+    def check_is_link(link)
+      "test -L #{escape(link)}"
+    end
+
+    def get_link_target(link)
+      "readlink -f #{escape(link)}"
+    end
+
     def get_mtime(file)
       "stat -c %Y #{escape(file)}"
     end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.0.0.beta42"
+  VERSION = "2.0.0.beta43"
 end

data/spec/command/base/file_spec.rb

@@ -2,52 +2,55 @@ require 'spec_helper'
 
 set :os, { :family => nil }
 
-describe 'File related commands'  do
-  after do
-    property[:os_by_host] = nil
-  end
+describe get_command(:check_file_is_directory, '/tmp') do
+  it { should eq 'test -d /tmp' }
+end
 
-  context get_command(:check_file_is_directory, '/tmp') do
-    it { should eq 'test -d /tmp' }
-  end
+describe get_command(:change_file_mode, '/tmp', '0644') do
+  it { should eq 'chmod 0644 /tmp' }
+end
 
-  context get_command(:change_file_mode, '/tmp', '0644') do
-    it { should eq 'chmod 0644 /tmp' }
-  end
+describe get_command(:change_file_owner, '/tmp', 'root') do
+  it { should eq 'chown root /tmp' }
+end
 
-  context get_command(:change_file_owner, '/tmp', 'root') do
-    it { should eq 'chown root /tmp' }
-  end
+describe get_command(:change_file_owner, '/tmp', 'root', 'root') do
+  it { should eq 'chown root:root /tmp' }
+end
 
-  context get_command(:change_file_owner, '/tmp', 'root', 'root') do
-    it { should eq 'chown root:root /tmp' }
-  end
+describe get_command(:change_file_group, '/tmp', 'root') do
+  it { should eq 'chgrp root /tmp' }
+end
+
+describe get_command(:create_file_as_directory, '/tmp') do
+  it { should eq 'mkdir -p /tmp' }
+end
 
-  context get_command(:change_file_group, '/tmp', 'root') do
-    it { should eq 'chgrp root /tmp' }
-  end
+describe get_command(:get_file_owner_user, '/tmp') do
+  it { should eq 'stat -c %U /tmp' }
+end
 
-  context get_command(:create_file_as_directory, '/tmp') do
-    it { should eq 'mkdir -p /tmp' }
-  end
+describe get_command(:get_file_owner_group, '/tmp') do
+  it { should eq 'stat -c %G /tmp' }
+end
 
-  context get_command(:get_file_owner_user, '/tmp') do
-    it { should eq 'stat -c %U /tmp' }
-  end
+describe get_command(:move_file, '/src', '/dest') do
+  it { should eq 'mv /src /dest' }
+end
 
-  context get_command(:get_file_owner_group, '/tmp') do
-    it { should eq 'stat -c %G /tmp' }
-  end
+describe get_command(:link_file_to, '/link', '/target') do
+  it { should eq 'ln -s /target /link' }
+end
 
-  context get_command(:move_file, '/src', '/dest') do
-    it { should eq 'mv /src /dest' }
-  end
+describe get_command(:remove_file, '/tmp') do
+  it { should eq 'rm -rf /tmp' }
+end
 
-  context get_command(:link_file_to, '/link', '/target') do
-    it { should eq 'ln -s /target /link' }
-  end
+describe get_command(:check_file_is_link, '/tmp') do
+  it { should eq 'test -L /tmp' }
+end
 
-  context get_command(:remove_file, '/tmp') do
-    it { should eq 'rm -rf /tmp' }
-  end
+describe get_command(:get_file_link_target, '/tmp') do
+  it { should eq 'readlink -f /tmp' }
 end
+

data/spec/command/base/user_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+set :os, { :family => nil }
+
 describe get_command(:get_user_uid, 'foo') do
   it { should eq 'id -u foo' }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta42
+  version: 2.0.0.beta43
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh