Set default output path to current working directory (#142)

majd · Jan 23, 2023 · 56cc64f · 56cc64f
1 parent 7813e78
commit 56cc64f
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 39 deletions.
diff --git a/pkg/appstore/appstore_download.go b/pkg/appstore/appstore_download.go
@@ -237,7 +237,7 @@ func (a *appstore) resolveDestinationPath(app App, path string) (string, error)
 	file := fmt.Sprintf("/%s_%d_v%s_%d.ipa", app.BundleID, app.ID, app.Version, util.RandInt(100, 999))
 
 	if path == "" {
-		workdir, err := a.currentDirectory()
+		workdir, err := a.os.Getwd()
 		if err != nil {
 			return "", errors.Wrap(err, ErrGetCurrentDirectory.Error())
 		}
@@ -257,15 +257,6 @@ func (a *appstore) resolveDestinationPath(app App, path string) (string, error)
 	return path, nil
 }
 
-func (a *appstore) currentDirectory() (string, error) {
-	path, err := a.os.Executable()
-	if err != nil {
-		return "", errors.Wrap(err, ErrGetExecutablePath.Error())
-	}
-
-	return filepath.Dir(path), nil
-}
-
 func (a *appstore) isDirectory(path string) (bool, error) {
 	info, err := a.os.Stat(path)
 	if err != nil && !os.IsNotExist(err) {

diff --git a/pkg/appstore/appstore_download_test.go b/pkg/appstore/appstore_download_test.go
@@ -150,7 +150,7 @@ var _ = Describe("AppStore (Download)", func() {
 				}, nil)
 
 			mockOS.EXPECT().
-				Executable().
+				Getwd().
 				Return("", nil)
 
 			mockMachine.EXPECT().
@@ -181,7 +181,7 @@ var _ = Describe("AppStore (Download)", func() {
 				}, nil)
 
 			mockOS.EXPECT().
-				Executable().
+				Getwd().
 				Return("", nil)
 
 			mockMachine.EXPECT().
@@ -220,7 +220,7 @@ var _ = Describe("AppStore (Download)", func() {
 				}, nil)
 
 			mockOS.EXPECT().
-				Executable().
+				Getwd().
 				Return("", nil)
 
 			mockMachine.EXPECT().
@@ -307,7 +307,7 @@ var _ = Describe("AppStore (Download)", func() {
 				}, nil)
 
 			mockOS.EXPECT().
-				Executable().
+				Getwd().
 				Return("", nil)
 
 			mockMachine.EXPECT().
@@ -408,7 +408,7 @@ var _ = Describe("AppStore (Download)", func() {
 				}, nil)
 
 			mockOS.EXPECT().
-				Executable().
+				Getwd().
 				Return("", nil)
 
 			mockMachine.EXPECT().
@@ -474,7 +474,7 @@ var _ = Describe("AppStore (Download)", func() {
 				}, nil)
 
 			mockOS.EXPECT().
-				Executable().
+				Getwd().
 				Return("", nil)
 
 			mockMachine.EXPECT().
@@ -518,7 +518,7 @@ var _ = Describe("AppStore (Download)", func() {
 				}, nil)
 
 			mockOS.EXPECT().
-				Executable().
+				Getwd().
 				Return("", nil)
 
 			mockMachine.EXPECT().
@@ -690,7 +690,7 @@ var _ = Describe("AppStore (Download)", func() {
 
 		It("writes data to file", func() {
 			mockOS.EXPECT().
-				Executable().
+				Getwd().
 				Return("", nil)
 
 			mockOS.EXPECT().

diff --git a/pkg/util/operating_system.go b/pkg/util/operating_system.go
@@ -6,7 +6,7 @@ import "os"
 type OperatingSystem interface {
 	Getenv(key string) string
 	Stat(name string) (os.FileInfo, error)
-	Executable() (string, error)
+	Getwd() (string, error)
 	OpenFile(name string, flag int, perm os.FileMode) (*os.File, error)
 	Remove(name string) error
 	IsNotExist(err error) bool
@@ -27,8 +27,8 @@ func (*operatingSystem) Stat(name string) (os.FileInfo, error) {
 	return os.Stat(name)
 }
 
-func (*operatingSystem) Executable() (string, error) {
-	return os.Executable()
+func (*operatingSystem) Getwd() (string, error) {
+	return os.Getwd()
 }
 
 func (*operatingSystem) OpenFile(name string, flag int, perm os.FileMode) (*os.File, error) {

diff --git a/pkg/util/operating_system_mock.go b/pkg/util/operating_system_mock.go
diff --git a/pkg/util/operating_system_test.go b/pkg/util/operating_system_test.go
@@ -65,9 +65,9 @@ var _ = Describe("Operating System", func() {
 		})
 	})
 
-	When("executing", func() {
-		It("returns executable path", func() {
-			res, err := os.Executable()
+	When("running", func() {
+		It("returns current working directory", func() {
+			res, err := os.Getwd()
 			Expect(err).ToNot(HaveOccurred())
 			Expect(res).ToNot(BeNil())
 		})