depengine 3.0.19 → 3.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0335b4baa151afe9e99277c7b6768d2056fb914
-  data.tar.gz: 474947ac8778ee612404341afefc026533a11e3d
+  metadata.gz: 80a1e552180801be141930fb42d7ccf0b298ebde
+  data.tar.gz: 96d44887c4a629e516b268d7aa03ef496da0c7bc
 SHA512:
-  metadata.gz: c03a1a4de62c95267685aaa98cba364e3234771f6bc390fe24f3d5005bc0233039528324396a9738f606932651bd4fe20e590a0578f2b690c9d2ee17dfbb7de7
-  data.tar.gz: f51e87ed96162c462eddec28926355db3c5970dea03a48760885e898d35db5e7c9d9c7472735fbc75c611ac10009ad1dd13560083e1412a651bcbc9062081fa8
+  metadata.gz: 34787500598a6ab6d89c942ed198d1c1c68e4574138c01f6764eaa50447ee1e7cf3f38d5db5402bf38067e8c8f5fa56a479c82cbdd2a98026c86237f9c15e1d4
+  data.tar.gz: 1099a7b739b491455d94756f0727010528eb7080975ada5aa499ff5bef30157e012cf2e9252ff13f85bcfbbbcab51e6f21525469d11145d45785990de36f446c

data/lib/depengine/dsl/helper.rb

@@ -80,11 +80,33 @@ module Deployment
           :from => options[:deploy_email_from] || @cdb['deploy_email_from'],
           :to => options[:deploy_email_to] || @cdb['deploy_email_to'],
           :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]}"
+          :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#{options[:message]}"
         }
         sendmail(mail_options)
       end
 
+      # Sends an email with git commit history to report a deployment to a given recepiant.
+      #
+      # Parameters:
+      # * +:r2+ - Include commits that are reachable from r2
+      # * +:r1+ - but exclude those that are reachable from r1.
+      # * +options+ - a hash with needed configuration options for the email. All parameters are optional.
+      #   * +:git_dir+ - Directory from which the git repo can be reached (the one containing .git or any of its children).
+      #   * +:application_name+ - which application has been deployed
+      #   * +:module_name+ - which module of the application has been deployed
+      #   * +:status+ - the resulting status of the deployment
+      #   * +:message+ - a additional message to send in the mail, commonly used to specify any non positive status.
+      #   * +:deploy_email_from+ - the senders address
+      #   * +:deploy_email_to+ - the recipiants address
+      # Please see `GITREVISIONS(7)` for more info on how to specify a revision range.
+      def report_by_mail_with_git_history(r1='', r2='', options={})
+        git = Provider::Git.new
+        git.repository_local_dir = options[:git_dir] || '.'
+        options[:message] = (options[:message] || '') + git.history(r1, r2).to_s
+
+        report_by_mail(options)
+      end
+
       # Deploys a tomcat based application to a set of app servers. <br>
       # The tomcats are restarted in this process.
       #

data/lib/depengine/provider/git.rb

@@ -104,6 +104,21 @@ module Provider
         end
       end
     end
+
+    # Gets the git commit history of a local git repository.
+    #
+    # Parameters:
+    # * +:r2+ - Include commits that are reachable from r2
+    # * +:r1+ - but exclude those that are reachable from r1.
+    # Please see `GITREVISIONS(7)` for more info on how to specify a revision range.
+    def history(r1='',r2='HEAD')
+      rev_range = r1.empty? ? '' : "#{r1}..#{r2}"
+
+      Dir.chdir(@repository_local_dir) do
+        Processor.local_execute(["git log --oneline #{rev_range}"])
+      end
+    end
+
   end
 end
 

data/lib/depengine/version.rb

@@ -1,3 +1,3 @@
 module Depengine
-  VERSION = "3.0.19"
+  VERSION = "3.0.20"
 end

data/spec/git_spec.rb

@@ -0,0 +1,31 @@
+require_relative '../lib/depengine/provider/git'
+require_relative '../lib/depengine/processor/local_execute'
+
+describe '#history' do
+
+  let(:git) { g = Provider::Git.new; g.repository_local_dir = '.'; g }
+
+  context 'no parameters given' do
+    it 'falls back to all history' do
+      expect(Processor).to receive(:local_execute).once.with(['git log --oneline ']).and_return('ok')
+      git.history()
+    end
+  end
+
+  context 'one revision given' do
+    it 'falls back to history between HEAD and given revision' do
+      r1 = '4223abc'
+      expect(Processor).to receive(:local_execute).once.with(['git log --oneline 4223abc..HEAD']).and_return('ok')
+      git.history(r1)
+    end
+  end
+
+  context 'two revisions given' do
+    it 'uses both to get commits betweem them' do
+      r1, r2 = '4223abc', 'caffe42'
+      expect(Processor).to receive(:local_execute).once.with(['git log --oneline 4223abc..caffe42']).and_return('ok')
+      git.history(r1,r2)
+    end
+  end
+
+end

data/spec/helper_spec.rb

@@ -145,4 +145,25 @@ describe "the report_by_mail method" do
     worker.report_by_mail(h)
   end
 
+  describe '#report_by_mail_with_git_history' do
+    it 'does include the git history in the message object' 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"
+      }
+      git_history = "825dc42 foo improved\ne626123 bar renamed\n"
+      allow(Processor).to receive(:local_execute).and_return(git_history)
+      expect(worker).to receive(:report_by_mail).once.with(
+        h.merge({:message => h[:message]+git_history})
+      )
+      worker.report_by_mail_with_git_history('', '', h)
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: depengine
 version: !ruby/object:Gem::Version
-  version: 3.0.19
+  version: 3.0.20
 platform: ruby
 authors:
 - Team Automatisierung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -267,6 +267,7 @@ files:
 - spec/demo_recipe/recipes/demo.rb
 - spec/deployhelper_spec.rb
 - spec/fileops_spec.rb
+- spec/git_spec.rb
 - spec/helper_spec.rb
 - spec/junit.rb
 - spec/local_execute.rb