brpm_content 0.1.36 → 0.1.37

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjAzMTJkNWM2YjUwNjA1ZGU2ZDg3YWE2OWFlYzUwMGFkYjAzYTQ1Zg==
+    YTBkYWIzNTNiYWUyYjUxMTg2YzgxYmY0ZjgwZTQyZWVmYjZmY2M4ZA==
   data.tar.gz: !binary |-
-    YWMwNDI2ZWI2Mzg4NjdlNDQxZTQ2MDQxZGY1ODNlMTdjNTI3OWI3NA==
+    OGNmYThiOGIwYzM0NWI0ZGM5MTkyYjg4YWE1YjIwYjc2OWQ1MTFjYw==
 SHA512:
   metadata.gz: !binary |-
-    MjNhMjJmMWE3MTZkYTcxZjI3YmQyMzdhMzAxZDlhZDc5OTY0MWUzZDA4ZmUx
-    ZDg5Mjk3ZDc0NzNmNGVjY2VkNzliYTM3MWUyMjEyMzUxZDUyMDgyYzYzOTUx
-    NTE4ZGQxMzY1NmFiODE3ZGM4YzNjNTBmY2YyMzRiOGUwMjA0OTQ=
+    MzlmOTYyOWRkNmQ2YTg3ZmJkOTMzYzk1MjllNmJiZmY2MDYwNTE2ZjJhNzQ5
+    OWUyYmU4NzEyY2EwNGJlMDllNmEwNDY3ZTUwMTUyY2ZmYjkyYzM2ZDQzZWJj
+    MmQ1ZDAyOTA3MGM3NzMyYjBiYjBkNzdkMjVmMGVlMWI1NmQ1YmY=
   data.tar.gz: !binary |-
-    ODBiMTgxMTQ2M2FmZmE2OTM5NDBmNDRiZGUzNDU2OGQ2MzhiOWY3YWY4ODVh
-    ZWI3NWFkNjNmYzg0ZGY3MGRmYjM1YzQ0YWNlODM3ODBlYTQwYWY3OWI2MzBk
-    NjM2ZDcwOWUwZmQ0YzU1ZTZiMDhmOWIyNWI3NDY0Mjg1NzU4ZDk=
+    MDIwODY0NDg5ODI4MWQ2ZDYxNTY3MTQ2Yjg2NzJmNzYzZTBiYjJlZmFiNjE2
+    MmQ0ZmRiNGU3YWI0OTg0NDMxNjI4M2VhNDk4YTBiNzVkMjUwODNjNmU3NWQ0
+    OGEyYTkzYjNjYzlkMjJlYjllMTQ5ZDM3NDNkNjhjN2Q5MDEwYjE=

data/modules/framework/brpm_auto.rb

@@ -218,6 +218,18 @@ class BrpmAuto
       @integration_settings = IntegrationSettings.new(dns, username, password, details)
     end
 
+    def get_gems_root_path
+      if ENV["BRPM_CONTENT_HOME"]
+        ENV["BRPM_CONTENT_HOME"] # gemset location is overridden
+      elsif ENV["BRPM_HOME"]
+        "#{ENV["BRPM_HOME"]}/modules" # default gemset location when BRPM is installed
+      elsif ENV["GEM_HOME"]
+        ENV["GEM_HOME"] # default gemset location when BRPM is not installed
+      else
+        raise "Unable to find out the gems root path."
+      end
+    end
+
     private
 
     def require_module_internal(module_name, module_version)
@@ -271,18 +283,6 @@ class BrpmAuto
       YAML.load_file(File.expand_path("#{File.dirname(__FILE__)}/config.yml"))
     end
 
-    def get_gems_root_path
-      if ENV["BRPM_CONTENT_HOME"]
-        ENV["BRPM_CONTENT_HOME"] # gemset location is overridden
-      elsif ENV["BRPM_HOME"]
-        "#{ENV["BRPM_HOME"]}/modules" # default gemset location when BRPM is installed
-      elsif ENV["GEM_HOME"]
-        ENV["GEM_HOME"] # default gemset location when BRPM is not installed
-      else
-        raise "Unable to find out the gems root path."
-      end
-    end
-
     def get_module_gem_path(module_name, module_version)
       "#{@gems_root_path}/gems/#{module_name}-#{module_version}"
     end

data/modules/framework/config.yml

@@ -1,4 +1,4 @@
-version: 0.1.36
+version: 0.1.37
 
 author: Niek Bartholomeus
 email: niek.bartholomeus@gmail.com

data/modules/framework/lib/module_installer.rb

@@ -70,7 +70,7 @@ class ModuleInstaller
   def install_gem(module_name, module_version)
     if BrpmAuto.run_from_brpm or BrpmAuto.params.unit_test
       # we need to override the GEM_HOME env var, otherwise the gems will be installed in BRPM's own gemset
-      ENV["GEM_HOME"] = ENV["BRPM_CONTENT_HOME"] || "#{ENV["BRPM_HOME"]}/modules"
+      ENV["GEM_HOME"] = BrpmAuto.get_gems_root_path
       Gem.paths = ENV
     end
 
@@ -95,7 +95,12 @@ class ModuleInstaller
     if File.exists?(gemfile) && File.exists?(gemfile_lock)
       BrpmAuto.log "Found a Gemfile.lock so executing command 'bundle install --gemfile #{gemfile}'..."
       # %x(bundle install --gemfile #{gemfile})
-      result = BrpmAuto.execute_shell("bundle install --gemfile #{gemfile}") #TODO: check if we must set GEM_HOME (when run from BRPM)
+      if BrpmAuto.run_from_brpm or BrpmAuto.params.unit_test
+        result = BrpmAuto.execute_shell("cd #{spec.gem_dir}; export GEM_HOME=#{BrpmAuto.get_gems_root_path}; bundle install")
+      else
+        result = BrpmAuto.execute_shell("cd #{spec.gem_dir}; bundle install")
+      end
+
       BrpmAuto.log result["stdout"] if result["stdout"] and !result["stdout"].empty?
       unless result["status"] == 0
         raise result["stderr"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brpm_content
 version: !ruby/object:Gem::Version
-  version: 0.1.36
+  version: 0.1.37
 platform: ruby
 authors:
 - Niek Bartholomeus