Merge pull request #130 from mstandley-tempus/assets-in-separate-dir

optionally put assets in separate dir

Author: taylorsilva

README.md

@@ -65,6 +65,10 @@ Fetches and creates versioned GitHub resources.
    Selects whether to order releases by version (as extracted by `tag_filter`)
    or by time. See `check` behavior described below for details.
 
+* `asset_dir`:  *Optional. Default `false`.* When set to `true`, downloaded assets
+  will be created in a separate directory called `assets`. Otherwise, they will be
+  created in the same directory as the other files.
+
 ### Example
 
 ``` yaml
@@ -135,7 +139,8 @@ Otherwise it returns the release with the latest version or time.
 
 ### `in`: Fetch assets from a release.
 
-Fetches artifacts from the requested release.
+Fetches artifacts from the requested release.  If `asset_dir` source param is set to `true`,
+artifacts will be created in a subdirectory called `assets`.
 
 Also creates the following files:
 

in_command.go

@@ -31,6 +31,16 @@ func (c *InCommand) Run(destDir string, request InRequest) (InResponse, error) {
 		return InResponse{}, err
 	}
 
+	// if AssetDir is true, create a separate directory for assets
+	assetDir := destDir
+	if request.Source.AssetDir {
+		assetDir = filepath.Join(destDir, "assets")
+		err = os.MkdirAll(assetDir, 0755)
+		if err != nil {
+			return InResponse{}, err
+		}
+	}
+
 	var foundRelease *github.RepositoryRelease
 	var commitSHA string
 
@@ -121,7 +131,7 @@ func (c *InCommand) Run(destDir string, request InRequest) (InResponse, error) {
 			continue
 		}
 
-		path := filepath.Join(destDir, *asset.Name)
+		path := filepath.Join(assetDir, *asset.Name)
 
 		var matchFound bool
 		if len(request.Params.Globs) == 0 {
@@ -158,7 +168,7 @@ func (c *InCommand) Run(destDir string, request InRequest) (InResponse, error) {
 			return InResponse{}, err
 		}
 		fmt.Fprintln(c.writer, "downloading source tarball to source.tar.gz")
-		if err := c.downloadFile(u.String(), filepath.Join(destDir, "source.tar.gz")); err != nil {
+		if err := c.downloadFile(u.String(), filepath.Join(assetDir, "source.tar.gz")); err != nil {
 			return InResponse{}, err
 		}
 	}
@@ -169,7 +179,7 @@ func (c *InCommand) Run(destDir string, request InRequest) (InResponse, error) {
 			return InResponse{}, err
 		}
 		fmt.Fprintln(c.writer, "downloading source zip to source.zip")
-		if err := c.downloadFile(u.String(), filepath.Join(destDir, "source.zip")); err != nil {
+		if err := c.downloadFile(u.String(), filepath.Join(assetDir, "source.zip")); err != nil {
 			return InResponse{}, err
 		}
 	}

in_command_test.go

@@ -270,6 +270,16 @@ var _ = Describe("In Command", func() {
 								Expect(err).NotTo(HaveOccurred())
 								Expect(fContents).To(Equal("source-tar-file-contents"))
 							})
+
+							It("saves the source tarball in the assets directory, if desired", func() {
+								inRequest.Source.AssetDir = true
+								inResponse, inErr = command.Run(destDir, inRequest)
+
+								fileContents, err := ioutil.ReadFile(filepath.Join(destDir, "assets", "source.tar.gz"))
+								fContents := string(fileContents)
+								Expect(err).NotTo(HaveOccurred())
+								Expect(fContents).To(Equal("source-tar-file-contents"))
+							})
 						})
 
 						Context("when downloading the tarball fails", func() {
@@ -350,6 +360,16 @@ var _ = Describe("In Command", func() {
 								Expect(err).NotTo(HaveOccurred())
 								Expect(fContents).To(Equal("source-zip-file-contents"))
 							})
+
+							It("saves the source tarball in the assets directory, if desired", func() {
+								inRequest.Source.AssetDir = true
+								inResponse, inErr = command.Run(destDir, inRequest)
+
+								fileContents, err := ioutil.ReadFile(filepath.Join(destDir, "assets", "source.zip"))
+								fContents := string(fileContents)
+								Expect(err).NotTo(HaveOccurred())
+								Expect(fContents).To(Equal("source-zip-file-contents"))
+							})
 						})
 
 						Context("when downloading the zip fails", func() {

resources.go

@@ -19,6 +19,7 @@ type Source struct {
 	PreRelease       bool   `json:"pre_release"`
 	Release          bool   `json:"release"`
 	Insecure         bool   `json:"insecure"`
+	AssetDir         bool   `json:"asset_dir"`
 
 	TagFilter        string `json:"tag_filter"`
 	OrderBy          string `json:"order_by"`