depengine 3.0.13 → 3.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e2c029e3eb7bd3346ecf335948c89a5c32887de
-  data.tar.gz: d816e6f7d3a987b5fc28a2b50c71b02da46b0691
+  metadata.gz: 9a134bda5edc62ec7717ac06c2aef9c71bbc2d2e
+  data.tar.gz: 0fd221facd7fd5ea5002ffbdff41b6269010017a
 SHA512:
-  metadata.gz: d04519c274f0eaa98ecbb8cff280bce4e00d6691201c13490e4f13b8f3a4fc7ed920187de3d5d7dcc9049aa969b257efeacc55918f2a6311dd601d7fccf47e59
-  data.tar.gz: a2d8b34ff09c1d4deeae8441fb6c0ac4d7386d63cca1d5e01f2d254642690aa62d571f9ca8e05e108e69168b4024b766061083fcb296e35f2db7ee3ac6bcd1de
+  metadata.gz: 733b1e3bf0234b75da148262cd2d91dc905f84ddaa0f468196724330215e8bf0b137263caa06367bdc1fcfcf0b078ed83a4dff32bfb11ea4bdf1562332747a67
+  data.tar.gz: bfda217511f8b553beed3e8a837afb34cf7a1f5ef696cae8fc5dfe0d6894395c29552eda19288852465ed9878152e0b8bbe5ab1ddb96fc27aa91f299155417e5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    depengine (3.0.12)
+    depengine (3.0.13)
       expect4r (~> 0.0)
       json (~> 1.4)
       log4r (~> 1.1)
@@ -15,6 +15,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    builder (3.2.2)
     diff-lcs (1.1.3)
     expect4r (0.0.10)
       highline (>= 1.5.0)
@@ -60,6 +61,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  builder (~> 3.2.0)
   depengine!
   fakefs (~> 0.5)
   rspec (~> 2)

data/bin/full_install

@@ -35,9 +35,10 @@ 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
+  if [ ! -f $rvm_path/scripts/rvm ]; then
+    echo "installing RVM..."
+    bash -s stable < <(curl -s -L "https://get.rvm.io")
+  fi
 
 source $rvm_path/scripts/rvm
 rvm reload

data/depengine.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", "~> 2"
   s.add_development_dependency "fakefs", '~> 0.5'
   s.add_development_dependency "sinatra", '~> 1.4'
+  s.add_development_dependency "builder", '~> 3.2.0'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/depengine/cli.rb

@@ -12,6 +12,11 @@ module Depengine
         args.options do |o|
           o.banner = "Usage: #{File.basename($0)} [options]"
           o.separator ""
+          o.on('-n', '--new [some_path]', 'create a new empty recipe directory structure') do |path|
+            require_relative('helper/cli_helper')
+            extend CLIHelper
+            setup_new_recipe(path ||= ".")
+          end
           o.on('-h', '--deployhome [DIRNAME]', 'Home of deployments.') do |dname|
             set :deploy_home, dname
           end

data/lib/depengine/helper/cli_helper.rb

@@ -0,0 +1,58 @@
+module CLIHelper
+
+  def setup_new_recipe(path)
+    puts "Setting up a new deployment recipe in #{File.expand_path(path)}"
+    require 'fileutils'
+    require 'yaml'
+    FileUtils.mkdir_p(File.expand_path(path))
+    FileUtils.cd(File.expand_path(path))
+    %w{cdb config recipe}.each {|d| FileUtils.mkdir_p d}
+    %w{DEV PROD}.each do |env|
+      FileUtils.mkdir_p "cdb/#{env}"
+      File.open("cdb/#{env}.yaml","w") {|f| f.write env_yaml("DEV")}
+      File.open("cdb/#{env}/demoapplication.yaml","w") {|f| f.write application_yaml}
+    end
+    FileUtils.touch("config/some_file_that_is_needed_for_the_deployment.jar")
+    File.open("recipe/deploy.rb","w") {|f| f.write deploy_recipe_template}
+    exit 0
+  end
+
+  def env_yaml(env)
+    { 'env' => env,
+      'projektname' => 'Demoproject',
+      'remote_user' => 'szzdep'
+    }.to_yaml
+  end
+
+  def application_yaml
+    { 'taskname' => 'A demo applicaition deployment',
+      'app_hosts' => ['appserv01', 'appserv02'],
+      'deploy_path' => '/some/path/to/deploy/to/',
+      'patch_properties' => {'test.message' => 'foo'}
+    }.to_yaml
+  end
+
+  def deploy_recipe_template
+    %{set :application_name,         "The Demo Application"
+# The module_name is used to select the correct file from cdb/$env/
+set :module_name,              "demoapplication"
+
+set :log_level,                "INFO"
+set :log_file,                 "deploy.log"
+set :log_file_level,           "DEBUG"
+
+Deployment.deliver do
+  config = get_all_config_parameters
+
+  config['app_hosts'].each do |host|
+    $log.writer.info "Copying .war to \#{host}..."
+    rsync("target/some_application.war", config['deploy_path'], :remote_host => host)
+    $log.writer.info "Restarting app servers..."
+    remote_execute("sudo /etc/init.d/appserver restart", :remote_host => host)
+  end
+  $log.writer.info "Done."
+end
+}
+  end
+
+end

data/lib/depengine/processor/properties.rb

@@ -50,8 +50,15 @@ module Processor
             if keyvalue[1].strip.empty?
               entry = entry.chomp + properties_hash[keyvalue[0].strip]
             else
-              entry = entry.sub(keyvalue[1].strip, \
-                                properties_hash[keyvalue[0].strip])
+              entry = keyvalue[0] + assigner + keyvalue[1].sub(keyvalue[1].strip, properties_hash[keyvalue[0].strip])
+
+              ### patch global variable
+              if not entry.nil? and entry.include?('<t:db_endpoint_1/>')
+                entry = entry.sub(/<t\:db_endpoint_1\/>/, properties_hash['db_endpoint_1'])
+              end
+              if not entry.nil? and entry.include?('<t:db_endpoint_2/>')
+                entry = entry.sub(/<t\:db_endpoint_2\/>/, properties_hash['db_endpoint_2'])
+              end
             end
           end
         end

data/lib/depengine/version.rb

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

data/spec/junit.rb

@@ -0,0 +1,90 @@
+=begin
+
+Copyright (c) 2012, Nathaniel Ritmeyer
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+3. Neither the name Nathaniel Ritmeyer nor the names of contributors to
+this software may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
+IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=end
+
+require 'time'
+require 'builder'
+require 'rspec/core/formatters/base_formatter'
+
+class JUnit < RSpec::Core::Formatters::BaseFormatter
+  def initialize output
+    super output
+    @test_results = []
+  end
+
+  def example_passed example
+    @test_results << example
+  end
+
+  def example_failed example
+    @test_results << example
+  end
+
+  def example_pending example
+    @test_results << example
+  end
+
+  def failure_details_for example
+    exception = example.metadata[:execution_result][:exception]
+    exception.nil? ? "" : "#{exception.message}\n#{format_backtrace(exception.backtrace, example).join("\n")}"
+  end
+
+  def full_name_for example
+    test_name = ""
+    current_example_group = example.metadata[:example_group]
+    until current_example_group.nil? do
+      test_name = "#{current_example_group[:description]}." + test_name
+      current_example_group = current_example_group[:example_group]
+    end
+    test_name << example.metadata[:description]
+  end
+
+  def dump_summary duration, example_count, failure_count, pending_count
+    builder = Builder::XmlMarkup.new :indent => 2
+    builder.instruct! :xml, :version => "1.0", :encoding => "UTF-8"
+    builder.testsuite :errors => 0, :failures => failure_count, :skipped => pending_count, :tests => example_count, :time => duration, :timestamp => Time.now.iso8601 do
+      builder.properties
+      @test_results.each do |test|
+        builder.testcase :classname => full_name_for(test), :name => test.metadata[:full_description], :time => test.metadata[:execution_result][:run_time] do
+          case test.metadata[:execution_result][:status]
+          when "failed"
+            builder.failure :message => "failed #{test.metadata[:full_description]}", :type => "failed" do
+              builder.cdata! failure_details_for test
+            end
+          when "pending" then builder.skipped
+          end
+        end
+      end
+    end
+    output.puts builder.target!
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: depengine
 version: !ruby/object:Gem::Version
-  version: 3.0.13
+  version: 3.0.14
 platform: ruby
 authors:
 - Team Automatisierung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -178,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 description: Simply generates Depengine text.
 email:
 - team-automatisierung@sinnerschrader.com
@@ -215,6 +229,7 @@ files:
 - lib/depengine/dsl/repository.rb
 - lib/depengine/dsl/template.rb
 - lib/depengine/dsl/zip.rb
+- lib/depengine/helper/cli_helper.rb
 - lib/depengine/helper/hudson.rb
 - lib/depengine/helper/mail.rb
 - lib/depengine/helper/properties.rb
@@ -252,6 +267,7 @@ files:
 - 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
@@ -302,6 +318,7 @@ test_files:
 - 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