wright 0.4.4 → 0.5.0

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ require_relative 'spec_helpers/test_coverage'
 
 require 'ostruct'
 require 'fakefs/safe'
+require 'minitest/stub_const'
 
 measure_coverage if coverage?
 

data/spec/spec_helpers/fake_capture3.rb

@@ -31,7 +31,7 @@ class FakeCapture3
 
   def return_values(command_and_args, base_filename)
     filename = base_filename ||
-               command_and_args.join(' ').gsub(' ', '_').gsub('/', 'SLASH')
+               command_and_args.join(' ').tr(' ', '_').gsub('/', 'SLASH')
     command_stdout = File.read("#{@basedir}/#{filename}.stdout")
     command_stderr = File.read("#{@basedir}/#{filename}.stderr")
     command_status = File.read("#{@basedir}/#{filename}.return").chomp == '0'

data/spec/util/erb_renderer_spec.rb

@@ -0,0 +1,23 @@
+require_relative '../spec_helper'
+
+require 'wright/util/erb_renderer'
+
+describe Wright::Util::ErbRenderer do
+  describe 'render' do
+    it 'should render ERB templates' do
+      template = "foo: <%= foo %>\n"
+      hash = { foo: 'FOO' }
+      renderer = Wright::Util::ErbRenderer.new(hash)
+      expected = "foo: FOO\n"
+      actual = renderer.render(template)
+      actual.must_equal expected
+    end
+
+    it 'should throw exceptions when encountering undefined names' do
+      template = '<%= undefined_name %>'
+      hash = {}
+      renderer = Wright::Util::ErbRenderer.new(hash)
+      -> { renderer.render(template) }.must_raise NameError
+    end
+  end
+end

data/spec/util/file_owner_spec.rb

@@ -7,6 +7,25 @@ describe Wright::Util::FileOwner do
     @owner = Wright::Util::FileOwner.new
   end
 
+  describe '#initialize' do
+    it 'should accept user and group arguments' do
+      owner = Wright::Util::FileOwner.new('user')
+      owner.user.must_equal 'user'
+
+      owner = Wright::Util::FileOwner.new('user', 'group')
+      owner.user.must_equal 'user'
+      owner.group.must_equal 'group'
+
+      owner = Wright::Util::FileOwner.new('user:group')
+      owner.user.must_equal 'user'
+      owner.group.must_equal 'group'
+
+      owner = Wright::Util::FileOwner.new('user:group1', 'group2')
+      owner.user.must_equal 'user'
+      owner.group.must_equal 'group2'
+    end
+  end
+
   describe '#user_and_group=' do
     it 'should set the user' do
       @owner.group = 'group'

data/spec/util/file_renderer_spec.rb

@@ -0,0 +1,28 @@
+require_relative '../spec_helper'
+
+require 'wright/util/file_renderer'
+
+describe Wright::Util::FileRenderer do
+  describe 'render' do
+    before(:each) do
+      @template_files = {
+        'foo.erb' => '<%= foo %>',
+        'foo.mustache' => '{{foo}}'
+      }
+    end
+
+    after(:each) { FakeFS::FileSystem.clear }
+
+    it 'should render template files' do
+      renderer = Wright::Util::FileRenderer.new(foo: 'FOOBAR')
+      FakeFS do
+        @template_files.each do |filename, template|
+          File.write(filename, template)
+          expected = 'FOOBAR'
+          actual = renderer.render(filename)
+          actual.must_equal expected
+        end
+      end
+    end
+  end
+end

data/spec/util/mustache_renderer_spec.rb

@@ -0,0 +1,57 @@
+require_relative '../spec_helper'
+
+require 'wright/util/mustache_renderer'
+
+describe Wright::Util::MustacheRenderer do
+  describe 'render' do
+    it 'should render mustache templates' do
+      template = "foo: {{foo}}\n"
+      hash = { foo: 'FOO' }
+      renderer = Wright::Util::MustacheRenderer.new(hash)
+      expected = "foo: FOO\n"
+      actual = renderer.render(template)
+      actual.must_equal expected
+    end
+
+    it 'should throw exceptions when encountering undefined names' do
+      skip unless defined?(Mustache)
+      template = '{{undefined_name}}'
+      hash = {}
+      renderer = Wright::Util::MustacheRenderer.new(hash)
+      -> { renderer.render(template) }.must_raise Mustache::ContextMiss
+    end
+
+    it 'should delegate rendering templates to Mustache' do
+      template = "foo: {{foo}}\n"
+      hash = { foo: 'FOO' }
+      mustache_class_double = Minitest::Mock.new
+      mustache_object_double = Minitest::Mock.new
+      mustache_class_double.expect(:new, mustache_object_double)
+      mustache_object_double.expect(:raise_on_context_miss=, true, [true])
+      mustache_object_double.expect(:render, nil, [template, hash])
+
+      Object.stub_const(:Mustache, mustache_class_double) do
+        Wright::Util::MustacheRenderer.new(hash).render(template)
+      end
+      mustache_class_double.verify
+      mustache_object_double.verify
+    end
+
+    it 'should fall back to pencil_mustache if Mustache is not available' do
+      template = "foo: {{foo}}\n"
+      hash = { foo: 'FOO' }
+      mustache_class_double = Minitest::Mock.new
+      mustache_object_double = Minitest::Mock.new
+      mustache_class_double.expect(:new, mustache_object_double)
+      mustache_object_double.expect(:render, nil, [template, hash])
+
+      Object.stub_remove_const(:Mustache) do
+        Wright::Util.stub_const(:PencilMustache, mustache_class_double) do
+          Wright::Util::MustacheRenderer.new(hash).render(template)
+        end
+      end
+      mustache_class_double.verify
+      mustache_object_double.verify
+    end
+  end
+end

data/spec/util/pencil_mustache_spec.rb

@@ -0,0 +1,15 @@
+require_relative '../spec_helper'
+
+require 'wright/util/pencil_mustache'
+
+describe Wright::Util::PencilMustache do
+  describe 'render' do
+    it 'should render mustache templates' do
+      template = "foo: {{foo}}\n"
+      hash = { foo: 'FOO' }
+      expected = "foo: FOO\n"
+      actual = Wright::Util::PencilMustache.new.render(template, hash)
+      actual.must_equal expected
+    end
+  end
+end

data/spec/util_spec.rb

@@ -1,6 +1,5 @@
 require_relative 'spec_helper'
 
-require 'minitest/stub_const'
 require 'wright/util'
 
 describe Wright::Util do
@@ -95,9 +94,9 @@ EOS
 
     after(:each) { FakeFS::FileSystem.clear }
 
-    it 'should detect MacOS X' do
+    it 'should detect OS X' do
       stub_os('darwin13') do
-        Wright::Util.os_family.must_equal 'macosx'
+        Wright::Util.os_family.must_equal 'osx'
       end
     end
 
@@ -155,4 +154,19 @@ EOS
       mock.verify
     end
   end
+
+  describe 'fetch_last' do
+    it 'should fetch the value of the last candidate key from a hash' do
+      hash = { candidate1: :value1, candidate2: :value2, foo: :bar }
+      candidates = [:candidate2, :candidate1]
+      Wright::Util.fetch_last(hash, candidates).must_equal :value2
+    end
+
+    it 'should return the default value if no candidate key is found' do
+      hash = { foo: :foo, bar: :bar, baz: :baz }
+      candidates = [:qux, :quux]
+      Wright::Util.fetch_last(hash, candidates).must_be_nil
+      Wright::Util.fetch_last(hash, candidates, :default).must_equal :default
+    end
+  end
 end

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: wright
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Sebastian Boehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mustache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.7.0
+        version: 5.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.7.0
+        version: 5.8.0
 - !ruby/object:Gem::Dependency
   name: minitest-stub-const
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.3.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +156,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.34.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.34.1
 description: |
   Wright is a lightweight configuration management tool.
 email:
@@ -187,9 +201,13 @@ files:
 - lib/wright/resource/user.rb
 - lib/wright/resource.rb
 - lib/wright/util/color.rb
+- lib/wright/util/erb_renderer.rb
 - lib/wright/util/file.rb
 - lib/wright/util/file_owner.rb
 - lib/wright/util/file_permissions.rb
+- lib/wright/util/file_renderer.rb
+- lib/wright/util/mustache_renderer.rb
+- lib/wright/util/pencil_mustache.rb
 - lib/wright/util/recursive_autoloader.rb
 - lib/wright/util/stolen_from_activesupport.rb
 - lib/wright/util/user.rb
@@ -302,21 +320,21 @@ files:
 - spec/provider/package/apt/apt-cache_showpkg_suckless-tools.return
 - spec/provider/package/apt/apt-cache_showpkg_suckless-tools.stderr
 - spec/provider/package/apt/apt-cache_showpkg_suckless-tools.stdout
-- spec/provider/package/apt/apt-get_--purge_remove_-qy_abcde.return
-- spec/provider/package/apt/apt-get_--purge_remove_-qy_abcde.stderr
-- spec/provider/package/apt/apt-get_--purge_remove_-qy_abcde.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
-- spec/provider/package/apt/apt-get_install_-qy_htop.return
-- spec/provider/package/apt/apt-get_install_-qy_htop.stderr
-- spec/provider/package/apt/apt-get_install_-qy_htop.stdout
-- spec/provider/package/apt/apt-get_install_-qy_not-a-real-package.return
-- spec/provider/package/apt/apt-get_install_-qy_not-a-real-package.stderr
-- spec/provider/package/apt/apt-get_install_-qy_not-a-real-package.stdout
-- 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/apt-get_-qy_--purge_remove_abcde.return
+- spec/provider/package/apt/apt-get_-qy_--purge_remove_abcde.stderr
+- spec/provider/package/apt/apt-get_-qy_--purge_remove_abcde.stdout
+- spec/provider/package/apt/apt-get_-qy_install_abcde=2.5.4-1.return
+- spec/provider/package/apt/apt-get_-qy_install_abcde=2.5.4-1.stderr
+- spec/provider/package/apt/apt-get_-qy_install_abcde=2.5.4-1.stdout
+- spec/provider/package/apt/apt-get_-qy_install_htop.return
+- spec/provider/package/apt/apt-get_-qy_install_htop.stderr
+- spec/provider/package/apt/apt-get_-qy_install_htop.stdout
+- spec/provider/package/apt/apt-get_-qy_install_not-a-real-package.return
+- spec/provider/package/apt/apt-get_-qy_install_not-a-real-package.stderr
+- spec/provider/package/apt/apt-get_-qy_install_not-a-real-package.stdout
+- spec/provider/package/apt/apt-get_-qy_remove_abcde.return
+- spec/provider/package/apt/apt-get_-qy_remove_abcde.stderr
+- spec/provider/package/apt/apt-get_-qy_remove_abcde.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
@@ -349,21 +367,21 @@ files:
 - spec/provider/package/yum/rpm_-q_zsh.return
 - spec/provider/package/yum/rpm_-q_zsh.stderr
 - spec/provider/package/yum/rpm_-q_zsh.stdout
-- spec/provider/package/yum/yum_install_-y_mc-4.8.7-8.el7.return
-- spec/provider/package/yum/yum_install_-y_mc-4.8.7-8.el7.stderr
-- spec/provider/package/yum/yum_install_-y_mc-4.8.7-8.el7.stdout
-- spec/provider/package/yum/yum_install_-y_nano.return
-- spec/provider/package/yum/yum_install_-y_nano.stderr
-- spec/provider/package/yum/yum_install_-y_nano.stdout
-- spec/provider/package/yum/yum_install_-y_not-a-real-package.return
-- spec/provider/package/yum/yum_install_-y_not-a-real-package.stderr
-- spec/provider/package/yum/yum_install_-y_not-a-real-package.stdout
+- spec/provider/package/yum/yum_-y_install_mc-4.8.7-8.el7.return
+- spec/provider/package/yum/yum_-y_install_mc-4.8.7-8.el7.stderr
+- spec/provider/package/yum/yum_-y_install_mc-4.8.7-8.el7.stdout
+- spec/provider/package/yum/yum_-y_install_nano.return
+- spec/provider/package/yum/yum_-y_install_nano.stderr
+- spec/provider/package/yum/yum_-y_install_nano.stdout
+- spec/provider/package/yum/yum_-y_install_not-a-real-package.return
+- spec/provider/package/yum/yum_-y_install_not-a-real-package.stderr
+- spec/provider/package/yum/yum_-y_install_not-a-real-package.stdout
+- spec/provider/package/yum/yum_-y_remove_screen.return
+- spec/provider/package/yum/yum_-y_remove_screen.stderr
+- spec/provider/package/yum/yum_-y_remove_screen.stdout
 - spec/provider/package/yum/yum_install_with_options.return
 - spec/provider/package/yum/yum_install_with_options.stderr
 - spec/provider/package/yum/yum_install_with_options.stdout
-- spec/provider/package/yum/yum_remove_-y_screen.return
-- spec/provider/package/yum/yum_remove_-y_screen.stderr
-- spec/provider/package/yum/yum_remove_-y_screen.stdout
 - spec/provider/package/yum/yum_remove_with_options.return
 - spec/provider/package/yum/yum_remove_with_options.stderr
 - spec/provider/package/yum/yum_remove_with_options.stdout
@@ -424,9 +442,13 @@ files:
 - spec/spec_helpers/fake_capture3.rb
 - spec/spec_helpers/test_coverage.rb
 - spec/util/activesupport_spec.rb
+- spec/util/erb_renderer_spec.rb
 - spec/util/file_owner_spec.rb
 - spec/util/file_permissions_spec.rb
+- spec/util/file_renderer_spec.rb
 - spec/util/file_spec.rb
+- spec/util/mustache_renderer_spec.rb
+- spec/util/pencil_mustache_spec.rb
 - spec/util/user_spec.rb
 - spec/util_spec.rb
 - man/wright.1
@@ -566,21 +588,21 @@ test_files:
 - spec/provider/package/apt/apt-cache_showpkg_suckless-tools.return
 - spec/provider/package/apt/apt-cache_showpkg_suckless-tools.stderr
 - spec/provider/package/apt/apt-cache_showpkg_suckless-tools.stdout
-- spec/provider/package/apt/apt-get_--purge_remove_-qy_abcde.return
-- spec/provider/package/apt/apt-get_--purge_remove_-qy_abcde.stderr
-- spec/provider/package/apt/apt-get_--purge_remove_-qy_abcde.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
-- spec/provider/package/apt/apt-get_install_-qy_htop.return
-- spec/provider/package/apt/apt-get_install_-qy_htop.stderr
-- spec/provider/package/apt/apt-get_install_-qy_htop.stdout
-- spec/provider/package/apt/apt-get_install_-qy_not-a-real-package.return
-- spec/provider/package/apt/apt-get_install_-qy_not-a-real-package.stderr
-- spec/provider/package/apt/apt-get_install_-qy_not-a-real-package.stdout
-- 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/apt-get_-qy_--purge_remove_abcde.return
+- spec/provider/package/apt/apt-get_-qy_--purge_remove_abcde.stderr
+- spec/provider/package/apt/apt-get_-qy_--purge_remove_abcde.stdout
+- spec/provider/package/apt/apt-get_-qy_install_abcde=2.5.4-1.return
+- spec/provider/package/apt/apt-get_-qy_install_abcde=2.5.4-1.stderr
+- spec/provider/package/apt/apt-get_-qy_install_abcde=2.5.4-1.stdout
+- spec/provider/package/apt/apt-get_-qy_install_htop.return
+- spec/provider/package/apt/apt-get_-qy_install_htop.stderr
+- spec/provider/package/apt/apt-get_-qy_install_htop.stdout
+- spec/provider/package/apt/apt-get_-qy_install_not-a-real-package.return
+- spec/provider/package/apt/apt-get_-qy_install_not-a-real-package.stderr
+- spec/provider/package/apt/apt-get_-qy_install_not-a-real-package.stdout
+- spec/provider/package/apt/apt-get_-qy_remove_abcde.return
+- spec/provider/package/apt/apt-get_-qy_remove_abcde.stderr
+- spec/provider/package/apt/apt-get_-qy_remove_abcde.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
@@ -613,21 +635,21 @@ test_files:
 - spec/provider/package/yum/rpm_-q_zsh.return
 - spec/provider/package/yum/rpm_-q_zsh.stderr
 - spec/provider/package/yum/rpm_-q_zsh.stdout
-- spec/provider/package/yum/yum_install_-y_mc-4.8.7-8.el7.return
-- spec/provider/package/yum/yum_install_-y_mc-4.8.7-8.el7.stderr
-- spec/provider/package/yum/yum_install_-y_mc-4.8.7-8.el7.stdout
-- spec/provider/package/yum/yum_install_-y_nano.return
-- spec/provider/package/yum/yum_install_-y_nano.stderr
-- spec/provider/package/yum/yum_install_-y_nano.stdout
-- spec/provider/package/yum/yum_install_-y_not-a-real-package.return
-- spec/provider/package/yum/yum_install_-y_not-a-real-package.stderr
-- spec/provider/package/yum/yum_install_-y_not-a-real-package.stdout
+- spec/provider/package/yum/yum_-y_install_mc-4.8.7-8.el7.return
+- spec/provider/package/yum/yum_-y_install_mc-4.8.7-8.el7.stderr
+- spec/provider/package/yum/yum_-y_install_mc-4.8.7-8.el7.stdout
+- spec/provider/package/yum/yum_-y_install_nano.return
+- spec/provider/package/yum/yum_-y_install_nano.stderr
+- spec/provider/package/yum/yum_-y_install_nano.stdout
+- spec/provider/package/yum/yum_-y_install_not-a-real-package.return
+- spec/provider/package/yum/yum_-y_install_not-a-real-package.stderr
+- spec/provider/package/yum/yum_-y_install_not-a-real-package.stdout
+- spec/provider/package/yum/yum_-y_remove_screen.return
+- spec/provider/package/yum/yum_-y_remove_screen.stderr
+- spec/provider/package/yum/yum_-y_remove_screen.stdout
 - spec/provider/package/yum/yum_install_with_options.return
 - spec/provider/package/yum/yum_install_with_options.stderr
 - spec/provider/package/yum/yum_install_with_options.stdout
-- spec/provider/package/yum/yum_remove_-y_screen.return
-- spec/provider/package/yum/yum_remove_-y_screen.stderr
-- spec/provider/package/yum/yum_remove_-y_screen.stdout
 - spec/provider/package/yum/yum_remove_with_options.return
 - spec/provider/package/yum/yum_remove_with_options.stderr
 - spec/provider/package/yum/yum_remove_with_options.stdout
@@ -688,9 +710,13 @@ test_files:
 - spec/spec_helpers/fake_capture3.rb
 - spec/spec_helpers/test_coverage.rb
 - spec/util/activesupport_spec.rb
+- spec/util/erb_renderer_spec.rb
 - spec/util/file_owner_spec.rb
 - spec/util/file_permissions_spec.rb
+- spec/util/file_renderer_spec.rb
 - spec/util/file_spec.rb
+- spec/util/mustache_renderer_spec.rb
+- spec/util/pencil_mustache_spec.rb
 - spec/util/user_spec.rb
 - spec/util_spec.rb
 has_rdoc: