wright 0.4.4 → 0.5.0

data/lib/wright/provider/package.rb

@@ -47,15 +47,15 @@ module Wright
       private
 
       def package_name
-        @resource.name
+        resource.name
       end
 
       def package_version
-        @resource.version
+        resource.version
       end
 
       def package_options
-        @resource.options
+        resource.options
       end
 
       # @api public

data/lib/wright/provider/package/apt.rb

@@ -34,7 +34,7 @@ module Wright
         def apt_get(action, options, package, version = nil)
           package_version = version.nil? ? '' : "=#{version}"
           cmd = 'apt-get'
-          args = [*options, action.to_s, '-qy', package + package_version]
+          args = ['-qy', *options, action.to_s, package + package_version]
           exec_or_fail(cmd, args, "cannot #{action} package '#{package}'")
         end
 

data/lib/wright/provider/package/yum.rb

@@ -30,7 +30,7 @@ module Wright
         def yum(action, options, package, version = nil)
           cmd = 'yum'
           package_version = version.nil? ? '' : "-#{version}"
-          args = [*options, action.to_s, '-y', package + package_version]
+          args = ['-y', *options, action.to_s, package + package_version]
           exec_or_fail(cmd, args, "cannot #{action} package '#{package}'")
         end
       end

data/lib/wright/provider/symlink.rb

@@ -36,11 +36,11 @@ module Wright
       private
 
       def link_name
-        @resource.name
+        resource.name
       end
 
       def link_to
-        @resource.to
+        resource.to
       end
 
       def link_to_expanded

data/lib/wright/provider/user.rb

@@ -36,35 +36,35 @@ module Wright
       private
 
       def user_name
-        @resource.name
+        resource.name
       end
 
       def uid
-        @resource.uid
+        resource.uid
       end
 
       def primary_group
-        @resource.primary_group
+        resource.primary_group
       end
 
       def full_name
-        @resource.full_name
+        resource.full_name
       end
 
       def groups
-        @resource.groups
+        resource.groups
       end
 
       def shell
-        @resource.shell
+        resource.shell
       end
 
       def home
-        @resource.home
+        resource.home
       end
 
       def system_user?
-        @resource.system
+        resource.system
       end
 
       # @api public

data/lib/wright/resource.rb

@@ -9,13 +9,13 @@ module Wright
     # Initializes a Resource.
     #
     # @param name [String] the name of the resource
-    def initialize(name = nil)
-      @name = name
-      @resource_name = Util.class_to_resource_name(self.class).to_sym
-      @provider = provider_for_resource
-      @action = nil
-      @on_update = nil
-      @ignore_failure = false
+    def initialize(name = nil, args = {})
+      @name           = name
+      @action         = args.fetch(:action, nil)
+      @ignore_failure = args.fetch(:ignore_failure, false)
+      self.on_update  = args.fetch(:on_update, nil)
+      @resource_name  = Util.class_to_resource_name(self.class).to_sym
+      @provider       = provider_for_resource
     end
 
     # @return [Symbol] the name of the method to be run by {#run_action}
@@ -69,11 +69,13 @@ module Wright
     #
     # @return the return value of the current action
     def run_action
-      send @action if @action
+      send action if action
     end
 
     private
 
+    attr_reader :on_update, :provider
+
     # @api public
     # Marks a code block that might update a resource.
     #
@@ -92,7 +94,7 @@ module Wright
     #
     #   class Balloon < Wright::Resource
     #     def inflate
-    #       might_update_resource { @provider.inflate }
+    #       might_update_resource { provider.inflate }
     #     end
     #   end
     #   Wright::Config[:resources] = { balloon: { provider: 'BalloonAnimal' } }
@@ -107,39 +109,39 @@ module Wright
         yield
       rescue => e
         log_error(e)
-        raise e unless @ignore_failure
+        raise e unless ignore_failure
       end
-      updated = @provider.updated?
+      updated = provider.updated?
       run_update_action if updated
       updated
     end
 
     def log_error(exception)
-      resource = "#{@resource_name}"
-      resource << " '#{@name}'" if @name
+      resource = "#{resource_name}"
+      resource << " '#{name}'" if name
       Wright.log.error "#{resource}: #{exception}"
     end
 
     def run_update_action
-      return if @on_update.nil?
+      return unless on_update
 
-      resource = "#{@resource_name} '#{@name}'"
+      resource = "#{resource_name} '#{name}'"
       notification = "run update action for #{resource}"
       if Wright.dry_run?
         Wright.log.info "(would) #{notification}"
       else
         Wright.log.info notification
-        @on_update.call
+        on_update.call
       end
     end
 
     def resource_class
-      Util::ActiveSupport.camelize(@resource_name)
+      Util::ActiveSupport.camelize(resource_name)
     end
 
     def provider_name
-      if Wright::Config.nested_key?(:resources, @resource_name, :provider)
-        Wright::Config[:resources][@resource_name][:provider]
+      if Wright::Config.nested_key?(:resources, resource_name, :provider)
+        Wright::Config[:resources][resource_name][:provider]
       else
         "Wright::Provider::#{resource_class}"
       end

data/lib/wright/resource/directory.rb

@@ -17,11 +17,18 @@ module Wright
       # Initializes a Directory.
       #
       # @param name [String] the directory's name
-      def initialize(name)
+      # @param args [Hash] the arguments
+      # @option args [Symbol] :action (:create) the action
+      # @option args [String, Integer] :mode the directory's mode
+      # @option args [String, Integer] :owner the directory's owner
+      # @option args [String, Integer] :group the directory's group
+      def initialize(name, args = {})
         super
-        @mode = nil
-        @owner = Wright::Util::FileOwner.new
-        @action = :create
+        @action    = args.fetch(:action, :create)
+        @mode      = args.fetch(:mode, nil)
+        owner      = args.fetch(:owner, nil)
+        group      = args.fetch(:group, nil)
+        @dir_owner = Wright::Util::FileOwner.new(owner, group)
       end
 
       # @return [String, Integer] the directory's intended mode
@@ -31,15 +38,15 @@ module Wright
       #   @return [String, Integer] the directory's intended owner
       # @!method owner=
       #   @see #owner
-      def_delegator :@owner, :user_and_group=, :owner=
-      def_delegator :@owner, :user, :owner
+      def_delegator :dir_owner, :user_and_group=, :owner=
+      def_delegator :dir_owner, :user, :owner
 
       # @!attribute group
       #   @return [String, Integer] the directory's intended group
       # @!method group=
       #   @see #group
-      def_delegator :@owner, :group
-      def_delegator :@owner, :group=
+      def_delegator :dir_owner, :group
+      def_delegator :dir_owner, :group=
 
       # Creates or updates the directory.
       #
@@ -47,7 +54,7 @@ module Wright
       #   otherwise
       def create
         might_update_resource do
-          @provider.create
+          provider.create
         end
       end
 
@@ -57,9 +64,13 @@ module Wright
       #   otherwise
       def remove
         might_update_resource do
-          @provider.remove
+          provider.remove
         end
       end
+
+      private
+
+      attr_reader :dir_owner
     end
   end
 end

data/lib/wright/resource/file.rb

@@ -9,13 +9,12 @@ module Wright
     # Symlink resource, represents a symlink.
     #
     # @example
-    #   file = Wright::Resource::File.new('/tmp/foo')
-    #   file.content = 'bar'
+    #   file = Wright::Resource::File.new('/tmp/foo', content: 'bar')
     #   file.create
     class File < Wright::Resource
       extend Forwardable
 
-      # @return [String] the file's intended content
+      # @return [String, #to_s] the file's intended content
       attr_accessor :content
 
       # @return [String, Integer] the file's intended mode
@@ -25,25 +24,33 @@ module Wright
       #   @return [String, Integer] the directory's intended owner
       # @!method owner=
       #   @see #owner
-      def_delegator :@owner, :user_and_group=, :owner=
-      def_delegator :@owner, :user, :owner
+      def_delegator :file_owner, :user_and_group=, :owner=
+      def_delegator :file_owner, :user, :owner
 
       # @!attribute group
       #   @return [String, Integer] the directory's intended group
       # @!method group=
       #   @see #group
-      def_delegator :@owner, :group=
-      def_delegator :@owner, :group
+      def_delegator :file_owner, :group=
+      def_delegator :file_owner, :group
 
       # Initializes a File.
       #
       # @param name [String] the file's name
-      def initialize(name)
+      # @param args [Hash] the arguments
+      # @option args [Symbol] :action (:create) the action
+      # @option args [String, #to_s] :content the file's content
+      # @option args [String, Integer] :mode the file's mode
+      # @option args [String, Integer] :owner the file's owner
+      # @option args [String, Integer] :group the file's group
+      def initialize(name, args = {})
         super
-        @content = nil
-        @mode = nil
-        @owner = Wright::Util::FileOwner.new
-        @action = :create
+        @action     = args.fetch(:action, :create)
+        @content    = args.fetch(:content, nil)
+        @mode       = args.fetch(:mode, nil)
+        owner       = args.fetch(:owner, nil)
+        group       = args.fetch(:group, nil)
+        @file_owner = Wright::Util::FileOwner.new(owner, group)
       end
 
       # Creates or updates the file.
@@ -52,7 +59,7 @@ module Wright
       #   otherwise
       def create
         might_update_resource do
-          @provider.create
+          provider.create
         end
       end
 
@@ -62,9 +69,13 @@ module Wright
       #   otherwise
       def remove
         might_update_resource do
-          @provider.remove
+          provider.remove
         end
       end
+
+      private
+
+      attr_reader :file_owner
     end
   end
 end

data/lib/wright/resource/group.rb

@@ -6,8 +6,7 @@ module Wright
     # Group resource, represents a group.
     #
     # @example
-    #   admins = Wright::Resource::Group.new('admins')
-    #   admins.members = ['root']
+    #   admins = Wright::Resource::Group.new('admins', members: ['root'])
     #   admins.create
     # @todo Use GnuPasswd provider on all GNU-flavoured systems
     class Group < Wright::Resource
@@ -24,10 +23,18 @@ module Wright
       # Initializes a Group.
       #
       # @param name [String] the group's name
-      def initialize(name)
+      # @param args [Hash] the arguments
+      # @option args [Symbol] :action (:create) the action
+      # @option args [Array<String>] :members the group's members
+      # @option args [Integer] :gid the group's gid
+      # @option args [Bool] :system (false) denotes whether the group
+      #   should be a system group or not
+      def initialize(name, args = {})
         super
-        @action = :create
-        @system = false
+        @action  = args.fetch(:action, :create)
+        @members = args.fetch(:members, nil)
+        @gid     = args.fetch(:gid, nil)
+        @system  = args.fetch(:system, false)
       end
 
       # Creates or updates the group.
@@ -36,7 +43,7 @@ module Wright
       #   otherwise
       def create
         might_update_resource do
-          @provider.create
+          provider.create
         end
       end
 
@@ -46,7 +53,7 @@ module Wright
       #   otherwise
       def remove
         might_update_resource do
-          @provider.remove
+          provider.remove
         end
       end
     end
@@ -57,9 +64,9 @@ Wright::DSL.register_resource(Wright::Resource::Group)
 
 group_providers = {
   'debian' => 'Wright::Provider::Group::GnuPasswd',
-  'rhel'   => 'Wright::Provider::Group::GnuPasswd',
   'fedora' => 'Wright::Provider::Group::GnuPasswd',
-  'macosx' => 'Wright::Provider::Group::DarwinDirectoryService'
+  'rhel'   => 'Wright::Provider::Group::GnuPasswd',
+  'osx'    => 'Wright::Provider::Group::DarwinDirectoryService'
 }
 Wright::Config[:resources][:group] ||= {}
 Wright::Config[:resources][:group][:provider] ||=

data/lib/wright/resource/package.rb

@@ -34,20 +34,24 @@ module Wright
       # Initializes a Package.
       #
       # @param name [String] the package's name
-      def initialize(name)
+      # @param args [Hash] the arguments
+      # @option args [Symbol] :action (:install) the action
+      # @option args [String, #to_s] :version the package version
+      # @option args [String, Array<String>] :options the package options
+      def initialize(name, args = {})
         super
-        @version = nil
-        @options = nil
-        @action = :install
+        @action  = args.fetch(:action, :install)
+        @version = args.fetch(:version, nil)
+        @options = args.fetch(:options, nil)
       end
 
       # @!method installed_versions
       # @return [Array<String>] the installed package versions
-      def_delegator :@provider, :installed_versions
+      def_delegator :provider, :installed_versions
 
       # @!method installed?
       # @return [Bool] +true+ if the package is installed
-      def_delegator :@provider, :installed?
+      def_delegator :provider, :installed?
 
       # Installs the Package.
       #
@@ -55,7 +59,7 @@ module Wright
       #   otherwise
       def install
         might_update_resource do
-          @provider.install
+          provider.install
         end
       end
 
@@ -65,7 +69,7 @@ module Wright
       #   otherwise
       def remove
         might_update_resource do
-          @provider.remove
+          provider.remove
         end
       end
 
@@ -78,8 +82,9 @@ Wright::DSL.register_resource(Wright::Resource::Package)
 
 package_providers = {
   'debian' => 'Wright::Provider::Package::Apt',
+  'fedora' => 'Wright::Provider::Package::Yum',
   'rhel'   => 'Wright::Provider::Package::Yum',
-  'macosx' => 'Wright::Provider::Package::Homebrew'
+  'osx'    => 'Wright::Provider::Package::Homebrew'
 }
 Wright::Config[:resources][:package] ||= {}
 Wright::Config[:resources][:package][:provider] ||=