brpm_content_framework 0.2.58 → 0.2.59

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjU4MjgzOTQ5YjI3MGM1MzcwZDc0YTg4NzQ1ZmNiNDI1NWQ2NzkwZg==
+    ZGE1YTEzMDZmYTBkZjIzYWI4YjM5ZDc3OWZjMjBiMzRmOTc1NjY2Ng==
   data.tar.gz: !binary |-
-    Nzg1Yzc1OThkZDM2NjMwZDRhNjJkNDNhMGIzZTRkZDcyMWNkNDBlNA==
+    YThmZTg5YzVhZDkwMmNhNjdkODcxOWE2Yzc3NWIyZmM3Y2NmOTk2Mg==
 SHA512:
   metadata.gz: !binary |-
-    NTVjNjBjZTU4OGE0Y2YyZGE0YjQ1OGM2MjhhMDE1YmM1ZGMyMzQxODM1MTA3
-    YzdjZGFlZDBjODI0ZWEyNGQ4MTcyZTQzY2QwMmI4NWE4YmM5MGNkODk5NTgw
-    YzRkNzdjZTQyZTIyMGQxYWQ1OTlmNTVjY2M5YTRhM2FmNTVmODI=
+    YjIyOTlhZTEwMzUyMTAyZTExZmEzMGVlYzBmOGFkZWZjZjA2ODY1YWM5NDc0
+    NzkwYTRjNWVmNTY0YzAzODMyZTdmYWE1NmEzMWFjNjI5NzBjMjc5ZGM3MzZl
+    Y2ZkNzhlOTlmZTcyZmUzM2ZiYWM3ZWFkZDdiZGJiYzI0MWMzMGQ=
   data.tar.gz: !binary |-
-    YTYyNTA2ODRkNzZmMWY2NDg3MTFiNThmOTEyM2JmMTJmYTQ3ZjU1M2JhMTBm
-    YTFmMThjMDNlYTc1ZDYyMjdmZjU0NzQ4NjFiZTIyMzFmYzVhZTYyMDZmZjZh
-    YjY2YzEwMWE0ODc5N2RmYjIwZDMwZWYzNTdkYWZlODYwMzlhYzg=
+    NTY3OWU3YzliYzhiZjUxZDJmOTZiOGY5MzQwN2RmZTZiMGJmMWMyYjVlMGQz
+    ZjdhZmFhYTYxNTNlYWJlOGQwMWJjYzQwYmE5ZTk0MDE4YzlkZjQ4NTM3ZTVm
+    YzUzODZmOTU0ZWNkYTA5Y2I2NmM4ZTE2NzBmNmJkMzE2ODJhOWM=

data/config.yml

@@ -1,4 +1,4 @@
-version: 0.2.58
+version: 0.2.59
 author: Niek Bartholomeus
 email: niek.bartholomeus@gmail.com
 homepage: https://github.com/BMC-RLM/brpm_content_framework

data/infrastructure/module_template/module.gemspec

@@ -28,8 +28,10 @@ Gem::Specification.new do |spec|
     end
   end
 
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  unless ENV["BRPM_CONTENT_FRAMEWORK_DEPLOYMENT"]
+    spec.add_development_dependency "rake"
+    spec.add_development_dependency "rspec"
+  end
 
   spec.files         = `git ls-files`.split("\n")
   spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/module_installer.rb

@@ -134,45 +134,38 @@ class ModuleInstaller
   end
 
   def install_gem(module_name_or_path, module_version)
+    BrpmAuto.log "Installing gem #{module_name_or_path}#{module_version.nil? ? "" : " " + module_version}..."
+    command = "gem install #{module_name_or_path}#{module_version.nil? ? "" : " -v " + module_version} --ignore-dependencies"
+    BrpmAuto.log command
+    _, stderr, _, status = BrpmAuto.execute_command(command) do |stdout_err|
+      BrpmAuto.log "    #{stdout_err.chomp}"
+    end
+    raise "The process failed with status #{status.exitstatus}.\n#{stderr}" unless status.success?
+
     if is_module_path?(module_name_or_path)
-      BrpmAuto.log "Installing gem #{module_name_or_path}#{module_version.nil? ? "" : " (ignoring dependencies) " + module_version} from file..."
       require 'rubygems/name_tuple'
       source = Gem::Source::SpecificFile.new module_name_or_path
-      module_spec = source.spec
-      specs = [module_spec]
-
-      gem = source.download module_spec
-
-      inst = Gem::Installer.new gem, { :ignore_dependencies => true }
-      inst.install
-      BrpmAuto.log "Done."
+      module_name = source.spec.name
+      module_version = source.spec.version
     else
-      BrpmAuto.log "Installing gem #{module_name_or_path}#{module_version.nil? ? "" : " " + module_version} (ignoring dependencies)..."
-      version_req = module_version ? Gem::Requirement.create(Gem::Version.new(module_version)) : Gem::Requirement.default
-
-      require "rubygems/dependency_installer"
-      inst = Gem::DependencyInstaller.new({ :ignore_dependencies => true })
-      inst.install module_name_or_path, version_req
-      specs = inst.installed_gems
-
-      BrpmAuto.log "Installed gems:"
-      specs.each do |spec|
-        BrpmAuto.log "  - #{spec.name} #{spec.version}"
-      end
-
-      module_spec = specs.find { |spec| spec.name == module_name_or_path}
+      module_name = module_name_or_path
     end
 
-    return module_spec, specs
+    Gem.refresh
+    version_req = module_version ? Gem::Requirement.create(Gem::Version.new(module_version)) : Gem::Requirement.default
+    module_spec = Gem::Specification.find_by_name(module_name, version_req)
+
+    module_spec
   end
 
   def install_bundle(spec, is_local = false)
     gemfile_path = File.join(spec.gem_dir, "Gemfile")
 
     if File.exists?(gemfile_path)
+      BrpmAuto.log "Found a Gemfile so doing a 'bundle install'..."
       command = "export BRPM_CONTENT_FRAMEWORK_DEPLOYMENT=true; cd #{spec.gem_dir}; bundle install --without development test"
       command += " --local" if is_local
-      BrpmAuto.log "Found a Gemfile so executing command '#{command}'..."
+      BrpmAuto.log command
       _, stderr, _, status = BrpmAuto.execute_command(command) do |stdout_err|
         BrpmAuto.log "    #{stdout_err.chomp}"
       end

data/module.gemspec

@@ -15,16 +15,17 @@ Gem::Specification.new do |spec|
 
   spec.required_rubygems_version = ">= 2.1.9"
 
-  spec.add_runtime_dependency "net-ssh", "2.3.0"
-  spec.add_runtime_dependency "net-scp", "1.0.4"
-  spec.add_runtime_dependency "net-sftp", "2.0.5"
-  spec.add_runtime_dependency "net-ssh-gateway", "1.1.0"
-
   spec.add_runtime_dependency "bundler"
   spec.add_runtime_dependency "rest-client"
   spec.add_runtime_dependency "json"
   spec.add_runtime_dependency "savon", '~>1.1.0'
-  spec.add_runtime_dependency 'capistrano', '2.15.5'
+
+  # capistrano is only used by the transport modules and it takes a whole set of net-* dependencies that were downgraded in BRPM 4.8
+  # spec.add_runtime_dependency 'capistrano', '2.15.5'
+  # spec.add_runtime_dependency "net-ssh", "2.3.0"
+  # spec.add_runtime_dependency "net-scp", "1.0.4"
+  # spec.add_runtime_dependency "net-sftp", "2.0.5"
+  # spec.add_runtime_dependency "net-ssh-gateway", "1.1.0"
 
   spec.add_runtime_dependency "stomp"
   spec.add_runtime_dependency "xml-simple"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brpm_content_framework
 version: !ruby/object:Gem::Version
-  version: 0.2.58
+  version: 0.2.59
 platform: ruby
 authors:
 - Niek Bartholomeus
@@ -10,62 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-- !ruby/object:Gem::Dependency
-  name: net-scp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-- !ruby/object:Gem::Dependency
-  name: net-sftp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.5
-- !ruby/object:Gem::Dependency
-  name: net-ssh-gateway
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +66,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: capistrano
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.15.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.15.5
 - !ruby/object:Gem::Dependency
   name: stomp
   requirement: !ruby/object:Gem::Requirement