depengine 3.0.14 → 3.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a134bda5edc62ec7717ac06c2aef9c71bbc2d2e
-  data.tar.gz: 0fd221facd7fd5ea5002ffbdff41b6269010017a
+  metadata.gz: 7856cb152ad82d60305dcf388ed32a9c716554a5
+  data.tar.gz: f9a1bfd52156af54a3bd2f992dcc093a662baac6
 SHA512:
-  metadata.gz: 733b1e3bf0234b75da148262cd2d91dc905f84ddaa0f468196724330215e8bf0b137263caa06367bdc1fcfcf0b078ed83a4dff32bfb11ea4bdf1562332747a67
-  data.tar.gz: bfda217511f8b553beed3e8a837afb34cf7a1f5ef696cae8fc5dfe0d6894395c29552eda19288852465ed9878152e0b8bbe5ab1ddb96fc27aa91f299155417e5
+  metadata.gz: 36a81c87f987d2cf4464c4ec067d376aeeb75f08081b38f104cb92988afc8413d39cf4e51f78a1c59b96c2d9ee33ea2389ada8113fd21025f4240ece6ebf5e76
+  data.tar.gz: 3620ec7a1c7ef81884a0d3b92244111898a3e820519c40e6396a31b5272ea7ee0d686761c20c1b95fc35978dd8620bc4c6b8c1b9679c36c2349d2cf66c5e3dd0

data/Gemfile.lock

@@ -16,7 +16,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     builder (3.2.2)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.5)
     expect4r (0.0.10)
       highline (>= 1.5.0)
     fakefs (0.5.2)
@@ -40,14 +40,14 @@ GEM
     rack-protection (1.5.3)
       rack
     radius (0.7.4)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -64,5 +64,5 @@ DEPENDENCIES
   builder (~> 3.2.0)
   depengine!
   fakefs (~> 0.5)
-  rspec (~> 2)
+  rspec (~> 2.14)
   sinatra (~> 1.4)

data/depengine.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency "radius", '~> 0.7'
   s.add_dependency "expect4r", '~> 0.0'
 
-  s.add_development_dependency "rspec", "~> 2"
+  s.add_development_dependency "rspec", "~> 2.14"
   s.add_development_dependency "fakefs", '~> 0.5'
   s.add_development_dependency "sinatra", '~> 1.4'
   s.add_development_dependency "builder", '~> 3.2.0'

data/lib/depengine/dsl/helper.rb

@@ -72,17 +72,15 @@ module Deployment
       #   * +:deploy_email_from+ - the senders address
       #   * +:deploy_email_to+ - the recipiants address
       def report_by_mail(options={})
-        application_name  = options[:application_name] ||  $recipe_config[:application_name] || @cdb['application_name']
-        module_name  = options[:module_name] ||  $recipe_config[:module_name] || @cdb['module_name']
-
-        status = options[:status] || "done"
-        message = options[:message] || ""
+        options = @cdb.merge($recipe_config).merge(options)
+        options[:status] ||= 'success'
+        options[:message] ||= ''
 
         mail_options = {
           :from => options[:deploy_email_from] || @cdb['deploy_email_from'],
           :to => options[:deploy_email_to] || @cdb['deploy_email_to'],
-          :subject => "DeploymentReport: #{module_name} #{$recipe_config['ENV']} #{application_name} #{status}",
-          :body => "Module: #{module_name}\nEnvironment:  #{$recipe_config['ENV']}\nJob: #{application_name}\nVersion: #{@version.to_json}\n#{status}.\n\n#{message}"
+          :subject => "#{options[:env]} #{options[:job_name]} #{options[:module_name]} #{options[:application_name]} #{options[:version]} #{options[:status]}",
+          :body => "Env: #{options[:env]}\nJob: #{options[:job_name]}\nModule: #{options[:module_name]}\nApplication: #{options[:application_name]}\nVersion: #{options[:version].to_json}\n#{options[:status]}.\n\n---\nx#{options[:message]}"
         }
         sendmail(mail_options)
       end

data/lib/depengine/version.rb

@@ -1,3 +1,3 @@
 module Depengine
-  VERSION = "3.0.14"
+  VERSION = "3.0.15"
 end

data/spec/helper_spec.rb

@@ -124,4 +124,25 @@ describe "the report_by_mail method" do
     expect {worker.report_by_mail(h)}.to_not raise_error
   end
 
+  it "does set a subject" do
+    worker = Deployment::Worker.new
+    h = {
+      :application_name => "testapplication",
+      :module_name => "testmodule",
+      :job_name => "testjob",
+      :status => "SUCCESS",
+      :message => "i dont know what could possibly go wrong",
+      :deploy_email_from => "#{ENV['USER']}@localhost",
+      :deploy_email_to   => "#{ENV['USER']}@localhost"
+    }
+    expect(worker).to receive(:sendmail).once.with(
+      {:to => h[:deploy_email_to],
+       :from => h[:deploy_email_from],
+       :subject => "TEST testjob testmodule testapplication 42.23.0 SUCCESS",
+       :body => kind_of(String)
+     }
+    )
+    worker.report_by_mail(h)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: depengine
 version: !ruby/object:Gem::Version
-  version: 3.0.14
+  version: 3.0.15
 platform: ruby
 authors:
 - Team Automatisierung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -205,7 +205,6 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - Gemfile.lock
-- README.md
 - Rakefile
 - bin/cdb_crypt
 - bin/de
@@ -309,31 +308,4 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Depengine generator
-test_files:
-- spec/cdb_spec.rb
-- spec/demo_recipe/bin/.gitkeep
-- spec/demo_recipe/cdb/.gitkeep
-- spec/demo_recipe/config/config.properties
-- spec/demo_recipe/recipes/demo.rb
-- spec/deployhelper_spec.rb
-- spec/fileops_spec.rb
-- spec/helper_spec.rb
-- spec/junit.rb
-- spec/log_spec.rb
-- spec/properties/source/config.properties
-- spec/properties/source/random.rb
-- spec/properties/target/.gitkeep
-- spec/properties_spec.rb
-- spec/recipe_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
+test_files: []

data/README.md

@@ -1,58 +0,0 @@
-# the S2 deployment-engine
-
-## Buidling the gem
-`gem build depengine.gemspec`
-
-## Usage
-  1. rvm use 2.1.1
-  2. bundle install
-  3. bundle exec depengine
-
-
-## Running specs
-
-To run the specs, your machine needs to fulfill some requirements:
-
-  * **mail_spec.rb**: be able to send and receive mails on localhost (e.g. install postfix on linux and set it to "local only")
-  * **repository_spec.rb**: be able to SSH into your own machine via public_key_auth (e.g. putting your .ssh/id_rsa_pub in your .ssh/authorized_keys)
-  * **zip_spec.rb**: have a unzip programm installed (e.g. apt-get install zip)
-
-There is a somewhat simplistic script to get a suitable environment up and running. Have a look at *bin/spec_setup*.
-
-`rspec`
-
-## Documentation
-
-To see a list of all currently supported methods in the DSL, run `rake doc` and browse to: doc/table_of_contents.html#methods
-
-## Example recipe
-
-```
-set :application_name,         "testapp"
-set :module_name,              "testmodule"
-
-set :cleanup_workspace_before, ["source", "tmp"]
-
-set :log_level,                "INFO"
-set :log_file,                 "deploy.log"
-set :log_file_level,           "DEBUG"
-
-Deployment.deliver do
-
-  config = get_all_config_parameters
-  $log.writer.info "Got config parameters from cdb"
-
-  $log.writer.info "date_unique: #{date_unique}"
-
-  config['test_app_hosts'].each do |test_app_host|
-    $log.writer.info "doing something on #{test_app_host}"
-    rsync("target/", "/srv/testapp/")
-    remote_execute("export JAVA_HOME=/opt/java7; cd /srv/testapp/project_#{config['env'].downcase}/current/; . ./setantenv.sh; ant;", :remote_host => test_app_host)
-  end
-
-  report_by_mail
-  $log.writer.info "Sent mail to deployment team #{config['deploy_email_to']}"
-
-  $log.writer.info "Deployment done!"
-end
-```