Align version (1.0.4)

majd · Jun 8, 2021 · 5009048 · 5009048
1 parent 59fb28c
commit 5009048
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -34,14 +34,16 @@ To search for apps on the App Store, use the `search` command.
 ```
 OVERVIEW: Search for iOS apps available on the App Store.
 
-USAGE: ipatool search [--limit <limit>] [--country <country>] <term> [--log-level <log-level>]
+USAGE: ipatool search <term> [--limit <limit>] [--country <country>] [--log-level <log-level>]
 
 ARGUMENTS:
   <term>                  The term to search for. 
 
 OPTIONS:
-  --limit <limit>         (default: 5)
-  --country <country>     The country to search in. (default: US)
+  -l, --limit <limit>     The maximum amount of search results to retrieve.
+                          (default: 5)
+  -c, --country <country> The two-letter (ISO 3166-1 alpha-2) country code for
+                          the iTunes Store. (default: US)
   --log-level <log-level> (default: info)
   --version               Show the version.
   -h, --help              Show help information.
@@ -52,15 +54,16 @@ To download a copy of the ipa file, use the `download` command.
 ```
 OVERVIEW: Download (encrypted) iOS app packages from the App Store.
 
-USAGE: ipatool download --bundle-identifier <bundle-identifier> [--email <email>] [--password <password>] [--log-level <log-level>]
+USAGE: ipatool download --bundle-identifier <bundle-identifier> [--email <email>] [--password <password>] [--country <country>] [--log-level <log-level>]
 
 OPTIONS:
   -b, --bundle-identifier <bundle-identifier>
                           The bundle identifier of the target iOS app. 
-  -c, --country <country> The country of the target iOS app. (default: US)
   -e, --email <email>     The email address for the Apple ID. 
   -p, --password <password>
                           The password for the Apple ID. 
+  -c, --country <country> The two-letter (ISO 3166-1 alpha-2) country code for
+                          the iTunes Store. (default: US)
   --log-level <log-level> (default: info)
   --version               Show the version.
   -h, --help              Show help information.

diff --git a/Source/Commands/Download.swift b/Source/Commands/Download.swift
@@ -16,15 +16,15 @@ struct Download: ParsableCommand {
     @Option(name: [.short, .long], help: "The bundle identifier of the target iOS app.")
     private var bundleIdentifier: String
 
-    @Option(name: [.short, .long], help: "The country of the target iOS app.")
-    private var country: String = "US"
-
     @Option(name: [.short, .customLong("email")], help: "The email address for the Apple ID.")
     private var emailArgument: String?
 
     @Option(name: [.short, .customLong("password")], help: "The password for the Apple ID.")
     private var passwordArgument: String?
 
+    @Option(name: [.short, .long], help: "The two-letter (ISO 3166-1 alpha-2) country code for the iTunes Store.")
+    private var country: String = "US"
+
     @Option
     private var logLevel: LogLevel = .info
 

diff --git a/Source/Commands/IPATool.swift b/Source/Commands/IPATool.swift
@@ -11,7 +11,7 @@ struct IPATool: ParsableCommand {
     static var configuration: CommandConfiguration {
         return .init(commandName: "ipatool",
                      abstract: "A cli tool for interacting with Apple's ipa files.",
-                     version: "1.0.3",
+                     version: "1.0.4",
                      subcommands: [Download.self, Search.self])
     }
 }
diff --git a/Source/Commands/Search.swift b/Source/Commands/Search.swift
@@ -13,14 +13,14 @@ struct Search: ParsableCommand {
         return .init(abstract: "Search for iOS apps available on the App Store.")
     }
 
-    @Option
-    private var limit: Int = 5
+    @Argument(help: "The term to search for.")
+    private var term: String
 
-    @Option(help: "The two-letter (ISO 3166-1 alpha-2) country code for the store you want to search.")
-    var country: String = "US"
+    @Option(name: [.short, .long], help: "The maximum amount of search results to retrieve.")
+    private var limit: Int = 5
 
-    @Argument(help: "The term to search for.")
-    var term: String
+    @Option(name: [.short, .long], help: "The two-letter (ISO 3166-1 alpha-2) country code for the iTunes Store.")
+    private var country: String = "US"
 
     @Option
     private var logLevel: LogLevel = .info

diff --git a/ipatool.xcodeproj/project.pbxproj b/ipatool.xcodeproj/project.pbxproj
@@ -122,8 +122,8 @@
 			isa = PBXGroup;
 			children = (
 				A9CA48CC2658FBF700BC09D5 /* Download.swift */,
-				A9CA49022659627A00BC09D5 /* Search.swift */,
 				A9CA48CE2658FC7400BC09D5 /* IPATool.swift */,
+				A9CA49022659627A00BC09D5 /* Search.swift */,
 			);
 			path = Commands;
 			sourceTree = "<group>";

diff --git a/ipatool.xcodeproj/xcshareddata/xcschemes/ipatool.xcscheme b/ipatool.xcodeproj/xcshareddata/xcschemes/ipatool.xcscheme
@@ -53,7 +53,7 @@
       <CommandLineArguments>
          <CommandLineArgument
             argument = "download --help"
-            isEnabled = "NO">
+            isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "download -b com.apple.TestFlight"
@@ -65,7 +65,7 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "search TestFlight --limit 5"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
       </CommandLineArguments>
    </LaunchAction>