serverspec 0.10.13 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a4acd1df5e5fbfb90f35c8c263d0a325caa1f91
-  data.tar.gz: acf698f9ff6cb2eb208bc6373bbdda0075407dd0
+  metadata.gz: 279b84aaad3e71e171fe5872691185331de88e42
+  data.tar.gz: cdbc4f32caca9fb007181aa281608f4ee9d32b83
 SHA512:
-  metadata.gz: b676dea6041e203fbd5f5fe0c453bd41460514e2d5b7580a5d43e2e7b6ba0bdb954ff8aa8391fe17e84bfb673a5f9814fa3db7ad998f267ae3750671b6ef7f48
-  data.tar.gz: c5a582e9d9a17eecbf404450c68832be64372505d78bcbedcdcbc1596d3b7af88a6ef45e8984b8203ca55b3e164ecd54221678a7e0a59f01eb0ca5b73266cc72
+  metadata.gz: ee6180eac5a04397eec6491a327543fcd3afe864ece743929a3640953ac40a170e132792d1a817054debbfd0a69b263862ee2431c8dfca4a1b85a76201e28ed3
+  data.tar.gz: 3a835a4d699bbe5089b8e62e8f677b0db591493c9419a56713ce0bfd7e362a2f4d895ee62310c3fe64830fc4c9b4caba028791d798e233ed94ff0fb5a88df951

data/lib/serverspec/helper.rb

@@ -26,6 +26,10 @@ require 'serverspec/helper/detect_os'
 require 'serverspec/helper/attributes'
 include Serverspec::Helper::Attributes
 
+# Properties helper
+require 'serverspec/helper/properties'
+include Serverspec::Helper::Properties
+
 # Subject type helper
 require 'serverspec/helper/type'
 include Serverspec::Helper::Type

data/lib/serverspec/helper/attributes.rb

@@ -4,9 +4,11 @@ module Serverspec
   module Helper
     module Attributes
       def attr
+        puts "Warning: attr method will be obsoleted. Please use property method instead."
         Serverspec::Attributes.instance.attributes
       end
       def attr_set(attr)
+        puts "Warning: attr_set method will be obsoleted. Please use set_property method instead."
         Serverspec::Attributes.instance.attributes(attr)
       end
     end

data/lib/serverspec/helper/detect_os.rb

@@ -2,14 +2,14 @@ module Serverspec
   module Helper
     module DetectOS
       def commands
-        attr[:os_type] = {} if ! attr[:os_type]
+        property[:os_type] = {} if ! property[:os_type]
         host = RSpec.configuration.ssh ? RSpec.configuration.ssh.host : 'localhost'
 
-        if attr[:os_type][host]
-          os = attr[:os_type][host]
+        if property[:os_type][host]
+          os = property[:os_type][host]
         else
           os = backend(Serverspec::Commands::Base).check_os
-          attr[:os_type][host] = os
+          property[:os_type][host] = os
         end
 
         self.class.const_get('Serverspec').const_get('Commands').const_get(os).new

data/lib/serverspec/helper/properties.rb

@@ -0,0 +1,14 @@
+require 'serverspec/properties'
+
+module Serverspec
+  module Helper
+    module Properties
+      def property
+        Serverspec::Properties.instance.properties
+      end
+      def set_property(prop)
+        Serverspec::Properties.instance.properties(prop)
+      end
+    end
+  end
+end

data/lib/serverspec/properties.rb

@@ -0,0 +1,17 @@
+require 'singleton'
+
+module Serverspec
+  class Properties
+    include Singleton
+    def initialize
+      @prop = {}
+    end
+    def properties(prop=nil)
+      if ! prop.nil?
+        @prop = prop
+      end
+      @prop
+    end
+  end
+end
+

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.10.13"
+  VERSION = "0.11.0"
 end

data/spec/helpers/properties_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Properties
+
+describe 'Properties Helper' do
+  before :all do
+    set_property :role => 'proxy'
+  end
+  subject { property }
+  it { should include :role => 'proxy' }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.10.13
+  version: 0.11.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -143,6 +143,7 @@ files:
 - lib/serverspec/helper/freebsd.rb
 - lib/serverspec/helper/gentoo.rb
 - lib/serverspec/helper/plamo.rb
+- lib/serverspec/helper/properties.rb
 - lib/serverspec/helper/puppet.rb
 - lib/serverspec/helper/redhat.rb
 - lib/serverspec/helper/smartos.rb
@@ -173,6 +174,7 @@ files:
 - lib/serverspec/matchers/return_exit_status.rb
 - lib/serverspec/matchers/return_stderr.rb
 - lib/serverspec/matchers/return_stdout.rb
+- lib/serverspec/properties.rb
 - lib/serverspec/setup.rb
 - lib/serverspec/subject.rb
 - lib/serverspec/type/base.rb
@@ -289,7 +291,7 @@ files:
 - spec/gentoo/service_spec.rb
 - spec/gentoo/user_spec.rb
 - spec/gentoo/zfs_spec.rb
-- spec/helpers/attributes_spec.rb
+- spec/helpers/properties_spec.rb
 - spec/plamo/cgroup_spec.rb
 - spec/plamo/command_spec.rb
 - spec/plamo/cron_spec.rb
@@ -490,7 +492,7 @@ test_files:
 - spec/gentoo/service_spec.rb
 - spec/gentoo/user_spec.rb
 - spec/gentoo/zfs_spec.rb
-- spec/helpers/attributes_spec.rb
+- spec/helpers/properties_spec.rb
 - spec/plamo/cgroup_spec.rb
 - spec/plamo/command_spec.rb
 - spec/plamo/cron_spec.rb

data/spec/helpers/attributes_spec.rb

@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-include Serverspec::Helper::Attributes
-
-describe 'Attributes Helper' do
-  before :all do
-    attr_set :role => 'proxy'
-  end
-  subject { attr }
-  it { should include :role => 'proxy' }
-end