Merge pull request #269 from mas-cli/fix-search

🐛 Fix search parameters
mas-cli · May 12, 2020 · b4ee510 · b4ee510
2 parents ef6be93 + 8591715
commit b4ee510
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+- 🐛 Fix search parameters #269
+
 ## [v1.6.3] 🗒️ List Fix - 2019-03-31
 
 - 🐛 Fix for list command on macOS 10.14.4 #228

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -30,6 +30,7 @@ pipeline {
         LANG        = 'en_US.UTF-8'
         LANGUAGE    = 'en_US.UTF-8'
         LC_ALL      = 'en_US.UTF-8'
+        DEVELOPER_DIR = '/Applications/Xcode-10.app'
     }
 
     stages {

diff --git a/MasKit/Controllers/StoreSearch.swift b/MasKit/Controllers/StoreSearch.swift
@@ -29,7 +29,7 @@ extension StoreSearch {
     /// - Returns: String URL for the search service or nil if appName can't be encoded.
     func searchURLString(forApp appName: String) -> String? {
         if let urlEncodedAppName = appName.URLEncodedString {
-            return "https://itunes.apple.com/search?entity=macSoftware&term=\(urlEncodedAppName)&attribute=allTrackTerm"
+            return "https://itunes.apple.com/search?media=software&entity=macSoftware&term=\(urlEncodedAppName)"
         }
         return nil
     }

diff --git a/MasKit/SupportingFiles/Info.plist b/MasKit/SupportingFiles/Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.3</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>10603000</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2018 Andrew Naylor. All rights reserved.</string>
 </dict>

diff --git a/MasKitTests/Controllers/StoreSearchSpec.swift b/MasKitTests/Controllers/StoreSearchSpec.swift
@@ -25,14 +25,14 @@ class StoreSearchSpec: QuickSpec {
                 let appName = "myapp"
                 let urlString = storeSearch.searchURLString(forApp: appName)
                 expect(urlString) ==
-                    "https://itunes.apple.com/search?entity=macSoftware&term=\(appName)&attribute=allTrackTerm"
+                    "https://itunes.apple.com/search?media=software&entity=macSoftware&term=\(appName)"
             }
             it("contains the encoded app name") {
                 let appName = "My App"
                 let appNameEncoded = "My%20App"
                 let urlString = storeSearch.searchURLString(forApp: appName)
                 expect(urlString) ==
-                    "https://itunes.apple.com/search?entity=macSoftware&term=\(appNameEncoded)&attribute=allTrackTerm"
+                    "https://itunes.apple.com/search?media=software&entity=macSoftware&term=\(appNameEncoded)"
             }
             // Find a character that causes addingPercentEncoding(withAllowedCharacters to return nil
             xit("is nil when app name cannot be url encoded") {

diff --git a/MasKitTests/SupportingFiles/Info.plist b/MasKitTests/SupportingFiles/Info.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.3</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>10603000</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
 </plist>
diff --git a/mas-cli.xcodeproj/project.pbxproj b/mas-cli.xcodeproj/project.pbxproj
@@ -1125,7 +1125,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
-				CURRENT_PROJECT_VERSION = 10603000;
+				CURRENT_PROJECT_VERSION = 10604000;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -1152,6 +1152,7 @@
 					"$(SRCROOT)/App/PrivateHeaders",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MARKETING_VERSION = 1.6.4;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli";
@@ -1190,7 +1191,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
-				CURRENT_PROJECT_VERSION = 10603000;
+				CURRENT_PROJECT_VERSION = 10604000;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1211,6 +1212,7 @@
 					"$(SRCROOT)/App/PrivateHeaders",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MARKETING_VERSION = 1.6.4;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli";
 				SDKROOT = macosx;

diff --git a/mas/mas-Info.plist b/mas/mas-Info.plist
@@ -11,6 +11,8 @@
 	<key>CFBundleName</key>
 	<string>mas-cli</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.3</string>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
 </plist>