uispecrunner 0.2.4 → 0.3.0

data/README.md

@@ -31,11 +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)
 
 ## TODO
 - Auto-detect SDK versions available
 - Support for running specific files
-- Support for running non-headless (either via AppleScript or iphonesim)
 - Generate a Kicker script
 - Enabling Zombies (or other debugging flags, see http://code.google.com/p/google-toolbox-for-mac/source/browse/trunk/UnitTesting/RunIPhoneUnitTest.sh)
 

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/lib/uispecrunner/drivers/osascript.rb

@@ -0,0 +1,98 @@
+class UISpecRunner
+  class Drivers
+    class OSAScript
+      attr_reader :config
+      
+      def initialize(config)
+        @config = config
+      end
+      
+      def run_specs(env)
+        # Set the environment variables requested by the runner...
+        env_definitions = env.map do |key, value|
+          "my setEnvironmentVariable(\"#{key}\", \"#{value}\")"
+        end.join("\n")
+        
+        script = <<-SCRIPT
+        on deactivateEnvironmentVariable(variableName)
+          
+          tell application "Xcode"
+        		tell active project document			
+        			set executableName to name of executable of active target as string			
+        			tell executable executableName
+
+        				-- Check to see if the fallback path already exists				
+        				set hasVariable to false as boolean
+
+        				repeat with environmentVariable in environment variables					
+        					if name of environmentVariable is equal to variableName then
+        						set active of environmentVariable to no
+      						end if
+    						end repeat
+    						
+  						end tell -- executable
+						end tell -- active project document
+					end tell -- Xcode
+					
+        end deactivateEnvironmentVariable
+        
+        on setEnvironmentVariable(variableName, variableValue)
+
+        	tell application "Xcode"
+        		tell active project document			
+        			set executableName to name of executable of active target as string			
+        			tell executable executableName
+
+        				-- Check to see if the fallback path already exists				
+        				set hasVariable to false as boolean
+
+        				repeat with environmentVariable in environment variables					
+        					if name of environmentVariable is equal to variableName then						
+        						-- Overwrite any value						
+        						set value of environmentVariable to variableValue						
+        						set active of environmentVariable to yes						
+        						set hasVariable to true as boolean						
+        						exit repeat						
+        					end if					
+        				end repeat
+
+        				-- Since the fallback path doesn't exist yet, create it				
+        				if not hasVariable then					
+        					make new environment variable with properties {name:variableName, value:variableValue, active:yes}					
+        				end if				
+        			end tell -- executable			
+        		end tell -- active project document		
+        	end tell -- Xcode
+
+        end setEnvironmentVariable
+
+        application "iPhone Simulator" quit
+--        application "iPhone Simulator" activate
+
+        tell application "Xcode"
+            set targetProject to project of active project document
+        		#{env_definitions}
+
+            tell targetProject
+                set active build configuration type to build configuration type "Debug"
+                set active SDK to "iphonesimulator4.0"
+        				set the active target to the target named "UISpec"
+--                set value of build setting "SDKROOT" of build configuration "Debug" of active target to "iphoneos4.0"
+
+        				build targetProject
+        				launch targetProject
+        				
+        				-- Clear out the environment variables
+        				my deactivateEnvironmentVariable("UISPEC_PROTOCOL")
+        				my deactivateEnvironmentVariable("UISPEC_SPEC")
+        				my deactivateEnvironmentVariable("UISPEC_EXAMPLE")
+            end tell
+        end tell
+        SCRIPT
+        # puts "#{script}"
+        # exit
+        `osascript <<SCRIPT\n#{script}\nSCRIPT`
+      end
+    end
+  end
+end

data/lib/uispecrunner/drivers/shell.rb

@@ -0,0 +1,83 @@
+require 'tmpdir'
+
+class UISpecRunner
+  class Drivers
+    class Shell
+      attr_reader :config
+      
+      def initialize(config)
+        @config = config
+      end
+      
+      def run_specs(env)
+        if build_project!
+          run_env = self.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 uispec_runner.verbose?
+          with_env(run_env) do
+            start_securityd if config.securityd
+            command = "#{build_dir}/#{configuration}-iphonesimulator/#{target}.app/#{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
+          end
+        else
+          puts "[!] Failed to build UISpecs.app"
+          exit 1
+        end
+      end
+      
+      def with_env(env)
+        before = env.inject({}) { |h, (k, _)| h[k] = ENV[k]; h }
+        env.each { |k, v| ENV[k] = v }
+        yield
+      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?
+        system(command)
+      end
+
+      def path_to_securityd
+        "#{sdk_dir}/usr/libexec/securityd"
+      end
+
+      def start_securityd
+        run_command("launchctl submit -l UISpecRunnerDaemons -- #{path_to_securityd}")
+        @securityd_running = true
+        Signal.trap("INT") { stop_securityd }
+        Signal.trap("TERM") { stop_securityd }
+        Signal.trap("EXIT") { stop_securityd }
+      end
+
+      def stop_securityd
+        run_command("launchctl remove UISpecRunnerDaemons") if @securityd_running
+        @securityd_running = false
+      end
+    end
+  end
+end

data/lib/uispecrunner/options.rb

@@ -19,6 +19,7 @@ class UISpecRunner
       self[:build_dir] = './build'
       self[:verbose] = false
       self[:sdk_version] = '3.0'
+      self[:driver] = :shell
       
       require 'optparse'
       @opts = OptionParser.new do |o|
@@ -52,6 +53,12 @@ class UISpecRunner
           self[:project] = project
         end
         
+        o.on('--driver [DRIVER]', [:shell, :osascript],
+             "Select driver (shell, osascript)",
+             'Default: shell') do |driver|
+              self[:driver] = driver.to_sym
+        end
+        
         o.on('--sdk [VERSION]',
              'Run the UISpec target against the iPhone SDK version',
              'Default: 3.0') do |sdk_version|

data/lib/uispecrunner.rb

@@ -2,10 +2,11 @@
 # By: Blake Watters <blake@twotoasters.com>
 # Portions borrowed from Eloy Duran's Kicker script (http://github.com/alloy/UISpec)
 
-require 'tmpdir'
+require 'uispecrunner/drivers/shell'
+require 'uispecrunner/drivers/osascript'
 
-class UISpecRunner
-  attr_accessor :project, :target, :configuration, :sdk_version, :build_dir, :verbose, :securityd, :env
+class UISpecRunner    
+  attr_accessor :project, :target, :configuration, :sdk_version, :build_dir, :verbose, :securityd, :driver, :env
   
   # private
   attr_accessor :run_mode, :spec, :example, :protocol
@@ -16,11 +17,12 @@ class UISpecRunner
     self.configuration ||= 'Debug'
     self.build_dir ||= './build'
     self.run_mode ||= :all
+    self.driver ||= :shell
     self.env ||= {}
   end    
   
   def run!
-    case run_mode
+    case self.run_mode
     when :all
       run_all!
     when :spec
@@ -30,7 +32,7 @@ class UISpecRunner
     when :protocol
       run_protocol!(self.protocol)
     else
-      raise ArgumentError, "Unknown run mode: #{run_mode}"
+      raise ArgumentError, "Unknown run mode: #{config.run_mode}"
     end    
   end
   
@@ -48,84 +50,24 @@ class UISpecRunner
   
   def run_spec_example!(spec_name, example_name)
     run_specs('UISPEC_SPEC' => spec_name, 'UISPEC_EXAMPLE' => example_name)
-  end
+  end    
   
   def verbose?
     self.verbose
   end
   
   private
-    def run_command(command)
-      puts "Executing: #{command}" if verbose?
-      system(command)
-    end
-    
-    def path_to_securityd
-      "#{sdk_dir}/usr/libexec/securityd"
-    end
-    
-    def start_securityd
-      run_command("launchctl submit -l UISpecRunnerDaemons -- #{path_to_securityd}")
-      @securityd_running = true
-      Signal.trap("INT") { stop_securityd }
-      Signal.trap("TERM") { stop_securityd }
-      Signal.trap("EXIT") { stop_securityd }
-    end
-    
-    def stop_securityd
-      run_command("launchctl remove UISpecRunnerDaemons") if @securityd_running
-      @securityd_running = false
+    def driver_class
+      if self.driver == :shell
+        UISpecRunner::Drivers::Shell
+      elsif self.driver == :osascript
+        UISpecRunner::Drivers::OSAScript
+      end
     end
     
     def run_specs(env = {})
-     if build_project!
-       run_env = self.env.merge(env)
-       run_env.merge!('DYLD_ROOT_PATH' => sdk_dir, 'IPHONE_SIMULATOR_ROOT' => sdk_dir, 'CFFIXED_USER_HOME' => tmpdir)
-       puts "Setting environment variables: #{run_env.inspect}" if verbose?
-       with_env(run_env) do
-         start_securityd if securityd
-         command = "#{build_dir}/#{configuration}-iphonesimulator/#{target}.app/#{target} -RegisterForSystemEvents"
-         puts "Executing: #{command}" if verbose?
-         output = `#{command}`
-         exit_code = $?
-         unless exit_code == 0
-           puts "[!] Failed to run UISpec target: #{output}"
-           exit 1
-         end
-       end
-     else
-       puts "[!] Failed to build UISpecs.app"
-       exit 1
-     end
-    end
-    
-    def sdk_dir
-      "/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator#{sdk_version}.sdk"
-    end
-    
-    def tmpdir
-      Dir.tmpdir
-    end
-    
-    def project_switch
-      "-project #{project}" if project
-    end
-    
-    def sdk_switch
-      "-sdk #{sdk_dir}" if sdk_version
-    end
-    
-    def build_project!
-      command = "xcodebuild #{project_switch} -target #{target} -configuration #{configuration} #{sdk_switch} > /dev/null"
-      puts "Building project with: #{command}" if verbose?
-      system(command)
-    end
-    
-    def with_env(env)
-      before = env.inject({}) { |h, (k, _)| h[k] = ENV[k]; h }
-      env.each { |k, v| ENV[k] = v }
-      yield
-    ensure
-      before.each { |k, v| ENV[k] = v }
+      puts "Running specs via #{driver}..."
+      driver = driver_class.new(self)
+      driver.run_specs(env)
     end
 end

data/uispecrunner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uispecrunner}
-  s.version = "0.2.4"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Blake Watters"]
-  s.date = %q{2010-07-30}
+  s.date = %q{2010-08-02}
   s.default_executable = %q{uispec}
   s.description = %q{Provides a simple Ruby interface for running UISpec iPhone tests}
   s.email = %q{blake@twotoasters.com}
@@ -28,6 +28,8 @@ Gem::Specification.new do |s|
      "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",

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 4
-  version: 0.2.4
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Blake Watters
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 -04:00
+date: 2010-08-02 00:00:00 -04:00
 default_executable: uispec
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,8 @@ files:
 - 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