uispecrunner 0.3.3 → 0.4.0

data/README.md

@@ -31,9 +31,11 @@ to the spec runner. Example:
 - Will read common arguments from uispec.opts file for easy per project configuration
 - Includes a sample Rakefile for running your UISpec's
 - Support for setting arbitrary environment variables on the runner
-- Supports running specs via shell (xcodebuild) or AppleScript (osascript)
+- Builds project using xcodebuild
+- Supports running specs via shell or AppleScript (osascript)
 
 ## TODO
+- Run via WaxSim
 - Simulator/device switch...
 - Auto-detect SDK versions available
 - Support for running specific files

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.homepage = "http://github.com/twotoasters/UISpecRunner"
     gem.authors = ["Blake Watters"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_runtime_dependency "open4", "= 1.0.1"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.0

data/lib/uispecrunner/drivers/shell.rb

@@ -10,25 +10,20 @@ class UISpecRunner
       end
       
       def run_specs(env)
-        if build_project!
-          run_env = config.env.merge(env)
-          run_env.merge!('DYLD_ROOT_PATH' => sdk_dir, 'IPHONE_SIMULATOR_ROOT' => sdk_dir, 'CFFIXED_USER_HOME' => Dir.tmpdir)
-          puts "Setting environment variables: #{run_env.inspect}" if config.verbose?
-          with_env(run_env) do
-            start_securityd if config.securityd
-            command = "#{config.build_dir}/#{config.configuration}-iphonesimulator/#{config.target}.app/#{config.target} -RegisterForSystemEvents"
-            puts "Executing: #{command}" if config.verbose?
-            output = `#{command}`
-            exit_code = $?
-            unless exit_code == 0
-              puts "[!] Failed to run UISpec target: #{output}"
-              exit 1
-            end
+        run_env = config.env.merge(env)
+        run_env.merge!('DYLD_ROOT_PATH' => config.sdk_dir, 'IPHONE_SIMULATOR_ROOT' => config.sdk_dir, 'CFFIXED_USER_HOME' => Dir.tmpdir)
+        puts "Setting environment variables: #{run_env.inspect}" if config.verbose?
+        with_env(run_env) do
+          start_securityd if config.securityd
+          command = "#{config.app_executable_path} -RegisterForSystemEvents"
+          puts "Executing: #{command}" if config.verbose?
+          output = `#{command}`
+          exit_code = $?
+          unless exit_code == 0
+            puts "[!] Failed specs running UISpec target (exit code #{exit_code})"
+            exit 1
           end
-        else
-          puts "[!] Failed to build UISpecs.app"
-          exit 1
-        end
+        end        
       end
       
       def with_env(env)
@@ -38,24 +33,6 @@ class UISpecRunner
       ensure
         before.each { |k, v| ENV[k] = v }
       end
-
-      def project_switch
-        "-project #{config.project}" if config.project
-      end
-
-      def sdk_switch
-        "-sdk #{sdk_dir}" if config.sdk_version
-      end
-      
-      def sdk_dir
-        "/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator#{config.sdk_version}.sdk"
-      end
-
-      def build_project!
-        command = "xcodebuild #{project_switch} -target #{config.target} -configuration #{config.configuration} #{sdk_switch} > /dev/null"
-        puts "Building project with: #{command}" if config.verbose?
-        system(command)
-      end
       
       def run_command(command)
         puts "Executing: #{command}" if config.verbose?
@@ -63,7 +40,7 @@ class UISpecRunner
       end
 
       def path_to_securityd
-        "#{sdk_dir}/usr/libexec/securityd"
+        "#{config.sdk_dir}/usr/libexec/securityd"
       end
 
       def start_securityd

data/lib/uispecrunner/options.rb

@@ -14,12 +14,12 @@ class UISpecRunner
       
       # Configure default settings
       self[:run_mode] = :all
-      self[:target] = 'UISpec'
       self[:configuration] = 'Debug'
       self[:build_dir] = './build'
       self[:verbose] = false
       self[:sdk_version] = '4.0'
       self[:driver] = :shell
+      self[:exit_on_finish] = true
       
       require 'optparse'
       @opts = OptionParser.new do |o|
@@ -53,6 +53,17 @@ class UISpecRunner
           self[:project] = project
         end
         
+        o.on('--workspace [WORKSPACE_PATH]',
+             'Run the UISpec scheme in the specified Xcode workspace at the path') do |workspace|
+          self[:workspace] = workspace
+        end
+        
+        o.on('--scheme [SCHEME_NAME]',
+             'Build and run the specified XCode scheme.',
+             'Default: UISpec (If workspace provided)') do |scheme|
+          self[:scheme] = scheme
+        end
+        
         o.on('--driver [DRIVER]', [:shell, :osascript],
              "Select driver (shell, osascript)",
              'Default: shell') do |driver|
@@ -84,23 +95,33 @@ class UISpecRunner
         end
         
         o.on('--securityd',
-             'Start the securityd daemon before running specs. This allow interaction with the keychain.') do |securityd|
+             'Start the securityd daemon before running specs. This allows interaction with the keychain.') do |securityd|
           self[:securityd] = securityd
         end
         
+        o.on('--no-exit', 'Do not exit the process after running the specs') do |exit_on_finish|
+          self[:exit_on_finish] = exit_on_finish
+        end
+        
         o.on('-v', '--[no-]verbose', "Run verbosely") do |v|
           self[:verbose] = v
         end
         
-        o.on_tail('-h', '--help', 'display this help and exit') do
+        o.on_tail('-h', '--help', 'Display this help and exit') do
           self[:show_help] = true
         end
       end
       
       begin
         @opts.parse!(args)
+        
+        # Set default Scheme name if Workspace was provided
+        if self[:workspace]
+          self[:scheme] ||= 'UISpec'
+        else
+          self[:target] ||= 'UISpec'
+        end
         # TODO: Support running specific files
-        #self[:project_name] = args.shift
       rescue OptionParser::InvalidOption => e
         self[:invalid_argument] = e.message
       end

data/lib/uispecrunner/xcode_builder.rb

@@ -0,0 +1,50 @@
+class UISpecRunner
+  class XcodeBuilder
+    attr_reader :config, :app_path
+    
+    def initialize(config)
+      @config = config
+    end
+    
+    def build!
+      command = "xcodebuild #{workspace_switch} #{scheme_switch} #{project_switch} #{target_switch} -configuration #{config.configuration} #{sdk_switch}"
+      puts "Building project with: #{command}" if config.verbose?
+      status = Open4::popen4(command) do |pid, stdin, stdout, stderr|
+        stdout.each_line do |line|
+          if line =~ /^Touch\s/
+            @app_path = line.split(/^Touch\s/).last.chomp
+            puts "*** Found app path: #{self.app_path}" if config.verbose?
+          end
+          puts line if config.verbose?
+        end
+        
+        stderr.each_line do |line|
+          puts line
+        end
+      end
+      puts "Exited with status: #{ status.exitstatus }" if config.verbose? || status.exitstatus != 0
+      return status.exitstatus
+    end
+    
+    private
+      def workspace_switch
+        "-workspace #{config.workspace}" if config.workspace
+      end
+      
+      def scheme_switch
+        "-scheme #{config.scheme}" if config.scheme
+      end
+      
+      def project_switch
+        "-project #{config.project}" if config.project
+      end
+      
+      def target_switch
+        "-target #{config.target}" if config.target
+      end
+
+      def sdk_switch
+        "-sdk #{config.sdk_dir}" if config.sdk_version
+      end
+  end
+end

data/lib/uispecrunner.rb

@@ -2,22 +2,30 @@
 # By: Blake Watters <blake@twotoasters.com>
 # Portions borrowed from Eloy Duran's Kicker script (http://github.com/alloy/UISpec)
 
+require 'rubygems'
+gem 'open4', '>= 1.0.1'
+require 'open4'
+require 'uispecrunner/xcode_builder'
 require 'uispecrunner/drivers/shell'
 require 'uispecrunner/drivers/osascript'
 
-class UISpecRunner    
-  attr_accessor :project, :target, :configuration, :sdk_version, :build_dir, :verbose, :securityd, :driver, :env
+class UISpecRunner
+  # Build Options
+  attr_accessor :workspace, :scheme, :project, :target, :configuration, :sdk_version, :build_dir
+  
+  # Run Options
+  attr_accessor :verbose, :securityd, :driver, :env, :exit_on_finish, :app_path
   
   # private
   attr_accessor :run_mode, :spec, :example, :protocol
   
   def initialize(options = {})
     options.each { |k,v| self.send("#{k}=", v) }
-    self.target ||= 'UISpec'
     self.configuration ||= 'Debug'
     self.build_dir ||= './build'
     self.run_mode ||= :all
     self.driver ||= :shell
+    self.exit_on_finish ||= true
     self.env ||= {}
   end    
   
@@ -52,12 +60,39 @@ class UISpecRunner
     run_specs('UISPEC_SPEC' => spec_name, 'UISPEC_EXAMPLE' => example_name)
   end    
   
+  # Configuration Methods
+  
   def verbose?
     self.verbose
   end
   
+  def exit_on_finish?
+    self.exit_on_finish
+  end
+  
+  def xcode_root
+    @xcode_root ||= "#{`xcode-select -print-path`.chomp}"
+  end
+
+  def sdk_dir
+    "#{xcode_root}/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator#{self.sdk_version}.sdk"
+  end
+  
+  def app_path
+    @app_path || "#{self.build_dir}/#{self.configuration}-iphonesimulator/#{self.target}.app/#{self.target}"
+  end
+  
+  def app_executable_name
+    File.basename(app_path).gsub(/.app$/, '')
+  end
+  
+  def app_executable_path
+    File.join(app_path, app_executable_name)
+  end
+  
   private
     def driver_class
+      # TODO: Add WaxSim...
       if self.driver == :shell
         UISpecRunner::Drivers::Shell
       elsif self.driver == :osascript
@@ -66,8 +101,19 @@ class UISpecRunner
     end
     
     def run_specs(env = {})
-      puts "Running specs via #{driver}..."
-      driver = driver_class.new(self)
-      driver.run_specs(env)
+      puts "Building project..."
+      builder = UISpecRunner::XcodeBuilder.new(self)
+      if builder.build!
+        @app_path ||= builder.app_path
+        puts "Running specs via #{driver}..."
+        env['UISPEC_EXIT_ON_FINISH'] = self.exit_on_finish? ? 'YES' : 'NO'
+        driver = driver_class.new(self)      
+        driver.run_specs(env)
+        # TODO: Exit with exit code from the process...
+      else
+        puts "Failed to build"
+        # TODO: Exit with the exit code from xcodebuild...
+        exit(-1)
+      end
     end
 end

data/src/UISpec+UISpecRunner.h

@@ -26,6 +26,7 @@
  * UISPEC_PROTOCOL - Specifies a protocol to run
  * UISPEC_SPEC - Specifies a spec class to run
  * UISPEC_METHOD - Specifies an example to run (requires UISPEC_SPEC to be set)
+ * UISPEC_EXIT_ON_FINISH - When YES, instructs UISpecRunner to terminate the application when specs run is complete
  */
 +(void)runSpecsFromEnvironmentAfterDelay:(int)seconds;
 

data/src/UISpec+UISpecRunner.m

@@ -8,6 +8,40 @@
 
 #import "UISpec+UISpecRunner.h"
 #import <objc/runtime.h>
+#import "UIConsoleLog.h"
+#import "UISpec.h"
+
+@interface UISpecRunnerLog : UIConsoleLog {
+    BOOL _exitOnFinish;
+}
+
+// When YES, the application will terminate after specs finish running
+@property (nonatomic, assign) BOOL exitOnFinish;
+
+@end
+
+@implementation UISpecRunnerLog
+
+@synthesize exitOnFinish = _exitOnFinish;
+
+- (id)init {
+    self = [super init];
+    if (self) {
+        _exitOnFinish = NO;
+    }
+    
+    return self;
+}
+
+-(void)onFinish:(int)count {
+    [super onFinish:count];
+    
+    if (self.exitOnFinish) {
+        exit(errors.count);
+    }
+}
+
+@end
 
 @interface UISpec ()
 
@@ -94,6 +128,15 @@
 	char* protocolName = getenv("UISPEC_PROTOCOL");
 	char* specName = getenv("UISPEC_SPEC");
 	char* exampleName = getenv("UISPEC_EXAMPLE");
+    char* exitOnFinish = getenv("UISPEC_EXIT_ON_FINISH");
+    
+    UISpecRunnerLog* log = [[UISpecRunnerLog alloc] init];
+    [UISpec setLog:(UILog*)log];
+    
+    if (NULL == exitOnFinish || [[NSString stringWithUTF8String:exitOnFinish] isEqualToString:@"YES"]) {
+        log.exitOnFinish = YES;
+    }
+    
 	if (protocolName) {
 		Protocol* protocol = NSProtocolFromString([NSString stringWithUTF8String:protocolName]);
 		NSLog(@"[UISpecRunner] Running Specs conforming to Protocol: %@", [NSString stringWithUTF8String:protocolName]);
@@ -110,7 +153,7 @@
 		[UISpec runSpecsInheritingFromClass:class afterDelay:seconds];
 	} else {
 		[UISpec runSpecsAfterDelay:seconds];
-	}	
+	}
 }
 
 @end

data/src/main.m

@@ -7,15 +7,13 @@
 //
 
 #import <UIKit/UIKit.h>
-#import <UISpec.h>
 #import "UISpec+UISpecRunner.h"
 
-int main(int argc, char *argv[]) {
-    
-	NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+int main(int argc, char *argv[]) {    
+    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
 	
-	// Run the specs
-	[UISpec runSpecsFromEnvironmentAfterDelay:0.5];
+	  // Run the specs
+    [UISpec runSpecsFromEnvironmentAfterDelay:0.5];
 	
     int retVal = UIApplicationMain(argc, argv, nil, nil);
     [pool release];

data/uispecrunner.gemspec

@@ -1,55 +1,54 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{uispecrunner}
-  s.version = "0.3.3"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Blake Watters"]
-  s.date = %q{2011-02-15}
+  s.date = %q{2011-03-09}
   s.default_executable = %q{uispec}
   s.description = %q{Provides a simple Ruby interface for running UISpec iPhone tests}
   s.email = %q{blake@twotoasters.com}
   s.executables = ["uispec"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
-    ".gitignore",
-     "CHANGELOG",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "bin/uispec",
-     "lib/uispecrunner.rb",
-     "lib/uispecrunner/application.rb",
-     "lib/uispecrunner/drivers/osascript.rb",
-     "lib/uispecrunner/drivers/shell.rb",
-     "lib/uispecrunner/options.rb",
-     "spec/options_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/uispecrunner_spec.rb",
-     "src/UISpec+UISpecRunner.h",
-     "src/UISpec+UISpecRunner.m",
-     "src/main.m",
-     "tasks/uispec.rake",
-     "uispecrunner.gemspec"
+    "CHANGELOG",
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "bin/uispec",
+    "lib/uispecrunner.rb",
+    "lib/uispecrunner/application.rb",
+    "lib/uispecrunner/drivers/osascript.rb",
+    "lib/uispecrunner/drivers/shell.rb",
+    "lib/uispecrunner/options.rb",
+    "lib/uispecrunner/xcode_builder.rb",
+    "spec/options_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "spec/uispecrunner_spec.rb",
+    "src/UISpec+UISpecRunner.h",
+    "src/UISpec+UISpecRunner.m",
+    "src/main.m",
+    "tasks/uispec.rake",
+    "uispecrunner.gemspec"
   ]
   s.homepage = %q{http://github.com/twotoasters/UISpecRunner}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Flexible spec runner for UISpec on iOS}
   s.test_files = [
     "spec/options_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/uispecrunner_spec.rb"
+    "spec/spec_helper.rb",
+    "spec/uispecrunner_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -58,11 +57,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_runtime_dependency(%q<open4>, ["= 1.0.1"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<open4>, ["= 1.0.1"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<open4>, ["= 1.0.1"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: uispecrunner
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Blake Watters
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 -05:00
+date: 2011-03-09 00:00:00 -05:00
 default_executable: uispec
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,6 +34,22 @@ dependencies:
         version: 1.2.9
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: open4
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  type: :runtime
+  version_requirements: *id002
 description: Provides a simple Ruby interface for running UISpec iPhone tests
 email: blake@twotoasters.com
 executables: 
@@ -44,7 +60,6 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
-- .gitignore
 - CHANGELOG
 - LICENSE
 - README.md
@@ -56,6 +71,7 @@ files:
 - lib/uispecrunner/drivers/osascript.rb
 - lib/uispecrunner/drivers/shell.rb
 - lib/uispecrunner/options.rb
+- lib/uispecrunner/xcode_builder.rb
 - spec/options_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -70,8 +86,8 @@ homepage: http://github.com/twotoasters/UISpecRunner
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC