pprof 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e19ab5781df3a2fe5ddd41e85b937da9134941a
-  data.tar.gz: ec74aa8ec2cd3341756d38ab617839cb259d87ac
+  metadata.gz: 2f60b44644e56bc45b81947c9199dd4764fb662a
+  data.tar.gz: db0e68c466cda99a9f3bf089c51d8acf6d6b9ce9
 SHA512:
-  metadata.gz: fd233c67e41648c601af8a57ae712a2ad32dfbd8912ba71d062633afbb6dbddeadc32161d9f5d929213c4479dfe8a0479c38c10d42d9bd6485477a28754df261
-  data.tar.gz: df20d443af778ba98a8b44d44927a994dd94d97536369bfba77580e8740787c1a9ab593938a4000cf6ad6a667f18e42ab43a9f7ed5310a400dfecf95983e1e6c
+  metadata.gz: ce03ae54a596510d275de06aefa1d37bc303cb4e48be2ff64dfefa2df5105f4138f4a93c721fb5cf94fe8ff246577bf94d14d653fb7837d899c68dbd523a7c6e
+  data.tar.gz: 86d71af33e77f24bfbe5a22ba24c06f9eeee51a346fe8f640b8a18520a37d317b6d00d07f2f9099c30b1b41aaf7def99861736010fc4a329c2fef88dca9c86ca

data/README.md

@@ -60,7 +60,11 @@ $ pprof --has-devices
 
 # Combine filters
 $ pprof --has-devices --aps --appid com.foo
+
+# List only the expired profiles, and pipe the resulting list to xargs to remove them all
+$ pprof --exp -0 | xargs -0 rm
 ```
+
 ```sh
 # Print info for a given Provisioning Profile
 $ pprof '12345678-ABCD-EF90-1234-567890ABCDEF'

data/bin/pprof

@@ -3,7 +3,9 @@
 require 'pprof'
 require 'optparse'
 
-
+# Creates a Regex if the string is wrapped inside `/…/`
+# Or a standard match if the string is bare.
+#
 def matcher(string)
   m = string.match(%r[^/(.*)/(.*)$])
   if m.nil?
@@ -17,17 +19,19 @@ end
 
 filters = {}
 options = {}
+list_options = { :mode => :table }
+
 parser = OptionParser.new do |opts|
   opts.banner = <<-BANNER.gsub(/^ *\|/,'')
     |Usage:
-    |  pprof [options] [PATH|UUID]
-    |  pprof [filters]
+    |  pprof [print_options] [PATH|UUID]
+    |  pprof [list_options] [filters]
     |
     |Note: All filters expecting a string are interpreted as regular expressions if surrounded by slashes
   BANNER
 
   opts.separator ""
-  opts.separator "Print options"
+  opts.separator "Print options (when file given)"
 
   opts.on("-i", "--info", "Print general info (default)") do
     options[:info] = true
@@ -40,9 +44,22 @@ parser = OptionParser.new do |opts|
   end
 
   opts.separator ""
-  opts.separator "Filters"
+  opts.separator "List options (when no file given)"
+
+  opts.on("-l", "--list", "Print only the UUIDs, one per line (instead of an ASCII table)") do
+    list_options[:mode] = :list
+  end
+  opts.on("-p", "--path", "Print only the paths, one per line (instead of an ASCII table)") do
+    list_options[:mode] = :path
+  end
+  opts.on("-0", "--print0", "Separate each found entry by \0, to be used by `xargs -0`") do
+    list_options[:zero] = true
+  end
+
+  opts.separator ""
+  opts.separator "Filters (when no file given)"
 
-  opts.on("-n", "--name NAME", "Filter by name") do |name|
+  opts.on("--name NAME", "Filter by name") do |name|
     filters[:name] = matcher(name)
   end
 
@@ -50,7 +67,7 @@ parser = OptionParser.new do |opts|
     filters[:appid_name] = matcher(appid_name)
   end
 
-  opts.on("-a", "--appid APPID", "Filter by App ID") do |appid|
+  opts.on("--appid APPID", "Filter by App ID") do |appid|
     filters[:appid] = matcher(appid)
   end
 
@@ -58,7 +75,11 @@ parser = OptionParser.new do |opts|
     filters[:uuid] = matcher(uuid)
   end
 
-  opts.on("-e", "--[no-]exp", "Only profiles (not) expired") do |flag|
+  opts.on("--team TEAM", "Filter by team name or ID") do |team|
+    filters[:team] = matcher(team)
+  end
+
+  opts.on("--[no-]exp", "Only profiles (not) expired") do |flag|
     filters[:exp] = flag
   end
 
@@ -117,7 +138,8 @@ end
 if ARGV.empty?
   # Print list of matching profiles
   o = PProf::OutputFormatter.new
-  o.print_filtered_list(PProf::ProvisioningProfile::DEFAULT_DIR, filters)
+  list_options[:mode] = :path if list_options[:zero] && list_options[:mode] == :table
+  o.print_filtered_list(PProf::ProvisioningProfile::DEFAULT_DIR, filters, list_options)
 else
   # Print info about given profile path/UUID
   p = PProf::ProvisioningProfile.new(ARGV[0])

data/lib/pprof/output_formatter.rb

@@ -71,24 +71,44 @@ module PProf
     #
     # 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
+    #
     # @param [Hash<Symbol,Any>] filters
     #        The hash describing the applied filters
     #
-    def print_filtered_list(dir = PProf::ProvisioningProfile::DEFAULT_DIR, filters = {})
-      print_list(dir) do |p|
+    # @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|
         (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]) &&
         (filters[:uuid].nil? || p.uuid =~ filters[:uuid]) &&
+        (filters[:team].nil? || p.team_name =~ filters[:team] || p.team_ids.any? { |id| id =~ filters[:team] }) &&
         (filters[:exp].nil? || (p.expiration_date < DateTime.now) == filters[:exp]) &&
         (filters[:has_devices].nil? || !(p.provisioned_devices || []).empty? == filters[:has_devices]) &&
         (filters[:all_devices].nil? || p.provisions_all_devices == filters[:all_devices]) &&
         (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)
+      else
+        print_list(dir, list_options, &filter_func)
+      end
     end
 
-    # Prints the filtered list
+    # Prints the filtered list as a table
     #
     # @param [String] dir
     #        The directory containing the mobileprovision files to list.
@@ -98,7 +118,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)
+    def print_table(dir = PProf::ProvisioningProfile::DEFAULT_DIR)
       count = 0
 
       table = PProf::OutputFormatter::ASCIITable.new(36, 60, 45, 25, 2, 10)
@@ -120,6 +140,27 @@ module PProf
       @output.puts "#{count} Provisioning Profiles found."
     end
 
+    # Prints the filtered list of UUIDs or Paths only
+    #
+    # @param [String] dir
+    #        The directory containing the mobileprovision files to list.
+    #        Defaults to '~/Library/MobileDevice/Provisioning Profiles'
+    #
+    # @yield each provisioning provile for filtering/validation
+    #        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)
+      Dir[dir + '/*.mobileprovision'].each do |file|
+        p = PProf::ProvisioningProfile.new(file)
+        next if block_given? && !yield(p)
+
+        @output.print options[:mode] == :uuid ? p.uuid.chomp : file.chomp
+        @output.print options[:zero] ? "\0" : "\n"
+      end
+    end
+
+
     private
     def self.match_aps_env(actual, expected)
       return false if actual.nil?      # false if no Push entitlements

data/lib/pprof/version.rb

@@ -1,4 +1,4 @@
 module PProf
   # Module version
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

metadata

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