serverspec 2.23.0 → 2.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 705b4d622f116fbfed3b96df2f953bc6ee30a6bd
-  data.tar.gz: 2256ecca97ef36a6f2a3d66e991cfcb88cc56dd0
+  metadata.gz: ba3ecfb90a2f60059e60a15f37d203ccc1c7fbfc
+  data.tar.gz: 459c61b6332695ea2682b48984fc04d4d21acf3e
 SHA512:
-  metadata.gz: 2a835bf90047183d9856594134f4bb78afc6c84c3f5916fcb53e487cc4e237645d285161c0b0b7d1af9d1daf7fb69b3d37dd15c3695588fac181eff3a6264a43
-  data.tar.gz: 8d905cfe1827b3cf0b1901efbe0001b38ae1b758e11f2910f801b2a5a5b91f82bd8daed0b9ee2a0c6db9fcf80af23bdf8a2c7ee4a63f65f8bd550b9ca63cc61c
+  metadata.gz: 6bb96ac5352cad40d8c95abb1cfc7fd48784a6abcb62bf1dd75ee3960ef99a7fb483f1486a253fcb8014bd5ca8ccc6851287daadeb128ad54398e50ca7472716
+  data.tar.gz: f316a743bcaeac8d47919d1effcdba4014ce31697f2d912f67e56039d2ac2e23344e997db47ec66983e3e24ddc85cec9b231075dae2f13e9d319f2c8992d93d4

data/lib/serverspec/type/docker_container.rb

@@ -1,7 +1,7 @@
 module Serverspec::Type
   class DockerContainer < DockerBase
     def running?
-      inspection['State']['Running']
+      inspection['State']['Running'] && !inspection['State']['Restarting']
     end
 
     def has_volume?(container_path, host_path)

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.23.0"
+  VERSION = "2.23.1"
 end

data/serverspec.gemspec

@@ -23,5 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "multi_json"
   spec.add_runtime_dependency "specinfra", "~> 2.43"
   spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency("json", "~> 1.8") if RUBY_VERSION < "1.9"
   spec.add_development_dependency "rake", "~> 10.1.1"
 end

data/spec/type/linux/docker_container_spec.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
+require 'json'
 
 property[:os] = nil
 set :os, {:family => 'linux'}
@@ -16,6 +17,16 @@ describe docker_container('c1') do
   its(['Config.Cmd']) { should include '/bin/sh' }
 end
 
+describe docker_container('restarting') do
+  let(:stdout) do
+    attrs = JSON.parse(inspect_container)
+    attrs.first['State']['Restarting'] = true
+    attrs.to_json
+  end
+
+  it { should_not be_running }
+end
+
 def inspect_container
   <<'EOS'
 [{

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.23.0
+  version: 2.23.1
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-29 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -446,3 +446,4 @@ test_files:
 - spec/type/windows/scheduled_task_spec.rb
 - spec/type/windows/service_spec.rb
 - spec/type/windows/user_spec.rb
+has_rdoc: