Mirrors/mas
2
0
Fork 0
mirror of https://github.com/mas-cli/mas synced 2024-11-22 19:43:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #270 from mas-cli/release-1.6.4

Browse source 
🐛 Fix search parameters (from 1.6.4 hotfix)
This commit is contained in:
Ben Chatelain 2020-05-12 23:07:54 -06:00 committed by GitHub
commit 1775c0c8b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 34 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -17,6 +17,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
thanks, [@lwolfsonkin](https://github.com/lwolfsonkin)! thanks, [@lwolfsonkin](https://github.com/lwolfsonkin)!
- 💡 Update readme with simpler tap usage #241 - 💡 Update readme with simpler tap usage #241
## [v1.6.4] 🔎 Search Fix - 2020-05-11
- 🐛 Fix search parameters #269
## [v1.6.3] 🗒️ List Fix - 2019-03-31 ## [v1.6.3] 🗒️ List Fix - 2019-03-31
- 🐛 Fix for list command on macOS 10.14.4 #228 - 🐛 Fix for list command on macOS 10.14.4 #228

13
Homebrew/mas-tap.rb
View file

@ -2,17 +2,18 @@ class Mas < Formula
desc "Mac App Store command-line interface" desc "Mac App Store command-line interface"
homepage "https://github.com/mas-cli/mas" homepage "https://github.com/mas-cli/mas"
url "https://github.com/mas-cli/mas.git", url "https://github.com/mas-cli/mas.git",
:tag => "v1.6.3", :tag => "v1.6.4",
:revision => "3ac7e51b9e9fdd33f7caf7c77bebf09bf0cce44b" :revision => "4cfb3185b6c72ac4a67eaaf17f842cc1dacf27c7"
head "https://github.com/mas-cli/mas.git" head "https://github.com/mas-cli/mas.git"
bottle do bottle do
root_url "https://dl.bintray.com/phatblat/mas-bottles" root_url "https://dl.bintray.com/phatblat/mas-bottles"
cellar :any cellar :any
sha256 "2e0a42866823ef0dfd0b4e0e86f9016ab634ce7206e56c3520cb6fc18098d955" => :mojave sha256 "5ef426109d9c5be43a43621ea52bab6130aac836f4bec75d0d127fbc5526c26f" => :catalina
sha256 "2e0a42866823ef0dfd0b4e0e86f9016ab634ce7206e56c3520cb6fc18098d955" => :high_sierra sha256 "5ef426109d9c5be43a43621ea52bab6130aac836f4bec75d0d127fbc5526c26f" => :mojave
sha256 "2e0a42866823ef0dfd0b4e0e86f9016ab634ce7206e56c3520cb6fc18098d955" => :sierra sha256 "5ef426109d9c5be43a43621ea52bab6130aac836f4bec75d0d127fbc5526c26f" => :high_sierra
sha256 "2e0a42866823ef0dfd0b4e0e86f9016ab634ce7206e56c3520cb6fc18098d955" => :el_capitan sha256 "5ef426109d9c5be43a43621ea52bab6130aac836f4bec75d0d127fbc5526c26f" => :sierra
sha256 "5ef426109d9c5be43a43621ea52bab6130aac836f4bec75d0d127fbc5526c26f" => :el_capitan
end end
depends_on "carthage" => :build depends_on "carthage" => :build

5
Homebrew/mas.rb
View file

@ -2,12 +2,13 @@ class Mas < Formula
desc "Mac App Store command-line interface" desc "Mac App Store command-line interface"
homepage "https://github.com/mas-cli/mas" homepage "https://github.com/mas-cli/mas"
url "https://github.com/mas-cli/mas.git", url "https://github.com/mas-cli/mas.git",
:tag => "v1.6.3", :tag => "v1.6.4",
:revision => "3ac7e51b9e9fdd33f7caf7c77bebf09bf0cce44b" :revision => "4cfb3185b6c72ac4a67eaaf17f842cc1dacf27c7"
head "https://github.com/mas-cli/mas.git" head "https://github.com/mas-cli/mas.git"
bottle do bottle do
cellar :any cellar :any
sha256 "2069b8c1c1a64c2fb91cc1c25ab9c9890c61f2182224b9e0605a35a151bb85bd" => :catalina
sha256 "3dd5a50b551a37c164c31375cc8498ba870e29e50086bd5c4c294bc26708a6d2" => :mojave sha256 "3dd5a50b551a37c164c31375cc8498ba870e29e50086bd5c4c294bc26708a6d2" => :mojave
sha256 "a0d1e45203448c08420c3eab2d40ef957fd22c8e40fbeb067bc7bffe4f08dfe2" => :high_sierra sha256 "a0d1e45203448c08420c3eab2d40ef957fd22c8e40fbeb067bc7bffe4f08dfe2" => :high_sierra
end end

1
Jenkinsfile vendored
View file

@ -30,6 +30,7 @@ pipeline {
LANG = 'en_US.UTF-8' LANG = 'en_US.UTF-8'
LANGUAGE = 'en_US.UTF-8' LANGUAGE = 'en_US.UTF-8'
LC_ALL = 'en_US.UTF-8' LC_ALL = 'en_US.UTF-8'
DEVELOPER_DIR = '/Applications/Xcode-11.4.1.app'
} }
stages { stages {

2
MasKit/Controllers/StoreSearch.swift
View file

@ -29,7 +29,7 @@ extension StoreSearch {
/// - Returns: String URL for the search service or nil if appName can't be encoded. /// - Returns: String URL for the search service or nil if appName can't be encoded.
func searchURLString(forApp appName: String) -> String? { func searchURLString(forApp appName: String) -> String? {
if let urlEncodedAppName = appName.URLEncodedString { 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 return nil
} }

4
MasKit/SupportingFiles/Info.plist
View file

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

4
MasKitTests/Controllers/StoreSearchSpec.swift
View file

@ -24,14 +24,14 @@ class StoreSearchSpec: QuickSpec {
let appName = "myapp" let appName = "myapp"
let urlString = storeSearch.searchURLString(forApp: appName) let urlString = storeSearch.searchURLString(forApp: appName)
expect(urlString) == 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") { it("contains the encoded app name") {
let appName = "My App" let appName = "My App"
let appNameEncoded = "My%20App" let appNameEncoded = "My%20App"
let urlString = storeSearch.searchURLString(forApp: appName) let urlString = storeSearch.searchURLString(forApp: appName)
expect(urlString) == 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 // Find a character that causes addingPercentEncoding(withAllowedCharacters to return nil
xit("is nil when app name cannot be url encoded") { xit("is nil when app name cannot be url encoded") {

4
MasKitTests/SupportingFiles/Info.plist
View file

@ -15,8 +15,8 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>BNDL</string> <string>BNDL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.6.3</string> <string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>10603000</string> <string>$(CURRENT_PROJECT_VERSION)</string>
</dict> </dict>
</plist> </plist>

6
mas-cli.xcodeproj/project.pbxproj
View file

@ -1125,7 +1125,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CREATE_INFOPLIST_SECTION_IN_BINARY = YES; CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
CURRENT_PROJECT_VERSION = 10603000; CURRENT_PROJECT_VERSION = 10604000;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;
@ -1152,6 +1152,7 @@
"$(SRCROOT)/App/PrivateHeaders", "$(SRCROOT)/App/PrivateHeaders",
); );
MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET = 10.11;
MARKETING_VERSION = 1.6.4;
MTL_ENABLE_DEBUG_INFO = YES; MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli"; PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli";
@ -1191,7 +1192,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CREATE_INFOPLIST_SECTION_IN_BINARY = YES; CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
CURRENT_PROJECT_VERSION = 10603000; CURRENT_PROJECT_VERSION = 10604000;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO; ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
@ -1212,6 +1213,7 @@
"$(SRCROOT)/App/PrivateHeaders", "$(SRCROOT)/App/PrivateHeaders",
); );
MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET = 10.11;
MARKETING_VERSION = 1.6.4;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli"; PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli";
SDKROOT = macosx; SDKROOT = macosx;

4
mas/mas-Info.plist
View file

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

2
script/bottle
View file

@ -11,7 +11,7 @@ BUILD_DIR="$PWD/build"
BOTTLE_DIR="$BUILD_DIR/bottles" BOTTLE_DIR="$BUILD_DIR/bottles"
VERSION=$(script/version) VERSION=$(script/version)
ROOT_URL="https://dl.bintray.com/phatblat/mas-bottles" ROOT_URL="https://dl.bintray.com/phatblat/mas-bottles"
OS_VERSIONS=(mojave high_sierra sierra el_capitan) OS_VERSIONS=(catalina mojave high_sierra sierra el_capitan)
OLD_FILENAME="mas--${VERSION}.${OS_VERSIONS[0]}.bottle.tar.gz" OLD_FILENAME="mas--${VERSION}.${OS_VERSIONS[0]}.bottle.tar.gz"
echo "==> 🍼 Bottling mas ${VERSION} for ${OS_VERSIONS[*]}" echo "==> 🍼 Bottling mas ${VERSION} for ${OS_VERSIONS[*]}"

5
script/version
View file

@ -6,4 +6,7 @@
# Displays the current marketing version of mas. # Displays the current marketing version of mas.
# #
agvtool what-marketing-version -terse1 # This no longer works with MARKETING_VERSION build setting in Info.plist
# agvtool what-marketing-version -terse1
echo "1.6.4"