serverspec 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd3bd738da245a8d57b9532757093bfc88d609af
-  data.tar.gz: 7161e72b363e811889c2da3e9642e39bdbcaef5d
+  metadata.gz: 7f6d7aa27e722dbebd2e7c9052d267f2a790b4bc
+  data.tar.gz: c5dce829ed3872a406673ab8872c4dc6811374aa
 SHA512:
-  metadata.gz: 87ace5e258793d1a52e02aa50f0030a8994cc9c51800e6fd7cddb491d165052ba247232f6981860187e30fc4cb9117981337b020233dc77732eccd1381ae656e
-  data.tar.gz: fdf8b8ad55b7c3aa5803b27b1f476f949bf8469b082e0f38515839d4113804ad68ba8d922e1dcaa72a29ac999679de81278712443cf9b3835eaa03a102b85da1
+  metadata.gz: d45ded0ebc80ae93284eba93a1b1c47b37234aaa375312c0bc266f84afcad3a081a5551b4b5da95793f7b0985397299bbe1792730e238ecd0e927e0f337fe9cd
+  data.tar.gz: 798478850c32be2528c8bf14b7040f5d0c4869056241b06aa4f887bff4064ddfabf38d919cb8e862467b02afd65eaa2d5539fbe73df7d98d9a0e4b157d8babcc

data/lib/serverspec.rb

@@ -9,6 +9,8 @@ require 'serverspec/setup'
 require 'serverspec/subject'
 require 'serverspec/commands/base'
 require 'rspec/core/formatters/base_formatter'
+require 'specinfra/helper/set'
+include Specinfra::Helper::Set
 
 module RSpec::Core::Notifications
   class FailedExampleNotification < ExampleNotification

data/lib/serverspec/power_assert.rb

@@ -0,0 +1,14 @@
+require 'test/unit'
+require 'specinfra'
+
+require 'serverspec/helper/type'
+
+PowerAssert.configure do |c|
+  c.lazy_inspection = true
+end
+
+class Serverspec::TestCase < Test::Unit::TestCase
+  extend Serverspec::Helper::Type
+  include Serverspec::Helper::Type
+end
+

data/lib/serverspec/type/base.rb

@@ -12,7 +12,13 @@ module Serverspec::Type
       %Q!#{type} "#{@name}"!
     end
 
-    alias_method :inspect, :to_s
+    def inspect
+      if defined?(PowerAssert)
+        @inspection
+      else
+        to_s
+      end
+    end
 
     def to_ary
       to_s.split(" ")

data/lib/serverspec/type/file.rb

@@ -5,6 +5,8 @@ module Serverspec::Type
     attr_accessor :content
 
     def file?
+      cmd = Specinfra.command.get(:check_file_is_file, @name)
+      @inspection = Specinfra.backend.build_command(cmd)
       @runner.check_file_is_file(@name)
     end
 
@@ -105,9 +107,3 @@ module Serverspec::Type
     end
   end
 end
-
-
-
-
-
-

data/lib/serverspec/type/package.rb

@@ -1,7 +1,8 @@
 module Serverspec::Type
   class Package < Base
-    def installed?(provider, version)
+    def installed?(provider=nil, version=nil)
       if provider.nil?
+        @inspection = Specinfra.command.get(:check_package_is_installed, @name, version)
         @runner.check_package_is_installed(@name, version)
       else
         check_method = "check_package_is_installed_by_#{provider}".to_sym

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/serverspec.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "rspec", "~> 3.0"
   spec.add_runtime_dependency "rspec-its"
-  spec.add_runtime_dependency "specinfra", "~> 2.1"
+  spec.add_runtime_dependency "specinfra", "~> 2.3"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.1"
 end

data/spec/type/linux/file_spec.rb

@@ -1,9 +1,8 @@
 require 'spec_helper'
 
+property[:os] = nil
 set :os, {:family => 'linux'}
 
-property[:os_by_host] = nil
-
 describe file('/tmp') do
   it { should be_readable.by_user('mail') }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-05 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +121,7 @@ files:
 - lib/serverspec/matcher/have_site_application.rb
 - lib/serverspec/matcher/have_site_bindings.rb
 - lib/serverspec/matcher/have_virtual_dir.rb
+- lib/serverspec/power_assert.rb
 - lib/serverspec/setup.rb
 - lib/serverspec/subject.rb
 - lib/serverspec/type/base.rb