brpm_content_framework 0.2.10 → 0.2.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDAzNWMwYmNkOWRkNWZkN2U0NDY3MDJiZjk4OTY0OGI2OTQzYmQyOA==
+    ODRkMTkyY2M4OTk1ZTJmNDdlNzIxYTk2ZDMzZjFmNzJhZGQyMjcyMw==
   data.tar.gz: !binary |-
-    NjYwMTY4NWQzMGQ3YmUwN2RlZTExOTBiZGVlNDk1MzhmYTYwMDJlYQ==
+    MTk4NGI4N2YyNDFiNTIzYjM4YTI0M2FlNDcyMTdiMWZmMzg3MzczNw==
 SHA512:
   metadata.gz: !binary |-
-    NmZkOTNiYWRjNzg4ODQ4YjI4MTYwYzBlM2UwZDM1MThjMmVmNmVkNTY4MWNl
-    NGQxYTYyZDFhZGE0MWRkMWIzYjVlMDk0ZTY4ZjQxY2NjODgxNzVkMzllOTJk
-    NGNhZDE0MTQ1NTRlYjM5ZTkxNzk3ZGFkNzE1M2UzMDE3NmYyOTQ=
+    YjJkYTFiODNlMTBkZjM5MjA5Y2I2MzNkZTg0NjU4NTQ2ZmI0NWM1MDM3MWU4
+    Zjg0MTMyNjIzN2U4OWU3MmMzMzI2ZmU1MjhmNDk2ZWM5NmJiMjFjZDg4NWVj
+    MTJmZDA5M2Q5MmIyNDVmZDc3ODIyYjkwMTc1ZGY0OTk4NjgxOTQ=
   data.tar.gz: !binary |-
-    YmU5NmUxNzg1NDY3YzUwODU0ODA2NDkwODUyNmI4N2VhN2RhOTBiZWY4MzZi
-    NjUzYmE5YTExNDc5MDZmZjRhYTgxYTM1MTBlNzM5Yzg0ZjY4ZjAxYWMxYTA3
-    Nzk5N2I2M2UyN2Y4NDJjYjIzMjQwNWJkZjJhMzFkZjZhMDA2YWM=
+    ODgwNDk2ZjUzZTRlOTJmNjIwYzJhZmM1ZDFmYWE1MGFkNDFhNzllYzgwZjUx
+    ZmJmZjIzZmI4NDljODUxN2RiMzA0NzkxMzNlMDIyMTlmMTRkMjcxZTJkMGE4
+    NDBiYTk3ZWJkMGJiY2RhY2EzZjgxMjZjMmNhOTBkMmFhM2ZkMzM=

data/config.yml

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

data/lib/module_installer.rb

@@ -12,7 +12,7 @@ class ModuleInstaller
 
       brpm_content_spec = specs.find { |spec| spec.name == "brpm_content_framework" } if specs
 
-      install_bundle_if_necessary(module_spec)
+      install_bundle(module_spec)
     else
       module_name = module_name_or_path
       module_spec = Gem::Specification.find_by_name(module_name)
@@ -152,18 +152,20 @@ class ModuleInstaller
     return module_spec, specs
   end
 
-  def install_bundle_if_necessary(spec)
-    gemfile = File.join(spec.gem_dir, "Gemfile")
+  def install_bundle(spec)
+    gemfile_path = File.join(spec.gem_dir, "Gemfile")
 
-    if File.exists?(gemfile)
-      command = "cd #{spec.gem_dir}; bundle install"
-      BrpmAuto.log "Found a Gemfile so executing command '#{command}'..."
-      result = BrpmAuto.execute_shell(command)
+    unless File.exists?(gemfile_path)
+      raise "This module doesn't have a Gemfile. Expected it at #{gemfile_path}."
+    end
 
-      BrpmAuto.log result["stdout"] if result["stdout"] and !result["stdout"].empty?
-      unless result["status"] == 0
-        raise result["stderr"]
-      end
+    command = "cd #{spec.gem_dir}; bundle install"
+    BrpmAuto.log "Found a Gemfile so executing command '#{command}'..."
+    result = BrpmAuto.execute_shell(command)
+
+    BrpmAuto.log result["stdout"] if result["stdout"] and !result["stdout"].empty?
+    unless result["status"] == 0
+      raise result["stderr"]
     end
   end
 

data/tests_no_bundler/brpm_script_executor_spec.rb

@@ -8,8 +8,6 @@ describe 'BRPM Script Executor' do
 
     require_relative "../lib/brpm_script_executor"
 
-    ENV["GEM_HOME"] = "#{ENV["BRPM_HOME"]}/modules"
-    Gem.paths = ENV
     test_gems = Gem::Specification.find_all_by_name("brpm_module_test")
 
     if test_gems.empty?

data/tests_no_bundler/module_installer_spec.rb

@@ -14,6 +14,7 @@ describe 'Module installer' do
   before(:each) do
     module_installer = ModuleInstaller.new
 
+    Gem::Specification.reset # Mske sure that modules that were installed by other unit tests are taken into account
     module_specs = Gem::Specification.find_all_by_name(@module_name)
     module_specs.each do |module_spec|
       if module_spec.loaded_from.start_with?(ENV["BRPM_HOME"])
@@ -28,6 +29,9 @@ describe 'Module installer' do
     module_installer.install_module(@module_name)
 
     expect{Gem::Specification.find_by_name(@module_name)}.not_to raise_error #(Gem::LoadError)
+
+    spec = Gem::Specification.find_by_name(@module_name)
+    expect(spec.loaded_from.start_with?(ENV["BRPM_HOME"]))
   end
 
   it "should install a specific version of a module from rubygems.org" do
@@ -35,6 +39,9 @@ describe 'Module installer' do
     module_installer.install_module(@module_name, @module_version)
 
     expect{Gem::Specification.find_by_name(@module_name, Gem::Requirement.create(Gem::Version.new(@module_version)))}.not_to raise_error #(Gem::LoadError)
+
+    spec = Gem::Specification.find_by_name(@module_name, Gem::Requirement.create(Gem::Version.new(@module_version)))
+    expect(spec.loaded_from.start_with?(ENV["BRPM_HOME"]))
   end
 
   it "should install a module from a local gem file" do
@@ -44,5 +51,8 @@ describe 'Module installer' do
     module_installer.install_module("temp/#{@module_name}-#{@module_version}.gem")
 
     expect{Gem::Specification.find_by_name(@module_name, Gem::Requirement.create(Gem::Version.new(@module_version)))}.not_to raise_error #(Gem::LoadError)
+
+    spec = Gem::Specification.find_by_name(@module_name, Gem::Requirement.create(Gem::Version.new(@module_version)))
+    expect(spec.loaded_from.start_with?(ENV["BRPM_HOME"]))
   end
 end

data/tests_no_bundler/spec_helper.rb

@@ -5,6 +5,7 @@ def setup_gem_env
 
   ENV["BRPM_HOME"] = ENV["BRPM_STUB_HOME"]
   ENV["GEM_HOME"] = "#{ENV["BRPM_HOME"]}/modules"
+  Gem.paths = ENV
 end
 
 def setup_modules_env

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brpm_content_framework
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Niek Bartholomeus