depengine 0.0.8 → 0.0.9

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTU3ZDdhMWU0NTAzZWE5YjU0YWU1NWNlNDgyOTllYTYyNTJlZDgxYQ==
+  data.tar.gz: !binary |-
+    MGNiZDQ0ZTAzMzA0M2MxM2VlOWJhMzBmZDVhYmZlNDdlODdjMzVjOA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MmZkNjNmNjkzNDAwNWIxY2Y3YTMxZDRlOWZkMDY0NGMwYmZkNTkyN2QyNjYw
+    ZDgwM2ZjYjg0NDdhMGExNTc1ZDVlN2M5MzM1ODE2YmQ1NTQ1MzkwZTE2OGE0
+    YWQwNWI4MWVhNTg4MDdkNzg0NTUxZjgwNTQ4ZjQ5OTQ2YjJiMGE=
+  data.tar.gz: !binary |-
+    YzhiOGU2ODVjMjJmZTAxNzcyOGM2YjdiYmQxNjg5ODQzNjQwMTcwY2MzMTE0
+    YTBmNmI3YTM1ZTZjZjU1MWM2YTNlODNiNTEyMDZiMjdiNzFmMTNlZDcwMzYy
+    ZDBkZWEyZjA1ODNlMTU5MDc0YTkwM2ZlMjNjYzZiZWIyNWI1YzA=

data/bin/de

@@ -5,5 +5,4 @@ $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'depengine'
 require 'depengine/cli'
 
-# exit Depengine::CLI.run(ARGV)
-Depengine::CLI.run(ARGV)
+exit Depengine::CLI.run(ARGV)

data/bin/full_install

@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+# TOOLROOT=$HOME/Projekte/deploy_depengine
+TOOLROOT=/home/jenkins/Projekt_depengine
+
+
+RUBYVERSION=1.9.3
+DEPENGINEVERSION=0.0.8
+usage=$(
+cat <<EOF
+$0 [OPTION]
+-t VALUE    set toolroot argument to VALUE
+-r VALUE    set rubyversion argument to VALUE
+-d VALUE    set depengineversion argument to VALUE
+EOF
+)
+
+while getopts "t:r:d:" OPTION; do
+  case "$OPTION" in 
+    t)
+      TOOLROOT="$OPTARG"
+      ;;
+    r)
+      RUBYVERSION="$OPTARG"
+      ;;
+    d)
+      DEPENGINEVERSION="$OPTARG"
+      ;;
+    *)
+      echo "unrecognized option"
+      echo "$usage"
+      ;;
+  esac
+done
+
+export rvm_path=$TOOLROOT/rvm
+mkdir -p $rvm_path
+
+if [ ! -f $rvm_path/scripts/rvm ]; then
+  bash -s stable < <(curl -s https://raw.github.com/wayneeseguin/rvm/master/binscripts/rvm-installer )
+fi
+
+source $rvm_path/scripts/rvm
+rvm reload
+
+if rvm list | grep "$RUBYVERSION" >/dev/null; then
+  # echo EXISTIERT
+  :
+else
+  # echo MUSS INSTALLIERT WERDEN
+  rvm install "$RUBYVERSION"
+fi
+
+rvm use "$RUBYVERSION"
+
+gem update --system | grep -v "Latest version currently installed"
+
+if gem list | grep depengine | grep "$DEPENGINEVERSION" >/dev/null; then
+  # echo EXISTIERT
+  :
+else
+  # echo MUSS INSTALLIERT WERDEN
+  gem install depengine --version "$DEPENGINEVERSION"
+fi
+
+# type de
+# de --deployhome /export/home/ctraut/Projekte/deploy_demoproject --env demo --version 0.0.1

data/lib/depengine/cli.rb

@@ -11,30 +11,28 @@ module Depengine
           o.banner = "Usage: #{File.basename($0)} [options]"
           o.separator ""
           o.on('-h', '--deployhome [DIRNAME]', 'Home of deployments.') do |dname|
-            @deploy_home = dname
-            ENV['WORKSPACE'] = dname
+            set :deploy_home, dname
           end
           o.on('-r', '--recipe [FILENAME]', 'Filename of the recipe.') do |fname|
             @recipe_name = fname
           end
           o.on('-e', '--env [ENVNAME]', 'Environment name.') do |ename|
-            ENV['ENVIRONMENT'] = ename
+            set :env, ename
           end
           o.on('-v', '--version [VERSION]', 'Version.') do |vname|
-            ENV['VERSION'] = vname
+            set :version, vname
           end
           o.parse!
         end
-
         # unless args.size == 2
         #   error << args.options
         #   return 127
         # end
 
-        recipe_filename = File.join(@deploy_home,  @recipe_name)
+        recipe_filename = File.join($recipe_config[:deploy_home],  @recipe_name)
         puts "Using recipe #{recipe_filename}"
         eval(File.new(recipe_filename).read)
-
+        return 0
       end
     end
   end

data/lib/depengine/dsl/deployment.rb

@@ -53,15 +53,15 @@ module Deployment
       $recipe_config.merge! Helper.get_environemnt_variables($recipe_config['env_exceptions'])
 
       # generate version hash from environment variable
-      @version = Helper.parse_version($recipe_config['VERSION'])
+      @version = Helper.parse_version($recipe_config[:version])
 
       # validate needed environment variables
-      Helper.validates_not_empty $recipe_config['ENVIRONMENT'], \
-                                   "ENVIRONMENT is not set"
-      Helper.validates_not_empty $recipe_config['VERSION'], \
-                                   "VERSION is not set"
-      Helper.validates_not_empty $recipe_config['WORKSPACE'], \
-                                   "WORKSPACE 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
       @cdb = get_cdb_parameters(@version['cdb'])
@@ -69,10 +69,10 @@ module Deployment
       # clean workspace if needed       
       if $recipe_config[:cleanup_workspace_before]
          $log.writer.info "Remove all files from Workspace"
-        Helper.cleanup_workspace!($recipe_config['WORKSPACE'])
+        Helper.cleanup_workspace!($recipe_config[:deploy_home])
       end
       # init workspace with default directorys
-      Helper.init_workspace($recipe_config['WORKSPACE'])
+      Helper.init_workspace($recipe_config[:deploy_home])
 
       # the logfile needs a correct WORKSPACE and the initial dirs
       # so we have to set it here
@@ -92,7 +92,7 @@ module Deployment
             level = Log4r::FATAL
         end
         $log.add_outputter(Log4r::FileOutputter.new('log_file', \
-          :filename => File.join($recipe_config['WORKSPACE'], 'log', \
+          :filename => File.join($recipe_config[:deploy_home], 'log', \
                                  $recipe_config[:log_file])), \
           level)
       end
@@ -103,38 +103,38 @@ module Deployment
     # $recipe_config[:application_name]
 
     def copy(source, target, options={})
-      Processor.copy(File.join($recipe_config['WORKSPACE'], source), \
-                     File.join($recipe_config['WORKSPACE'], target), \
+      Processor.copy(File.join($recipe_config[:deploy_home], source), \
+                     File.join($recipe_config[:deploy_home], target), \
                      options)
     end
 
     def mkdir(directory)
-      Processor.mkdir(File.join($recipe_config['WORKSPACE'], directory))
+      Processor.mkdir(File.join($recipe_config[:deploy_home], directory))
     end
 
     def chmod(file, mode, options={})
-      Processor.chmod(File.join($recipe_config['WORKSPACE'], file), \
+      Processor.chmod(File.join($recipe_config[:deploy_home], file), \
                       mode, options)
     end
 
     def remove(file)
-      Processor.remove(File.join($recipe_config['WORKSPACE'], file))
+      Processor.remove(File.join($recipe_config[:deploy_home], file))
     end
 
     def mklink(source, target)
-      Processor.mklink(source, File.join($recipe_config['WORKSPACE'], target))
+      Processor.mklink(source, File.join($recipe_config[:deploy_home], target))
     end
 
     def check_filelist(list, target)
-      Processor.check_filelist(File.join($recipe_config['WORKSPACE'], list), \
-                               File.join($recipe_config['WORKSPACE'], target))
+      Processor.check_filelist(File.join($recipe_config[:deploy_home], list), \
+                               File.join($recipe_config[:deploy_home], target))
     end
 
     def unzip_file(zip_file, target_dir, filename=nil)
       Helper.validates_presence_of @cdb['unzip_bin']
 
-      Processor.unzip_file(File.join($recipe_config['WORKSPACE'], zip_file), \
-                           File.join($recipe_config['WORKSPACE'], target_dir), \
+      Processor.unzip_file(File.join($recipe_config[:deploy_home], zip_file), \
+                           File.join($recipe_config[:deploy_home], target_dir), \
                            filename,
                            @cdb['unzip_bin'])
     end
@@ -142,8 +142,8 @@ module Deployment
     def tgz_file(tgz_file, source_dir, filename=nil)
       Helper.validates_presence_of @cdb['tar_bin']
 
-      Processor.tgz_file(File.join($recipe_config['WORKSPACE'], tgz_file), \
-                         File.join($recipe_config['WORKSPACE'], source_dir), \
+      Processor.tgz_file(File.join($recipe_config[:deploy_home], tgz_file), \
+                         File.join($recipe_config[:deploy_home], source_dir), \
                          filename,
                          @cdb['tar_bin'])
     end
@@ -151,8 +151,8 @@ module Deployment
     def untgz_file(tgz_file, target_dir, filename=nil)
       Helper.validates_presence_of @cdb['tar_bin']
 
-      Processor.untgz_file(File.join($recipe_config['WORKSPACE'], tgz_file), \
-                           File.join($recipe_config['WORKSPACE'], target_dir), \
+      Processor.untgz_file(File.join($recipe_config[:deploy_home], tgz_file), \
+                           File.join($recipe_config[:deploy_home], target_dir), \
                            filename,
                            @cdb['tar_bin'])
     end
@@ -160,7 +160,7 @@ module Deployment
     def parse_template(source, target, content, options={})
       template           = Processor::Template.new
       template.cdb       = @cdb
-      template.basepath  = options[:basepath] || $recipe_config['WORKSPACE']
+      template.basepath  = options[:basepath] || $recipe_config[:deploy_home]
       options[:excludes] = [] if options[:excludes].nil?
       options[:excludes] << '.svn'
       template.parse_template(source, content, target, options)
@@ -182,7 +182,7 @@ module Deployment
       cdb.protocol = 'http'
       cdb.host     = $recipe_config['cdb_host']
       cdb.context  = $recipe_config['cdb_context']
-      cdb.env      = $recipe_config['ENVIRONMENT']
+      cdb.env      = $recipe_config[:env]
 
       cdb.get_parameters(File.join( $recipe_config[:module_name], \
                                 $recipe_config[:application_name] ), version)
@@ -198,7 +198,7 @@ module Deployment
       cdb.protocol = 'http'
       cdb.host     = $recipe_config['cdb_host']
       cdb.context  = $recipe_config['cdb_context']
-      cdb.env      = $recipe_config['ENVIRONMENT']
+      cdb.env      = $recipe_config[:env]
 
       cdb.set_parameter(File.join( $recipe_config[:module_name], \
                                 $recipe_config[:application_name] ), key, value)
@@ -212,7 +212,7 @@ module Deployment
       samba.samba_mountpoints = @cdb['samba_mountpoints']
       samba.method     = "samba"
       samba.worker  = self
-      samba.get_from_repository(source, File.join($recipe_config['WORKSPACE'], target))
+      samba.get_from_repository(source, File.join($recipe_config[:deploy_home], target))
     end
 
     def get_file_from_maven(source, target)
@@ -223,7 +223,7 @@ module Deployment
       maven.user       = @cdb['maven_user']
       maven.password   = @cdb['maven_password']
       maven.method     = "maven"
-      maven.get_from_repository(source, File.join($recipe_config['WORKSPACE'], target))
+      maven.get_from_repository(source, File.join($recipe_config[:deploy_home], target))
     end
 
     def get_file_via_scp(source, target, options={})
@@ -243,7 +243,7 @@ module Deployment
                                  @cdb['ssh_key_file'])
       end
       scp.method     = "scp"
-      scp.get_from_repository(source, File.join($recipe_config['WORKSPACE'], target))
+      scp.get_from_repository(source, File.join($recipe_config[:deploy_home], target))
     end
 
     def get_file_via_svn(source, target, options={})
@@ -275,7 +275,7 @@ module Deployment
       end
 
       svn.get_from_repository(source, \
-                              File.join($recipe_config['WORKSPACE'], target))
+                              File.join($recipe_config[:deploy_home], target))
     end
 
     def send_dweb_command(command, options={})
@@ -305,7 +305,7 @@ module Deployment
       vhost                  = options[:siteid]   || @cdb['siteid']
       options[:excludes]     = options[:excludes] || ['.svn']
 
-      publisher.upload(File.join($recipe_config['WORKSPACE'], source), \
+      publisher.upload(File.join($recipe_config[:deploy_home], source), \
                        File.join('/vhosts/', vhost, target), options)
     end
 
@@ -352,7 +352,7 @@ module Deployment
       if source[0].chr == "/"
         source_path = source
       else
-        source_path = File.join($recipe_config['WORKSPACE'], source)
+        source_path = File.join($recipe_config[:deploy_home], source)
       end
 
       publisher.sync(source_path, target, options)
@@ -371,7 +371,7 @@ module Deployment
       Helper.validates_presence_of publisher.samba_share, "Sambe share not set"
       Helper.validates_presence_of publisher.samba_mountpoints, "Sambe mountpoints not set"
 
-      publisher.copy(File.join($recipe_config['WORKSPACE'], source), \
+      publisher.copy(File.join($recipe_config[:deploy_home], source), \
                        target, options)
     end
 
@@ -391,7 +391,7 @@ module Deployment
       Helper.validates_presence_of publisher.remote_host, "Remote host not set"
       Helper.validates_presence_of publisher.remote_user, "Remote user not set"
 
-      publisher.copy(File.join($recipe_config['WORKSPACE'], source), \
+      publisher.copy(File.join($recipe_config[:deploy_home], source), \
                        target, options)
     end
     
@@ -442,8 +442,8 @@ module Deployment
       properties                 = Processor::Properties.new
       properties.properties_hash = @cdb[patch_set]
       properties.assigner        = assigner
-      properties.patch(File.join($recipe_config['WORKSPACE'], source), \
-                       File.join($recipe_config['WORKSPACE'], target,  \
+      properties.patch(File.join($recipe_config[:deploy_home], source), \
+                       File.join($recipe_config[:deploy_home], target,  \
                        File.basename(source)))
     end
 
@@ -462,8 +462,8 @@ module Deployment
       properties                 = Processor::Properties.new
       properties.assigner        = assigner
       properties.properties_hash = @cdb[patch_set]
-      properties.substitute(File.join($recipe_config['WORKSPACE'], source), \
-                       File.join($recipe_config['WORKSPACE'], target,  \
+      properties.substitute(File.join($recipe_config[:deploy_home], source), \
+                       File.join($recipe_config[:deploy_home], target,  \
                        File.basename(source)))
     end
 
@@ -479,8 +479,8 @@ module Deployment
         assigner = options[:assigner]
       end
 
-      source_path = File.join($recipe_config['WORKSPACE'], source)
-      target_path = File.join($recipe_config['WORKSPACE'], target)
+      source_path = File.join($recipe_config[:deploy_home], source)
+      target_path = File.join($recipe_config[:deploy_home], target)
 
       properties                 = Processor::Properties.new
       properties.assigner        = assigner
@@ -504,8 +504,8 @@ module Deployment
       properties                 = Processor::Properties.new
       properties.assigner        = assigner
       properties.properties_hash = @cdb[patch_set]
-      properties.add(File.join($recipe_config['WORKSPACE'], source), \
-                       File.join($recipe_config['WORKSPACE'], target,  \
+      properties.add(File.join($recipe_config[:deploy_home], source), \
+                       File.join($recipe_config[:deploy_home], target,  \
                        File.basename(source)))
     end
 

data/lib/depengine/provider/cdb.rb

@@ -85,7 +85,7 @@ module Provider
       Helper.validates_presence_of path
 		
       begin
-      	if ENV['CDB_METHOD'] == 'file'
+      	if true
           begin
             cdb_filesystem = Provider::CDB_FILESYSTEM.new
             result = JSON.parse(cdb_filesystem.read_data(path))

data/lib/depengine/provider/cdb_filesystem.rb

@@ -23,7 +23,7 @@ module Provider
     
     def read_data(cdb_path, options={})
       config    = Hash.new
-      basedir   = ENV['CDB_HOME']
+      basedir   = File.join($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!"

data/lib/depengine/version.rb

@@ -1,3 +1,3 @@
 module Depengine
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: depengine
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 0.0.9
 platform: ruby
 authors:
 - Team Automatisierung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pony
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ptools
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: radius
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -175,6 +156,7 @@ files:
 - bin/de
 - bin/depengine
 - bin/depengine.sh
+- bin/full_install
 - depengine.gemspec
 - etc/Isolate.bak
 - etc/config.yaml
@@ -2700,26 +2682,46 @@ files:
 - spec/zip_spec.rb
 homepage: http://www.sinnerschrader.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 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