depengine 3.0.11 → 3.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 699d0a17010d5fa884d2f5b49b56647a4c31eaa0
-  data.tar.gz: e1554472b1b379b8c556ed600cc26e95abb34b2b
+  metadata.gz: 65323cd0cb0e566052549a932ebf9648b5e9cdff
+  data.tar.gz: e332c30d4454cf4894058dc3b1fc4f1f6c123697
 SHA512:
-  metadata.gz: 0a0ec9e982df1c7b7c15b873e226acb884b23e754354661c166778b6adb815cc95ab02878c3b76570efb28873855314a5b73506cbcfde794f79e37350afad836
-  data.tar.gz: 9d536acdaf7a4c80d8a96ff855a86ff3b60063463944b1938c859412270618d456b4f46ddd7361db4032e3c159ded0e024fe80185264cc2dbf84d2f99e76ec83
+  metadata.gz: dd0b8f3e5b915c513c177eaceaaa4cba2a85db0f808a3ced5ed1322f156062b21c44a04ebea896f2c77dc83bb5749c1cd0baa077ff733e8f3dc0b08587f3dd01
+  data.tar.gz: e0832ffbb1bf5d715b9041b09dc3bd28ade749b7f7366384d5aa10f007147ce74b8fa88bf790e035199ca06b7790af37d37a28ffc1d150613e137246ef3f1396

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    depengine (3.0.9)
+    depengine (3.0.11)
       expect4r (~> 0.0)
       json (~> 1.4)
       log4r (~> 1.1)

data/lib/depengine/dsl/template.rb

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

data/lib/depengine/processor/template.rb

@@ -81,7 +81,7 @@ module Processor
         template_content = ""
         result           = ""
         if File.file? template
-          $log.writer.debug "tempalte #{template} seems to be a file, reading it..."
+          $log.writer.debug "template #{template} seems to be a file, reading it..."
           File.open(template, "rb") do |f|
             c = ""
             f.ungetc c unless (c = f.getc)=="\uFEFF" # remove BOM, if present

data/lib/depengine/publisher/ssh.rb

@@ -59,7 +59,8 @@ module Publisher
 
     def remove_old_releases(path, num_of_releases_to_keep, release_name_shema)
       releases = remote_execute("ls #{path}").split("\n").find_all {|dir| dir =~ release_name_shema}.sort
-      releases_to_delete = releases.take releases.size-num_of_releases_to_keep
+      num_to_remove = releases.size-num_of_releases_to_keep
+      releases_to_delete = releases.take(num_to_remove < 0 ? 0 : num_to_remove)
       releases_to_delete.each do |dir|
         $log.writer.debug "removing #{path}/#{dir}"
         remote_execute("rm -rf #{path}/#{dir}")

data/lib/depengine/version.rb

@@ -1,3 +1,3 @@
 module Depengine
-  VERSION = "3.0.11"
+  VERSION = "3.0.12"
 end

data/spec/ssh_spec.rb

@@ -51,5 +51,25 @@ describe "the ssh publisher" do
     end
   end
 
-end
+  context "when no previous release" do
+    it "does not remove anything" do
+      tmp_dir = Dir.mktmpdir
+      begin
+        worker = Publisher::Ssh.new
+        worker.remote_host  = 'localhost'
+        worker.remote_user  = ENV['USER']
+        worker.ssh_key_file = ENV['HOME']+"/.ssh/id_rsa"
+
+        newest_release = Time.now.strftime("%Y-%m-%d_%s")
+        FileUtils.mkdir_p(File.join(tmp_dir, newest_release))
 
+        worker.remove_old_releases(tmp_dir, 2, /[0-9]{4}\-[0-9]{2}\-[0-9]{2}_[0-9]+.*/)
+        Dir.glob(tmp_dir+"/*").size.should be 1
+        Dir.glob(tmp_dir+"/*").first.should include(newest_release)
+
+      ensure
+        FileUtils.remove_entry tmp_dir
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: depengine
 version: !ruby/object:Gem::Version
-  version: 3.0.11
+  version: 3.0.12
 platform: ruby
 authors:
 - Team Automatisierung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json