garcun 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2827b045552795cc5a3934823fc34bc6d7c3b1bf
-  data.tar.gz: bf3026b6fdd4ca118e727db751c39f256a66dcae
+  metadata.gz: 091b57cc6a987848fc8f7e9497367c90f3b3e141
+  data.tar.gz: cc6405bab9133f36b7c26f27d20711c2d3ecf667
 SHA512:
-  metadata.gz: 3858d4a7601ff6afbc09a4a6c1765bad36cccf0c6c9b0ed39e52c098fcf4fceb465172dd49ce54c0249bdce98ff8877fbe4215a971337690fd9b2fe27c7e44f4
-  data.tar.gz: 0bfd59282111449b3c6dfffff1fb696b9711f2f30bb16c5759a4bcd0ab23a77788f9b3350feed5ba675bb80d9492ecdb9b60692ba5ac5aee6ce74070a93dd944
+  metadata.gz: a72ae5eb6840593c0ade85fe6f18a2d394adc6c479a58f7e194d95647fb349dc317cc9316f8b3c65c97b6606f242f985d2a045ec519bb69981bef35f35b3b81a
+  data.tar.gz: 2020ed1a932abb9cccdefa20ae85fd95080663edf5516e53d177ecfaf4852479896d86958aeb98bf1090559c1b5e516969ba4c922c1636149132896078737029

data/lib/garcon/chef/chef_helpers.rb

@@ -69,7 +69,9 @@ module Garcon
     def find_by(type, filter, single = true, &block)
       nodes = []
       env   = node.chef_environment
-      if node.public_send(Inflections.pluralize(type.to_s)).include? filter
+      type  = Inflections.pluralize(type.to_s)
+
+      if node.public_send(type).include? filter
         nodes << node
       end
       if !single || nodes.empty?
@@ -81,7 +83,7 @@ module Garcon
       if block_given?
         nodes.each { |n| yield n }
       else
-        single ? nodes.first : nodes
+        single ? [nodes.first] : nodes
       end
     end
 
@@ -310,15 +312,31 @@ module Garcon
     # Boolean method to check if a command line utility is installed.
     #
     # @param [String] cmd
-    #   the command to find
+    #   The command to find.
     #
     # @return [TrueClass, FalseClass]
-    #   true if the command is found in the path, false otherwise
+    #   true if the command is found in the path.
     #
     def installed?(cmd)
       !Garcon::FileHelper.which(cmd).nil?
     end
 
+    # Boolean method to check if a package is installed.
+    #
+    # @param [String] pkg
+    #   The package to check for.
+    #
+    # @return [TrueClass, FalseClass]
+    #   True if the package is found in the path.
+    #
+    def pkg_installed?(pkg)
+      if node.platform_family == 'debian'
+        shell_out("dpkg -l #{pkg}").exitstatus == 0 ? true : false
+      elsif node.platform_family == 'rhel'
+        shell_out("rpm -qa | grep #{pkg}").exitstatus == 0 ? true : false
+      end
+    end
+
     # @return [String] object inspection
     # @api public
     def inspect

data/lib/garcon/chef/provider/civilize.rb

@@ -35,26 +35,27 @@ class Chef
       # Attributes
       attribute :name,
         kind_of: String
+      attribute :local,
+        kind_of: [String],
+        default: 'en_US.UTF-8'
       attribute :iptables,
         kind_of: [TrueClass, FalseClass],
-        default: true
+        default: lazy { node[:garcon][:civilize][:iptables] }
       attribute :selinux,
         kind_of: [TrueClass, FalseClass],
-        default: true
+        default: lazy { node[:garcon][:civilize][:selinux] }
       attribute :dotfiles,
         kind_of: [TrueClass, FalseClass, String, Array],
-        default: true
+        default: lazy { node[:garcon][:civilize][:dotfiles] }
       attribute :ruby,
         kind_of: [TrueClass, FalseClass],
-        default: true
+        default: lazy { node[:garcon][:civilize][:ruby] }
       attribute :docker,
         kind_of: Array,
-        default: %w[tar htop initscripts]
+        default: lazy { node[:garcon][:civilize][:docker] }
       attribute :rhel_svcs,
         kind_of: Array,
-        default: %w[
-          autofs avahi-daemon bluetooth cpuspeed cups gpm haldaemon messagebus
-        ]
+        default: lazy { node[:garcon][:civilize][:rhel_svcs] }
     end
   end
 
@@ -86,16 +87,61 @@ class Chef
       end
 
       def action_run
-        civilize_docker if docker? && r.docker
-        rhel_services   if r.rhel_svcs
-        iptables        if !docker? && r.iptables
-        selinux         if selinux? && r.selinux
+        civilize_platform
+        civilize_locale
+        civilize_docker   if docker? && r.docker
+        rhel_services     if r.rhel_svcs
+        iptables          if !docker? && r.iptables
+        selinux           if selinux? && r.selinux
         ps1prompt
-        dotfiles        if r.dotfiles
+        dotfiles          if r.dotfiles
       end
 
       private #        P R O P R I E T À   P R I V A T A   Vietato L'accesso
 
+      def omnibus_updater
+        node.default[:omnibus_updater][:restart_chef_service] = true
+        node.default[:omnibus_updater][:force_latest]         = false
+      end
+
+      def civilize_locale
+        case node[:platform_family]
+        when 'debian'
+          e = Chef::Resource::Execute.new('Set locale', run_context)
+          e.command "/usr/sbin/update-locale LANG=#{r.local}"
+          e.not_if { docker? }
+          e.action :run
+        when 'rhel'
+          t ||= Chef::Resource::Template.new('/etc/sysconfig/i18n', run_context)
+          t.cookbook   'garcon'
+          t.owner      'root'
+          t.group      'root'
+          t.mode        00644
+          t.variables   local: r.local
+          e.not_if    { docker? }
+          t.run_action :create
+        end
+      end
+
+      def civilize_platform
+        case node[:platform]
+        when 'debian', 'ubuntu'
+          run_context.include_recipe 'apt::default'
+          run_context.include_recipe 'motd-tail::default'
+          m = Chef::Resource::MotdTail.new('/etc/motd.tail', run_context)
+          m.template_source 'motd.erb'
+          m.action          :create
+        when 'fedora'
+          run_context.include_recipe 'yum-fedora::default'
+        when 'centos'
+          run_context.include_recipe 'yum-epel::default'
+          run_context.include_recipe 'yum-centos::default'
+        when 'amazon'
+          run_context.include_recipe 'yum-epel::default'
+          run_context.include_recipe 'yum-amazon::default'
+        end
+      end
+
       def civilize_docker
         r.docker.each { |pkg| package pkg }
       end

data/lib/garcon/chef/provider/development.rb

@@ -57,7 +57,7 @@ class Chef
 
       # Load and return the current resource.
       #
-      # @return [Chef::Provider::Civilize]
+      # @return [Chef::Provider:Development]
       #
       # @api private
       def load_current_resource
@@ -76,7 +76,7 @@ class Chef
       private #        P R O P R I E T À   P R I V A T A   Vietato L'accesso
 
       def chef_handler
-        include_recipe 'chef_handler::default'
+        run_context.include_recipe 'chef_handler::default'
 
         file = ::File.join(node[:chef_handler][:handler_path], 'devreporter.rb')
         f ||= Chef::Resource::CookbookFile.new(file, run_context)
@@ -110,8 +110,8 @@ end
 # @api private.
 Chef::Platform.set(
   platform: :amazon,
-  resource: :civilize,
-  provider:  Chef::Provider::Civilize
+  resource: :development,
+  provider:  Chef::Provider::Development
 )
 
 # Chef::Platform mapping for resource and providers
@@ -121,8 +121,8 @@ Chef::Platform.set(
 # @api private.
 Chef::Platform.set(
   platform: :centos,
-  resource: :civilize,
-  provider:  Chef::Provider::Civilize
+  resource: :development,
+  provider:  Chef::Provider::Development
 )
 
 # Chef::Platform mapping for resource and providers
@@ -132,8 +132,8 @@ Chef::Platform.set(
 # @api private.
 Chef::Platform.set(
   platform: :oracle,
-  resource: :civilize,
-  provider:  Chef::Provider::Civilize
+  resource: :development,
+  provider:  Chef::Provider::Development
 )
 
 # Chef::Platform mapping for resource and providers
@@ -143,8 +143,8 @@ Chef::Platform.set(
 # @api private.
 Chef::Platform.set(
   platform: :redhat,
-  resource: :civilize,
-  provider:  Chef::Provider::Civilize
+  resource: :development,
+  provider:  Chef::Provider::Development
 )
 
 # Chef::Platform mapping for resource and providers
@@ -154,6 +154,6 @@ Chef::Platform.set(
 # @api private.
 Chef::Platform.set(
   platform: :scientific,
-  resource: :civilize,
-  provider:  Chef::Provider::Civilize
+  resource: :development,
+  provider:  Chef::Provider::Development
 )

data/lib/garcon/chef/provider/download.rb

@@ -302,8 +302,10 @@ class Chef
       end
 
       def handle_prerequisites
-        package 'gnutls', :install
-        yumrepo(:create) if node.platform_family == 'rhel'
+        if node.platform_family == 'rhel'
+          package 'gnutls', :install
+          yumrepo(:create)
+        end
         package 'aria2', :install
         wipe_repo if node.platform_family == 'rhel'
       end
@@ -317,9 +319,9 @@ class Chef
 
       def yumrepo(action = :nothing)
         y = Chef::Resource::YumRepository.new('garcon', run_context)
-        y.mirrorlist node[:garcon][:repo][:mirrorlist]
-        y.gpgcheck   node[:garcon][:repo][:gpgcheck]
-        y.gpgkey     node[:garcon][:repo][:gpgkey]
+        y.mirrorlist Repos.mirrorlist
+        y.gpgkey     Repos.gpgkey
+        y.gpgcheck   true
         y.run_action action
       end
 

data/lib/garcon/chef/provider/zip_file.rb

@@ -75,7 +75,7 @@ class Chef
 
       def initialize(new_resource, run_context)
         super
-        require_zip unless defined?(Zip)
+        __zip__ unless defined?(Zip)
       end
 
       # Shortcut to new_resource.
@@ -137,7 +137,7 @@ class Chef
               r.updated_by_last_action(true)
             end
           else
-            Chef::Log.info 'a valid directory must be specified for ziping'
+            Chef::Log.warn 'A valid directory must be specified for ziping.'
           end
         end
       end
@@ -170,17 +170,13 @@ class Chef
       # @return [undefined]
       #
       # @api private
-      def require_zip
-        require 'zip'
+      def __zip__
+        require 'zip' unless defined?(Zip)
       rescue LoadError
-        gem_rubyzip
-        require 'zip'
-      end
-
-      def gem_rubyzip
-        g ||= Chef::Resource::ChefGem.new('rubyzip', run_context)
+        g = Chef::Resource::ChefGem.new('zip', run_context)
         g.compile_time(false) if respond_to?(:compile_time)
-        g.run_action :install
+        g.run_action(:install)
+        require 'zip'
       end
 
       # Cache a file locally in Chef::Config[:file_cache_path].

data/lib/garcon/core_ext/time.rb

@@ -132,14 +132,13 @@ class Time
   #   t.shift(:days=>4, :hours=>3)  # =>  Time.utc(2010,10,14,3,0,0)
   #
   def shift(*time_units)
-    time_hash = Hash===time_units.last ? time_units.pop : {}
-    time_units = time_units.flatten
+    time_hash   = Hash===time_units.last ? time_units.pop : {}
+    time_units  = time_units.flatten
     time_units << :seconds if time_units.size % 2 == 1
-    time_hash.each{ |units, number| time_units << number; time_units << units }
+    time_hash.each { |units, number| time_units << number; time_units << units }
 
     time = self
     time_units.each_slice(2) do |number, units|
-      #next time = time.ago(-number, units) if number < 0
       time = (
         case units.to_s.downcase.to_sym
         when :years, :year

data/lib/garcon/utility/at_random.rb

@@ -39,6 +39,14 @@ module Garcon
       end
     end
 
+    # Hook called when module is included, extends a descendant with class
+    # and instance methods.
+    #
+    # @param [Module] descendant
+    #   the module or class including Garcon::Resource::BaseDSL
+    #
+    # @return [self]
+    #
     def self.included(other)
       other.extend(ClassMethods)
     end

data/lib/garcon/version.rb

@@ -27,7 +27,7 @@ module Garcon
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 3
+    PATCH = 4
 
     # Returns a version string by joining MAJOR, MINOR, and PATCH with '.'
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: garcun
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Stefano Harding
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef