wright 0.4.4 → 0.5.0

data/lib/wright/version.rb

@@ -1,4 +1,4 @@
 module Wright # rubocop:disable Documentation
   # Current wright version
-  VERSION = '0.4.4'
+  VERSION = '0.5.0'
 end

data/man/wright.1

@@ -2,12 +2,12 @@
 .\"     Title: wright
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 06/03/2015
+.\"      Date: 09/20/2015
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "WRIGHT" "1" "06/03/2015" "\ \&" "\ \&"
+.TH "WRIGHT" "1" "09/20/2015" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -94,7 +94,7 @@ Create a system user named "foobard":
 .RS 4
 .\}
 .nf
-wright \-e \*(Aquser("foobard") { |u| u\&.system = true }\*(Aq
+wright \-e \*(Aquser "foobard", system: true\*(Aq
 .fi
 .if n \{\
 .RE
@@ -106,7 +106,7 @@ Create a system group named "foobard":
 .RS 4
 .\}
 .nf
-wright \-e \*(Aqgroup("foobard") { |u| u\&.system = true }\*(Aq
+wright \-e \*(Aqgroup "foobard", system: true\*(Aq
 .fi
 .if n \{\
 .RE
@@ -118,7 +118,7 @@ Create a file named \fI/etc/issue\fR containing the current wright version:
 .RS 4
 .\}
 .nf
-wright \-e \*(Aqfile("/etc/issue") { |f| f\&.content = Wright::VERSION }\*(Aq
+wright \-e \*(Aqfile "/etc/issue", content: Wright::VERSION\*(Aq
 .fi
 .if n \{\
 .RE
@@ -142,7 +142,7 @@ Create a symlink from \fI\&.bash_profile\fR to \fI\&.profile\fR in the current u
 .RS 4
 .\}
 .nf
-wright \-e \*(Aqsymlink("~/\&.bash_profile") { |s| s\&.to = "~/\&.profile" }\*(Aq
+wright \-e \*(Aqsymlink "~/\&.bash_profile", to: "~/\&.profile"\*(Aq
 .fi
 .if n \{\
 .RE
@@ -156,15 +156,14 @@ To install tmux and update its config file from a wright script, create the foll
 .nf
 package \*(Aqtmux\*(Aq
 
-file \*(Aq/etc/tmux\&.conf\*(Aq do |f|
-  f\&.content = <<EOF
+file \*(Aq/etc/tmux\&.conf\*(Aq,
+     mode: \*(Aq444\*(Aq,
+     on_update: \-> { puts \*(AqUpdated /etc/tmux\&.conf\*(Aq },
+     content: <<EOF
 unbind C\-b
 set \-g prefix C\-a
 bind\-key a send\-prefix
 EOF
-  f\&.mode = \*(Aq444\*(Aq
-  f\&.on_update = \-> { puts \*(AqUpdated /etc/tmux\&.conf\*(Aq }
-end
 .fi
 .if n \{\
 .RE

data/spec/dsl_spec.rb

@@ -6,9 +6,8 @@ describe Wright::DSL do
   before(:each) do
     # duplicate Wright::DSL for testing
     dsl = Wright::DSL.dup
-    @recipe = Class.new do
-      extend dsl
-    end
+    @recipe = Object.new
+    @recipe.extend(dsl)
     @wright_dsl = dsl
   end
 
@@ -17,7 +16,8 @@ describe Wright::DSL do
       def self.name
         'ResourceKlass'
       end
-      def initialize(_name); end
+
+      def initialize(_name, _args); end
     end
 
     @wright_dsl.register_resource(resource_class)
@@ -26,8 +26,10 @@ describe Wright::DSL do
     resource_name = 'just a name'
     @recipe.must_respond_to(resource_method_name)
 
+    # Ruby 1.9: "0 for 1", Ruby 2: "0 for 1..2"
+    error_message_re = /\Awrong number of arguments \(0 for 1(..2)?\)\Z/
     e = -> { @recipe.send(resource_method_name) }.must_raise ArgumentError
-    e.message.must_equal 'wrong number of arguments (0 for 1)'
+    e.message.must_match error_message_re
 
     resource = @recipe.send(resource_method_name, resource_name)
     resource.must_be_instance_of(resource_class)
@@ -39,7 +41,7 @@ describe Wright::DSL do
         'Hello'
       end
 
-      def initialize(name)
+      def initialize(name, _args = {})
         @name = name
       end
 
@@ -58,7 +60,7 @@ describe Wright::DSL do
         'ResourceKlass'
       end
 
-      def initialize(_name); end
+      def initialize(_name, _args = {}); end
     end
     @wright_dsl.register_resource(resource_class)
 
@@ -67,4 +69,67 @@ describe Wright::DSL do
 
     -> { @recipe.send(resource_name, nil, &block) }.must_throw resource_class
   end
+
+  describe '#util' do
+    it 'should return a Wright::DSL::Util object' do
+      @recipe.util.must_be_instance_of Wright::DSL::Util
+    end
+  end
+end
+
+describe Wright::DSL::Util do
+  before(:each) { @util = Wright::DSL::Util.new }
+
+  describe '#render_erb' do
+    it 'should delegate rendering ERB templates to ErbRenderer' do
+      erb_renderer_class_double = Minitest::Mock.new
+      erb_renderer_object_double = Minitest::Mock.new
+      erb_renderer_class_double.expect(:new,
+                                       erb_renderer_object_double,
+                                       [:hash])
+      erb_renderer_object_double.expect(:render, nil, [:template])
+
+      Wright::Util.stub_const(:ErbRenderer,
+                              erb_renderer_class_double) do
+        @util.render_erb(:template, :hash)
+      end
+      erb_renderer_class_double.verify
+      erb_renderer_object_double.verify
+    end
+  end
+
+  describe '#render_mustache' do
+    it 'should delegate rendering mustache templates to MustacheRenderer' do
+      mustache_renderer_class_double = Minitest::Mock.new
+      mustache_renderer_object_double = Minitest::Mock.new
+      mustache_renderer_class_double.expect(:new,
+                                            mustache_renderer_object_double,
+                                            [:hash])
+      mustache_renderer_object_double.expect(:render, nil, [:template])
+
+      Wright::Util.stub_const(:MustacheRenderer,
+                              mustache_renderer_class_double) do
+        @util.render_mustache(:template, :hash)
+      end
+      mustache_renderer_class_double.verify
+      mustache_renderer_object_double.verify
+    end
+  end
+
+  describe '#render_file' do
+    it 'should delegate rendering files templates to FileRenderer' do
+      file_renderer_class_double = Minitest::Mock.new
+      file_renderer_object_double = Minitest::Mock.new
+      file_renderer_class_double.expect(:new,
+                                        file_renderer_object_double,
+                                        [:hash])
+      file_renderer_object_double.expect(:render, nil, [:filename])
+
+      Wright::Util.stub_const(:FileRenderer, file_renderer_class_double) do
+        @util.render_file(:filename, :hash)
+      end
+      file_renderer_class_double.verify
+      file_renderer_object_double.verify
+    end
+  end
 end

data/spec/provider/package/apt_spec.rb

@@ -10,7 +10,7 @@ describe Wright::Provider::Package::Apt do
   def apt_get(action, pkg_name, args = {})
     version = args[:version].nil? ? '' : "=#{args[:version]}"
     options = args[:options]
-    ['apt-get', *options, action.to_s, '-qy', pkg_name + version]
+    ['apt-get', '-qy', *options, action.to_s, pkg_name + version]
   end
 
   def package_provider(pkg_name, args = {})
@@ -135,7 +135,7 @@ describe Wright::Provider::Package::Apt do
       pkg_provider = package_provider(pkg_name, options: pkg_options)
       apt_cmd = apt_get(:install, pkg_name, options: pkg_options)
 
-      @fake_capture3.expect(apt_cmd, 'apt-get_install_-qy_htop')
+      @fake_capture3.expect(apt_cmd, 'apt-get_-qy_install_htop')
       @fake_capture3.stub do
         pkg_provider.send(:install_package)
       end

data/spec/provider/package/yum_spec.rb

@@ -18,7 +18,7 @@ describe Wright::Provider::Package::Yum do
 
   def yum(action, pkg_name, args = {})
     version = args[:version].nil? ? '' : "-#{args[:version]}"
-    ['yum', *args[:options], action.to_s, '-y', pkg_name + version]
+    ['yum', '-y', *args[:options], action.to_s, pkg_name + version]
   end
 
   before :each do

data/spec/resource/directory_spec.rb

@@ -9,6 +9,21 @@ describe Wright::Resource::Directory do
 
   after(:each) { FakeFS::FileSystem.clear }
 
+  describe '#initialize' do
+    it 'should accept attributes via an argument hash' do
+      resource = Wright::Resource::Directory.new(@dirname,
+                                                 mode: 'sample_mode',
+                                                 action: 'sample_action',
+                                                 owner: 'sample_owner',
+                                                 group: 'sample_group')
+      resource.name.must_equal @dirname
+      resource.mode.must_equal 'sample_mode'
+      resource.action.must_equal 'sample_action'
+      resource.owner.must_equal 'sample_owner'
+      resource.group.must_equal 'sample_group'
+    end
+  end
+
   describe '#create' do
     it 'should create directories' do
       FakeFS do

data/spec/resource/file_spec.rb

@@ -12,6 +12,23 @@ describe Wright::Resource::File do
 
   after(:each) { FakeFS::FileSystem.clear }
 
+  describe '#initialize' do
+    it 'should accept attributes via an argument hash' do
+      resource = Wright::Resource::File.new(@filename,
+                                            content: 'sample_content',
+                                            mode: 'sample_mode',
+                                            action: 'sample_action',
+                                            owner: 'sample_owner',
+                                            group: 'sample_group')
+      resource.name.must_equal @filename
+      resource.content.must_equal 'sample_content'
+      resource.mode.must_equal 'sample_mode'
+      resource.action.must_equal 'sample_action'
+      resource.owner.must_equal 'sample_owner'
+      resource.group.must_equal 'sample_group'
+    end
+  end
+
   describe '#create' do
     it 'should create files' do
       FakeFS do

data/spec/resource/group_spec.rb

@@ -9,6 +9,21 @@ describe Wright::Resource::Group do
     @group.instance_variable_set(:@provider, @provider)
   end
 
+  describe '#initialize' do
+    it 'should accept attributes via an argument hash' do
+      resource = Wright::Resource::Group.new('sample_name',
+                                             members: 'sample_members',
+                                             gid: 'sample_gid',
+                                             system: 'sample_system',
+                                             action: 'sample_action')
+      resource.name.must_equal 'sample_name'
+      resource.members.must_equal 'sample_members'
+      resource.gid.must_equal 'sample_gid'
+      resource.system.must_equal 'sample_system'
+      resource.action.must_equal 'sample_action'
+    end
+  end
+
   describe '#create' do
     it 'should ask the provider to create the group' do
       @provider.expect(:create, nil)

data/spec/resource/package_spec.rb

@@ -9,6 +9,19 @@ describe Wright::Resource::Package do
     @package.instance_variable_set(:@provider, @provider)
   end
 
+  describe '#initialize' do
+    it 'should accept attributes via an argument hash' do
+      resource = Wright::Resource::Package.new('sample_name',
+                                               version: 'sample_version',
+                                               options: 'sample_options',
+                                               action: 'sample_action')
+      resource.name.must_equal 'sample_name'
+      resource.version.must_equal 'sample_version'
+      resource.options.must_equal 'sample_options'
+      resource.action.must_equal 'sample_action'
+    end
+  end
+
   describe '#installed_versions' do
     it 'should ask the provider for installed versions' do
       @provider.expect(:installed_versions, nil)

data/spec/resource/symlink_spec.rb

@@ -18,6 +18,17 @@ describe Wright::Resource::Symlink do
     link
   end
 
+  describe '#initialize' do
+    it 'should accept attributes via an argument hash' do
+      resource = Wright::Resource::Symlink.new(@link_name,
+                                               to: 'sample_to',
+                                               action: 'sample_action')
+      resource.name.must_equal @link_name
+      resource.to.must_equal 'sample_to'
+      resource.action.must_equal 'sample_action'
+    end
+  end
+
   describe '#create' do
     it 'should create symlinks' do
       FakeFS do

data/spec/resource/user_spec.rb

@@ -9,6 +9,38 @@ describe Wright::Resource::User do
     @user.instance_variable_set(:@provider, @provider)
   end
 
+  describe '#initialize' do
+    it 'should accept attributes via an argument hash' do
+      resource = Wright::Resource::User.new('sample_name',
+                                            uid: 'sample_uid',
+                                            full_name: 'sample_full_name',
+                                            groups: 'sample_groups',
+                                            shell: 'sample_shell',
+                                            home: 'sample_home',
+                                            primary_group: 'sample_pgroup',
+                                            system: 'sample_system',
+                                            action: 'sample_action')
+      resource.name.must_equal 'sample_name'
+      resource.uid.must_equal 'sample_uid'
+      resource.full_name.must_equal 'sample_full_name'
+      resource.groups.must_equal 'sample_groups'
+      resource.shell.must_equal 'sample_shell'
+      resource.home.must_equal 'sample_home'
+      resource.primary_group.must_equal 'sample_pgroup'
+      resource.system.must_equal 'sample_system'
+      resource.action.must_equal 'sample_action'
+    end
+
+    it 'should accept aliased attributes via an argument hash' do
+      resource = Wright::Resource::User.new('sample_name',
+                                            login_group: 'sample_login_group',
+                                            homedir: 'sample_homedir')
+      resource.name.must_equal 'sample_name'
+      resource.login_group.must_equal 'sample_login_group'
+      resource.homedir.must_equal 'sample_homedir'
+    end
+  end
+
   describe '#create' do
     it 'should ask the provider to create the user' do
       @provider.expect(:create, nil)

data/spec/resource_spec.rb

@@ -3,13 +3,6 @@ require_relative 'spec_helper'
 require 'wright/resource'
 require 'wright/provider'
 
-module Wright
-  # add provider attribute reader for tests
-  class Resource
-    attr_reader :provider
-  end
-end
-
 module Wright
   class Provider
     class Sample < Wright::Provider; end
@@ -56,20 +49,23 @@ describe Wright::Resource do
 
   it 'should retrieve a provider for a resource' do
     provider_class = Wright::Provider::Sample
-    Sample.new.provider.must_be_kind_of provider_class
+    provider = Sample.new.send(:provider)
+    provider.must_be_kind_of provider_class
   end
 
   it 'should retrieve a provider for a resource listed in the config' do
     # instantiating the Sample resource without any config should
     # yield the Sample provider
     provider_class = Wright::Provider::Sample
-    Sample.new.provider.must_be_kind_of provider_class
+    provider = Sample.new.send(:provider)
+    provider.must_be_kind_of provider_class
 
     # when the provider for Sample resources is set to
     # AlternateSample, AlternateSample should be instantiated
     alternate = Wright::Provider::AlternateSample
     Wright::Config[:resources] = { sample: { provider: alternate.name } }
-    Sample.new.provider.must_be_kind_of alternate
+    alternate_provider = Sample.new.send(:provider)
+    alternate_provider.must_be_kind_of alternate
   end
 
   it 'should display warnings for nonexistent providers' do
@@ -189,4 +185,16 @@ describe Wright::Resource do
       resource.fail_train
     end.must_raise(RuntimeError)
   end
+
+  it 'should accept attributes via an argument hash' do
+    sample_lambda = -> {}
+    sample = Sample.new('sample_name',
+                        action: 'sample_action',
+                        on_update: sample_lambda,
+                        ignore_failure: 'sample_ignore_failure')
+    sample.name.must_equal 'sample_name'
+    sample.action.must_equal 'sample_action'
+    sample.send(:on_update).must_equal sample_lambda
+    sample.ignore_failure.must_equal 'sample_ignore_failure'
+  end
 end