wright 0.2.0 → 0.3.0

data/spec/resource/directory_spec.rb

@@ -86,21 +86,7 @@ describe Wright::Resource::Directory do
       end
     end
 
-    it 'should support owner:group notation' do
-      FakeFS do
-        FileUtils.mkdir_p(@dirname)
-        FileUtils.chown(23, 45, @dirname)
-        owner = Etc.getpwuid(Process.uid).name
-        group = Etc.getgrgid(Process.gid).name
-        dir = Wright::Resource::Directory.new(@dirname)
-        dir.owner = "#{owner}:#{group}"
-        dir.create
-        Wright::Util::File.file_owner(@dirname).must_equal Process.uid
-        Wright::Util::File.file_group(@dirname).must_equal Process.gid
-      end
-    end
-
-    it 'should raise an exception when setting an invalid owner or group' do
+    it 'should raise an exception when creating dirs with invalid owners' do
       dir = Wright::Resource::Directory.new(@dirname)
       user = 'this_user_doesnt_exist'
       group = 'this_group_doesnt_exist'
@@ -184,4 +170,20 @@ describe Wright::Resource::Directory do
       end
     end
   end
+
+  describe '#owner=' do
+    it 'should support owner:group notation' do
+      dir = Wright::Resource::Directory.new(@dirname)
+      dir.owner = 'foo:bar'
+      dir.owner.must_equal 'foo'
+      dir.group.must_equal 'bar'
+      dir.group = 'baz'
+      dir.group.must_equal 'baz'
+    end
+
+    it 'should reject owner:group strings with invalid notation' do
+      dir = Wright::Resource::Directory.new(@dirname)
+      -> { dir.owner = 'foo:bar:baz' }.must_raise ArgumentError
+    end
+  end
 end

data/spec/resource/file_spec.rb

@@ -104,21 +104,7 @@ describe Wright::Resource::File do
       end
     end
 
-    it 'should support owner:group notation' do
-      FakeFS do
-        FileUtils.touch(@filename)
-        FileUtils.chown(23, 45, @filename)
-        owner = Etc.getpwuid(Process.uid).name
-        group = Etc.getgrgid(Process.gid).name
-        file = Wright::Resource::File.new(@filename)
-        file.owner = "#{owner}:#{group}"
-        file.create
-        Wright::Util::File.file_owner(@filename).must_equal Process.uid
-        Wright::Util::File.file_group(@filename).must_equal Process.gid
-      end
-    end
-
-    it 'should raise an exception when setting invalid an owner/group' do
+    it 'should raise an exception when creating files with invalid owners' do
       file = Wright::Resource::File.new(@filename)
       user = 'this_user_doesnt_exist'
       group = 'this_group_doesnt_exist'
@@ -210,4 +196,20 @@ describe Wright::Resource::File do
       end
     end
   end
+
+  describe '#owner=' do
+    it 'should support owner:group notation' do
+      file = Wright::Resource::File.new(@filename)
+      file.owner = 'foo:bar'
+      file.owner.must_equal 'foo'
+      file.group.must_equal 'bar'
+      file.group = 'baz'
+      file.group.must_equal 'baz'
+    end
+
+    it 'should reject owner:group strings with invalid notation' do
+      file = Wright::Resource::File.new(@filename)
+      -> { file.owner = 'foo:bar:baz' }.must_raise ArgumentError
+    end
+  end
 end

data/spec/resource_spec.rb

@@ -106,7 +106,7 @@ describe Wright::Resource do
       name = :farnsworth
       resource = Updater.new(name)
       resource_info = "#{resource.resource_name} '#{name}'"
-      output = "INFO: Would trigger update action for #{resource_info}\n"
+      output = "INFO: (would) run update action for #{resource_info}\n"
       lambda do
         reset_logger
         resource.on_update = @say_hello

data/spec/spec_helpers/test_coverage.rb

@@ -22,5 +22,5 @@ def measure_coverage
 
   ignored_directories = ['/spec/', '/vendor/', '/.bundle/']
   SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[*formatters]
-  SimpleCov.start { ignored_directories.each { |dir| add_filter(dir) } }
+  SimpleCov.start { add_filter(ignored_directories) }
 end

data/spec/util/file_owner_spec.rb

@@ -0,0 +1,36 @@
+require_relative '../spec_helper'
+
+require 'wright/util/file_owner'
+
+describe Wright::Util::FileOwner do
+  before(:each) do
+    @owner = Wright::Util::FileOwner.new
+  end
+
+  describe '#user_and_group=' do
+    it 'should set the user' do
+      @owner.group = 'group'
+      @owner.user_and_group = 'user'
+      @owner.user.must_equal 'user'
+      @owner.group.must_equal 'group'
+    end
+
+    it 'should set the user when given a uid' do
+      @owner.user_and_group = 23
+      @owner.user.must_equal 23
+    end
+
+    it 'should support user:group notation' do
+      @owner.user_and_group = 'user:group'
+      @owner.user.must_equal 'user'
+      @owner.group.must_equal 'group'
+    end
+
+    it 'should reject user:group strings with invalid notation' do
+      invalid_owner = 'user:group:something:else'
+      invalid_call = -> { @owner.user_and_group = invalid_owner }
+      e = invalid_call.must_raise ArgumentError
+      e.message.must_equal "Invalid owner: '#{invalid_owner}'"
+    end
+  end
+end

data/spec/util/file_permissions_spec.rb

@@ -82,12 +82,12 @@ describe FilePermissions do
       FakeFS do
         FileUtils.touch(@file_permissions.filename)
         FileUtils.chown(user1.name, nil, @file_permissions.filename)
-        @file_permissions.current_owner.must_equal user1.uid
-        @file_permissions.owner = user2.name
+        @file_permissions.current_uid.must_equal user1.uid
+        @file_permissions.uid = user2.uid
         @file_permissions.uptodate?.must_equal false
         @file_permissions.update
         @file_permissions.uptodate?.must_equal true
-        @file_permissions.current_owner.must_equal user2.uid
+        @file_permissions.current_uid.must_equal user2.uid
       end
     end
 
@@ -97,12 +97,12 @@ describe FilePermissions do
       FakeFS do
         FileUtils.touch(@file_permissions.filename)
         FileUtils.chown(nil, group1.name, @file_permissions.filename)
-        @file_permissions.current_group.must_equal group1.gid
-        @file_permissions.group = group2.name
+        @file_permissions.current_gid.must_equal group1.gid
+        @file_permissions.gid = group2.gid
         @file_permissions.uptodate?.must_equal false
         @file_permissions.update
         @file_permissions.uptodate?.must_equal true
-        @file_permissions.current_group.must_equal group2.gid
+        @file_permissions.current_gid.must_equal group2.gid
       end
     end
 

data/spec/util/user_spec.rb

@@ -28,21 +28,4 @@ describe Util::User do
       Util::User.group_to_gid(group.name).must_equal group.gid
     end
   end
-
-  describe 'owner_to_owner_group' do
-    it 'should return non-string owners unmodified' do
-      Util::User.owner_to_owner_group(23).must_equal [23, nil]
-    end
-
-    it 'should convert owner strings to [owner, group] arrays' do
-      Util::User.owner_to_owner_group('foo').must_equal ['foo', nil]
-      Util::User.owner_to_owner_group('foo:bar').must_equal %w(foo bar)
-    end
-
-    it 'should raise exceptions for invalid owner strings' do
-      lambda do
-        Util::User.owner_to_owner_group('foo:bar:baz')
-      end.must_raise ArgumentError
-    end
-  end
 end

data/spec/util_spec.rb

@@ -3,13 +3,31 @@ require_relative 'spec_helper'
 require 'minitest/stub_const'
 require 'wright/util'
 
-def stub_os(target_os)
-  RbConfig.stub_const(:CONFIG, 'target_os' => target_os) do
-    yield
+describe Wright::Util do
+  def stub_os(target_os)
+    RbConfig.stub_const(:CONFIG, 'target_os' => target_os) do
+      yield
+    end
+  end
+
+  def without_bundler
+    if defined?(Bundler)
+      Object.stub_remove_const(:Bundler) { yield }
+    else
+      yield
+    end
+  end
+
+  def with_bundler
+    if defined?(Bundler)
+      yield
+    else
+      fake_bundler = Class.new
+      def fake_bundler.with_clean_env; end
+      Object.stub_const(:Bundler, fake_bundler) { yield }
+    end
   end
-end
 
-describe Wright::Util do
   describe 'filename_to_classname' do
     it 'should convert filenames to class names' do
       classname = Wright::Util.filename_to_classname('foo_bar/baz')
@@ -44,6 +62,18 @@ ID=ubuntu
 ID_LIKE=debian
 PRETTY_NAME="Ubuntu precise (12.04.4 LTS)"
 VERSION_ID="12.04"
+EOS
+      @centos_os_release = <<EOS
+NAME="CentOS Linux"
+VERSION="7 (Core)"
+ID="centos"
+ID_LIKE="rhel fedora"
+VERSION_ID="7"
+PRETTY_NAME="CentOS Linux 7 (Core)"
+ANSI_COLOR="0;31"
+CPE_NAME="cpe:/o:centos:centos:7"
+HOME_URL="https://www.centos.org/"
+BUG_REPORT_URL="https://bugs.centos.org/"
 EOS
     end
 
@@ -67,6 +97,9 @@ EOS
 
           File.write('/etc/os-release', @ubuntu_os_release)
           Wright::Util.os_family.must_equal 'debian'
+
+          File.write('/etc/os-release', @centos_os_release)
+          Wright::Util.os_family.must_equal 'rhel'
         end
       end
     end
@@ -77,4 +110,30 @@ EOS
       end
     end
   end
+
+  describe 'bundler_clean_env' do
+    it 'should call a block when not using bundler' do
+      mock = Minitest::Mock.new
+
+      mock.expect(:inside_block, [])
+      without_bundler do
+        Wright::Util.bundler_clean_env { mock.inside_block }
+      end
+      mock.verify
+    end
+
+    it 'should call a block using Bundler.with_clean_env when using bundler' do
+      mock = Minitest::Mock.new
+      with_clean_env_stub = -> { mock.with_clean_env }
+
+      mock.expect(:with_clean_env, [])
+      mock.expect(:inside_block, [])
+      with_bundler do
+        Bundler.stub(:with_clean_env, with_clean_env_stub) do
+          Wright::Util.bundler_clean_env { mock.inside_block }
+        end
+      end
+      mock.verify
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wright
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sebastian Boehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.5.1
+        version: 5.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.5.1
+        version: 5.6.0
 - !ruby/object:Gem::Dependency
   name: minitest-stub-const
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -128,19 +128,20 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.30.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.30.1
 description: |
   Wright is a lightweight configuration management library.
 email:
 - sebastian@sometimesfood.org
-executables: []
+executables:
+- wright
 extensions: []
 extra_rdoc_files: []
 files:
@@ -149,6 +150,9 @@ files:
 - CONTRIBUTING.md
 - LICENSE
 - NEWS.md
+- man/wright.1
+- bin/wright
+- lib/wright/cli.rb
 - lib/wright/config.rb
 - lib/wright/dry_run.rb
 - lib/wright/dsl.rb
@@ -162,6 +166,7 @@ files:
 - lib/wright/provider/package/homebrew.rb
 - lib/wright/provider/package.rb
 - lib/wright/provider/symlink.rb
+- lib/wright/provider/user/darwin_directory_service.rb
 - lib/wright/provider/user/gnu_passwd.rb
 - lib/wright/provider/user.rb
 - lib/wright/provider.rb
@@ -174,6 +179,7 @@ files:
 - lib/wright/resource.rb
 - lib/wright/util/color.rb
 - lib/wright/util/file.rb
+- lib/wright/util/file_owner.rb
 - lib/wright/util/file_permissions.rb
 - lib/wright/util/recursive_autoloader.rb
 - lib/wright/util/stolen_from_activesupport.rb
@@ -181,6 +187,8 @@ files:
 - lib/wright/util.rb
 - lib/wright/version.rb
 - lib/wright.rb
+- spec/cli/shebang.rb
+- spec/cli_spec.rb
 - spec/config_spec.rb
 - spec/dsl_spec.rb
 - spec/logger_spec.rb
@@ -198,9 +206,9 @@ files:
 - spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_1234_newgroup.return
 - spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_1234_newgroup.stderr
 - spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_1234_newgroup.stdout
-- spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_499_newgroup.return
-- spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_499_newgroup.stderr
-- spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_499_newgroup.stdout
+- spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_2_newgroup.return
+- spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_2_newgroup.stderr
+- spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_2_newgroup.stdout
 - spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_ERROR_newgroup.return
 - spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_ERROR_newgroup.stderr
 - spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_ERROR_newgroup.stdout
@@ -249,6 +257,15 @@ files:
 - spec/provider/group/gnu_passwd/groupmod_-g_ERROR_foobar.stdout
 - spec/provider/group/gnu_passwd_spec.rb
 - spec/provider/group_spec.rb
+- spec/provider/package/apt/apt-cache_policy_abcde.return
+- spec/provider/package/apt/apt-cache_policy_abcde.stderr
+- spec/provider/package/apt/apt-cache_policy_abcde.stdout
+- spec/provider/package/apt/apt-cache_policy_htop.return
+- spec/provider/package/apt/apt-cache_policy_htop.stderr
+- spec/provider/package/apt/apt-cache_policy_htop.stdout
+- spec/provider/package/apt/apt-cache_policy_not-a-real-package.return
+- spec/provider/package/apt/apt-cache_policy_not-a-real-package.stderr
+- spec/provider/package/apt/apt-cache_policy_not-a-real-package.stdout
 - spec/provider/package/apt/apt-get_install_-qy_abcde=2.5.4-1.return
 - spec/provider/package/apt/apt-get_install_-qy_abcde=2.5.4-1.stderr
 - spec/provider/package/apt/apt-get_install_-qy_abcde=2.5.4-1.stdout
@@ -261,18 +278,6 @@ files:
 - spec/provider/package/apt/apt-get_remove_-qy_abcde.return
 - spec/provider/package/apt/apt-get_remove_-qy_abcde.stderr
 - spec/provider/package/apt/apt-get_remove_-qy_abcde.stdout
-- spec/provider/package/apt/dpkg-query_-s_abcde.return
-- spec/provider/package/apt/dpkg-query_-s_abcde.stderr
-- spec/provider/package/apt/dpkg-query_-s_abcde.stdout
-- spec/provider/package/apt/dpkg-query_-s_htop.return
-- spec/provider/package/apt/dpkg-query_-s_htop.stderr
-- spec/provider/package/apt/dpkg-query_-s_htop.stdout
-- spec/provider/package/apt/dpkg-query_-s_not-a-real-package.return
-- spec/provider/package/apt/dpkg-query_-s_not-a-real-package.stderr
-- spec/provider/package/apt/dpkg-query_-s_not-a-real-package.stdout
-- spec/provider/package/apt/dpkg-query_-s_vlc.return
-- spec/provider/package/apt/dpkg-query_-s_vlc.stderr
-- spec/provider/package/apt/dpkg-query_-s_vlc.stdout
 - spec/provider/package/apt_spec.rb
 - spec/provider/package/homebrew/brew_info_--json=v1_cd-discid.return
 - spec/provider/package/homebrew/brew_info_--json=v1_cd-discid.stderr
@@ -295,6 +300,28 @@ files:
 - spec/provider/package/homebrew_spec.rb
 - spec/provider/package_spec.rb
 - spec/provider/symlink_spec.rb
+- spec/provider/user/darwin_directory_service/dscl-delete-user.return
+- spec/provider/user/darwin_directory_service/dscl-delete-user.stderr
+- spec/provider/user/darwin_directory_service/dscl-delete-user.stdout
+- spec/provider/user/darwin_directory_service/dscl-new-user-full-name.return
+- spec/provider/user/darwin_directory_service/dscl-new-user-full-name.stderr
+- spec/provider/user/darwin_directory_service/dscl-new-user-full-name.stdout
+- spec/provider/user/darwin_directory_service/dscl-new-user-home.return
+- spec/provider/user/darwin_directory_service/dscl-new-user-home.stderr
+- spec/provider/user/darwin_directory_service/dscl-new-user-home.stdout
+- spec/provider/user/darwin_directory_service/dscl-new-user-password.return
+- spec/provider/user/darwin_directory_service/dscl-new-user-password.stderr
+- spec/provider/user/darwin_directory_service/dscl-new-user-password.stdout
+- spec/provider/user/darwin_directory_service/dscl-new-user-primary-group.return
+- spec/provider/user/darwin_directory_service/dscl-new-user-primary-group.stderr
+- spec/provider/user/darwin_directory_service/dscl-new-user-primary-group.stdout
+- spec/provider/user/darwin_directory_service/dscl-new-user-shell.return
+- spec/provider/user/darwin_directory_service/dscl-new-user-shell.stderr
+- spec/provider/user/darwin_directory_service/dscl-new-user-shell.stdout
+- spec/provider/user/darwin_directory_service/dscl-new-user-uid.return
+- spec/provider/user/darwin_directory_service/dscl-new-user-uid.stderr
+- spec/provider/user/darwin_directory_service/dscl-new-user-uid.stdout
+- spec/provider/user/darwin_directory_service_spec.rb
 - spec/provider/user/gnu_passwd/useradd_johndoe.return
 - spec/provider/user/gnu_passwd/useradd_johndoe.stderr
 - spec/provider/user/gnu_passwd/useradd_johndoe.stdout
@@ -327,6 +354,7 @@ files:
 - spec/spec_helpers/fake_capture3.rb
 - spec/spec_helpers/test_coverage.rb
 - spec/util/activesupport_spec.rb
+- spec/util/file_owner_spec.rb
 - spec/util/file_permissions_spec.rb
 - spec/util/file_spec.rb
 - spec/util/user_spec.rb
@@ -356,6 +384,8 @@ signing_key:
 specification_version: 4
 summary: A lightweight config management library
 test_files:
+- spec/cli/shebang.rb
+- spec/cli_spec.rb
 - spec/config_spec.rb
 - spec/dsl_spec.rb
 - spec/logger_spec.rb
@@ -373,9 +403,9 @@ test_files:
 - spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_1234_newgroup.return
 - spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_1234_newgroup.stderr
 - spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_1234_newgroup.stdout
-- spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_499_newgroup.return
-- spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_499_newgroup.stderr
-- spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_499_newgroup.stdout
+- spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_2_newgroup.return
+- spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_2_newgroup.stderr
+- spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_2_newgroup.stdout
 - spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_ERROR_newgroup.return
 - spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_ERROR_newgroup.stderr
 - spec/provider/group/darwin_directory_service/dseditgroup_-o_create_-i_ERROR_newgroup.stdout
@@ -424,6 +454,15 @@ test_files:
 - spec/provider/group/gnu_passwd/groupmod_-g_ERROR_foobar.stdout
 - spec/provider/group/gnu_passwd_spec.rb
 - spec/provider/group_spec.rb
+- spec/provider/package/apt/apt-cache_policy_abcde.return
+- spec/provider/package/apt/apt-cache_policy_abcde.stderr
+- spec/provider/package/apt/apt-cache_policy_abcde.stdout
+- spec/provider/package/apt/apt-cache_policy_htop.return
+- spec/provider/package/apt/apt-cache_policy_htop.stderr
+- spec/provider/package/apt/apt-cache_policy_htop.stdout
+- spec/provider/package/apt/apt-cache_policy_not-a-real-package.return
+- spec/provider/package/apt/apt-cache_policy_not-a-real-package.stderr
+- spec/provider/package/apt/apt-cache_policy_not-a-real-package.stdout
 - spec/provider/package/apt/apt-get_install_-qy_abcde=2.5.4-1.return
 - spec/provider/package/apt/apt-get_install_-qy_abcde=2.5.4-1.stderr
 - spec/provider/package/apt/apt-get_install_-qy_abcde=2.5.4-1.stdout
@@ -436,18 +475,6 @@ test_files:
 - spec/provider/package/apt/apt-get_remove_-qy_abcde.return
 - spec/provider/package/apt/apt-get_remove_-qy_abcde.stderr
 - spec/provider/package/apt/apt-get_remove_-qy_abcde.stdout
-- spec/provider/package/apt/dpkg-query_-s_abcde.return
-- spec/provider/package/apt/dpkg-query_-s_abcde.stderr
-- spec/provider/package/apt/dpkg-query_-s_abcde.stdout
-- spec/provider/package/apt/dpkg-query_-s_htop.return
-- spec/provider/package/apt/dpkg-query_-s_htop.stderr
-- spec/provider/package/apt/dpkg-query_-s_htop.stdout
-- spec/provider/package/apt/dpkg-query_-s_not-a-real-package.return
-- spec/provider/package/apt/dpkg-query_-s_not-a-real-package.stderr
-- spec/provider/package/apt/dpkg-query_-s_not-a-real-package.stdout
-- spec/provider/package/apt/dpkg-query_-s_vlc.return
-- spec/provider/package/apt/dpkg-query_-s_vlc.stderr
-- spec/provider/package/apt/dpkg-query_-s_vlc.stdout
 - spec/provider/package/apt_spec.rb
 - spec/provider/package/homebrew/brew_info_--json=v1_cd-discid.return
 - spec/provider/package/homebrew/brew_info_--json=v1_cd-discid.stderr
@@ -470,6 +497,28 @@ test_files:
 - spec/provider/package/homebrew_spec.rb
 - spec/provider/package_spec.rb
 - spec/provider/symlink_spec.rb
+- spec/provider/user/darwin_directory_service/dscl-delete-user.return
+- spec/provider/user/darwin_directory_service/dscl-delete-user.stderr
+- spec/provider/user/darwin_directory_service/dscl-delete-user.stdout
+- spec/provider/user/darwin_directory_service/dscl-new-user-full-name.return
+- spec/provider/user/darwin_directory_service/dscl-new-user-full-name.stderr
+- spec/provider/user/darwin_directory_service/dscl-new-user-full-name.stdout
+- spec/provider/user/darwin_directory_service/dscl-new-user-home.return
+- spec/provider/user/darwin_directory_service/dscl-new-user-home.stderr
+- spec/provider/user/darwin_directory_service/dscl-new-user-home.stdout
+- spec/provider/user/darwin_directory_service/dscl-new-user-password.return
+- spec/provider/user/darwin_directory_service/dscl-new-user-password.stderr
+- spec/provider/user/darwin_directory_service/dscl-new-user-password.stdout
+- spec/provider/user/darwin_directory_service/dscl-new-user-primary-group.return
+- spec/provider/user/darwin_directory_service/dscl-new-user-primary-group.stderr
+- spec/provider/user/darwin_directory_service/dscl-new-user-primary-group.stdout
+- spec/provider/user/darwin_directory_service/dscl-new-user-shell.return
+- spec/provider/user/darwin_directory_service/dscl-new-user-shell.stderr
+- spec/provider/user/darwin_directory_service/dscl-new-user-shell.stdout
+- spec/provider/user/darwin_directory_service/dscl-new-user-uid.return
+- spec/provider/user/darwin_directory_service/dscl-new-user-uid.stderr
+- spec/provider/user/darwin_directory_service/dscl-new-user-uid.stdout
+- spec/provider/user/darwin_directory_service_spec.rb
 - spec/provider/user/gnu_passwd/useradd_johndoe.return
 - spec/provider/user/gnu_passwd/useradd_johndoe.stderr
 - spec/provider/user/gnu_passwd/useradd_johndoe.stdout
@@ -502,6 +551,7 @@ test_files:
 - spec/spec_helpers/fake_capture3.rb
 - spec/spec_helpers/test_coverage.rb
 - spec/util/activesupport_spec.rb
+- spec/util/file_owner_spec.rb
 - spec/util/file_permissions_spec.rb
 - spec/util/file_spec.rb
 - spec/util/user_spec.rb

data/spec/provider/package/apt/dpkg-query_-s_abcde.stdout

@@ -1,23 +0,0 @@
-Package: abcde
-Status: install ok installed
-Priority: optional
-Section: sound
-Installed-Size: 282
-Maintainer: Jesus Climent <jesus.climent@hispalinux.es>
-Architecture: all
-Version: 2.5.3-1
-Depends: cd-discid, wget, cdparanoia | icedax, vorbis-tools (>= 1.0beta4-1) | lame | flac | bladeenc | speex
-Recommends: vorbis-tools, libmusicbrainz-discid-perl, libwebservice-musicbrainz-perl, libdigest-sha-perl, mailx
-Suggests: eject, distmp3, id3 (>= 0.12), id3v2, eyed3, normalize-audio, vorbisgain, mkcue, mp3gain, atomicparsley
-Conffiles:
- /etc/abcde.conf 6123bcbdb6204f9a2193f560e2cf5014
-Description: A Better CD Encoder
- A frontend program to cdparanoia, wget, cd-discid, id3, and your favorite
- Ogg/Vorbis, MP3, FLAC, Ogg/Speex and/or MPP/MP+(Musepack) encoder (defaults
- to oggenc). Grabs an entire CD and converts each track to the specified
- formats and then comments or ID3-tags each file, with one command.
- .
- With abcde you can encode several formats with one single command, using a
- single CD read operation. It also allows you to read and encode while not
- on the internet, and later query a CDDB server to tag your files.
-Homepage: http://code.google.com/p/abcde/

data/spec/provider/package/apt/dpkg-query_-s_htop.stdout

@@ -1,19 +0,0 @@
-Package: htop
-Status: deinstall ok config-files
-Priority: optional
-Section: utils
-Installed-Size: 211
-Maintainer: Eugene V. Lyubimkin <jackyf@debian.org>
-Architecture: amd64
-Version: 1.0.1-1
-Config-Version: 1.0.1-1
-Depends: libc6 (>= 2.3.4), libncursesw5 (>= 5.6+20070908), libtinfo5
-Suggests: strace, ltrace
-Description: interactive processes viewer
- Htop is an ncursed-based process viewer similar to top, but it
- allows one to scroll the list vertically and horizontally to see
- all processes and their full command lines.
- .
- Tasks related to processes (killing, renicing) can be done without
- entering their PIDs.
-Homepage: http://htop.sourceforge.net

data/spec/provider/package/apt/dpkg-query_-s_not-a-real-package.return

@@ -1 +0,0 @@
-1

data/spec/provider/package/apt/dpkg-query_-s_not-a-real-package.stderr

@@ -1,3 +0,0 @@
-dpkg-query: package 'not-a-real-package' is not installed and no information is available
-Use dpkg --info (= dpkg-deb --info) to examine archive files,
-and dpkg --contents (= dpkg-deb --contents) to list their contents.

data/spec/provider/package/apt/dpkg-query_-s_vlc.return

@@ -1 +0,0 @@
-1

data/spec/provider/package/apt/dpkg-query_-s_vlc.stderr

@@ -1,3 +0,0 @@
-dpkg-query: package 'vlc' is not installed and no information is available
-Use dpkg --info (= dpkg-deb --info) to examine archive files,
-and dpkg --contents (= dpkg-deb --contents) to list their contents.