Added cli-validator tests

Author: nyo

lib/aws/codedeploy/local/cli_validator.rb

@@ -40,8 +40,12 @@ def validate(args)
           end
 
           if (type == 'directory' && (uri.scheme != 'https' && uri.scheme != 's3' && File.directory?(location)))
-            unless File.exists? "#{location}/appspec.yml"
-              raise ValidationError.new("Expecting appspec file at location #{location}/appspec.yml but it is not found there. Please either run the CLI from within a directory containing the appspec.yml file or specify a bundle location containing an appspec.yml file in its root directory")
+            appspec_filename = args['--appspec-filename']
+            if !appspec_filename.nil? && !File.exists?("#{location}/#{appspec_filename}")
+              raise ValidationError.new("Expecting appspec file at location #{location}/#{appspec_filename} but it is not found there. Please either run the CLI from within a directory containing the #{appspec_filename} file or specify a bundle location containing an #{appspec_filename} file in its root directory")
+            end
+            if !File.exists?("#{location}/appspec.yml") && !File.exists?("#{location}/appspec.yaml")
+              raise ValidationError.new("Expecting appspec file at location #{location}/appspec.yml or #{location}/appspec.yaml but it is not found there. Please either run the CLI from within a directory containing the appspec.yml or appspec.yaml file or specify a bundle location containing an appspec.yml or appspec.yaml file in its root directory")
             end
           end
 
@@ -60,7 +64,7 @@ def validate(args)
         end
 
         def any_new_revision_event_or_install_before_download_bundle(events)
-          events_using_new_revision.push('Install').any? do |event_not_allowed_before_download_bundle| 
+          events_using_new_revision.push('Install').any? do |event_not_allowed_before_download_bundle|
             events.take_while{|e| e != 'DownloadBundle'}.include? event_not_allowed_before_download_bundle
           end
         end

spec/aws/codedeploy/local/cli_validator_spec.rb

@@ -96,7 +96,23 @@
         allow(File).to receive(:exists?).with(FAKE_DIRECTORY).and_return(true)
         allow(File).to receive(:directory?).with(FAKE_DIRECTORY).and_return(true)
         expect(File).to receive(:exists?).with("#{FAKE_DIRECTORY}/appspec.yml").and_return(false)
-        expect{validator.validate(args)}.to raise_error(AWS::CodeDeploy::Local::CLIValidator::ValidationError, "Expecting appspec file at location #{FAKE_DIRECTORY}/appspec.yml but it is not found there. Please either run the CLI from within a directory containing the appspec.yml file or specify a bundle location containing an appspec.yml file in its root directory")
+        expect(File).to receive(:exists?).with("#{FAKE_DIRECTORY}/appspec.yaml").and_return(false)
+        expect{validator.validate(args)}.to raise_error(AWS::CodeDeploy::Local::CLIValidator::ValidationError, "Expecting appspec file at location #{FAKE_DIRECTORY}/appspec.yml or #{FAKE_DIRECTORY}/appspec.yaml but it is not found there. Please either run the CLI from within a directory containing the appspec.yml or appspec.yaml file or specify a bundle location containing an appspec.yml or appspec.yaml file in its root directory")
+      end
+    end
+
+    context 'when loction is directory and --appspec-filename is specified (but not existing)' do
+      let(:args) do
+        {"--bundle-location"=>FAKE_DIRECTORY,
+         "--type"=>'directory',
+         "--appspec-filename"=>"appspec-override.yaml"}
+      end
+
+      it 'throws a ValidationError' do
+        allow(File).to receive(:exists?).with(FAKE_DIRECTORY).and_return(true)
+        allow(File).to receive(:directory?).with(FAKE_DIRECTORY).and_return(true)
+        expect(File).to receive(:exists?).with("#{FAKE_DIRECTORY}/appspec-override.yaml").and_return(false)
+        expect{validator.validate(args)}.to raise_error(AWS::CodeDeploy::Local::CLIValidator::ValidationError, "Expecting appspec file at location #{FAKE_DIRECTORY}/appspec-override.yaml but it is not found there. Please either run the CLI from within a directory containing the appspec-override.yaml file or specify a bundle location containing an appspec-override.yaml file in its root directory")
       end
     end
 
@@ -225,7 +241,7 @@
         allow(File).to receive(:directory?).with(FAKE_DIRECTORY).and_return(true)
         expect(File).to receive(:exists?).with("#{FAKE_DIRECTORY}/appspec.yml").and_return(true)
         expect(validator.validate(args)).to equal(args)
-      end 
+      end
     end
   end
 end