depengine 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32fea509480666bf40405f710fccdba27dae57b1
-  data.tar.gz: bf020af61701b2c9e7cefff607e010d619a9786d
+  metadata.gz: a9ae5354bbc7dc33a51cdc9f6673a0b76f533f5d
+  data.tar.gz: cba053bde8c7575bacdb2e67ac24d388be75cd64
 SHA512:
-  metadata.gz: c0ed143347cbc7a5864fe9fd34e1e4f7f035a2c8bae7b228863dd52577863e9e49fbb7427045cdfce5eacc311585cd28ac41c21f81f5ee564492739d7d8866fe
-  data.tar.gz: 50b03cd8ee4b44434a03a3a98057f05a7f4ed2709036f087b24096516f42eacb7d9e86c78fa0052724f521323cc91ef8305de102fa7aa7e77e14002f184ca244
+  metadata.gz: 535a2ceac963e1229498942b98307ba95ae6a547991f04f1b618363e8b1bb7844a771c43b1e94ebb802900d0815b3a72647217fc365d95d0506845c3c9501804
+  data.tar.gz: 58b8a3e526b71663b2b94c545e8b550d2bc11e186afdff7c91a8f00f50ec507284d80ac4f4a4ed5620961ae2a3de58687159ed00bf1d7c36401bca39f7316678

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    depengine (0.0.3)
+    depengine (0.0.20)
+      expect4r
       json (~> 1.4)
       log4r
       net-scp
@@ -15,24 +16,26 @@ GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    i18n (0.6.1)
-    json (1.7.7)
+    expect4r (0.0.10)
+      highline (>= 1.5.0)
+    fakefs (0.5.2)
+    highline (1.6.21)
+    json (1.8.1)
     log4r (1.1.10)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.21)
-    net-scp (1.1.0)
+    mime-types (1.25.1)
+    net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-sftp (2.1.1)
+    net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.5)
-    polyglot (0.3.3)
-    pony (1.4)
-      mail (> 2.0)
-    ptools (1.2.2)
-    radius (0.7.3)
+    net-ssh (2.8.0)
+    polyglot (0.3.4)
+    pony (1.8)
+      mail (>= 2.0)
+    ptools (1.2.4)
+    radius (0.7.4)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -41,7 +44,7 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.2)
-    treetop (1.4.12)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
 
@@ -50,4 +53,5 @@ PLATFORMS
 
 DEPENDENCIES
   depengine!
+  fakefs
   rspec (~> 2)

data/depengine.gemspec

@@ -16,16 +16,17 @@ Gem::Specification.new do |s|
    
   # See http://spin.atomicobject.com/2011/01/10/using-bundler-for-ruby-gem-development/
   s.add_dependency "json", "~> 1.4"
-  s.add_dependency "net-ssh"
-  s.add_dependency "net-sftp"
-  s.add_dependency "net-scp"
-  s.add_dependency "log4r"
-  s.add_dependency "pony"
-  s.add_dependency "ptools"
-  s.add_dependency "radius"
-  s.add_dependency "expect4r"
+  s.add_dependency "net-ssh", '~> 0'
+  s.add_dependency "net-sftp", '~> 0'
+  s.add_dependency "net-scp", '~> 0'
+  s.add_dependency "log4r", '~> 0'
+  s.add_dependency "pony", '~> 0'
+  s.add_dependency "ptools", '~> 0'
+  s.add_dependency "radius", '~> 0'
+  s.add_dependency "expect4r", '~> 0'
   
   s.add_development_dependency "rspec", "~> 2"
+  s.add_development_dependency "fakefs", '~> 0'
  
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/depengine/dsl/deployment.rb

@@ -69,7 +69,7 @@ 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[:deploy_home])
+        Helper.cleanup_workspace!($recipe_config[:deploy_home], $recipe_config[:cleanup_workspace_before])
       end
       # init workspace with default directorys
       Helper.init_workspace($recipe_config[:deploy_home])

data/lib/depengine/helper/hudson.rb

@@ -26,12 +26,18 @@ module Helper
   end
   module_function :parse_version
 
-  def cleanup_workspace!(workspace)
+  def cleanup_workspace!(workspace, sub_dirs)
     Helper.validates_presence_of workspace
 
     begin
-      FileUtils.rm_rf Dir.glob("#{workspace}/**/*")
-      $log.writer.debug "Cleaning Workspace #{workspace}"
+      unless sub_dirs.respond_to?(:each)
+        sub_dirs = ["**/*"]      
+      end
+      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!"
       $log.writer.error e.message

data/lib/depengine/version.rb

@@ -1,3 +1,3 @@
 module Depengine
-  VERSION = "0.0.27"
+  VERSION = "0.0.28"
 end

data/spec/cdb_spec.rb

@@ -2,12 +2,12 @@ require 'rubygems'
 require 'net/http'
 require 'json'
 require 'log4r'
-require 'lib/depengine/helper/validations'
-require 'lib/depengine/provider/cdb'
-require 'lib/depengine/log/log'
+require_relative '../lib/depengine/helper/validations'
+require_relative '../lib/depengine/provider/cdb'
+require_relative '../lib/depengine/log/log'
 
 $log       = Log::DeploymentLogger.new
-$log.level = Log4r::ERROR
+#$log.level = Log4r::ERROR
 
 describe "the cdb backend" do
   include Provider

data/spec/deployhelper_spec.rb

@@ -2,13 +2,13 @@ require 'rubygems'
 require 'json'
 require 'log4r'
 require 'fakefs/spec_helpers'
-require 'lib/depengine/helper/validations'
-require 'lib/depengine/helper/hudson'
-require 'lib/depengine/log/log'
+require_relative '../lib/depengine/helper/validations'
+require_relative '../lib/depengine/helper/hudson'
+require_relative '../lib/depengine/log/log'
 require 'fileutils'
 
 $log       = Log::DeploymentLogger.new
-$log.level = Log4r::ERROR
+#$log.level = Log4r::ERROR
 
 describe "helper functions" do
   include Helper

data/spec/dweb_spec.rb

@@ -2,12 +2,12 @@ require 'rubygems'
 require 'log4r'
 require 'net/ssh'
 require 'net/sftp'
-require 'lib/depengine/helper/validations'
-require 'lib/depengine/publisher/dweb'
-require 'lib/depengine/log/log'
+require_relative '../lib/depengine/helper/validations'
+require_relative '../lib/depengine/publisher/dweb'
+require_relative '../lib/depengine/log/log'
 
 $log            = Log::DeploymentLogger.new
-$log.level      = Log4r::ERROR
+#$log.level      = Log4r::ERROR
 $exec_file_path = __FILE__
 
 describe "the dweb publisher" do

data/spec/fileops_spec.rb

@@ -1,11 +1,11 @@
 require 'rubygems'
 require 'log4r'
 require 'fakefs/spec_helpers'
-require 'lib/depengine/processor/fileops'
-require 'lib/depengine/log/log'
+require_relative '../lib/depengine/processor/fileops'
+require_relative '../lib/depengine/log/log'
 
 $log       = Log::DeploymentLogger.new
-$log.level = Log4r::ERROR
+#$log.level = Log4r::ERROR
 
 describe "file operations" do
   include FakeFS::SpecHelpers

data/spec/log_spec.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'log4r'
-require 'lib/depengine/log/log'
+require_relative '../lib/depengine/log/log'
 require 'stringio'
 
 describe "logging" do

data/spec/logs/log_spec.log

@@ -1 +0,0 @@
- INFO Deployment: Logger is now setup

data/spec/mail_spec.rb

@@ -1,12 +1,12 @@
 require 'rubygems'
 require 'log4r'
 require 'pony'
-require 'lib/depengine/helper/validations'
-require 'lib/depengine/helper/mail'
-require 'lib/depengine/log/log'
+require_relative '../lib/depengine/helper/validations'
+require_relative '../lib/depengine/helper/mail'
+require_relative '../lib/depengine/log/log'
 
 $log       = Log::DeploymentLogger.new
-$log.level = Log4r::ERROR
+#$log.level = Log4r::ERROR
 
 describe "mail delivery" do
   it "should send an email via smtp" do

data/spec/properties_spec.rb

@@ -1,4 +1,4 @@
-require 'lib/depengine/processor/properties'
+require_relative '../lib/depengine/processor/properties'
 
 describe "the properties patcher" do
   it "should patch properties in a file by key/value)" do

data/spec/repository_spec.rb

@@ -6,11 +6,11 @@ require 'net/scp'
 require 'uri'
 require 'rexml/document'
 require 'log4r'
-require 'lib/depengine/provider/repository'
-require 'lib/depengine/log/log'
+require_relative '../lib/depengine/provider/repository'
+require_relative '../lib/depengine/log/log'
 
 $log       = Log::DeploymentLogger.new
-$log.level = Log4r::ERROR
+#$log.level = Log4r::ERROR
 
 describe "get from repository" do
   # Besser waere File.tmp_dir

data/spec/ssh_spec.rb

@@ -2,12 +2,12 @@ require 'rubygems'
 require 'net/ssh'
 require 'net/sftp'
 require 'log4r'
-require 'lib/depengine/helper/validations'
-require 'lib/depengine/publisher/ssh'
-require 'lib/depengine/log/log'
+require_relative '../lib/depengine/helper/validations'
+require_relative '../lib/depengine/publisher/ssh'
+require_relative '../lib/depengine/log/log'
 
 $log            = Log::DeploymentLogger.new
-$log.level      = Log4r::ERROR
+#$log.level      = Log4r::ERROR
 $exec_file_path = __FILE__
 
 describe "the ssh publisher" do

data/spec/template_spec.rb

@@ -1,13 +1,13 @@
 require 'rubygems'
-require 'ftools'
+require 'fileutils'
 require 'radius'
 require 'log4r'
-require 'lib/depengine/processor/tags'
-require 'lib/depengine/processor/template'
-require 'lib/depengine/log/log'
+require_relative '../lib/depengine/processor/tags'
+require_relative '../lib/depengine/processor/template'
+require_relative '../lib/depengine/log/log'
 
 $log       = Log::DeploymentLogger.new
-$log.level = Log4r::ERROR
+#$log.level = Log4r::ERROR
 
 describe "the templates mechanism" do
   it "should render a template from a string" do

data/spec/zip_spec.rb

@@ -1,10 +1,10 @@
 require 'rubygems'
 require 'log4r'
-require 'lib/depengine/processor/zip'
-require 'lib/depengine/log/log'
+require_relative '../lib/depengine/processor/zip'
+require_relative '../lib/depengine/log/log'
 
 $log       = Log::DeploymentLogger.new
-$log.level = Log4r::ERROR
+#$log.level = Log4r::ERROR
 
 describe "zip operations" do
   include Processor

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: depengine
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - Team Automatisierung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -28,112 +28,112 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pony
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ptools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: radius
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: expect4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simply generates Depengine text.
 email:
 - team-automatisierung@sinnerschrader.com