depengine 3.0.20 → 3.0.21

data/lib/depengine/dsl/template.rb

@@ -1,25 +1,25 @@
 module Deployment
   module Methods
     module Template
-			def parse_template(source, target, content, options={})
-	      template           = Processor::Template.new
-	      template.cdb       = @cdb
-	      template.basepath  = options[:basepath] || $recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home]
-	      options[:excludes] = [] if options[:excludes].nil?
-	      options[:excludes] << '.svn'
+      def parse_template(source, target, content, options = {})
+        template           = Processor::Template.new
+        template.cdb       = @cdb
+        template.basepath  = options[:basepath] || $recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home]
+        options[:excludes] = [] if options[:excludes].nil?
+        options[:excludes] << '.svn'
         options[:excludes] << '.git'
-	      template.parse_template(source, content, ::Helper::path_in_deploy_home(target), options)
-	    end
+        template.parse_template(source, content, ::Helper.path_in_deploy_home(target), options)
+      end
 
-	    def parse_erb_template(source, target, content, options={})
-	      template           = Processor::Template.new
-	      template.cdb       = @cdb
-	      template.basepath  = options[:basepath] || $recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home]
-	      options[:excludes] = [] if options[:excludes].nil?
-	      options[:excludes] << '.svn'
+      def parse_erb_template(source, target, content, options = {})
+        template           = Processor::Template.new
+        template.cdb       = @cdb
+        template.basepath  = options[:basepath] || $recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home]
+        options[:excludes] = [] if options[:excludes].nil?
+        options[:excludes] << '.svn'
         options[:excludes] << '.git'
-	      template.parse_erb_template(source, content, ::Helper::path_in_deploy_home(target), options)
-	    end
-		end
-	end
-end
+        template.parse_erb_template(source, content, ::Helper.path_in_deploy_home(target), options)
+      end
+    end
+  end
+end

data/lib/depengine/dsl/zip.rb

@@ -1,32 +1,32 @@
 module Deployment
   module Methods
-  	module Zip
-	    def unzip_file(zip_file, target_dir, filename=nil)
-	      Helper.validates_presence_of @cdb['unzip_bin']
+    module Zip
+      def unzip_file(zip_file, target_dir, filename = nil)
+        Helper.validates_presence_of @cdb['unzip_bin']
 
-	      Processor.unzip_file(File.join($recipe_config[:deploy_home], zip_file), \
-	                           File.join($recipe_config[:deploy_home], target_dir), \
-	                           filename,
-	                           @cdb['unzip_bin'])
-	    end
+        Processor.unzip_file(File.join($recipe_config[:deploy_home], zip_file), \
+                             File.join($recipe_config[:deploy_home], target_dir), \
+                             filename,
+                             @cdb['unzip_bin'])
+      end
 
-	    def tgz_file(tgz_file, source_dir, filename=nil)
-	      Helper.validates_presence_of @cdb['tar_bin']
+      def tgz_file(tgz_file, source_dir, filename = nil)
+        Helper.validates_presence_of @cdb['tar_bin']
 
-	      Processor.tgz_file(File.join($recipe_config[:deploy_home], tgz_file), \
-	                         File.join($recipe_config[:deploy_home], source_dir), \
-	                         filename,
-	                         @cdb['tar_bin'])
-	    end
+        Processor.tgz_file(File.join($recipe_config[:deploy_home], tgz_file), \
+                           File.join($recipe_config[:deploy_home], source_dir), \
+                           filename,
+                           @cdb['tar_bin'])
+      end
 
-	    def untgz_file(tgz_file, target_dir, filename=nil)
-	      Helper.validates_presence_of @cdb['tar_bin']
+      def untgz_file(tgz_file, target_dir, filename = nil)
+        Helper.validates_presence_of @cdb['tar_bin']
 
-	      Processor.untgz_file(File.join($recipe_config[:deploy_home], tgz_file), \
-	                           File.join($recipe_config[:deploy_home], target_dir), \
-	                           filename,
-	                           @cdb['tar_bin'])
-	    end
-  	end
+        Processor.untgz_file(File.join($recipe_config[:deploy_home], tgz_file), \
+                             File.join($recipe_config[:deploy_home], target_dir), \
+                             filename,
+                             @cdb['tar_bin'])
+      end
+    end
   end
-end
+end

data/lib/depengine/helper/cli_helper.rb

@@ -1,19 +1,18 @@
 module CLIHelper
-
   def setup_new_recipe(path)
     puts "Setting up a new deployment recipe in #{File.expand_path(path)}"
     require 'fileutils'
     require 'yaml'
     FileUtils.mkdir_p(File.expand_path(path))
     FileUtils.cd(File.expand_path(path))
-    %w{cdb config recipe}.each {|d| FileUtils.mkdir_p d}
-    %w{DEV PROD}.each do |env|
+    %w(cdb config recipe).each { |d| FileUtils.mkdir_p d }
+    %w(DEV PROD).each do |env|
       FileUtils.mkdir_p "cdb/#{env}"
-      File.open("cdb/#{env}.yaml","w") {|f| f.write env_yaml("DEV")}
-      File.open("cdb/#{env}/demoapplication.yaml","w") {|f| f.write application_yaml}
+      File.open("cdb/#{env}.yaml", 'w') { |f| f.write env_yaml('DEV') }
+      File.open("cdb/#{env}/demoapplication.yaml", 'w') { |f| f.write application_yaml }
     end
-    FileUtils.touch("config/some_file_that_is_needed_for_the_deployment.jar")
-    File.open("recipe/deploy.rb","w") {|f| f.write deploy_recipe_template}
+    FileUtils.touch('config/some_file_that_is_needed_for_the_deployment.jar')
+    File.open('recipe/deploy.rb', 'w') { |f| f.write deploy_recipe_template }
     exit 0
   end
 
@@ -26,9 +25,9 @@ module CLIHelper
 
   def application_yaml
     { 'taskname' => 'A demo applicaition deployment',
-      'app_hosts' => ['appserv01', 'appserv02'],
+      'app_hosts' => %w(appserv01 appserv02),
       'deploy_path' => '/some/path/to/deploy/to/',
-      'patch_properties' => {'test.message' => 'foo'}
+      'patch_properties' => { 'test.message' => 'foo' }
     }.to_yaml
   end
 
@@ -54,5 +53,4 @@ Deployment.deliver do
 end
 }
   end
-
-end
+end

data/lib/depengine/helper/hudson.rb

@@ -1,12 +1,11 @@
 module Helper
-  def get_environemnt_variables(exception=[])
+  def get_environemnt_variables(exception = [])
     result = {}
 
     ENV.each do |key, value|
-      unless (exception || []).include? key
-        $log.writer.debug "Add environment variable #{key} with value #{value} to configuration hash"
-        result[key] = value
-      end
+      next if (exception || []).include? key
+      $log.writer.debug "Add environment variable #{key} with value #{value} to configuration hash"
+      result[key] = value
     end
 
     result
@@ -18,28 +17,26 @@ module Helper
     begin
       result = JSON.parse(version)
     rescue
-      $log.writer.debug "Given version string is not a JSON object"
-      result = {"app" => version, "cdb" => "", "depsw" => ""}
+      $log.writer.debug 'Given version string is not a JSON object'
+      result = { 'app' => version, 'cdb' => '', 'depsw' => '' }
     end
 
     result
   end
   module_function :parse_version
 
-  def cleanup_workspace!(workspace, sub_dirs=nil)
+  def cleanup_workspace!(workspace, sub_dirs = nil)
     Helper.validates_presence_of workspace
 
     begin
-      unless sub_dirs.respond_to?(:each)
-        sub_dirs = ["**/*"]
-      end
+      sub_dirs = ['**/*'] unless sub_dirs.respond_to?(:each)
       sub_dirs.each do |sub_dir|
         FileUtils.rm_rf Dir.glob("#{workspace}/#{sub_dir}")
         $log.writer.debug "Cleaning Workspace #{workspace}/#{sub_dir}"
       end
 
-    rescue Exception => e
-      $log.writer.error "Can not cleanup Workspace!"
+    rescue => e
+      $log.writer.error 'Can not cleanup Workspace!'
       $log.writer.error e.message
       exit 1
     end
@@ -49,19 +46,18 @@ module Helper
   def init_workspace(workspace)
     Helper.validates_presence_of workspace
 
-    $log.writer.debug "Initialize Workspace"
-    initial_dirs = %w{source target config keep log}
+    $log.writer.debug 'Initialize Workspace'
+    initial_dirs = %w(source target config keep log)
     begin
       initial_dirs.each do |dir|
-        FileUtils.mkdir_p( File.join(workspace, dir) )
+        FileUtils.mkdir_p(File.join(workspace, dir))
         $log.writer.debug "Create directory #{File.join(workspace, dir)}"
       end
-    rescue Exception => e
-      $log.writer.error "Can not create initial directories in workspace!"
+    rescue => e
+      $log.writer.error 'Can not create initial directories in workspace!'
       $log.writer.error e.message
       exit 1
     end
   end
   module_function :init_workspace
 end
-

data/lib/depengine/helper/mail.rb

@@ -1,12 +1,10 @@
 module Helper
-
   class Mail
-
     attr_accessor :smtp_host, :smtp_port
 
     def initialize
-      smtp_host ||= 'localhost'
-      smtp_port ||= 25
+      @smtp_host ||= 'localhost'
+      @smtp_port ||= 25
     end
 
     # Sends an email via smtp.
@@ -17,27 +15,23 @@ module Helper
     #   * +:to+ - the recipiants address
     #   * +:subject+ - the email subject
     #   * +:body+ - the actual text to send in the mail
-    def sendmail(options={})
-      begin
-        Pony.mail( \
-          :from => options[:from],
-          :to => options[:to],
-          :via => :smtp,
-          :via_options => {
-            :address              => smtp_host,
-            :port                 => smtp_port,
-            :authentication       => nil,
-            :enable_starttls_auto => false
-          },
-          :subject => options[:subject],
-          :body    => options[:body]
-        )
-      rescue Exception => e
-        $log.writer.error "Can not send mail via host #{smtp_host}"
-        $log.writer.error e.message
-      end
+    def sendmail(options = {})
+      Pony.mail( \
+        from: options[:from],
+        to: options[:to],
+        via: :smtp,
+        via_options: {
+          address: @smtp_host,
+          port: @smtp_port,
+          authentication: nil,
+          enable_starttls_auto: false
+        },
+        subject: options[:subject],
+        body: options[:body]
+      )
+    rescue => e
+      $log.writer.error "Can not send mail via host #{smtp_host}"
+      $log.writer.error e.message
     end
   end
-
 end
-

data/lib/depengine/helper/properties.rb

@@ -1,91 +1,72 @@
 module Helper
   class Properties
-  
     attr_accessor :properties_hash
     attr_accessor :separator
-    
-    def initialize()
-      properties_hash = {}
-      separator = "="
-    end   
+
+    def initialize
+      @properties_hash = {}
+      @separator = '='
+    end
 
     ### patch properties (key/value)
     def patch(source, target)
-    
-      if not File.file? source
+      unless File.file? source
         $log.writer.error "File #{source} does not exists"
         exit 1
       end
-      
+
       if target.nil?
-        $log.writer.error "Parameter target not set"
+        $log.writer.error 'Parameter target not set'
         exit 1
       end
-      
+
       if target.length == 0
-        $log.writer.error "Parameter target not set"
+        $log.writer.error 'Parameter target not set'
         exit 1
       end
-      
-   
+
       ### read source file in array
       data = File.readlines(source)
 
-      target_file = File.open(target, "w")
-      
-      data.each { |entry|
-        if entry.include? separator
-          keyvalue = entry.split(separator,2)
+      target_file = File.open(target, 'w')
 
-          if keyvalue[1].class == TrueClass
-	    keyvalue[1] = 'true'
-          end
-	  if properties_hash[keyvalue[0].strip].class == TrueClass
-	    properties_hash[keyvalue[0].strip] = 'true'
-	  end
+      data.each do |entry|
+        if entry.include? separator
+          keyvalue = entry.split(separator, 2)
 
-          if keyvalue[1].class == FalseClass
-	    keyvalue[1] = 'false'
-          end
-	  if properties_hash[keyvalue[0].strip].class == FalseClass
-	    properties_hash[keyvalue[0].strip] = 'false'
-	  end
+          keyvalue[1] = 'true' if keyvalue[1].class == TrueClass
+          keyvalue[1] = 'false' if keyvalue[1].class == FalseClass
+          properties_hash[keyvalue[0].strip] = 'true' if properties_hash[keyvalue[0].strip].class == TrueClass
+          properties_hash[keyvalue[0].strip] = 'false' if properties_hash[keyvalue[0].strip].class == FalseClass
 
-          if properties_hash[keyvalue[0].strip] != nil
-            entry = entry.sub(keyvalue[1].strip, properties_hash[keyvalue[0].strip])
-          end
+          entry = entry.sub(keyvalue[1].strip, properties_hash[keyvalue[0].strip]) unless properties_hash[keyvalue[0].strip].nil?
         end
         target_file.puts entry
-      }
-    
+      end
+
       target_file.close
-    
     end
 
     ### patch strings
     def substitute(source, target)
-    
-      if not File.file? source
+      unless File.file? source
         $log.writer.error "File #{source} does not exists"
-        exit 1
-      end   
-   
+        fail "File #{source} does not exists"
+      end
+
       ### read backup file in array
       data = File.readlines(source)
 
-      target_file = File.open(target, "w")
-      
-      data.each { |entry|
-        properties_hash.keys.each { |hashkey|
+      target_file = File.open(target, 'w')
+
+      data.each do |entry|
+        properties_hash.keys.each do |hashkey|
           entry = entry.sub(hashkey, properties_hash[hashkey])
-        }
+        end
         target_file.puts entry
-      }
-    
+      end
+
       target_file.close
-    
     end
-    
   end
-
 end

data/lib/depengine/helper/smb.rb

@@ -1,43 +1,37 @@
 module Helper
-
   class Smb
-
     attr_accessor :remote_path
     attr_accessor :local_path
 
-    def samba_mount()
-      Helper.validates_presence_of remote_path, "Samba remote_path not set"
-      Helper.validates_presence_of local_path, "Samba mountpoint not set"
+    def samba_mount
+      Helper.validates_presence_of remote_path, 'Samba remote_path not set'
+      Helper.validates_presence_of local_path, 'Samba mountpoint not set'
 
       $log.writer.debug "Mount samba share #{remote_path} to #{local_path}"
 
       # Check if already mounted (heuristik!)
-      if File.stat('/').dev == File.stat(local_path).dev
-        # Have to mount
-
-        #### create mountpoint directory
-        if not File.directory?(local_path)
-          if not FileUtils.mkdir_p(local_path)
-            $log.writer.error "Unable to create mountpoint directory #{local_path}"
-            exit 1
-          end
-        end
+      return unless File.stat('/').dev == File.stat(local_path).dev
+      # Have to mount
 
-        shell_cmd = "/sbin/mount.cifs #{remote_path}  #{local_path}"
-        $log.writer.debug "Execute command: #{shell_cmd}"
-        output = system shell_cmd
-        if not output
-          $log.writer.error "#{shell_cmd} failed"
+      #### create mountpoint directory
+      unless File.directory?(local_path)
+        unless FileUtils.mkdir_p(local_path)
+          $log.writer.error "Unable to create mountpoint directory #{local_path}"
           exit 1
         end
       end
+
+      shell_cmd = "/sbin/mount.cifs #{remote_path}  #{local_path}"
+      $log.writer.debug "Execute command: #{shell_cmd}"
+      output = system(shell_cmd)
+      return if output
+      $log.writer.error "#{shell_cmd} failed"
+      fail "#{shell_cmd} failed"
     end
 
-    def samba_umount()
-      Helper.validates_presence_of local_path, "Samba mountpoint not set"
-      $log.writer.debug "Not yet implemented"
+    def samba_umount
+      Helper.validates_presence_of local_path, 'Samba mountpoint not set'
+      $log.writer.debug 'Not yet implemented'
     end
   end
-
 end
-

data/lib/depengine/helper/validations.rb

@@ -1,28 +1,28 @@
 module Helper
-  def validates_presence_of(attribute, message=nil)
-    raise ArgumentError, message || "Missing parameter", caller \
+  def validates_presence_of(attribute, message = nil)
+    fail ArgumentError, message || 'Missing parameter', caller \
        if attribute.nil?
   end
   module_function :validates_presence_of
 
-  def validates_not_empty(attribute, message=nil)
-    raise ArgumentError, message || "Parameter is empty", caller \
+  def validates_not_empty(attribute, message = nil)
+    fail ArgumentError, message || 'Parameter is empty', caller \
        if attribute.nil?
   end
   module_function :validates_not_empty
 
   def path_in_deploy_home(path)
-    absolute_path?(path) ? path : File.join($recipe_config[:deploy_home] || "", path)
+    absolute_path?(path) ? path : File.join($recipe_config[:deploy_home] || '', path)
   end
   module_function :path_in_deploy_home
 
   def path_in_recipe_base_dir(path)
-    absolute_path?(path) ? path : File.join($recipe_config[:recipe_base_dir] || "", path)
+    absolute_path?(path) ? path : File.join($recipe_config[:recipe_base_dir] || '', path)
   end
   module_function :path_in_recipe_base_dir
 
   def absolute_path?(path)
-    path.start_with? "/"
+    path.start_with? '/'
   end
   module_function :absolute_path?
 end

data/lib/depengine/helper/yaml.rb

@@ -1,15 +1,13 @@
 module Helper
   def yaml_parse(filename)
-    if File.file? filename
-      begin
-        YAML::load_file(filename)
-      rescue Exception => e
-        $log.writer.error "YAML parsing in #{filename}"
-        $log.writer.error e.message
-        exit 1
-      end
+    return unless File.file? filename
+    begin
+      YAML.load_file(filename)
+    rescue => e
+      $log.writer.error "YAML parsing in #{filename}"
+      $log.writer.error e.message
+      exit 1
     end
   end
   module_function :yaml_parse
 end
-

data/lib/depengine/log/log.rb

@@ -4,7 +4,7 @@ module Log
 
     attr_accessor :writer
 
-    def initialize(target=StdoutOutputter.new('stdout_logger'))
+    def initialize(target = StdoutOutputter.new('stdout_logger'))
       target.level = Log4r::DEBUG
       @writer = Logger.new 'Deployment'
       @writer.outputters = target
@@ -12,9 +12,7 @@ module Log
 
     def level(name, level)
       @writer.outputters.each do |outputter|
-        if outputter.name == name
-          outputter.level = level
-        end
+        outputter.level = level if outputter.name == name
       end
     end
 
@@ -26,10 +24,9 @@ module Log
       @writer.trace = false
     end
 
-    def add_outputter(outputter, level=nil)
+    def add_outputter(outputter, level = nil)
       outputter.level = level if level
       @writer.add(outputter)
     end
-
   end
 end