depengine 3.0.20 → 3.0.21

data/lib/depengine/processor/template.rb

@@ -2,12 +2,12 @@ module Processor
   class Template
     include Processor
     attr_accessor :basepath, :outdir, :source, :content
-    attr_writer   :cdb
+    attr_writer :cdb
 
     # Render a template and write the output to a file or directory
     # structure under 'basepath'
-    def parse_template(template_source, content, outdir, options={})
-      Helper.validates_presence_of basepath, "Basepath not set for template engine"
+    def parse_template(template_source, content, outdir, options = {})
+      Helper.validates_presence_of basepath, 'Basepath not set for template engine'
       # expand basepath
       @basepath = File.expand_path basepath
       @outdir = outdir
@@ -20,8 +20,8 @@ module Processor
       else
         all_from_directory
       end
-      return self
-   end
+      self
+    end
 
     def from_file
       if excluded? @source
@@ -30,8 +30,8 @@ module Processor
       end
       target_dir = target_path_of(@source)
       create_sub_dirs!(target_dir)
-      target_file = File.join(target_dir, File.basename(@source).gsub(".tpl",""))
-      File.open(target_file, "w") do |f|
+      target_file = File.join(target_dir, File.basename(@source).gsub('.tpl', ''))
+      File.open(target_file, 'w') do |f|
         f.write(parse(@source))
       end
     end
@@ -48,7 +48,7 @@ module Processor
       Find.find(path_to_find_in) do |path|
         # next if we found ourself
         next if path == path_to_find_in
-        next unless File.file?(path) and path.end_with?(".tpl")
+        next unless File.file?(path) and path.end_with?('.tpl')
         templates << path
       end
       templates
@@ -63,22 +63,18 @@ module Processor
     def excluded?(target)
       if @excludes
         @excludes.each do |exclude|
-          if target.include? exclude
-            return true
-          end
+          return true if target.include? exclude
         end
       end
-      return false
+      false
     end
 
     def create_sub_dirs!(target)
-      if not File.directory?(target)
-        FileUtils.mkdir_p(target)
-        $log.writer.debug "Create directory #{target}"
-      end
+      return if File.directory?(target)
+      FileUtils.mkdir_p(target)
+      $log.writer.debug "Create directory #{target}"
     end
 
-
     # This function returns the output of a parsed template, 'template' can be
     # a filename or a String.
     def self.parse(template, content)
@@ -92,39 +88,39 @@ module Processor
     def parse(template)
       context = load_tags(@content, @cdb)
       begin
-        parser           = Radius::Parser.new(context, :tag_prefix => 't')
-        template_content = ""
-        result           = ""
+        parser           = Radius::Parser.new(context, tag_prefix: 't')
+        template_content = ''
+        result           = ''
         if File.file? template
           $log.writer.debug "template #{template} seems to be a file, reading it..."
-          File.open(template, "rb") do |f|
-            c = ""
-            f.ungetc c unless (c = f.getc)=="\uFEFF" # remove BOM, if present
-            while line = f.gets
+          File.open(template, 'rb') do |f|
+            c = '' # rubocop:disable Lint/UselessAssignment
+            f.ungetc c unless (c = f.getc) == "\uFEFF" # remove BOM, if present
+            while line = f.gets # rubocop:disable Lint/AssignmentInCondition
               template_content << line
             end
           end
         else
-          $log.writer.debug "tempalte is not a file, using it as source"
+          $log.writer.debug 'tempalte is not a file, using it as source'
           template_content = template
         end
 
         result          = parser.parse(template_content)
-        nested_result_1 = ""
+        nested_result_1 = ''
         nested_result_2 = result
         nested_loop     = 0
-        while( nested_result_1 != nested_result_2 )
+        while ( nested_result_1 != nested_result_2)
           if nested_loop >= 100
-            $log.writer.error "Template stack overflow, too many nested tags"
+            $log.writer.error 'Template stack overflow, too many nested tags'
             exit 1
           end
           nested_result_1 = parser.parse(nested_result_2)
           nested_result_2 = parser.parse(nested_result_1)
 
           nested_loop = nested_loop + 1
-       end
-       result = nested_result_2
-      rescue Exception => e
+        end
+        result = nested_result_2
+      rescue => e
         $log.writer.error "Error in template processing: #{template}"
         $log.writer.error e.message
         exit 1
@@ -134,4 +130,3 @@ module Processor
     end
   end
 end
-

data/lib/depengine/processor/zip.rb

@@ -1,22 +1,21 @@
 module Processor
-
-  def unzip_file(zip_file, target_dir, extract_file=nil, unzip_bin=nil)
+  def unzip_file(zip_file, target_dir, extract_file = nil, unzip_bin = nil)
     unzip = unzip_bin || 'unzip'
 
-    if not File.exists? zip_file
+    unless File.exist? zip_file
       $log.writer.error "Zip file #{zip_file} does not exist!"
       exit 1
     end
 
-    if not File.exists? target_dir
-      FileUtils.mkdir( target_dir )
+    unless File.exist? target_dir
+      FileUtils.mkdir(target_dir)
       $log.writer.debug "Create target directory #{target_dir}"
     end
 
     begin
-      stdout = %x"#{unzip} -o \"#{zip_file}\" #{extract_file} -d \"#{target_dir}\""
+      stdout = `#{unzip} -o \"#{zip_file}\" #{extract_file} -d \"#{target_dir}\"`
       $log.writer.debug stdout
-    rescue Exception => e
+    rescue => e
       $log.writer.error "Can not extract Zipfile #{zip_file} to #{target_dir}"
       $log.writer.error e.message
       exit 1
@@ -24,18 +23,18 @@ module Processor
   end
   module_function :unzip_file
 
-  def tgz_file(tgz_file, source_dir, add_file=nil, tar_bin=nil)
+  def tgz_file(tgz_file, source_dir, add_file = nil, tar_bin = nil)
     tar = tar_bin || 'tar'
 
-    if not File.exists? source_dir
+    unless File.exist? source_dir
       $log.writer.error "Source directory #{source_dir} does not exist!"
       exit 1
     end
 
     begin
-      stdout = %x"#{tar} -c -z -C #{source_dir} -f #{tgz_file} #{add_file}"
+      stdout = `#{tar} -c -z -C #{source_dir} -f #{tgz_file} #{add_file}`
       $log.writer.debug stdout
-    rescue Exception => e
+    rescue => e
       $log.writer.error "Can not add files in #{source_dir} to Tar-Gz file #{tgz_file}"
       $log.writer.error e.message
       exit 1
@@ -43,30 +42,27 @@ module Processor
   end
   module_function :tgz_file
 
-  def untgz_file(tgz_file, target_dir, extract_file=nil, tar_bin=nil)
+  def untgz_file(tgz_file, target_dir, extract_file = nil, tar_bin = nil)
     tar = tar_bin || 'tar'
 
-    if not File.exists? tgz_file
+    unless File.exist? tgz_file
       $log.writer.error "Tar-Gz file #{tgz_file} does not exist!"
       exit 1
     end
 
-    if not File.exists? target_dir
-      FileUtils.mkdir( target_dir )
+    unless File.exist? target_dir
+      FileUtils.mkdir(target_dir)
       $log.writer.debug "Create target directory #{target_dir}"
     end
 
     begin
-      stdout = %x"#{tar} -x -z -C #{target_dir} -f #{tgz_file} #{extract_file}"
+      stdout = `#{tar} -x -z -C #{target_dir} -f #{tgz_file} #{extract_file}`
       $log.writer.debug stdout
-    rescue Exception => e
+    rescue => e
       $log.writer.error "Can not extract Tar-Gz file #{tgz_file} to #{target_dir}"
       $log.writer.error e.message
       exit 1
     end
   end
   module_function :untgz_file
-
 end
-
-

data/lib/depengine/provider/cdb.rb

@@ -6,8 +6,8 @@ module Provider
     attr_accessor :env
 
     def get_parameter(path, version)
-      result = "@@ERROR@@"
-      version = "" if version == 0
+      result = '@@ERROR@@'
+      version = '' if version == 0
 
       Helper.validates_presence_of host
       Helper.validates_presence_of context
@@ -17,14 +17,14 @@ module Provider
 
       begin
         url = protocol + '://' + File.join(host, context, \
-                                               version.to_s, env, path)
+                                           version.to_s, env, path)
         result = Net::HTTP.get(URI.parse(url))
         if path =~ /.json$/
           begin
-            result = JSON.parse( result )
-          rescue Exception => e
-            $log.writer.error "Error: got invalid json from cdb"
-            $log.writer.error "Request was: #{url.to_s}"
+            result = JSON.parse(result)
+          rescue => e
+            $log.writer.error 'Error: got invalid json from cdb'
+            $log.writer.error "Request was: #{url}"
             $log.writer.error "Answer was: #{Net::HTTP.get(URI.parse(url))}"
             $log.writer.error e.message
             exit 1
@@ -32,39 +32,38 @@ module Provider
         end
 
         # decrypt encrypted entries automagically
-        password      = ""
+        password      = ''
         password_file = (File.join(File.dirname($exec_file_path), '../etc/crypt.yaml'))
 
         if File.file? password_file
-          password = YAML::load_file(password_file)['password']
+          password = YAML.load_file(password_file)['password']
         else
-          $log.writer.warn "Can not open etc/crypt.yaml, no decryption possible"
+          $log.writer.warn 'Can not open etc/crypt.yaml, no decryption possible'
         end
 
-        if result.class.name == "Hash"
-          result.each do |key,value|
-            if value.class.name != "Fixnum" and \
-              ((value =~ /^\{[\w-]+\}.+/ ) != nil)
-              result[key] = decrypt(password, value)
-            end
-         end
+        if result.class.name == 'Hash'
+          result.each do |key, value|
+            next unless value.class.name != 'Fixnum' and \
+              (value =~ /^\{[\w-]+\}.+/)
+            result[key] = decrypt(password, value)
+          end
         else
-          if result.class.name != "Fixnum" and \
-              ((result =~ /^\{[\w-]+\}.+/ ) != nil)
+          if result.class.name != 'Fixnum' and \
+              (result =~ /^\{[\w-]+\}.+/)
             result = decrypt(password, result)
           end
         end
 
-      rescue Exception => e
-        $log.writer.error "Error: while connecting to configuration database"
-        $log.writer.error "Request was: #{url.to_s}"
+      rescue => e
+        $log.writer.error 'Error: while connecting to configuration database'
+        $log.writer.error "Request was: #{url}"
         $log.writer.error e.message
         exit 1
       end
 
-      if result == "@@ERROR@@"
-        $log.writer.error "Error while talking to configuration database, giving up!"
-        $log.writer.error "Request was: #{url.to_s}"
+      if result == '@@ERROR@@'
+        $log.writer.error 'Error while talking to configuration database, giving up!'
+        $log.writer.error "Request was: #{url}"
         exit 1
       end
 
@@ -72,10 +71,9 @@ module Provider
     end
 
     def get_parameters(path, version)
-      result  = "@@ERROR@@"
-      version = "" if version == 0
-      url     = ""
-
+      result  = '@@ERROR@@'
+      version = '' if version == 0
+      url     = ''
 
       Helper.validates_presence_of host
       Helper.validates_presence_of context
@@ -86,57 +84,56 @@ module Provider
       begin
 
         begin
-          cdb_filesystem = Provider::CDB_FILESYSTEM.new
+          cdb_filesystem = Provider::CdbFilesystem.new
           result = JSON.parse(cdb_filesystem.read_data(path))
-          #puts result
-        rescue Exception => e
-          $log.writer.error "Error: got invalid json from cdb"
-          $log.writer.error "Request was: #{path.to_s}"
+          # puts result
+        rescue => e
+          $log.writer.error 'Error: got invalid json from cdb'
+          $log.writer.error "Request was: #{path}"
           $log.writer.error e.message
           exit 1
         end
 
         # decrypt encrypted entries automagically
-        password      = ""
+        password      = ''
         if ENV['USE_DEPENGINE_AS_GEM']
           password_file = \
-            ( File.join(File.dirname($exec_file_path), '../../etc/crypt.yaml') )
+            ( File.join(File.dirname($exec_file_path), '../../etc/crypt.yaml'))
         else
           password_file = \
-            ( File.join(File.dirname($exec_file_path), '../etc/crypt.yaml') )
+            ( File.join(File.dirname($exec_file_path), '../etc/crypt.yaml'))
         end
         if File.file? password_file
-          password = YAML::load_file(password_file)['password']
+          password = YAML.load_file(password_file)['password']
         else
-          $log.writer.warn "Can not open etc/crypt.yaml, no decryption possible"
+          $log.writer.warn 'Can not open etc/crypt.yaml, no decryption possible'
         end
 
-        result.each do |key,value|
-          if value.class.name == "Hash"
-            value.each do |subkey,subvalue|
-              if subvalue.class.name != "Fixnum" and \
-                  ((subvalue =~ /^\{[\w-]+\}.+/ ) != nil)
-                result[key][subkey] = decrypt(password, subvalue)
-              end
+        result.each do |key, value|
+          if value.class.name == 'Hash'
+            value.each do |subkey, subvalue|
+              next unless subvalue.class.name != 'Fixnum' and \
+                  (subvalue =~ /^\{[\w-]+\}.+/)
+              result[key][subkey] = decrypt(password, subvalue)
             end
           else
-            if value.class.name != "Fixnum" and
-                ((value =~ /^\{[\w-]+\}.+/ ) != nil)
+            if value.class.name != 'Fixnum' and
+                (value =~ /^\{[\w-]+\}.+/)
               result[key] = decrypt(password, value)
             end
           end
         end
 
-      rescue Exception => e
-        $log.writer.error "Error: while talking to configuration database, giving up!"
-        $log.writer.error "Request was: #{url.to_s}"
+      rescue => e
+        $log.writer.error 'Error: while talking to configuration database, giving up!'
+        $log.writer.error "Request was: #{url}"
         $log.writer.error e.message
         exit 1
       end
 
-      if result == "@@ERROR@@"
-        $log.writer.error "Error while talking to configuration database, giving up!"
-        $log.writer.error "Request was: #{url.to_s}"
+      if result == '@@ERROR@@'
+        $log.writer.error 'Error while talking to configuration database, giving up!'
+        $log.writer.error "Request was: #{url}"
         exit 1
       end
 
@@ -144,7 +141,7 @@ module Provider
     end
 
     def set_parameter(path, key, value)
-      result = "@@ERROR@@"
+      result = '@@ERROR@@'
 
       Helper.validates_presence_of host
       Helper.validates_presence_of context
@@ -154,33 +151,33 @@ module Provider
       Helper.validates_presence_of value
 
       begin
-        json   = {key => value.to_s}.to_json
+        json   = { key => value.to_s }.to_json
         url    = URI.parse(protocol + '://' + \
                  File.join(host, context, env, path))
-        header = {'Content-Type' => 'application/x-www-form-urlencoded;charset=utf-8'}
+        header = { 'Content-Type' => 'application/x-www-form-urlencoded;charset=utf-8' }
         http   = Net::HTTP.new(url.host, url.port)
         result = http.request_post(url.path, 'json=' + json.to_s, header)
         $log.writer.debug "Writing #{key} with #{value} to cdb"
-      rescue Exception => e
-        $log.writer.error "Error: while connecting to configuration database"
-        $log.writer.error "Request was: #{url.to_s}"
+      rescue => e
+        $log.writer.error 'Error: while connecting to configuration database'
+        $log.writer.error "Request was: #{url}"
         $log.writer.error e.message
         exit 1
       end
 
-      if result == "@@ERROR@@"
-        $log.writer.error "Error while talking to configuration database, giving up!"
-        $log.writer.error "Request was: #{url.to_s}"
+      if result == '@@ERROR@@'
+        $log.writer.error 'Error while talking to configuration database, giving up!'
+        $log.writer.error "Request was: #{url}"
         exit 1
       end
 
       result
     end
 
-    def decrypt(password,transferrable)
-      alg           = transferrable.split("}")[0].split("{")[1]
-      hex_encrypted = transferrable.split(":")[0].split("}")[1]
-      hex_iv        = transferrable.split(":")[1]
+    def decrypt(password, transferrable)
+      alg           = transferrable.split('}')[0].split('{')[1]
+      hex_encrypted = transferrable.split(':')[0].split('}')[1]
+      hex_iv        = transferrable.split(':')[1]
       text          = Base64.decode64(hex_encrypted)
       iv            = Base64.decode64(hex_iv)
       c             = OpenSSL::Cipher::Cipher.new(alg)
@@ -190,10 +187,6 @@ module Provider
       c.iv  = iv
       d     = c.update(text)
       d << c.final
-
-      return d
     end
-
   end
 end
-

data/lib/depengine/provider/cdb_filesystem.rb

@@ -1,48 +1,40 @@
 module Provider
-  class CDB_FILESYSTEM
-
+  class CdbFilesystem
     def load_yaml(filename)
       if File.file? filename
-          begin
-            YAML::load_file(filename)
-          rescue StringIndexOutOfBoundsException => e
-            puts "Error: YAML parsing in #{filename}"
-            raise "YAML not parsable"
-            false
-          rescue Exception => e
-            puts "Error: YAML parsing in #{filename}"
-            raise "YAML not parsable"
-            false
-          end
+        begin
+          YAML.load_file(filename)
+        rescue
+          puts "Error: YAML parsing in #{filename}"
+          raise 'YAML not parsable'
+        end
       else
-        raise "File not found: #{filename}"
+        fail "File not found: #{filename}"
       end
     end
 
-    def read_data(cdb_path, options={})
-      config    = Hash.new
-      basedir   = File.join(($recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home]),'cdb')
+    def read_data(cdb_path, options = {})
+      config    = {}
+      basedir   = File.join(($recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home]), 'cdb')
       filename  = ''
       if cdb_path.nil? or cdb_path.empty?
-        $log.writer.error "Error while talking to configuration database, no cdb path given!"
+        $log.writer.error 'Error while talking to configuration database, no cdb path given!'
         exit 1
       end
       paths = cdb_path.split('/')
 
       paths.each do |path|
-        basedir = File.join( basedir, path.to_s )
+        basedir = File.join(basedir, path.to_s)
         filename = basedir + '.yaml'
         additional_config = load_yaml(filename)
-        if additional_config.is_a?(Hash)
-          if options[:disable_merge]
-            config = additional_config
-          else
-            config.merge!( additional_config )
-          end
+        next unless additional_config.is_a?(Hash)
+        if options[:disable_merge]
+          config = additional_config
+        else
+          config.merge!(additional_config)
         end
       end
       config.to_json
     end
-
   end
 end