Add Logging around using create-symlinks without environment

Author: Calum Gilchrist

lib/octocatalog-diff/catalog-util/builddir.rb

@@ -84,11 +84,14 @@ def create_symlinks(logger = nil)
             install_directory_symlink(logger, File.join(@options[:basedir], x), x)
           end
         else
-          if @options[:environment]
-            install_directory_symlink(logger, @options[:basedir], "environments/#{@options[:environment]}")
-          end
-          if @options[:create_symlinks]
+          if @options[:create_symlinks] && @options[:environment]
+            unless logger.nil?
+              logger.warn '--create-symlinks with --environment ignored unless --preserve-environments is used'
+            end
+          elsif @options[:create_symlinks]
             logger.warn '--create-symlinks is ignored unless --preserve-environments is used' unless logger.nil?
+          elsif @options[:environment]
+            install_directory_symlink(logger, @options[:basedir], "environments/#{@options[:environment]}")
           end
           install_directory_symlink(logger, @options[:basedir])
         end
@@ -178,6 +181,7 @@ def install_fact_file(logger, options)
       def install_directory_symlink(logger, dir, target = 'environments/production')
         raise ArgumentError, "Called install_directory_symlink with #{dir.class} argument" unless dir.is_a?(String)
         raise Errno::ENOENT, "Specified directory #{dir} doesn't exist" unless File.directory?(dir)
+
         symlink_target = File.join(@tempdir, target)
 
         if target =~ %r{/}

spec/octocatalog-diff/tests/catalog-util/builddir_spec.rb

@@ -121,15 +121,18 @@
         end
       end
 
-      context 'with --environment' do
+      context 'with --create-symlinks and --environment' do
         context 'with logger' do
           it 'should log a warning message and install default symlink' do
             logger = double('Logger')
-            expect(logger).to receive(:warn).with('--environment is ignored unless --preserve-environments is used')
+            expect(logger).to receive(:warn).with(
+              '--create-symlinks with --environment ignored unless --preserve-environments is used'
+            )
 
             @described_object.instance_variable_set(
               '@options',
               basedir: '/tmp/basedir',
+              create_symlinks: %w(foo bar),
               environment: 'baz'
             )
 
@@ -142,10 +145,11 @@
         end
 
         context 'without logger' do
-          it 'should install default symlink' do
+          it 'should install directory symlink' do
             @described_object.instance_variable_set(
               '@options',
               basedir: '/tmp/basedir',
+              create_symlinks: %w(foo bar),
               environment: 'baz'
             )