brpm_content 0.1.45 → 0.1.46

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWM5Yjc2NzlmMDcyMTQ1YmIwMDIxODI4OWNiNTZmNDAyMGRlYWI1ZA==
+    MmMzMmVhMDQ0MzMzZTdlZTU5MDYzNGYxNWRjNzgzMzBkZTU3NTBhNg==
   data.tar.gz: !binary |-
-    YWJhNjJiZGUzYTgyNmI4MjZkMTk2MjYwNjU1M2MyZDExZTI0NDJiMQ==
+    NWZkMTlhOTgwOWI5OWIwYjFjZDUzYzYwY2E0MGJhNzg4MjM4ODE3Mw==
 SHA512:
   metadata.gz: !binary |-
-    OTU4NDAyZGE3NzdmYzIyOGYxMTdjYTIxMGNiMDZiZjdhYzU4OTIzYjU4Njgw
-    OWQ5OTkxMTgwNDYwNGI5NTcyZGNjNTY0MWRhMTdmMGM0YjYyMTY0Yjc4ZDE1
-    YjNkN2NhOTVkMjIxMWUxMmYwZDA2NmIwZDlkOWNiMGY0ZjU1MDY=
+    MzcyZWZlNGQxMTY0YTgwYzhlMDYxZTMyNjQwNDM3NjA4Njg2NjdiNDc4OWVm
+    N2E2NDAwOTAzNGE0ZmIwNWIxMmY3YTY0YTlkMGE2ZDc4ZTNhNzBiNmMwM2Ux
+    Njg4N2I4ZDUwNDM5ZWVkYjEzZDdkMjFiZjI4YzU4ODhiNjA1NzI=
   data.tar.gz: !binary |-
-    NzdkMWU0M2IwMjE2MDcxZjFkYTJkODVmMzk3ZTgwMWJmZjI1YWVhNmJhZTc3
-    ZTU0NzE4ZjdkYmU2ZjliZDY0NzRkNzhjNzE2NTJlMWM2YWU1MjhmZTU5MmY1
-    MTQ4Y2UwNWZjNGUwNzEzYjRmZGZmNWIxNjI3YjBkNzBhYTM5MTk=
+    ZjIwZjIzYmFiMTUwN2M1NDI3ZmVmOGM4M2Q0YTliMjE1YjBlM2E2NjY3MWJh
+    MjdlNmNkYjljNTAyY2ZjNjBlNWU4NTY5OGJlZjc5NzgyNDc0ODU2Njg2Mjgz
+    OTA3MTZhOGQ4ZDc2MGNiMzMzMDQwNDViZWU3M2M4NGYxM2U1ZjM=

data/.travis.yml

@@ -5,8 +5,6 @@ rvm:
 before_install:
   - gem update --system 2.1.9
 
-install: gem install brpm_module_brpm #needed for module installation tests
-
 script:
   - rspec modules/framework/tests --format documentation --color
 

data/config.yml

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

data/modules/framework/lib/module_installer.rb

@@ -89,8 +89,10 @@ class ModuleInstaller
       end
     end
 
-    BrpmAuto.log "Uninstalling module #{module_name}#{module_version.nil? ? "" : " " + module_version}..."
-    `gem uninstall #{module_name}#{module_version.nil? ? "" : " -v " + module_version}`
+    unless ENV["TRAVIS"] == "true" #TODO: make this work on the travisci server
+      BrpmAuto.log "Uninstalling module #{module_name}#{module_version.nil? ? "" : " " + module_version}..."
+      BrpmAuto.log `gem uninstall #{module_name}#{module_version.nil? ? "" : " -v " + module_version}`
+    end
 
     return true
   end
@@ -358,6 +360,22 @@ class ModuleInstaller
       script_to_update["aasm_state"] = "released"
       script = @brpm_rest_client.update_script_from_hash(script_to_update)
     end
+
+    if script["aasm_state"] == "archived_state"
+      BrpmAuto.log "Updating the aasm_state of the wrapper script to 'released'..."
+      script_to_update = {}
+      script_to_update["id"] = script["id"]
+      script_to_update["aasm_state"] = "retired"
+      script = @brpm_rest_client.update_script_from_hash(script_to_update)
+    end
+
+    if script["aasm_state"] == "retired"
+      BrpmAuto.log "Updating the aasm_state of the wrapper script to 'released'..."
+      script_to_update = {}
+      script_to_update["id"] = script["id"]
+      script_to_update["aasm_state"] = "released"
+      script = @brpm_rest_client.update_script_from_hash(script_to_update)
+    end
   end
 
   def uninstall_auto_script_wrapper(auto_script_path, automation_type, module_friendly_name)

data/modules/framework/tests/module_installer_spec.rb

@@ -2,6 +2,7 @@ require_relative "spec_helper"
 
 describe 'Module installer' do
   before(:all) do
+    BrpmAuto.log "Creating ~/.brpm file..."
     create_brpm_file
     setup_brpm_auto
   end

data/modules/framework/tests/spec_helper.rb

@@ -49,14 +49,16 @@ def decrypt_string_with_prefix(input) # mocked method
 end
 
 def create_brpm_file
-  unless File.exists?("~/.brpm")
-    params = get_default_params
-    brpm_params = {}
-    brpm_params["brpm_url"] = params["brpm_url"]
-    brpm_params["brpm_api_token"] = params["brpm_api_token"]
-
-    File.open(File.expand_path("~/.brpm"), "w") do |file|
-      file.puts(brpm_params.to_yaml)
-    end
+  if File.exists?("~/.brpm")
+    FileUtils.rm("~/.brpm")
+  end
+
+  params = get_default_params
+  brpm_params = {}
+  brpm_params["brpm_url"] = params["brpm_url"]
+  brpm_params["brpm_api_token"] = params["brpm_api_token"]
+
+  File.open(File.expand_path("~/.brpm"), "w") do |file|
+    file.puts(brpm_params.to_yaml)
   end
 end

metadata

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