brpm_content_framework 0.2.40 → 0.2.41

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmNhY2ZkODI3N2M1MDk4OTk3YTFlN2EzNzFlMGE3OGU1NjRmMDNiNw==
+    ZjRlMWMyZWNkZDMwMTQwNjE5MDUwMTExOTgzNGM0ODA0ODE3OWUxYQ==
   data.tar.gz: !binary |-
-    MTJlZGFhODljMTQyYjdiNzQxMjNlZjk0YzU4ODQ2MTM3NTcwMDRkOQ==
+    MTdhNTdmZGFmN2Q1OGY1NmZkM2RlNmJmYTQ3Yzg4Y2E0ODJkNWE4Yw==
 SHA512:
   metadata.gz: !binary |-
-    ODdhYjYwNDA2NzM5N2FkODUzMTQzODE5ZmFkMzA1YWMxZDdmNzllMTU3YTA4
-    ZjU2ZjVlNmJjNDg5YzU4YjM2YTc0NDkyODIyOTBiMWRmN2ZlNTQ4N2JjMDc2
-    OGEyMjliNTZiYTRkNjczNDY0NDY2ZmZiMDY3N2RhNGJkMDcwODk=
+    YmNhNmFiZjczMzRhNmUxNTRiNTU5M2FlYWQyOGE4YzIxYWRkNzA2N2QzMDUx
+    ZDU2NTZhMGYyNGIxMGNlNzM2NmMxNmI4YWU0MjA0Y2EyMzIwMjhhNGE3OGYw
+    ZTU4MGMxODQ1ZjZhYjhkNjE0YjUzY2VlZjdkZDRkODBmMzE2NDE=
   data.tar.gz: !binary |-
-    MzU2OTZjMjMxMDNjMjI3NmRmYWY4MzU3ZTlhYzg2MDU3MTg0OTFjMWM5NDRl
-    MjNkMTdlN2FhYWI5YWQ3NWQzNjkzYzhkMmFlYTEwYTM1MTliMjIzNDkzMTQz
-    ZWViZTM4MzA0ZmY3OGI4YzBhMmJmY2RlYWZlMTI1ZWFjMDAyZTM=
+    NjljM2U0MjA0MWMzMmRjMTUwNDBlMzIxOWMzOTE3OTI4ODhkMDlmNjY4MTk3
+    MmI5OTQ0ZDhmZjc0NWFlNTYzYzY5MDA1Y2E4ZGM0MmVmNjFhOWQ1NjRmNDA0
+    MWY5MjljN2IxZmJiYzUwM2U5MzgxMTJlZjJhYjI2MzgyYjQxYWY=

data/bin/build_docker_image

@@ -0,0 +1,55 @@
+#!/usr/bin/env ruby
+require "brpm_auto"
+
+if ARGV.size < 1
+  puts "Missing arguments."
+  puts "Usage: \n  build_docker_image <path to module>"
+  exit
+end
+
+begin
+  BrpmAuto.setup({ "log_file" => "/tmp/brpm_install.log", "also_log_to_console" => "true" })
+
+  module_path = File.expand_path(ARGV[0])
+
+  module_name = File.basename(module_path)
+  module_config = YAML.load_file("#{module_path}/config.yml")
+  module_version = module_config["version"]
+
+  BrpmAuto.log "Module #{module_name} #{module_version}"
+
+  if module_name == "brpm_content_framework"
+    dockerfile_path = File.expand_path("#{File.dirname(__FILE__)}/../docker/framework/Dockerfile")
+  else
+    dockerfile_path = File.expand_path("#{File.dirname(__FILE__)}/../docker/modules/Dockerfile")
+  end
+
+  dockerfile_content = File.read(dockerfile_path)
+  dockerfile_original_content = File.read(dockerfile_path)
+
+  unless module_name == "brpm_content_framework"
+    dockerfile_content.sub!(/(?<=ENV MODULE )(.*)/, module_name)
+  end
+  dockerfile_content.sub!(/(?<=ENV VERSION )(.*)/, module_version)
+
+  File.open(dockerfile_path, "w") do |file|
+    file << dockerfile_content
+  end
+
+  BrpmAuto.log ""
+  BrpmAuto.log ">>> Building docker image bmcrlm/#{module_name}:#{module_version}..."
+  _, stderr, _, status = BrpmAuto.execute_command("docker build -t bmcrlm/#{module_name}:#{module_version} #{File.dirname(dockerfile_path)}") do |stdout_err|
+    BrpmAuto.log "    #{stdout_err.chomp}"
+  end
+  raise "The process failed with status #{status.exitstatus}.\n#{stderr}" unless status.success?
+
+  File.open(dockerfile_path, "w") do |file|
+    file << dockerfile_original_content
+  end
+
+rescue Exception => e
+  BrpmAuto.log_error "#{e}"
+  BrpmAuto.log "\n\t" + e.backtrace.join("\n\t")
+
+  raise e
+end

data/bin/publish_docker_image

@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby
+require "brpm_auto"
+
+if ARGV.size < 1
+  puts "Missing arguments."
+  puts "Usage: \n  publish_docker_image <path to module>"
+  exit
+end
+
+begin
+  BrpmAuto.setup({ "log_file" => "/tmp/brpm_install.log", "also_log_to_console" => "true" })
+
+  module_path = File.expand_path(ARGV[0])
+
+  module_name = File.basename(module_path)
+  module_config = YAML.load_file("#{module_path}/config.yml")
+  module_version = module_config["version"]
+
+  BrpmAuto.log "Module #{module_name} #{module_version}"
+
+  if module_name == "brpm_content_framework"
+    dockerfile_path = File.expand_path("#{File.dirname(__FILE__)}/../docker/framework/Dockerfile")
+  else
+    dockerfile_path = File.expand_path("#{File.dirname(__FILE__)}/../docker/modules/Dockerfile")
+  end
+
+  dockerfile_content = File.read(dockerfile_path)
+  dockerfile_original_content = File.read(dockerfile_path)
+
+  unless module_name == "brpm_content_framework"
+    dockerfile_content.sub!(/(?<=ENV MODULE )(.*)/, module_name)
+  end
+  dockerfile_content.sub!(/(?<=ENV VERSION )(.*)/, module_version)
+
+  File.open(dockerfile_path, "w") do |file|
+    file << dockerfile_content
+  end
+
+  BrpmAuto.log ""
+  BrpmAuto.log ">>> Building docker image bmcrlm/#{module_name}:#{module_version}..."
+  _, stderr, _, status = BrpmAuto.execute_command("docker build -t bmcrlm/#{module_name}:#{module_version} #{File.dirname(dockerfile_path)}") do |stdout_err|
+    BrpmAuto.log "    #{stdout_err.chomp}"
+  end
+  raise "The process failed with status #{status.exitstatus}.\n#{stderr}" unless status.success?
+
+  File.open(dockerfile_path, "w") do |file|
+    file << dockerfile_original_content
+  end
+
+  BrpmAuto.log ""
+  BrpmAuto.log ">>> Publishing docker image bmcrlm/#{module_name}:#{module_version} to the docker hub..."
+  _, stderr, _, status = BrpmAuto.execute_command("docker push bmcrlm/#{module_name}:#{module_version}") do |stdout_err|
+    BrpmAuto.log "    #{stdout_err.chomp}"
+  end
+  raise "The process failed with status #{status.exitstatus}.\n#{stderr}" unless status.success?
+
+  if module_name == "brpm_content_framework"
+    BrpmAuto.log ""
+    BrpmAuto.log ">>> Tagging docker image bmcrlm/#{module_name}:#{module_version} as bmcrlm/#{module_name}:latest..."
+    _, stderr, _, status = BrpmAuto.execute_command("docker tag -f bmcrlm/#{module_name}:#{module_version} bmcrlm/#{module_name}:latest") do |stdout_err|
+      BrpmAuto.log "    #{stdout_err.chomp}"
+    end
+    raise "The process failed with status #{status.exitstatus}.\n#{stderr}" unless status.success?
+    _, stderr, _, status = BrpmAuto.execute_command("docker push bmcrlm/#{module_name}:latest") do |stdout_err|
+      BrpmAuto.log "    #{stdout_err.chomp}"
+    end
+    raise "The process failed with status #{status.exitstatus}.\n#{stderr}" unless status.success?
+  end
+
+rescue Exception => e
+  BrpmAuto.log_error "#{e}"
+  BrpmAuto.log "\n\t" + e.backtrace.join("\n\t")
+
+  raise e
+end

data/config.yml

@@ -1,4 +1,4 @@
-version: 0.2.40
+version: 0.2.41
 author: Niek Bartholomeus
 email: niek.bartholomeus@gmail.com
 homepage: https://github.com/BMC-RLM/brpm_content_framework

data/docker/{Dockerfile → framework/Dockerfile}

@@ -1,11 +1,11 @@
 FROM atlashealth/ruby:1.9.3
 MAINTAINER Niek Bartholomeus <niek.bartholomeus@gmail.com>
 
-ENV BRPM_CONTENT_FRAMEWORK_VERSION 1.0.0
 ENV GEM_HOME /usr/lib/ruby/gems/1.9.1
+ENV VERSION 1.0.0
 
-RUN gem install brpm_content_framework -v $BRPM_CONTENT_FRAMEWORK_VERSION && \
-    cd $GEM_HOME/gems/brpm_content_framework-$BRPM_CONTENT_FRAMEWORK_VERSION && \
+RUN gem install brpm_content_framework -v $VERSION && \
+    cd $GEM_HOME/gems/brpm_content_framework-$VERSION && \
     bundle install && \
     rm -rf $GEM_HOME/cache
 

data/docker/modules/Dockerfile

@@ -0,0 +1,10 @@
+FROM bmcrlm/brpm_content_framework
+MAINTAINER Niek Bartholomeus <niek.bartholomeus@gmail.com>
+
+ENV MODULE module
+ENV VERSION 1.0.0
+
+RUN gem install $MODULE -v $VERSION && \
+    cd $GEM_HOME/gems/$MODULE-$VERSION && \
+    bundle install && \
+    rm -rf $GEM_HOME/cache

data/lib/brpm_script_executor.rb

@@ -73,13 +73,8 @@ class BrpmScriptExecutor
             command += " \"#{max_records}\"" if max_records
           end
 
-          _, stderr, _, status = BrpmAuto.execute_command(command) do |stdout_err|
-            BrpmAuto.log "  stdout:#{stdout_err.chomp}"
-          end
-
         else
-          env_vars = {}
-          env_vars["GEM_HOME"] = ENV["BRPM_CONTENT_HOME"] || "#{ENV["BRPM_HOME"]}/modules"
+          env_var_gem_home = "export GEM_HOME=#{ENV["BRPM_CONTENT_HOME"] || "#{ENV["BRPM_HOME"]}/modules"} && "
 
           module_path = get_module_gem_path(modul, module_version)
 
@@ -92,24 +87,33 @@ class BrpmScriptExecutor
           gemfile_path = "#{module_path}/Gemfile"
           if File.exists?(gemfile_path)
             BrpmAuto.log "Using Gemfile #{gemfile_path}."
-            env_vars["BUNDLE_GEMFILE"] = gemfile_path
+            env_var_bundler = "export BUNDLE_GEMFILE=#{gemfile_path} && "
             require_bundler = "require 'bundler/setup';"
           else
             BrpmAuto.log("This module doesn't have a Gemfile.")
+            env_var_bundler = ""
             require_bundler = ""
           end
 
           BrpmAuto.log "Executing the script in a separate process..."
-          _, stderr, _, status = Bundler.with_clean_env do
-            BrpmAuto.execute_command(env_vars, "ruby", "-e", "#{require_bundler};require \"brpm_script_executor\";BrpmScriptExecutor.execute_automation_script_from_other_process(\"#{modul}\", \"#{name}\", \"#{params_path}\", \"#{automation_type}\", \"#{parent_id}\", \"#{offset}\", \"#{max_records}\")") do |stdout_err|
-              BrpmAuto.log "  stdout:#{stdout_err.chomp}"
-            end
-          end
+          ruby_command = <<EOR
+#{require_bundler}
+require \\"brpm_script_executor\\"
+BrpmScriptExecutor.execute_automation_script_from_other_process(\\"#{modul}\\", \\"#{name}\\", \\"#{params_path}\\", \\"#{automation_type}\\", \\"#{parent_id}\\", \\"#{offset}\\", \\"#{max_records}\\")
+EOR
+          command = "#{env_var_gem_home}#{env_var_bundler}ruby -e \"#{ruby_command}\""
+        end
+
+        result = Bundler.with_clean_env do
+          BrpmAuto.execute_shell(command)
         end
 
         FileUtils.rm(params_path) if File.exists?(params_path)
 
-        raise "The process failed with status #{status.exitstatus}.\n#{stderr}" unless status.success?
+        unless result["status"] == 0
+          BrpmAuto.log "stdout:#{result["stdout"]}"
+          raise "The process failed with status #{result["status"]}.\n#{result["stderr"]}"
+        end
 
         BrpmAuto.log "The process finished succesfully."
 

data/lib/utilities.rb

@@ -318,6 +318,14 @@ module Utilities
     end
   end
 
+  def replace_in_file(file_path, pattern, replacement)
+    file_content = File.read(file_path)
+
+    File.open(file_path, "w") do |file|
+      file << file_content.gsub(pattern, replacement)
+    end
+  end
+
   private
 
     #TODO: still needed? the framework's error handling should take care of this already

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brpm_content_framework
 version: !ruby/object:Gem::Version
-  version: 0.2.40
+  version: 0.2.41
 platform: ruby
 authors:
 - Niek Bartholomeus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -157,7 +157,9 @@ email: niek.bartholomeus@gmail.com
 executables:
 - brpm_install
 - brpm_uninstall
+- build_docker_image
 - event_handler
+- publish_docker_image
 - webhook_receiver
 extensions: []
 extra_rdoc_files: []
@@ -176,11 +178,14 @@ files:
 - automations/install_module.rb
 - bin/brpm_install
 - bin/brpm_uninstall
+- bin/build_docker_image
 - bin/event_handler
+- bin/publish_docker_image
 - bin/webhook_receiver
 - config.yml
-- docker/Dockerfile
-- docker/docker_execute_automation
+- docker/framework/Dockerfile
+- docker/framework/docker_execute_automation
+- docker/modules/Dockerfile
 - infrastructure/.bashrc
 - infrastructure/.brpm
 - infrastructure/config/customer_include.rb
@@ -204,7 +209,6 @@ files:
 - infrastructure/scripts/install_brpm.sh
 - infrastructure/scripts/maintenance.sh
 - infrastructure/scripts/patch_brpm.sh
-- infrastructure/scripts/publish_module_version.sh
 - infrastructure/scripts/restore_database.sh
 - infrastructure/scripts/run_event_handler.cmd
 - infrastructure/scripts/run_event_handler.sh

data/infrastructure/scripts/publish_module_version.sh

@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-USAGE="publish_module_version.sh <module name>"
-
-MODULE_NAME=$1
-
-if [ -z "$MODULE_NAME" ]; then
-    echo "Module name is not specified. Aborting."
-    echo "Usage: $USAGE"
-    exit 1
-fi
-
-cd $(dirname $0)/../../../$MODULE_NAME
-
-echo ""
-echo ">>> Publishing module $MODULE_NAME as a gem to rubygems.org..."
-rake release
-if [ -f "docker/Dockerfile" ]; then
-    MODULE_VERSION=$(eval "sed -n \"s=version: \(.*\)=\1=p\" config.yml")
-
-    cd docker
-
-    if [[ "$MODULE_NAME" == brpm_content_framework ]]; then
-      OLD_MODULE_VERSION=$(eval "sed -n \"s=ENV BRPM_CONTENT_FRAMEWORK_VERSION \(.*\)=\1=p\" Dockerfile")
-    else
-      OLD_MODULE_VERSION=$(eval "sed -n \"s=ENV VERSION \(.*\)=\1=p\" Dockerfile")
-    fi
-    sed -i "" s/$OLD_MODULE_VERSION/$MODULE_VERSION/ Dockerfile
-
-    echo ""
-    echo ">>> Building docker image bmcrlm/$MODULE_NAME:$MODULE_VERSION..."
-    docker build -t bmcrlm/$MODULE_NAME:$MODULE_VERSION . || { echo 'Aborting' ; exit 1; }
-
-    sed -i "" s/$MODULE_VERSION/$OLD_MODULE_VERSION/ Dockerfile
-
-    echo ""
-    echo ">>> Publishing docker image bmcrlm/$MODULE_NAME:$MODULE_VERSION to the docker hub..."
-    docker push bmcrlm/$MODULE_NAME:$MODULE_VERSION || { echo 'Aborting' ; exit 1; }
-
-    if [[ "$MODULE_NAME" == brpm_content_framework ]]; then
-        echo ""
-        echo ">>> Tagging bmcrlm/$MODULE_NAME:$MODULE_VERSION as bmcrlm/$MODULE_NAME:latest..."
-        docker tag -f bmcrlm/$MODULE_NAME:$MODULE_VERSION bmcrlm/$MODULE_NAME:latest || { echo 'Aborting' ; exit 1; }
-        docker push bmcrlm/$MODULE_NAME:latest || { echo 'Aborting' ; exit 1; }
-    fi
-fi