brpm_content_framework 0.1.60 → 0.1.61

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjFmNjQ0NmMyOWM0ZTMwM2QxMmUwZGU1OTBhYzZmMTEzYzkwODcyYg==
+    NTRhZWQwY2YzZGU1MjJlNDY1NTA1MmYyMDc4MDc1ZGZlMTNjOTI4OQ==
   data.tar.gz: !binary |-
-    ODA4ODJlZmJiODhmODdjOTFlY2JhZDBmY2U5NDg1YTM4N2E4NzY5Yw==
+    OTBjMzBhOGIxZWY4YTYwY2Q4Y2IzZGUzMjQ3ZGE4M2MyMTQ4ZTc0NQ==
 SHA512:
   metadata.gz: !binary |-
-    MDI0OTM0NmQ2MjlmZmI2NWMzMTQ5NTI4NWE3Njc0YjI0YjMyMTkzMmI2MDkw
-    NzUyYTVkOWVkMjVjZGIyYmQyY2ZlODY1NDUyYjFhYjlhNzdiMWJlOGM1MzJh
-    OWFhOGE5YTlhYzdkN2U1MDlhMTkwNjQxMWJiZmY5ODc5MTgzNGQ=
+    NTJhNDFlZWM3YWQ1ZDAwNTFmOGI1NjExYmNmZDVhOTZmNGVmNWY0YjQzNzBi
+    ZmVhZjlhNDE0MTIwN2FmNjE4ZTAyYmJmODdmNTQwNjUzZTBjOTQ0YmQ1OTA3
+    YWRkN2E3NTY1OGEzMjliOGU2ZWYzYjFjY2U3NmFiNzMxYzBkZDU=
   data.tar.gz: !binary |-
-    YjA4MWQxMDM0ZGQ4NjZiNGM0NGQ1OWM0MzE4NTYyZTNiZGUxOTAyYWM4M2Iz
-    NzM3NTVlN2YwNTkyYTdhMDQ5Nzk2ZDNlYzJjM2Y0OThjOTFhMTdjNjQyOTUz
-    NTQ4NjcwMmJkNDc1NmEwNjQzYWUxNGMzYjI1YjRhNjdlMDU2NDE=
+    MjdkZTE1MGZhNGNiMGQ3MGFlNTY1YTRkNWY0NTZkNzJjOGYyYjQ5NGFmOTc5
+    NGIyOGI0MzE0YjA4NDMxMDM3MjRhNGE4NWFhYzg3YmFlN2YzOGY5N2VlMTJl
+    YmNlZWQwN2IxMmU1NGFjNjBhNGNhMGM2ZmE1ZGZiMjQ5MGUxMzk=

data/config.yml

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

data/lib/brpm_auto.rb

@@ -31,7 +31,7 @@ class BrpmAuto
       @config = get_config
       @version = @config["version"]
 
-      @brpm_version = get_brpm_version if ENV["BRPM_HOME"]
+      @brpm_version = get_brpm_version if self.brpm_installed
 
       @gems_root_path = get_gems_root_path
     end
@@ -184,6 +184,10 @@ class BrpmAuto
       @integration_settings = IntegrationSettings.new(dns, username, password, details)
     end
 
+    def brpm_installed
+      ENV["BRPM_HOME"] != nil
+    end
+
     def  get_gems_root_path
       if ENV["BRPM_CONTENT_HOME"]
         ENV["BRPM_CONTENT_HOME"] # gemset location is overridden
@@ -330,7 +334,16 @@ class BrpmAuto
     end
 
     def get_brpm_version
-      knob = YAML.load_file("#{ENV["BRPM_HOME"]}/server/jboss/standalone/deployments/RPM-knob.yml")
+      unless self.params.brpm_installed
+        raise "BRPM is not installed."
+      end
+
+      knob_file = "#{ENV["BRPM_HOME"]}/server/jboss/standalone/deployments/RPM-knob.yml"
+      unless File.exists?(knob_file)
+        raise "Could not find the knob file at the expected location (#{knob_file})"
+      end
+
+      knob = YAML.load_file(knob_file)
       version_content = File.read("#{knob["application"]["root"]}/VERSION")
       version_content.scan(/VERSION=([0-9\.]*)/)[0][0]
     end

data/tests/module_installer_spec.rb

@@ -1,9 +1,11 @@
 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")
-    raise "$BRPM_HOME is not set" unless ENV["BRPM_HOME"]
+    raise "$BRPM_STUB_HOME is not set" unless ENV["BRPM_STUB_HOME"]
 
     brpm_version = "4.6.00.00"
+    ENV["BRPM_HOME"] = ENV["BRPM_STUB_HOME"]
+
     FileUtils.mkdir_p "#{ENV["BRPM_HOME"]}/modules"
     FileUtils.mkdir_p "#{ENV["BRPM_HOME"]}/server/jboss/standalone/deployments"
     FileUtils.mkdir_p "#{ENV["BRPM_HOME"]}/releases/#{brpm_version}/RPM"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brpm_content_framework
 version: !ruby/object:Gem::Version
-  version: 0.1.60
+  version: 0.1.61
 platform: ruby
 authors:
 - Niek Bartholomeus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client