instrumentality 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05ae3b363734c9eb4a9c6cbbbb3b2d2f7e4c3d87
-  data.tar.gz: 8ac7c4c91afa271574d1e78e8a09b69eaf48badc
+  metadata.gz: 4bd92f799a2dc113dda402dfe40d94334be2324f
+  data.tar.gz: 350759f37a462eab9c6a155c90a689945f3764a0
 SHA512:
-  metadata.gz: 4fb9e519ea950637947cc7e06ed3fd895966bd8d554f1016fb1cb7b1b1ea7cab5a3ebed8ad8c9abdbe8ec10b0329b1f4de6f5a1e4d811c5343b0c8eb6f618eb7
-  data.tar.gz: 5432bc1923d7091db9920d82f8e8bfd6bcc50c55026ee7fe51b33e8a332ebde863c899eac44048e9645eed68d80e8b7aa1ea8c6f07f147f2367817e5c01a91c6
+  metadata.gz: 0df7535151887c65cf1f89412f8419801cc731d71d7f43844e40200f117f2300cf853d648059b67950e02a46b074b3055d87c6ff7a8abbb912c72332e2703fbb
+  data.tar.gz: 013656bdb62c8d9295a797f1455dfa5b12e4a3465fe0f2dffc6ab76c22763339c3401be35a288bfe048607084db708987d25761668915128b16ebfde4b4a22e0

data/.circleci/config.yml

@@ -0,0 +1,12 @@
+version: 2.0
+jobs:
+  build:
+    docker:
+      - image: ruenzuo/instrumentality-circle-ci:latest
+    environment:
+      - COVERAGE: "YES"
+    steps:
+      - checkout
+      - run: gem install bundler
+      - run: bundle
+      - run: (/usr/local/bin/Finder.app &) && bundle exec rake spec

data/.circleci/images/Dockerfile

@@ -0,0 +1,4 @@
+FROM ruby:2.2-alpine
+COPY Finder.app xcode-select xcodebuild /usr/local/bin/
+RUN apk --update --no-cache add git make gcc libc-dev
+

data/.circleci/images/Finder.app

@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+
+while true
+do
+    sleep 5
+done

data/.coveralls.yml

@@ -0,0 +1,2 @@
+service_name: 'circle-ci'
+repo_token: '5Qb2yMzjmBmwxQ2sDr6Irn5jjHhYLST9d'

data/README.md

@@ -1,5 +1,8 @@
 # Instrumentality
 
+[![CircleCI](https://circleci.com/gh/Ruenzuo/instrumentality.svg?style=svg&circle-token=71523995bd17c73c1ce365df507d24cb0bc1e3c4)](https://circleci.com/gh/Ruenzuo/instrumentality)
+[![Coverage Status](https://coveralls.io/repos/github/Ruenzuo/instrumentality/badge.svg?branch=master)](https://coveralls.io/github/Ruenzuo/instrumentality?branch=master)
+
 Command line interface to profiling tools for iOS development
 
 ## Installation

data/instrumentality.gemspec

@@ -28,4 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "pry-byebug", "~> 3.4"
+  spec.add_development_dependency "simplecov", "~> 0.15"
+  spec.add_development_dependency "coveralls", "~> 0.7.0"
 end

data/lib/instrumentality/command.rb

@@ -3,10 +3,11 @@ require 'instrumentality/version'
 
 module Instrumentality
   class Command < CLAide::Command
-    require 'instrumentality/command/benchmark'
-    require 'instrumentality/command/file_activity'
+    require 'instrumentality/command/profile'
+    require 'instrumentality/command/profile/benchmark'
+    require 'instrumentality/command/profile/file_activity'
+    require 'instrumentality/command/profile/custom'
     require 'instrumentality/command/generate_header'
-    require 'instrumentality/command/custom'
 
     self.abstract_command = true
     self.command = 'instr'

data/lib/instrumentality/command/{custom.rb → profile.rb}

@@ -1,33 +1,15 @@
 require 'instrumentality/command'
-require 'instrumentality/finder'
-require 'instrumentality/profiler'
-require 'instrumentality/constants'
-require 'ostruct'
 
 module Instrumentality
-  class Custom < Command
-    def self.options
-      [
-        ['--workspace=path/to/name.xcworkspace', 'If not set, Instr will try to find one'],
-        ['--project=path/to/name.xcodeproj', 'If not set and workspace search failed, Instr will try to find one'],
-        ['--scheme=name', 'If not set, Instr will use the process name'],
-        ['--server-port=port_number', 'If not set, Instr will use 8080'],
-        ['--interactive', 'If set, Instr will not attempt to run an Xcode scheme, but instead attach DTrace directly'],
-      ].concat(super)
-    end
+  class Profile < Command
+    self.abstract_command = true
 
-    self.arguments = [
-      CLAide::Argument.new("process", true),
-      CLAide::Argument.new("script", true),
-    ]
+    self.summary = "Run instruments"
 
-    self.summary = <<-DESC
-      Runs a DTrace script against a specific iOS process.
-    DESC
+    #-----#
 
     def initialize(argv)
       @process = argv.shift_argument
-      @script = argv.shift_argument
       @workspace = argv.option('workspace') || Finder.find_workspace
       @project = argv.option('project')
       @project ||= Finder.find_project if @workspace.nil?
@@ -39,24 +21,29 @@ module Instrumentality
 
     def validate!
       super
+    end
 
+    def validate_shared_arguments!
       help! 'A process name is required' unless @process
-      help! 'A valid script path is required' unless File.exist?(@script)
       return if @interactive
       help! 'Xcode workspace or project files not found' if @workspace.nil? && @project.nil?
     end
 
-    def run
-      config = OpenStruct.new({'script' => @script,
-                               'process' => @process,
-                               'workspace' => @workspace,
-                               'project' => @project,
-                               'scheme' => @scheme,
-                               'server_port' => @server_port,
-                               'interactive' => @interactive,
-                               'experimental' => false})
-      profiler = Profiler.new(config, @verbose)
-      profiler.profile
+    def self.shared_arguments
+      [
+        CLAide::Argument.new("process", true),
+      ]
+    end
+
+    def self.shared_options
+      [
+        ['--workspace=path/to/name.xcworkspace', 'If not set, Instr will try to find one'],
+        ['--project=path/to/name.xcodeproj', 'If not set and workspace search failed, Instr will try to find one'],
+        ['--scheme=name', 'If not set, Instr will use the process name'],
+        ['--server-port=port_number', 'If not set, Instr will use 8080'],
+        ['--interactive', 'If set, Instr will not attempt to run an Xcode scheme, but instead attach DTrace directly'],
+      ]
     end
   end
 end
+

data/lib/instrumentality/command/profile/benchmark.rb

@@ -0,0 +1,47 @@
+require 'instrumentality/command'
+require 'instrumentality/finder'
+require 'instrumentality/profiler'
+require 'instrumentality/constants'
+require 'ostruct'
+
+module Instrumentality
+  class Profile < Command
+    class Benchmark < Profile
+      def self.options
+        shared_options.concat([
+          ['--experimental', "Don't use it if you don't know what it does"],
+        ]).concat(super)
+      end
+
+      self.arguments = shared_arguments.concat([
+      ])
+
+      self.summary = <<-DESC
+        Runs a benchmark against a specific iOS process. Requires static probes.
+      DESC
+
+      def initialize(argv)
+        @experimental = argv.flag?('experimental', false)
+        super
+      end
+
+      def validate!
+        super
+        validate_shared_arguments!
+      end
+
+      def run
+        config = OpenStruct.new({'script' => Constants::BENCHMARK_SCRIPT,
+                                 'process' => @process,
+                                 'workspace' => @workspace,
+                                 'project' => @project,
+                                 'scheme' => @scheme,
+                                 'server_port' => @server_port,
+                                 'interactive' => @interactive,
+                                 'experimental' => @experimental})
+        profiler = Profiler.new(config, @verbose)
+        profiler.profile
+      end
+    end
+  end
+end

data/lib/instrumentality/command/profile/custom.rb

@@ -0,0 +1,47 @@
+require 'instrumentality/command'
+require 'instrumentality/finder'
+require 'instrumentality/profiler'
+require 'instrumentality/constants'
+require 'ostruct'
+
+module Instrumentality
+  class Profile < Command
+    class Custom < Profile
+      def self.options
+        shared_options.concat([
+        ]).concat(super)
+      end
+
+      self.arguments = shared_arguments.concat([
+        CLAide::Argument.new("script", true),
+      ])
+
+      self.summary = <<-DESC
+        Runs a DTrace script against a specific iOS process.
+      DESC
+
+      def initialize(argv)
+        super
+        @script = argv.shift_argument
+      end
+
+      def validate!
+        super
+        validate_shared_arguments!
+      end
+
+      def run
+        config = OpenStruct.new({'script' => @script,
+                                 'process' => @process,
+                                 'workspace' => @workspace,
+                                 'project' => @project,
+                                 'scheme' => @scheme,
+                                 'server_port' => @server_port,
+                                 'interactive' => @interactive,
+                                 'experimental' => false})
+        profiler = Profiler.new(config, @verbose)
+        profiler.profile
+      end
+    end
+  end
+end

data/lib/instrumentality/command/profile/file_activity.rb

@@ -0,0 +1,47 @@
+require 'instrumentality/command'
+require 'instrumentality/finder'
+require 'instrumentality/profiler'
+require 'instrumentality/constants'
+require 'ostruct'
+
+module Instrumentality
+  class Profile < Command
+    class FileActivity < Profile
+      def self.options
+        shared_options.concat([
+          ['--experimental', "Don't use it if you don't know what it does"],
+        ]).concat(super)
+      end
+
+      self.arguments = shared_arguments.concat([
+      ])
+
+      self.summary = <<-DESC
+        Prints files read or write by a specific iOS process.
+      DESC
+
+      def initialize(argv)
+        @experimental = argv.flag?('experimental', false)
+        super
+      end
+
+      def validate!
+        super
+        validate_shared_arguments!
+      end
+
+      def run
+        config = OpenStruct.new({'script' => Constants::FILE_ACTIVITY_SCRIPT,
+                                 'process' => @process,
+                                 'workspace' => @workspace,
+                                 'project' => @project,
+                                 'scheme' => @scheme,
+                                 'server_port' => @server_port,
+                                 'interactive' => @interactive,
+                                 'experimental' => @experimental})
+        profiler = Profiler.new(config, @verbose)
+        profiler.profile
+      end
+    end
+  end
+end

data/lib/instrumentality/executor.rb

@@ -1,4 +1,4 @@
-require 'instrumentality/constants'
+require 'instrumentality/logger'
 require 'claide'
 require 'colorize'
 require 'timeout'
@@ -8,7 +8,7 @@ module Instrumentality
     class ExecutorError < StandardError; include CLAide::InformativeError; end
 
     def self.execute(cmd, verbose = false)
-      puts "#{Constants::OUTPUT_PREFIX} Executing command: #{cmd}"
+      Logger.log("Executing command: #{cmd}")
       if verbose
         system(cmd)
       else
@@ -19,21 +19,25 @@ module Instrumentality
     end
 
     def self.execute_async(cmd)
-      spawn("#{cmd}").tap do |pid|
-        puts "#{Constants::OUTPUT_PREFIX} Spawned process (PID: #{pid}) from command: #{cmd}"
+      Process.spawn("#{cmd}").tap do |pid|
+        Logger.log("Spawned process (PID: #{pid}) from command: #{cmd}")
       end
     end
 
     def self.timeout(process, seconds = Constants::TIMEOUT)
       pid = ""
-      Timeout.timeout(seconds) do
-        loop do
-          pid = `ps aux | grep #{process}.app | grep -v grep | awk '{print $2}'`.strip
-          break if pid != ""
+      begin
+        Timeout.timeout(seconds) do
+          loop do
+            pid = `ps aux | grep #{process}.app | grep -v grep | awk '{print $2}'`.strip
+            break if pid != ""
+          end
         end
+      rescue Timeout::Error
+        raise ExecutorError, "Timeout while trying to find #{process} process".red
       end
       pid.tap do |pid|
-        puts "#{Constants::OUTPUT_PREFIX} Found process #{process} with PID: #{pid}"
+        Logger.log("Found process #{process} with PID: #{pid}")
       end
     end
   end

data/lib/instrumentality/finder.rb

@@ -1,11 +1,11 @@
 module Instrumentality
   class Finder
     def self.find_workspace
-      find('*.xcworkspace', 1).first
+      find('*.xcworkspace', 2).first
     end
 
     def self.find_project
-      find('*.xcodeproj', 1).first
+      find('*.xcodeproj', 2).first
     end
 
     def self.find_xctestrun(location)

data/lib/instrumentality/header_generator.rb

@@ -1,19 +1,24 @@
 require 'instrumentality/executor'
 require 'instrumentality/finder'
 require 'instrumentality/constants'
+require 'claide'
+require 'colorize'
 
 module Instrumentality
   class HeaderGenerator
+    class HeaderGeneratorError < StandardError; include CLAide::InformativeError; end
     attr_reader :instrument, :verbose
 
-    def initialize(instrument, verbose)
+    def initialize(instrument, verbose = false)
       @instrument = instrument
       @verbose = verbose
     end
 
     def generate
+      path_for_header = Finder.path_for_header("#{instrument}.d")
+      raise HeaderGeneratorError, "Couldn't find header for #{instrument} instrument".red unless File.exist?(path_for_header)
       dtrace_cmd = %w[dtrace]
-      dtrace_cmd += %W[-h -s #{Finder.path_for_header(Constants::BENCHMARK_SCRIPT)}]
+      dtrace_cmd += %W[-h -s #{path_for_header}]
       cmd = dtrace_cmd.join(' ')
       Executor.execute(cmd, verbose)
     end

data/lib/instrumentality/logger.rb

@@ -0,0 +1,9 @@
+require 'instrumentality/constants'
+
+module Instrumentality
+  class Logger
+    def self.log(message)
+      puts "#{Constants::OUTPUT_PREFIX} #{message}"
+    end
+  end
+end

data/lib/instrumentality/profiler.rb

@@ -2,8 +2,10 @@ require 'instrumentality/executor'
 require 'instrumentality/finder'
 require 'instrumentality/constants'
 require 'instrumentality/simctl'
+require 'instrumentality/logger'
 require 'net/http'
 require 'uri'
+require 'tmpdir'
 
 module Instrumentality
   class Profiler
@@ -11,7 +13,7 @@ module Instrumentality
     class ProfilerError < StandardError; include CLAide::InformativeError; end
     attr_reader :config, :script_path, :verbose, :xcodebuild_pid, :app_pid, :dtrace_pid
 
-    def initialize(config, verbose)
+    def initialize(config, verbose = false)
       @config = config
       @verbose = verbose
       script = config.script.dup
@@ -25,8 +27,8 @@ module Instrumentality
       current_directory = Dir.pwd
       Dir.mktmpdir do |tmpdir|
         compile(current_directory, tmpdir)
-        Simctl.execute_with_simulator_ready(Constants::DEFAULT_RUNTIME, Constants::DEFAULT_DEVICE) do |device|
-          run_tests(tmpdir, device)
+        Simctl.execute_with_simulator_ready(Constants::DEFAULT_RUNTIME, Constants::DEFAULT_DEVICE) do |device_udid|
+          run_tests(tmpdir, device_udid)
           find_app_pid
           notify_server
           attach_dtrace(tmpdir)
@@ -59,11 +61,11 @@ module Instrumentality
       Executor.execute(cmd, verbose)
     end
 
-    def run_tests(temporary_directory, device)
+    def run_tests(temporary_directory, device_udid)
       xctestrun = Finder.find_xctestrun(temporary_directory)
       xcodebuild_cmd = %w[xcodebuild]
       xcodebuild_cmd += %W[-xctestrun #{xctestrun}]
-      xcodebuild_cmd += %W[-destination 'platform=iOS Simulator,id=#{device.udid}']
+      xcodebuild_cmd += %W[-destination 'platform=iOS Simulator,id=#{device_udid}']
       xcodebuild_cmd += %w[test-without-building]
       cmd = xcodebuild_cmd.join(' ')
       @xcodebuild_pid = Executor.execute_async(cmd)
@@ -116,7 +118,7 @@ module Instrumentality
       cmd = touch_cmd.join(' ')
       Executor.execute(cmd, verbose)
       stream = IO.new(IO.sysopen(output_file))
-      puts "#{Constants::OUTPUT_PREFIX} Started interactive session. #{"Press CTRL+C to finish.".blue}"
+      Logger.log("Started interactive session. #{"Press CTRL+C to finish.".blue}")
       begin
         loop do
           output = stream.gets

data/lib/instrumentality/simctl.rb

@@ -10,7 +10,7 @@ module Instrumentality
         d.state == :booted && d.ready?
       end
       begin
-        yield device
+        yield device.udid
       rescue StandardError => error
         throw error
       ensure

data/lib/instrumentality/version.rb

@@ -1,3 +1,3 @@
 module Instrumentality
-  VERSION = "0.1.0"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,99 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: instrumentality
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Renzo Crisóstomo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2018-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: simctl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.15'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 description: Command line interface to profiling tools for iOS development
 email:
 - renzo.crisostomo@here.com
@@ -103,9 +145,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .circleci/config.yml
+- .circleci/images/Dockerfile
+- .circleci/images/Finder.app
+- .circleci/images/xcode-select
+- .circleci/images/xcodebuild
+- .coveralls.yml
+- .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -115,15 +162,17 @@ files:
 - instrumentality.gemspec
 - lib/instrumentality.rb
 - lib/instrumentality/command.rb
-- lib/instrumentality/command/benchmark.rb
-- lib/instrumentality/command/custom.rb
-- lib/instrumentality/command/file_activity.rb
 - lib/instrumentality/command/generate_header.rb
+- lib/instrumentality/command/profile.rb
+- lib/instrumentality/command/profile/benchmark.rb
+- lib/instrumentality/command/profile/custom.rb
+- lib/instrumentality/command/profile/file_activity.rb
 - lib/instrumentality/constants.rb
 - lib/instrumentality/executor.rb
 - lib/instrumentality/finder.rb
 - lib/instrumentality/header_generator.rb
 - lib/instrumentality/headers/benchmark.d
+- lib/instrumentality/logger.rb
 - lib/instrumentality/profiler.rb
 - lib/instrumentality/scripts/benchmark.d
 - lib/instrumentality/scripts/experimental_file_activity.d
@@ -140,19 +189,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.2
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Command line interface to profiling tools for iOS development
 test_files: []
-has_rdoc: 

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.2.7
-before_install: gem install bundler -v 1.15.4

data/lib/instrumentality/command/benchmark.rb

@@ -1,61 +0,0 @@
-require 'instrumentality/command'
-require 'instrumentality/finder'
-require 'instrumentality/profiler'
-require 'instrumentality/constants'
-require 'ostruct'
-
-module Instrumentality
-  class Benchmark < Command
-    def self.options
-      [
-        ['--workspace=path/to/name.xcworkspace', 'If not set, Instr will try to find one'],
-        ['--project=path/to/name.xcodeproj', 'If not set and workspace search failed, Instr will try to find one'],
-        ['--scheme=name', 'If not set, Instr will use the process name'],
-        ['--server-port=port_number', 'If not set, Instr will use 8080'],
-        ['--interactive', 'If set, Instr will not attempt to run an Xcode scheme, but instead attach DTrace directly'],
-        ['--experimental', "Don't use it if you don't know what it does"],
-      ].concat(super)
-    end
-
-    self.arguments = [
-      CLAide::Argument.new("process", true),
-    ]
-
-    self.summary = <<-DESC
-      Runs a benchmark against a specific iOS process. Requires static probes.
-    DESC
-
-    def initialize(argv)
-      @process = argv.shift_argument
-      @workspace = argv.option('workspace') || Finder.find_workspace
-      @project = argv.option('project')
-      @project ||= Finder.find_project if @workspace.nil?
-      @scheme = argv.option('scheme') || @process
-      @server_port = argv.option('server-port') || Constants::DEFAULT_SERVER_PORT
-      @interactive = argv.flag?('interactive', false)
-      @experimental = argv.flag?('experimental', false)
-      super
-    end
-
-    def validate!
-      super
-
-      help! 'A process name is required' unless @process
-      return if @interactive
-      help! 'Xcode workspace or project files not found' if @workspace.nil? && @project.nil?
-    end
-
-    def run
-      config = OpenStruct.new({'script' => Constants::BENCHMARK_SCRIPT,
-                               'process' => @process,
-                               'workspace' => @workspace,
-                               'project' => @project,
-                               'scheme' => @scheme,
-                               'server_port' => @server_port,
-                               'interactive' => @interactive,
-                               'experimental' => @experimental})
-      profiler = Profiler.new(config, @verbose)
-      profiler.profile
-    end
-  end
-end

data/lib/instrumentality/command/file_activity.rb

@@ -1,61 +0,0 @@
-require 'instrumentality/command'
-require 'instrumentality/finder'
-require 'instrumentality/profiler'
-require 'instrumentality/constants'
-require 'ostruct'
-
-module Instrumentality
-  class FileActivity < Command
-    def self.options
-      [
-        ['--workspace=path/to/name.xcworkspace', 'If not set, Instr will try to find one'],
-        ['--project=path/to/name.xcodeproj', 'If not set and workspace search failed, Instr will try to find one'],
-        ['--scheme=name', 'If not set, Instr will use the process name'],
-        ['--server-port=port_number', 'If not set, Instr will use 8080'],
-        ['--interactive', 'If set, Instr will not attempt to run an Xcode scheme, but instead attach DTrace directly'],
-        ['--experimental', "Don't use it if you don't know what it does"],
-      ].concat(super)
-    end
-
-    self.arguments = [
-      CLAide::Argument.new("process", true),
-    ]
-
-    self.summary = <<-DESC
-      Prints files read or write by a specific iOS process.
-    DESC
-
-    def initialize(argv)
-      @process = argv.shift_argument
-      @workspace = argv.option('workspace') || Finder.find_workspace
-      @project = argv.option('project')
-      @project ||= Finder.find_project if @workspace.nil?
-      @scheme = argv.option('scheme') || @process
-      @server_port = argv.option('server-port') || Constants::DEFAULT_SERVER_PORT
-      @interactive = argv.flag?('interactive', false)
-      @experimental = argv.flag?('experimental', false)
-      super
-    end
-
-    def validate!
-      super
-
-      help! 'A process name is required' unless @process
-      return if @interactive
-      help! 'Xcode workspace or project files not found' if @workspace.nil? && @project.nil?
-    end
-
-    def run
-      config = OpenStruct.new({'script' => Constants::FILE_ACTIVITY_SCRIPT,
-                               'process' => @process,
-                               'workspace' => @workspace,
-                               'project' => @project,
-                               'scheme' => @scheme,
-                               'server_port' => @server_port,
-                               'interactive' => @interactive,
-                               'experimental' => @experimental})
-      profiler = Profiler.new(config, @verbose)
-      profiler.profile
-    end
-  end
-end