depengine 0.0.12 → 0.0.13

data/depengine.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency "pony"
   s.add_dependency "ptools"
   s.add_dependency "radius"
+  s.add_dependency "expect4r"
   
   s.add_development_dependency "rspec", "~> 2"
  

data/lib/depengine/dsl/deployment.rb

@@ -166,6 +166,15 @@ module Deployment
       template.parse_template(source, content, target, options)
     end
 
+    def parse_erb_template(source, target, content, options={})
+      template           = Processor::Template.new
+      template.cdb       = @cdb
+      template.basepath  = options[:basepath] || $recipe_config[:deploy_home]
+      options[:excludes] = [] if options[:excludes].nil?
+      options[:excludes] << '.svn'
+      template.parse_erb_template(source, content, target, options)
+    end
+
     def get_all_config_parameters
       # merge cdb data
       $recipe_config.merge @cdb
@@ -204,6 +213,21 @@ module Deployment
                                 $recipe_config[:application_name] ), key, value)
     end
 
+    def set_cdb_parameter_4_app(module_name, app_name, key, value)
+      Helper.validates_presence_of $recipe_config['cdb_host'], \
+                                   "cdb_host parameter is missing"
+      Helper.validates_presence_of $recipe_config['cdb_context'], \
+                                   "cdb_context parameter is missing"
+
+      cdb          = Provider::CDB.new
+      cdb.protocol = 'http'
+      cdb.host     = $recipe_config['cdb_host']
+      cdb.context  = $recipe_config['cdb_context']
+      cdb.env      = $recipe_config['ENVIRONMENT']
+
+      cdb.set_parameter(File.join( module_name, app_name ), key, value)
+    end
+
     def get_dir_from_samba(source, target)
       Helper.validates_presence_of @cdb['samba_repository'], "Samba repository not set"
 
@@ -441,6 +465,9 @@ module Deployment
 
       properties                 = Processor::Properties.new
       properties.properties_hash = @cdb[patch_set]
+### add db_endpoint
+      properties.properties_hash['db_endpoint_1'] = @cdb['db_endpoint_1']
+      properties.properties_hash['db_endpoint_2'] = @cdb['db_endpoint_2']      
       properties.assigner        = assigner
       properties.patch(File.join($recipe_config[:deploy_home], source), \
                        File.join($recipe_config[:deploy_home], target,  \
@@ -462,6 +489,9 @@ module Deployment
       properties                 = Processor::Properties.new
       properties.assigner        = assigner
       properties.properties_hash = @cdb[patch_set]
+### add db_endpoint
+      properties.properties_hash['db_endpoint_1'] = @cdb['db_endpoint_1']
+      properties.properties_hash['db_endpoint_2'] = @cdb['db_endpoint_2']      
       properties.substitute(File.join($recipe_config[:deploy_home], source), \
                        File.join($recipe_config[:deploy_home], target,  \
                        File.basename(source)))
@@ -485,7 +515,9 @@ module Deployment
       properties                 = Processor::Properties.new
       properties.assigner        = assigner
       properties.properties_hash = @cdb[patch_set]
-
+### add db_endpoint
+      properties.properties_hash['db_endpoint_1'] = @cdb['db_endpoint_1']
+      properties.properties_hash['db_endpoint_2'] = @cdb['db_endpoint_2']
       properties.substitute_r(source_path, target_path)
     end
 

data/lib/depengine/processor/erb_template.rb

@@ -0,0 +1,127 @@
+module Processor
+  class Erb_template
+    include Processor
+    attr_accessor :basepath
+    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"
+      # expand basepath
+      self.basepath = File.expand_path basepath
+
+      if File.file?( File.join( basepath, template_source ) )
+        source_root_path = File.join( basepath, File.dirname(template_source) )
+        single_file      = File.join( basepath, template_source )
+      else
+        # source is a directory
+        source_root_path = File.join( basepath, template_source)
+        single_file      = nil
+      end
+      target_root_path = File.join( basepath, outdir )
+      target_path      = target_root_path
+
+      Find.find( single_file || source_root_path ) do |path|
+        # next if we found ourself
+        next if path == source_root_path
+          
+        sub_dir     = File.join( File.dirname( path ).split(/\//) - \
+                      source_root_path.split(/\//) )
+        target_path = File.join( target_root_path, sub_dir )
+        target      = File.join( target_path, File.basename( path ) )
+
+        if not options[:excludes].nil?
+          options[:excludes].each do |exclude|
+            if target.include? exclude
+              $log.writer.debug "Skip template #{target}"
+              Find.prune
+              next
+            end
+          end
+        end
+
+        if File.directory? path
+          if not File.directory? target
+            FileUtils.mkdir_p( target )
+            $log.writer.debug "Create directory #{target}"
+          end
+        else
+          target_file = File.join( target_path, \
+                                   File.basename(target, ".erb"))
+          begin
+            if not File.binary? path and not File.zero? path
+              writer = File.new(target_file, 'w')
+              # writer.write(parse(path, content))
+              writer.write(ERB.new(File.read(path)).result())
+              writer.close if not writer.nil?
+              writer = nil
+            else
+              FileUtils.cp(path, File.expand_path(target_file))
+            end
+          rescue Exception => e
+            $log.writer.error "Can not write output from template to #{target_file}"
+            $log.writer.error e.message
+            exit 1
+          end
+        end
+      end
+    end
+
+    # This function returns the output of a parsed template, 'template' can be
+    # a filename or a String.
+    def self.parse(template, content)
+      $log.writer.debug "Parse Template #{template}"
+      Template.new.parse(template, content)
+    end
+
+    def parse(template, content)
+      context = load_tags(content, @cdb)
+      begin
+        parser           = Radius::Parser.new(context, :tag_prefix => 't')  
+        template_content = ""
+        result           = ""
+        if File.file? template
+          read_mode        = ""
+          if RUBY_VERSION < '1.9'
+            read_mode = 'r'
+          else
+            read_mode = 'rb'
+          end
+          File.open(template, read_mode) do |f|
+            c = ""
+            f.ungetc c unless (c = f.getc)=="\uFEFF" # remove BOM, if present
+            while line = f.gets
+              template_content << line
+            end
+          end
+        else
+          template_content = template
+        end
+ 
+        result          = parser.parse(template_content) 
+        nested_result_1 = ""
+        nested_result_2 = result
+        nested_loop     = 0
+        while( nested_result_1 != nested_result_2 )
+          if nested_loop >= 100
+            $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
+        $log.writer.error "Error in template processing: #{template}"
+        $log.writer.error e.message
+        exit 1
+      end
+  
+      result
+    end
+  end
+end
+

data/lib/depengine/processor/properties.rb

@@ -61,6 +61,13 @@ module Processor
             else
               entry = entry.sub(keyvalue[1].strip, \
                                 properties_hash[keyvalue[0].strip])
+              ### patch global variable
+              if not entry.nil? and entry.include?('<t:db_endpoint_1/>')
+                entry = entry.sub(/<t\:db_endpoint_1\/>/, properties_hash['db_endpoint_1'])
+              end
+              if not entry.nil? and entry.include?('<t:db_endpoint_2/>')
+                entry = entry.sub(/<t\:db_endpoint_2\/>/, properties_hash['db_endpoint_2'])
+              end
             end
           end
         end
@@ -93,6 +100,14 @@ module Processor
         properties_hash.keys.each { |hashkey|
           hashkey = hashkey.to_s
           entry = entry.sub(hashkey, properties_hash[hashkey].to_s)
+          ### patch global variable
+          if not entry.nil? and entry.include?('<t:db_endpoint_1/>')
+            entry = entry.sub(/<t\:db_endpoint_1\/>/, properties_hash['db_endpoint_1'])
+          end
+          if not entry.nil? and entry.include?('<t:db_endpoint_2/>')
+            entry = entry.sub(/<t\:db_endpoint_2\/>/, properties_hash['db_endpoint_2'])
+          end
+          
         }
         target_file.puts entry
       }

data/lib/depengine/publisher/ssh.rb

@@ -31,12 +31,15 @@ module Publisher
               exit 1
             end
 
-            ch.on_data do |ch, data|
-              if data.empty?
-                $log.writer.debug "Command successfully executed"
-              else
-                $log.writer.debug data
-              end
+            ch.on_data do |ch, type, data|
+              raise "could not execute command" if type.nil?
+              $log.writer.info type
+              $log.writer.info data
+#              if type.nil?
+#                $log.writer.debug "Command successfully executed"
+#              else
+#                $log.writer.debug data
+#              end
             end
 
             ch.on_extended_data do |ch, type, data|

data/lib/depengine/version.rb

@@ -1,3 +1,3 @@
 module Depengine
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,171 +1,177 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: depengine
-version: !ruby/object:Gem::Version
-  version: 0.0.12
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 5
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 13
+  version: 0.0.13
 platform: ruby
-authors:
+authors: 
 - Team Automatisierung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-08-14 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: net-ssh
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: net-sftp
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: net-sftp
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: net-scp
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: net-scp
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: log4r
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: log4r
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pony
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: pony
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ptools
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: ptools
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: radius
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: expect4r
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2'
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        version: "2"
+  type: :development
+  version_requirements: *id010
 description: Simply generates Depengine text.
-email:
+email: 
 - team-automatisierung@sinnerschrader.com
-executables:
+executables: 
 - de
 - depengine
 - depengine.sh
 - cdb_crypt
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -2654,6 +2660,7 @@ files:
 - lib/depengine/helper/validations.rb
 - lib/depengine/helper/yaml.rb
 - lib/depengine/log/log.rb
+- lib/depengine/processor/erb_template.rb
 - lib/depengine/processor/fileops.rb
 - lib/depengine/processor/properties.rb
 - lib/depengine/processor/sed.rb
@@ -2699,28 +2706,61 @@ files:
 - spec/watchr
 - spec/zip/source/dummy.zip
 - spec/zip_spec.rb
+has_rdoc: true
 homepage: http://www.sinnerschrader.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Depengine generator
-test_files: []
+test_files: 
+- spec/cdb_spec.rb
+- spec/deployhelper_spec.rb
+- spec/dweb_spec.rb
+- spec/fileops_spec.rb
+- spec/helper_spec.rb
+- spec/log_spec.rb
+- spec/logs/log_spec.log
+- spec/mail_spec.rb
+- spec/properties_spec.rb
+- spec/repository_spec.rb
+- spec/ssh_spec.rb
+- spec/template_spec.rb
+- spec/templates/base/sub1/single.tpl
+- spec/templates/base/sub2/multi1.tpl
+- spec/templates/base/sub2/multi2.tpl
+- spec/templates/base/sub2/multi3.tpl
+- spec/templates/single.tpl
+- spec/templates/single_hash.tpl
+- spec/watchr
+- spec/zip/source/dummy.zip
+- spec/zip_spec.rb