From a983a12e61ab1164625c7722413d878bab5b1ace Mon Sep 17 00:00:00 2001
From: "Christian G. Warden" <cwarden@xerus.org>
Date: Thu, 25 Feb 2016 10:30:00 -0800
Subject: [PATCH] Don't Add meta.xml Files to package.xml When Deploying

Fixes deploying by metadata type, e.g. `force push -t ApexClass`.
---
 packagebuilder.go      |  2 +-
 packagebuilder_test.go | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/packagebuilder.go b/packagebuilder.go
index 3a393aae..d36fd5f5 100644
--- a/packagebuilder.go
+++ b/packagebuilder.go
@@ -136,7 +136,7 @@ func (pb *PackageBuilder) AddFile(fpath string) (fname string, err error) {
 	}
 
 	metaName, fname := getMetaTypeFromPath(fpath)
-	if !isDestructiveChanges && !strings.HasSuffix(fname, "-meta.xml") {
+	if !isDestructiveChanges && !strings.HasSuffix(fpath, "-meta.xml") {
 		pb.AddMetaToPackage(metaName, fname)
 	}
 
diff --git a/packagebuilder_test.go b/packagebuilder_test.go
index 1c146bf7..9be82d5f 100644
--- a/packagebuilder_test.go
+++ b/packagebuilder_test.go
@@ -54,6 +54,27 @@ var _ = Describe("Packagebuilder", func() {
 			})
 		})
 
+		Context("when adding a meta.xml file", func() {
+			var apexClassMetadataPath string
+
+			BeforeEach(func() {
+				os.MkdirAll(tempDir+"/src/classes", 0755)
+				apexClassMetadataPath = tempDir + "/src/classes/Test.cls-meta.xml"
+				apexClassMetadataContents := `<?xml version="1.0" encoding="UTF-8"?>`
+				ioutil.WriteFile(apexClassMetadataPath, []byte(apexClassMetadataContents), 0644)
+			})
+
+			It("should add the file to package", func() {
+				_, err := pb.AddFile(apexClassMetadataPath)
+				Expect(err).ToNot(HaveOccurred())
+				Expect(pb.Files).To(HaveKey("classes/Test.cls-meta.xml"))
+			})
+			It("should not add the file to the package.xml", func() {
+				pb.AddFile(apexClassMetadataPath)
+				Expect(pb.Metadata).ToNot(HaveKey("ApexClass"))
+			})
+		})
+
 		Context("when adding a CustomMetadata file", func() {
 			var customMetadataPath string