serverspec 2.0.0.beta10 → 2.0.0.beta11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2255417730cf4c48dfb89e8f01fe44da49481cd7
-  data.tar.gz: 7986406330d3a62cafce615b7d8dbedf855189d3
+  metadata.gz: 7e957c06e8e32ed7498f082132a63e9e88c4969c
+  data.tar.gz: 2b2e8cc776df290e1524ea011f0a31edeac132e1
 SHA512:
-  metadata.gz: 4d2bf5e4cff1c49b37ba3840bf4eea20ffba32cd92fa72e3b8468b7e087009d5c633b6f9e40644b0d4a74153b1fc1b1562b0b9bab5936f4b75b5cc26647f6dc4
-  data.tar.gz: 7750404e08fe787eb0c88391df8a744183dcc9989166405f740dd63457ba7cd3995904c281dfffb59957706e264bc260024015880208d02c5a7c0210d117fb07
+  metadata.gz: c483c85441a7f4ccfa65f5918726f32a186f7da2e436b7846d1232cce9378511354ac49721e63b109e3202503bd82f7503ecd0f85fdc94c982602277a2d84846
+  data.tar.gz: 59d94690c51f5552efbb093d3f0e4d5ec219bc0380845510d998f2cfde037c543de9ffa625508b09c65ddcb4ef299a331e8ae6a4a4c73338d422685bc9866b8e

data/lib/serverspec/matchers.rb

@@ -23,6 +23,7 @@ require 'serverspec/matchers/be_running'
 
 # user
 require 'serverspec/matchers/belong_to_group'
+require 'serverspec/matchers/belong_to_primary_group'
 
 require 'serverspec/matchers/return_exit_status'
 require 'serverspec/matchers/return_stdout'

data/lib/serverspec/matchers/belong_to_primary_group.rb

@@ -0,0 +1,5 @@
+RSpec::Matchers.define :belong_to_primary_group do |group|
+  match do |user|
+    user.belongs_to_primary_group?(group)
+  end
+end

data/lib/serverspec/setup.rb

@@ -39,6 +39,7 @@ module Serverspec
       safe_create_spec
       safe_create_spec_helper
       safe_create_rakefile
+      safe_create_dotrspec
     end
 
     def self.ask_os_type
@@ -285,9 +286,18 @@ options[:user] ||= Etc.getlogin
 
 set :host,        options[:host_name] || host
 set :ssh_options, options
+
+# Disable sudo
+# set :disable_sudo, true
 <%- end -%>
 <%- end -%>
 
+# Set environment variables
+# set :env, 'LANG' => 'C', 'LC_MESSAGES' => 'C' 
+
+# Set PATH
+# set :path, '/sbin:/usr/local/sbin:$PATH'
+
 <% if @backend_type == 'WinRM'-%>
 user = <username>
 pass = <password>
@@ -299,5 +309,24 @@ c.winrm.set_timeout 300 # 5 minutes max timeout for any operation
 EOF
       template
     end
+
+    def self.safe_create_dotrspec
+      content = <<-'EOF'
+--color
+--format documentation
+      EOF
+      if File.exists? '.rspec'
+        old_content = File.read('.rspec')
+        if old_content != content
+          $stderr.puts '!! .rspec already exists and differs from template'
+        end
+      else
+        File.open('.rspec', 'w') do |f|
+          f.puts content
+        end
+        puts ' + .rspec'
+      end
+    end
+
   end
 end

data/lib/serverspec/type/user.rb

@@ -9,6 +9,10 @@ module Serverspec
         @runner.check_user_is_belonging_to_group(@name, group)
       end
 
+      def belongs_to_primary_group?(group)
+        backend.check_belonging_primary_group(@name, group)
+      end
+
       def has_uid?(uid)
         @runner.check_user_has_uid(@name, uid)
       end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.0.0.beta10"
+  VERSION = "2.0.0.beta11"
 end

data/serverspec.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "rspec", "~> 3.0.0"
   spec.add_runtime_dependency "rspec-its"
-  spec.add_runtime_dependency "specinfra", "~> 2.0.0.beta8"
+  spec.add_runtime_dependency "specinfra", "~> 2.0.0.beta10"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta10
+  version: 2.0.0.beta11
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta8
+        version: 2.0.0.beta10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta8
+        version: 2.0.0.beta10
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +115,7 @@ files:
 - lib/serverspec/matchers/be_running.rb
 - lib/serverspec/matchers/be_writable.rb
 - lib/serverspec/matchers/belong_to_group.rb
+- lib/serverspec/matchers/belong_to_primary_group.rb
 - lib/serverspec/matchers/contain.rb
 - lib/serverspec/matchers/have_entry.rb
 - lib/serverspec/matchers/have_rule.rb