pprof 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7691660bb69c7c6f6f4fedb4722dc0e647183378e5aa79cfa0ce2a80f7e4cef
-  data.tar.gz: ae54346cc1d76c10a89468b605a698727ff38909f683bed7ff8a6d779c6605b0
+  metadata.gz: 21276029f4a059802fcc59cdf37a843caa2b38cc11d6af22f76fa2969bf24975
+  data.tar.gz: 02eedbe630b35226f7a00c531d0b8075b11ab6f4c705434e2f4e4f3445251c8d
 SHA512:
-  metadata.gz: 9b2490137336562c025610bbfc7de8b0fe1a177005b9a7c7cfea21310fedb3f77164745303dc08b1816d3e8dd5a0f7a5aaa71373a71c784921982d36da4e876f
-  data.tar.gz: 22665cd4ba32a996577a8ed8099348f29193fb88589a32b1faaf8ca03298a971902373d23cdad568c59a1b6e23f59f81e3c0a3e543e8173c18ddd71f098379a5
+  metadata.gz: 48eb1f57db15c832e6a9acf454d9c6a5ce3be07dc7db4d5877cccb7c32c96f6cfddcf7b3be78a8af8c2c9374148961273a0a1e22a5f51e13b0d8df7359b20ed7
+  data.tar.gz: fdb8efa34984352bc61242ae6452c3e5f6a6e3c11708735c0061d202dae12d8c232458ad88f02d572579221e7d1b8e7e30b1c457048ad626097d80d9825e5aba

data/bin/pprof

@@ -40,6 +40,8 @@ parser = OptionParser.new do |opts|
     |Tips:
     |  - If you want to search for _exact_ match, you can use and anchored RegEx like `/^InHouse$/i`
     |  - To remove all expired certificates, you can use `#{opts.program_name} -e0 | xargs -0 rm`
+    |  - You can combine the `--json` output with `jq` to generate and filter using some powerful custom outputs.
+    |    e.g.: `#{opts.program_name} --name 'My App' --json --devices | jq '.[] | {uuid:.UUID, name:.AppIDName, nb_profiles: .ProvisionedDevices|length}'`
   BANNER
 
   opts.separator ''
@@ -142,7 +144,7 @@ unless filters.empty? || ARGV.empty?
   exit
 end
 
-unless options.empty? || !ARGV.empty?
+unless list_options[:mode] == :json || options.empty? || !ARGV.empty?
   puts 'You should use option flags only when providing an specific path.'
   puts parser # Usage
   exit
@@ -154,7 +156,15 @@ o = PProf::OutputFormatter.new
 if ARGV.empty?
   # Print list of matching profiles
   list_options[:mode] = :path if list_options[:zero] && list_options[:mode] == :table
-  o.print_filtered_list(PProf::ProvisioningProfile::DEFAULT_DIR, filters, list_options)
+  filter_func = o.filter_proc(filters)
+  case list_options[:mode]
+  when :table
+    o.print_table(&filter_func)
+  when :json
+    o.print_json_list(options: options, &filter_func)
+  else
+    o.print_list(options: list_options, &filter_func)
+  end
 else
   begin
     # Print info about given profile path/UUID

data/lib/pprof/output_formatter.rb

@@ -113,7 +113,7 @@ module PProf
       hash.delete 'DER-Encoded-Profile'
       hash.delete 'ProvisionedDevices' unless options[:devices]
       if options[:certs]
-        hash['DeveloperCertificates'] = developer_certificates.map do |cert|
+        hash['DeveloperCertificates'] = profile.developer_certificates.map do |cert|
           {
             subject: cert.subject,
             issuer: cert.issuer,
@@ -140,27 +140,14 @@ module PProf
       @output.puts JSON.pretty_generate(as_json(profile, options))
     end
 
-    # Prints the filtered list of Provisioning Profiles
-    #
-    # Convenience method. Calls self.print_list with a filter block build from a filter hash
-    #
-    # @param [String] dir
-    #        The directory to search for the provisioning profiles. Defaults to the standard directory on Mac
+    # Generates a lambda which takes a `PProf::ProvisioningProfile` and returns if it should be kept in our listing or not
     #
     # @param [Hash<Symbol,Any>] filters
     #        The hash describing the applied filters
+    # @return [Lambda] A lambda which takes a `PProf::ProvisioningProfile` and returns `true` if it matches the provided `filters`
     #
-    # @param [Hash<Symbol,Any>] list_options
-    #        The way to print the output.
-    #        * Valid values for key `:mode` are:
-    #          - `:table` (for ASCII table output)
-    #          - `:list` (for plain list of only the UUIDs, suitable for piping to `xargs`)
-    #          - `:path` (for plain list of only the paths, suitable for piping to `xargs`)
-    #        * Valid values for key `:zero` are `true` or `false` to decide if we print `\0` at the end of each output.
-    #          Only used by `:list` and `:path` modes
-    #
-    def print_filtered_list(dir = PProf::ProvisioningProfile::DEFAULT_DIR, filters = {}, list_options = { mode: :table })
-      filter_func = lambda do |p|
+    def filter_proc(filters = {})
+      lambda do |p|
         (filters[:name].nil? || p.name =~ filters[:name]) &&
           (filters[:appid_name].nil? || p.app_id_name =~ filters[:appid_name]) &&
           (filters[:appid].nil? || p.entitlements.app_id =~ filters[:appid]) &&
@@ -172,15 +159,6 @@ module PProf
           (filters[:aps_env].nil? || match_aps_env(p.entitlements.aps_environment, filters[:aps_env])) &&
           true
       end
-
-      case list_options[:mode]
-      when :table
-        print_table(dir, &filter_func)
-      when :json
-        print_json_list(dir, list_options, &filter_func)
-      else
-        print_list(dir, list_options, &filter_func)
-      end
     end
 
     # Prints the filtered list as a table
@@ -193,7 +171,7 @@ module PProf
     #        The block is given ProvisioningProfile object and should
     #        return true to display the row, false to filter it out
     #
-    def print_table(dir = PProf::ProvisioningProfile::DEFAULT_DIR)
+    def print_table(dir: PProf::ProvisioningProfile::DEFAULT_DIR)
       count = 0
       errors = []
 
@@ -237,7 +215,7 @@ module PProf
     #        The block is given ProvisioningProfile object and should
     #        return true to display the row, false to filter it out
     #
-    def print_list(dir = PProf::ProvisioningProfile::DEFAULT_DIR, options) # rubocop:disable Style/OptionalArguments
+    def print_list(dir: PProf::ProvisioningProfile::DEFAULT_DIR, options:) # rubocop:disable Style/OptionalArguments
       errors = []
       Dir['*.mobileprovision', base: dir].each do |file_name|
         file = File.join(dir, file_name)
@@ -259,14 +237,14 @@ module PProf
     #        Defaults to '~/Library/MobileDevice/Provisioning Profiles'
     # @param [Hash] options
     #        The options hash typically filled while parsing the command line arguments.
-    #         - :mode: will print the UUIDs if set to `:list`, the file path otherwise
-    #         - :zero: will concatenate the entries with `\0` instead of `\n` if set
+    #         - :certs: will print the UUIDs if set to `:list`, the file path otherwise
+    #         - :devices: will concatenate the entries with `\0` instead of `\n` if set
     #
     # @yield each provisioning profile for filtering/validation
     #        The block is given ProvisioningProfile object and should
     #        return true to display the row, false to filter it out
     #
-    def print_json_list(dir = PProf::ProvisioningProfile::DEFAULT_DIR, options) # rubocop:disable Style/OptionalArguments
+    def print_json_list(dir: PProf::ProvisioningProfile::DEFAULT_DIR, options:) # rubocop:disable Style/OptionalArguments
       errors = []
       profiles = Dir['*.mobileprovision', base: dir].map do |file_name|
         file = File.join(dir, file_name)

data/lib/pprof/version.rb

@@ -2,5 +2,5 @@
 
 module PProf
   # Module version
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pprof
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Olivier Halligon