brpm_content_framework 0.2.53 → 0.2.54

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- YjU3ZTAxNWFiMGNjYTJlMjI0NzQ0ZmMzZjRiYTY3Yzg3ODRkNTc5Zg==
4
+ MzA5NjdhMWIyZjA5NzRiNjEwNjFjZWFkMjVlMTcwNzVjZmM3MTVmMw==
5
5
  data.tar.gz: !binary |-
6
- MDBlMTBhOTE4MWEwNDlhNGFmMWU4NzNmMDQ5YmYwOTYwNWZmN2IyNw==
6
+ ZWYyOGZjMDliMTY5MzU0MWFkYzZhNDMxNTJjMTI3MTQ4Nzk4YzU4ZQ==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- ZjQ5OWRlYTEwZDEzZTg0ZmQ2Zjg2ZTRhZmViOTExODM3NTFjZThmMWZjZWM4
10
- ZTcwZTNjZjUzZDU5YzVjNjdhNWZkNDM5MzJkMmY0ZmJlNmU0OTgxZDQ4ZWU4
11
- YjQxNDFhMjEyNmY2OTNlYzdkOWJjZjM4NjQ4MDMwNGE1MzgwNmM=
9
+ OGE3ZWZkM2M1Yzg4YzYxN2JlN2YyMzRkMjkzZTY4MmEwODg3NmY4ZjBlNDE2
10
+ NDA5MjVmNTgwZDFjODU4ODFjNGMyYWY3NGM2NTM3ZjM0MWJkODFhNzMwMDEw
11
+ ODY1MzU0MmFkNzg2MWU1N2ZjMjRjZGYxYTg3NDZmYWUwOWNmZTA=
12
12
  data.tar.gz: !binary |-
13
- MGY2NjJmOWI1M2YzZWFjYTEyYTQyNDBmODAxZGU0YTNmZjU4NWU3NjY3MjY3
14
- NzczYWE4ZmE2YWIyODFjZjc0Y2FlMDRiNzVlZWY1YThiN2ViOWI0NmQ3ODQ5
15
- ZmQ5ZTRiZGNjMzE1NDNjZTcwYTRlOGZmN2JkY2M1MDI1OWJiMzk=
13
+ YzNlMTQ0MTI1OTRlZjlmNjQ4ZGQ1ODM1NTE1MDQ1OGYxZDM2ODUyNDNhOTg3
14
+ YzJlYTc2ZDU5MDZlNmE1NDlmNzJjM2Y5ODc5NzAzZGY2MmE4ZGQ2OTgzMDEx
15
+ MmM1YWNiZmVmYTcxMGUxM2QxMWM3ZGZhOWJhMjNmOWRlNzc3ZDU=
data/config.yml CHANGED
@@ -1,4 +1,4 @@
1
- version: 0.2.53
1
+ version: 0.2.54
2
2
  author: Niek Bartholomeus
3
3
  email: niek.bartholomeus@gmail.com
4
4
  homepage: https://github.com/BMC-RLM/brpm_content_framework
@@ -12,7 +12,8 @@ class ModuleInstaller
12
12
 
13
13
  brpm_content_spec = specs.find { |spec| spec.name == "brpm_content_framework" } if specs
14
14
 
15
- install_bundle(module_spec)
15
+ is_local = is_module_path?(module_name_or_path)
16
+ install_bundle(module_spec, is_local)
16
17
  pull_docker_image(module_spec)
17
18
  else
18
19
  module_name = module_name_or_path
@@ -128,8 +129,12 @@ class ModuleInstaller
128
129
  true
129
130
  end
130
131
 
132
+ def is_module_path?(module_name_or_path)
133
+ module_name_or_path =~ /\.gem$/ and File.file? module_name_or_path
134
+ end
135
+
131
136
  def install_gem(module_name_or_path, module_version)
132
- if module_name_or_path =~ /\.gem$/ and File.file? module_name_or_path
137
+ if is_module_path?(module_name_or_path)
133
138
  BrpmAuto.log "Installing gem #{module_name_or_path}#{module_version.nil? ? "" : " " + module_version} from file..."
134
139
  require 'rubygems/name_tuple'
135
140
  source = Gem::Source::SpecificFile.new module_name_or_path
@@ -157,11 +162,12 @@ class ModuleInstaller
157
162
  return module_spec, specs
158
163
  end
159
164
 
160
- def install_bundle(spec)
165
+ def install_bundle(spec, is_local = false)
161
166
  gemfile_path = File.join(spec.gem_dir, "Gemfile")
162
167
 
163
168
  if File.exists?(gemfile_path)
164
- command = "cd #{spec.gem_dir}; bundle install"
169
+ command = "cd #{spec.gem_dir}; bundle install --without development test"
170
+ command += " --local" if is_local
165
171
  BrpmAuto.log "Found a Gemfile so executing command '#{command}'..."
166
172
  _, stderr, _, status = BrpmAuto.execute_command(command) do |stdout_err|
167
173
  BrpmAuto.log " #{stdout_err.chomp}"
data/lib/utilities.rb CHANGED
@@ -90,7 +90,7 @@ module Utilities
90
90
  def execute_command(command)
91
91
  *commands=command
92
92
  if is_jruby? #TODO work around for buggy jruby implementation of popen3
93
- *commands = RbConfig::CONFIG['SHELL'], is_windows? ? "?C" : "-c", command
93
+ *commands = RbConfig::CONFIG['SHELL'], is_windows? ? "/C" : "-c", command
94
94
  end
95
95
  Open3.popen3(*commands) do |stdin, stdout, stderr, thread|
96
96
  logs = {:out => "", :err => ""}
data/module.gemspec CHANGED
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
15
15
 
16
16
  spec.required_rubygems_version = ">= 2.1.9"
17
17
 
18
- spec.add_runtime_dependency "net-ssh", '2.9.2' #
18
+ spec.add_runtime_dependency "net-ssh", '2.3.0' #
19
19
  spec.add_runtime_dependency "bundler"
20
20
  spec.add_runtime_dependency "rest-client"
21
21
  spec.add_runtime_dependency "json"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: brpm_content_framework
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.53
4
+ version: 0.2.54
5
5
  platform: ruby
6
6
  authors:
7
7
  - Niek Bartholomeus
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-11-04 00:00:00.000000000 Z
11
+ date: 2015-11-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: net-ssh
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 2.9.2
19
+ version: 2.3.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 2.9.2
26
+ version: 2.3.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: bundler
29
29
  requirement: !ruby/object:Gem::Requirement