Fix bugs

* move dir_path_gem_home to config
* use dir_path_gem_home to run modules_install
* use dir_path_gem_home to run tasks
* disable librarian_installed? if bunle mode is enabled

Change-Id: I7112e6ed5e96909a7812fa60ae13998947a089f9

lib/noop/config/base.rb

@@ -97,6 +97,23 @@ module Noop
       @dir_path_workspace
     end
 
+    # The name of the gem home directory
+    # @return [Pathname]
+    def self.dir_name_gem_home
+      Pathname.new 'bundled_gems'
+    end
+
+    # Get a GEM_HOME either from the environment (using RVM)
+    # or from the default value (using bundle)
+    # @return [Pathname]
+    def self.dir_path_gem_home
+      return @dir_path_gem_home if @dir_path_gem_home
+      @dir_path_gem_home = Noop::Utils.path_from_env 'GEM_HOME'
+      return @dir_path_gem_home if @dir_path_gem_home
+      @dir_path_gem_home = dir_path_workspace + dir_name_gem_home
+      @dir_path_gem_home
+    end
+
     # @return [Pathname]
     def self.dir_path_reports
       return @dir_path_reports if @dir_path_reports

lib/noop/manager/setup.rb

@@ -1,15 +1,6 @@
 module Noop
   class Manager
 
-    # Get a GEM_HOME either from the environment (using RVM)
-    # or from the default value (using bundle)
-    # @return [Pathname]
-    def dir_path_gem_home
-      return Pathname.new ENV['GEM_HOME'] if ENV['GEM_HOME']
-      dir_name_bundle = Pathname.new 'bundled_gems'
-      Noop::Config.dir_path_workspace + dir_name_bundle
-    end
-
     # Check if bundle command is installed
     # @return [true,false]
     def bundle_installed?
@@ -18,15 +9,17 @@ module Noop
     end
 
     # Check if librarian-puppet command is installed
+    # If we are using bundle there is no need to check it
     # @return [true,false]
     def librarian_installed?
+      return true if ENV['SPEC_BUNDLE_EXEC']
       `librarian-puppet version`
       $?.exitstatus == 0
     end
 
     # Setup bundle in the fixtures repo and bundle for puppet librarian
     def setup_bundle
-      ENV['GEM_HOME'] = dir_path_gem_home.to_s
+      ENV['GEM_HOME'] = Noop::Config.dir_path_gem_home.to_s
       bundle_install_and_update Noop::Config.dir_path_root
       bundle_install_and_update Noop::Config.dir_path_deployment
       Dir.chdir Noop::Config.dir_path_root
@@ -34,7 +27,7 @@ module Noop
 
     # Run update script to setup external Puppet modules
     def setup_library
-      ENV['GEM_HOME'] = dir_path_gem_home.to_s
+      ENV['GEM_HOME'] = Noop::Config.dir_path_gem_home.to_s
       update_puppet_modules Noop::Config.dir_path_deployment
       Dir.chdir Noop::Config.dir_path_root
     end
@@ -78,7 +71,7 @@ module Noop
       root = Noop::Utils.convert_to_path root
       Dir.chdir root or error "Could not chdir to: #{root}"
       command = './update_modules.sh -v'
-      command = command + ' -b' if options[:bundle_exec]
+      command = command + ' -b' if ENV['SPEC_BUNDLE_EXEC']
       command = command + ' -r' if options[:reset_librarian_puppet]
 
       debug 'Starting update_modules script'

lib/noop/task/run.rb

@@ -58,6 +58,7 @@ module Noop
           'SPEC_HIERA_NAME' => file_name_hiera.to_s,
           'SPEC_FACTS_NAME' => file_name_facts.to_s,
           'SPEC_FILE_NAME' => file_name_spec.to_s,
+          'GEM_HOME' => Noop::Config.dir_path_gem_home.to_s,
       }
       command = "rspec #{file_path_spec.to_s} #{rspec_options} --format json --out #{file_path_report_json.to_s}"
       command = "bundle exec #{command}" if ENV['SPEC_BUNDLE_EXEC']