brpm_content_framework 0.1.55 → 0.1.56

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGU4YWFmZTY1ODZhOTgzOTc3MWRiMWI4MTRlMjIyZTY5NWFiMGE0MQ==
+    N2UxZGY3MjMwZTM4NzIzMjBmMWNhZWIyNDc0ZTg5ODY2NDAyYTY1OA==
   data.tar.gz: !binary |-
-    MDhhODJhZDIxZmMzNDM3MjQwNTJhMDkwYzE0ZjdkN2VkMjkxMDlkOQ==
+    ZmQ5NzNmMjZlYTQ2NWEyOThmYTllYjhjZGI0MDA2MDNiMTBkNjIyNw==
 SHA512:
   metadata.gz: !binary |-
-    NmFiMWRjYjdjNDQ2NTE3ZDI1MTA4MDBlM2ExNTU3ZTNlY2VlYjU2OWI3ZThm
-    ZGI3YTU4MGFmZjMzZjZlZjhkNjdlY2UyZWI5MjhjMTliNWNlODY4YzBlYzk2
-    YjNiZTc4M2Q3MTU4ZTI1NmUwMmI2OGE2Yjg3YjZiZTE0NDgyMzY=
+    OWQxOTU2ZWZjZmYyYmI3Njc1Yzg3Y2E0M2M0ZWUwOWUwYjY5NWFjNTMyYmE2
+    NDFhMjE1M2Y3ZTQ4ODg5MzJjM2Q0NDRiZmU2NTVhZjYxZWM2NGYxMzNmMzc4
+    MTRhYWJlZjJjODNjM2Y0ZjEwZjFmZjU0NDcwNTk0ODZlMTU5ZDE=
   data.tar.gz: !binary |-
-    YTVmODI1MjE4OWY5NzQ1MjQ0MjcxMWI1NmJhYjg3OWExNzZjZDcwOWQ3MjE5
-    NTFlYjIwMjQxNTQ2MDliMzRlMjc0N2VkNTY0ZWY5Y2QwZTBjNzlmMDliZGYx
-    N2Y5MDViOTUwOTY5YWViMWRmYWU0NWYxYWVlZWY4ZDZmNmJkMjg=
+    NTBiMmUyYmE3YzJhMDlkMTQ2YzMyMTIyNGQyZWM1MjRjOGU4Zjg1MWEwMjUy
+    NDE0ZjVmMWM1NWMwZWEyOGFlZWY5OTExNTNiMzYwMmU4ZTlkNWIyZWNhMTQ5
+    MjU1Mjk3MjYzYTBhOTgyZTA3NjJkMDMyN2U2YmQ2MThjYmM4Nzk=

data/config.yml

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

data/tests/module_installer_spec.rb

@@ -4,43 +4,50 @@ describe 'Module installer' do
   before(:all) do
     raise "Module installation tests don't work under Bundler." if ENV["RUBYOPT"] and ENV["RUBYOPT"].include?("-rbundler/setup")
 
+    FileUtils.mkdir_p "#{ENV["BRPM_HOME"]}/modules"
+
     setup_brpm_auto
 
     BrpmAuto.log "Creating ~/.brpm file..."
     create_brpm_file
+
+    @module_name = "brpm_module_bladelogic"
+    @module_version = "0.1.22"
   end
 
   before(:each) do
     module_installer = ModuleInstaller.new
 
-    brpm_specs = Gem::Specification.find_all_by_name("brpm_module_bladelogic")
+    module_specs = Gem::Specification.find_all_by_name(@module_name)
 
-    brpm_specs.each do |brpm_spec|
-      BrpmAuto.log "Module brpm_module_bladelogic (#{brpm_spec.version.to_s}) is already installed, uninstalling it..."
-      module_installer.uninstall_module("brpm_module_bladelogic", brpm_spec.version.to_s)
+    module_specs.each do |module_spec|
+      if module_spec.loaded_from.start_with?(ENV["BRPM_HOME"])
+        BrpmAuto.log "Module #{@module_name} (#{module_spec.version.to_s}) is already installed, uninstalling it..."
+        module_installer.uninstall_module(@module_name, module_spec.version.to_s)
+      end
     end
   end
 
-  it 'should install the Bladelogic module from rubygems.org' do
+  it "should install #{@module_name} from rubygems.org" do
     module_installer = ModuleInstaller.new
-    module_installer.install_module("brpm_module_bladelogic")
+    module_installer.install_module(@module_name)
 
-    expect{Gem::Specification.find_by_name("brpm_module_bladelogic")}.not_to raise_error #(Gem::LoadError)
+    expect{Gem::Specification.find_by_name(@module_name)}.not_to raise_error #(Gem::LoadError)
   end
 
-  it 'should install a specific version of the Bladelogic module from rubygems.org' do
+  it "should install a specific version of #{@module_name} from rubygems.org" do
     module_installer = ModuleInstaller.new
-    module_installer.install_module("brpm_module_bladelogic", "0.1.21")
+    module_installer.install_module(@module_name, @module_version)
 
-    expect{Gem::Specification.find_by_name("brpm_module_bladelogic", Gem::Requirement.create(Gem::Version.new("0.1.21")))}.not_to raise_error #(Gem::LoadError)
+    expect{Gem::Specification.find_by_name(@module_name, Gem::Requirement.create(Gem::Version.new(@module_version)))}.not_to raise_error #(Gem::LoadError)
   end
 
-  it 'should install a Bladelogic module from a local gem file' do
-    `wget https://rubygems.org/downloads/brpm_module_bladelogic-0.1.21.gem` unless File.exists?("./brpm_module_bladelogic-0.1.21.gem")
+  it "should install #{@module_name} from a local gem file" do
+    `mkdir -p temp && cd temp && wget https://rubygems.org/downloads/#{@module_name}-#{@module_version}.gem` unless File.exists?("temp/#{@module_name}-#{@module_version}.gem")
 
     module_installer = ModuleInstaller.new
-    module_installer.install_module("./brpm_module_bladelogic-0.1.21.gem")
+    module_installer.install_module("temp/#{@module_name}-#{@module_version}.gem")
 
-    expect{Gem::Specification.find_by_name("brpm_module_bladelogic", Gem::Requirement.create(Gem::Version.new("0.1.21")))}.not_to raise_error #(Gem::LoadError)
+    expect{Gem::Specification.find_by_name(@module_name, Gem::Requirement.create(Gem::Version.new(@module_version)))}.not_to raise_error #(Gem::LoadError)
   end
 end

data/tests/spec_helper.rb

@@ -2,7 +2,6 @@ require 'fileutils'
 require 'yaml'
 require_relative "../lib/brpm_auto"
 
-FileUtils.mkdir_p "#{ENV["BRPM_HOME"]}/modules" if ENV["BRPM_HOME"]
 FileUtils.mkdir_p "/tmp/brpm_content"
 
 def setup_brpm_auto

metadata

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