depengine 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad9268ce675daefc94dc5dfc7ae29925ac247308
-  data.tar.gz: c23742a660ebf9d069e4d85f2a8152a22512f91a
+  metadata.gz: ae7ab576f40e2d40332339a33be0c20db69fac61
+  data.tar.gz: 2155052a6ced85ae12e4a947cecfc2904bc5a0e6
 SHA512:
-  metadata.gz: c9f62019cbe1c68153f92206f635f26b39a6edafc09887dd5f962f676c0e2046b85b504b1937e5acd9844aec7d485402a74896193f8c285311c586e882293a61
-  data.tar.gz: edd36baf51936a992ab912e62d144ed470149efaacd8b1252269206aa5345a8e127b394fea019adf42416a9dfe1863a3fceb66b5924c21501f31caa21ef84e82
+  metadata.gz: 457526ad954a12cf626a48a4e8e031fdd85098964b9854974feb2f1a857ea2b6fde56025fd9a75e9356585dd265a995779d4ccefbce345711503ea1d7c1af3da
+  data.tar.gz: 01c519bd8a40df40130ced31528774f04ada204e626d06f01701085ecf34bf47aef7f4e817543b76cb49db46e5c24a0d5871f5c6b97c653c95337ba0c4c84e5c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    depengine (3.0.2)
+    depengine (3.0.3)
       expect4r (~> 0.0)
       json (~> 1.4)
       log4r (~> 1.1)
@@ -26,7 +26,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    net-scp (1.1.2)
+    net-scp (1.2.0)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)

data/lib/depengine/dsl/deployment.rb

@@ -37,35 +37,19 @@ module Deployment
 
       load_modules!
 
-      # read global deployment configuration from etc/config.yaml
-      if ENV['USE_DEPENGINE_AS_GEM']
-        deployment_configuration_file = \
-           ( File.join(File.dirname($exec_file_path), '../../etc/config.yaml') )
-      else
-        deployment_configuration_file = \
-           ( File.join(File.dirname($exec_file_path), '../etc/config.yaml') )
-      end
-      if File.file? deployment_configuration_file
-        $recipe_config.merge! Helper.yaml_parse(deployment_configuration_file)
-      else
-        puts "Can not read deployment configuration etc/config.yaml"
-      end
-
       # generate hash from environemnt variables and merge
-      $recipe_config.merge! Helper.get_environemnt_variables($recipe_config['env_exceptions'])
+      $recipe_config.merge! Helper.get_environemnt_variables($recipe_config['env_exceptions'] || "LS_COLORS TERMCAP")
 
-      # generate version hash from environment variable
       @version = Helper.parse_version($recipe_config[:version])
 
       # validate needed environment variables
-      Helper.validates_not_empty $recipe_config[:env], \
-                                   "env is not set"
-      Helper.validates_not_empty $recipe_config[:version], \
-                                   "version is not set"
-      Helper.validates_not_empty $recipe_config[:deploy_home], \
-                                   "deploy_home is not set"
+      Helper.validates_not_empty $recipe_config[:env], "env is not set"
+      Helper.validates_not_empty $recipe_config[:version], "version is not set"
+      Helper.validates_not_empty $recipe_config[:deploy_home], "deploy_home is not set"
 
       # read configuration from cdb
+      $recipe_config['cdb_host'] ||= "filesystem"
+      $recipe_config['cdb_context'] ||= ""
       @cdb = get_cdb_parameters(@version['cdb'])
 
       # clean workspace if needed

data/lib/depengine/dsl/dweb.rb

@@ -7,7 +7,7 @@ module Deployment
         Helper.validates_presence_of @cdb['ssh_key_file_command'], "SSH keyfile not set"
         Helper.validates_presence_of @cdb['siteid'], "Siteid not set"
 
-        publisher = Publisher::Dweb.new
+        publisher = ::Publisher::Dweb.new
         publisher.staging_host = @cdb['staging_host']
         publisher.ssh_key_file = @cdb['ssh_key_file_command']
         publisher.siteid       = @cdb['siteid']
@@ -21,7 +21,7 @@ module Deployment
         Helper.validates_presence_of source
         Helper.validates_presence_of target
 
-        publisher = Publisher::Dweb.new
+        publisher = ::Publisher::Dweb.new
         publisher.staging_host = @cdb['staging_host']
         publisher.ssh_key_file = @cdb['ssh_key_file']
         publisher.siteid       = @cdb['siteid']
@@ -34,7 +34,7 @@ module Deployment
       end
 
       def dweb_link(source, symlink, options={})
-        publisher = Publisher::Dweb.new
+        publisher = ::Publisher::Dweb.new
         publisher.staging_host = @cdb['staging_host']
         publisher.ssh_key_file = @cdb['ssh_key_file']
         publisher.siteid       = @cdb['siteid']

data/lib/depengine/dsl/helper.rb

@@ -44,7 +44,7 @@ module Deployment
       end
 
       def tomcat_deploy(options={})
-        publisher = Publisher::Tomcat.new
+        publisher = ::Publisher::Tomcat.new
         publisher.servers  = options[:servers] || @cdb['servers']
         publisher.runners = options[:runners] || @cdb['runners'] || publisher.servers
         publisher.initd_script  = options[:initd_script] || @cdb['initd_script']

data/lib/depengine/dsl/iis.rb

@@ -16,7 +16,7 @@ module Deployment
         Helper.validates_presence_of $recipe_config['VALUE'], \
                                      "VALUE parameter is missing"
 
-        iis          = Publisher::Iis_build.new
+        iis          = ::Publisher::Iis_build.new
         iis.iis_build_protocol = @cdb['iis_build_protocol']
         iis.iis_build_url     = @cdb['iis_build_url']
         if @cdb['http_read_timeout']
@@ -40,7 +40,7 @@ module Deployment
         Helper.validates_presence_of  @version['app'], \
                                      "VERSION parameter is missing"
 
-        iis          = Publisher::Iis_deploy.new
+        iis          = ::Publisher::Iis_deploy.new
         iis.iis_deploy_protocol = @cdb['iis_deploy_protocol']
         iis.iis_deploy_url     = options[:iis_deploy_url] || @cdb['iis_deploy_url']
         if @cdb['http_read_timeout']
@@ -59,7 +59,7 @@ module Deployment
         Helper.validates_presence_of $recipe_config['VALUE'], \
                                      "VALUE parameter is missing"
 
-        iis          = Publisher::Iis_appcmd.new
+        iis          = ::Publisher::Iis_appcmd.new
         iis.iis_appcmd_protocol = @cdb['iis_appcmd_protocol']
         iis.iis_appcmd_url     = @cdb['iis_appcmd_url']
         if @cdb['http_read_timeout']

data/lib/depengine/dsl/publisher.rb

@@ -5,7 +5,7 @@ module Deployment
         Helper.validates_presence_of source
         Helper.validates_presence_of target
 
-        publisher = Publisher::Samba.new
+        publisher = ::Publisher::Samba.new
         publisher.samba_share      = options[:samba_share]      || @cdb['samba_share']
         publisher.worker = self
         publisher.samba_mountpoints      = options[:samba_mountpoints]      || @cdb['samba_mountpoints']
@@ -22,7 +22,7 @@ module Deployment
         Helper.validates_presence_of source
         Helper.validates_presence_of target
 
-        publisher = Publisher::Sftp.new
+        publisher = ::Publisher::Sftp.new
         publisher.remote_host  = options[:remote_host]  || @cdb['remote_host']
         publisher.remote_user  = options[:remote_user]  || @cdb['remote_user']
         publisher.ssh_key_file = options[:ssh_key_file] || @cdb['ssh_key_file']
@@ -42,7 +42,7 @@ module Deployment
         Helper.validates_presence_of path
         Helper.validates_presence_of permissions
 
-        publisher = Publisher::Sftp.new
+        publisher = ::Publisher::Sftp.new
         publisher.remote_host  = options[:remote_host]  || @cdb['remote_host']
         publisher.remote_user  = options[:remote_user]  || @cdb['remote_user']
         publisher.ssh_key_file = options[:ssh_key_file] || @cdb['ssh_key_file']

data/lib/depengine/dsl/remote.rb

@@ -6,7 +6,7 @@ module Deployment
         Helper.validates_presence_of command, "No command to execute!"
         Helper.validates_presence_of @cdb['ssh_key_file'], "SSH keyfile not set"
 
-        publisher = Publisher::Ssh.new
+        publisher = ::Publisher::Ssh.new
         publisher.remote_host  = options[:remote_host]  || @cdb['remote_host']
         publisher.remote_user  = options[:remote_user]  || @cdb['remote_user']
         publisher.ssh_key_file = options[:ssh_key_file] || @cdb['ssh_key_file']
@@ -20,7 +20,7 @@ module Deployment
         Helper.validates_presence_of source
         Helper.validates_presence_of target
 
-        publisher = Publisher::Rsync.new
+        publisher = ::Publisher::Rsync.new
         publisher.remote_host  = options[:remote_host]  || @cdb['remote_host']
         publisher.remote_user  = options[:remote_user]  || @cdb['remote_user']
         publisher.ssh_key_file = options[:ssh_key_file] || @cdb['ssh_key_file']
@@ -47,7 +47,7 @@ module Deployment
 
         release_name_shema = /[0-9]{4}\-[0-9]{2}\-[0-9]{2}_[0-9]+.*/ unless release_name_shema # e.g. timestamps like 2014-04-11_1397227004
 
-        publisher = Publisher::Ssh.new
+        publisher = ::Publisher::Ssh.new
         publisher.remote_host  = options[:remote_host]  || @cdb['remote_host']
         publisher.remote_user  = options[:remote_user]  || @cdb['remote_user']
         publisher.ssh_key_file = options[:ssh_key_file] || @cdb['ssh_key_file']

data/lib/depengine/dsl/repository.rb

@@ -77,28 +77,28 @@ module Deployment
       end
 
       def git_fetch(options={})
-        publisher = Publisher::Git.new
+        publisher = ::Publisher::Git.new
         publisher.repository_url = options[:git_repository_url] || @cdb['git_repository_url']
         publisher.repository_local_dir = options[:git_repository_local] || @cdb['git_repository_local']
         publisher.fetch()
       end
 
       def git_checkout(branch_name, options={})
-        publisher = Publisher::Git.new
+        publisher = ::Publisher::Git.new
         publisher.repository_url = options[:git_repository_url] || @cdb['git_repository_url']
         publisher.repository_local_dir = options[:git_repository_local] || @cdb['git_repository_local']
         publisher.checkout(branch_name, options)
       end
 
       def git_submodule(submodule_option, options={})
-        publisher = Publisher::Git.new
+        publisher = ::Publisher::Git.new
         publisher.repository_url = options[:git_repository_url] || @cdb['git_repository_url']
         publisher.repository_local_dir = options[:git_repository_local] || @cdb['git_repository_local']
         publisher.submodule(submodule_option, options)
       end
 
       def git_tag(tag_name, options={})
-        publisher = Publisher::Git.new
+        publisher = ::Publisher::Git.new
         publisher.repository_url = options[:git_repository_url] || @cdb['git_repository_url']
         publisher.repository_local_dir = options[:git_repository_local] || @cdb['git_repository_local']
         publisher.tag(tag_name, options)

data/lib/depengine/provider/cdb.rb

@@ -84,30 +84,16 @@ module Provider
       Helper.validates_presence_of path
 
       begin
-      	if true
-          begin
-            cdb_filesystem = Provider::CDB_FILESYSTEM.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}"
-            $log.writer.error e.message
-            exit 1
-          end
-        else
-          url    = protocol + '://' + \
-                   File.join(host, context, env, path, "showall.json")
 
-          begin
-            result = JSON.parse(Net::HTTP.get(URI.parse(url)))
-          rescue Exception => e
-            $log.writer.error "Error: got invalid json from cdb"
-            $log.writer.error "Request was: #{url.to_s}"
-            $log.writer.error "Answer was: #{Net::HTTP.get(URI.parse(url))}"
-            $log.writer.error e.message
-            exit 1
-          end
+        begin
+          cdb_filesystem = Provider::CDB_FILESYSTEM.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}"
+          $log.writer.error e.message
+          exit 1
         end
 
         # decrypt encrypted entries automagically

data/lib/depengine/provider/cdb_filesystem.rb

@@ -1,6 +1,6 @@
 module Provider
   class CDB_FILESYSTEM
-    
+
     def load_yaml(filename)
       if File.file? filename
           begin
@@ -18,11 +18,9 @@ module Provider
         raise "File not found: #{filename}"
       end
     end
-    
-    
-    
+
     def read_data(cdb_path, options={})
-      config    = Hash.new      
+      config    = Hash.new
       basedir   = File.join(($recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home]),'cdb')
       filename  = ''
       if cdb_path.nil? or cdb_path.empty?
@@ -30,7 +28,7 @@ module Provider
         exit 1
       end
       paths = cdb_path.split('/')
-      
+
       paths.each do |path|
         basedir = File.join( basedir, path.to_s )
         filename = basedir + '.yaml'
@@ -45,6 +43,6 @@ module Provider
       end
       config.to_json
     end
-    
+
   end
-end    
+end

data/lib/depengine/version.rb

@@ -1,3 +1,3 @@
 module Depengine
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: depengine
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Team Automatisierung