xcoder 0.1.15 → 0.1.18

data/lib/xcode/terminal_output.rb

@@ -0,0 +1,116 @@
+require 'colorize'
+
+module Xcode
+  module TerminalOutput
+    @@colour_enabled = true
+    @@log_level = :info
+
+    LEVELS = [
+      :error,
+      :warning,
+      :notice,
+      :info,
+      :debug
+    ]
+
+    def log_level
+      @@log_level
+    end
+
+    def self.log_level=(level)
+      raise "Unknown log level #{level}, should be one of #{LEVELS.join(', ')}" unless LEVELS.include? level
+      @@log_level = level
+    end
+
+    def self.included(base)
+      @@colour_supported = terminal_supports_colors?
+    end
+
+    def color_output= color_output
+      @@colour_enabled = color_output
+    end
+
+    def color_output?
+      @@colour_supported and @@colour_enabled
+    end
+
+    #
+    # Print an IO input interaction
+    #
+    def print_input message, level=:debug
+      return if LEVELS.index(level) > LEVELS.index(@@log_level)
+      puts format_lhs("", "", "<") + message, :default
+    end
+
+    #
+    # Print an IO output interaction
+    def print_output message, level=:debug
+      return if LEVELS.index(level) > LEVELS.index(@@log_level)
+      puts format_lhs("", "", ">") + message, :default
+    end
+    
+    def print_system message, level=:debug
+      return if LEVELS.index(level) > LEVELS.index(@@log_level)
+      puts format_lhs("", "", "!") + message, :green
+    end
+    
+    def format_lhs(left, right, terminator=":")
+      # "#{left.to_s.ljust(10)} #{right.rjust(6)}#{terminator} "
+      "#{right.to_s.rjust(7)}#{terminator} "
+    end
+
+    def print_task(task, message, level=:info, cr=true)
+      return if LEVELS.index(level) > LEVELS.index(@@log_level)
+
+      level_str = ""
+      case level
+      when :error
+        level_str = "ERROR"
+        color = :red
+      when :warning
+        level_str = "WARN"
+        color = :yellow
+      when :notice
+        level_str = "NOTICE"
+        color = :green
+      when :info
+        level_str = ""
+        color = :blue
+      else
+        color = :default
+      end
+
+      print format_lhs(task, level_str), color
+      print message, (level==:warning or level==:error or level==:notice) ? color : :default
+
+      if block_given?
+        yield
+      end
+
+      print "\n" if cr
+    end
+
+    def puts(text, color = :default)
+      color_params = color_output? ? color : {}
+      super(text.colorize(color_params))
+    end
+
+    def print(text, color = :default)
+      color_params = color_output? ? color : {}
+      super(text.colorize(color_params))
+    end
+
+    def self.terminal_supports_colors?
+      # No colors unless we are being run via a TTY
+      return false unless $stdout.isatty
+
+      # Check if the terminal supports colors
+      colors = `tput colors 2> /dev/null`.chomp
+      if $?.exitstatus == 0
+        colors.to_i >= 8
+      else
+        false
+      end
+    end
+  end
+end

data/lib/xcode/test/formatters/junit_formatter.rb

@@ -6,7 +6,7 @@ module Xcode
     module Formatters
       class JunitFormatter
         def initialize(dir)
-          @dir = File.expand_path(dir)
+          @dir = File.expand_path(dir).to_s
           FileUtils.mkdir_p(@dir)
         end
         
@@ -42,12 +42,17 @@ module Xcode
             end
           end
           
-          File.open("#{@dir}/TEST-#{report.name}.xml", 'w') do |current_file|
+          File.open(File.join(@dir, sanitize_filename("TEST-#{report.name}.xml")), 'w') do |current_file|
             current_file.write xml.target!
           end
           
         end # write
         
+        private
+        def sanitize_filename(filename)
+           filename.gsub(/[^0-9A-Za-z.\-]/, '_')
+        end
+        
       end # JUnitFormatter
       
     end # Formatters

data/lib/xcode/test/formatters/stdout_formatter.rb

@@ -2,44 +2,53 @@ module Xcode
   module Test
     module Formatters
       class StdoutFormatter
+        include Xcode::TerminalOutput
         
-        def initialize
+        def initialize(options = {})
           @errors = []
+          @test_count = 0
+          options.each { |k,v| self.send("#{k}=", v) }
         end
                 
         def before(report)
-          puts "Begin tests"
+          print_task :test, "Begin tests", :info
         end
         
         def after(report)
-          puts "\n\nThe following failures occured:" if @errors.count>0
-          @errors.each do |e|
-            puts "[#{e.suite.name} #{e.name}]"
-            e.errors.each do |error|
-              puts "  #{error[:message]}"
-              puts "    at #{error[:location]}"
-              if error[:data].count>0
-                puts "\n   Test Output:"
-                puts "   > #{error[:data].join("   > ")}\n\n"
+          level = @errors.count>0 ? :error : :info
+          if @errors.count>0
+            print_task :test, "The following failures occured:", :warning 
+            @errors.each do |e|
+              print_task :test, "[#{e.suite.name} #{e.name}]", :error
+              e.errors.each do |error|
+                print_task :test, "  #{error[:message]}", :error
+                print_task :test, "    at #{error[:location]}", :error
+                if error[:data].count>0
+                  print_task :test, "\n   Test Output:", :error
+                  print_task :test, "   > #{error[:data].join("   > ")}\n\n", :error
+                end
+              end       
+              
+              # if there is left over data in the test report, show that
+              if e.data.count>0
+                print_task :test, "\n  There was this trailing output after the above failures", :error
+                print_task :test, "   > #{e.data.join("   > ")}\n\n", :error
               end
-            end       
-            
-            # if there is left over data in the test report, show that
-            if e.data.count>0
-              puts "\n  There was this trailing output after the above failures"
-              puts "   > #{e.data.join("   > ")}\n\n"
             end
           end
           
-          puts "\n\nEnd tests (#{report.failed? ? 'FAILED' : 'PASSED'}).  Took #{report.duration}s"
+          print_task :test, "Finished in #{report.duration} seconds", :info
+          print_task :test, "#{@test_count} tests, #{@errors.count} failures", report.failed? ? :error : :info
         end
         
         def before_suite(suite)
-          print "#{suite.name}: "
+          print_task :test, "#{suite.name}: ", :info, false
         end
         
         def after_suite(suite)
-          puts " [#{suite.total_passed_tests}/#{suite.tests.count}]"
+          color = (suite.total_passed_tests == suite.tests.count) ? :info : :error
+          #print_task :test, "#{suite.total_passed_tests}/#{suite.tests.count}", color
+          puts " [#{suite.total_passed_tests}/#{suite.tests.count}]", color
         end
         
         def before_test(test)
@@ -47,14 +56,14 @@ module Xcode
         end
         
         def after_test(test)
+          @test_count += 1
           if test.passed?
-            print "." 
+            print ".", :green
           elsif test.failed?
-            print "F"
+            print "F", :red
             @errors << test 
-          end 
-          # puts "[#{test.suite.name} #{test.name}] << END"
-      end
+          end                    
+        end
                 
       end # StdoutFormatter
     end # Formatters

data/lib/xcode/test/parsers/kif_parser.rb

@@ -0,0 +1,87 @@
+require 'xcode/test/report'
+require 'time'
+
+module Xcode
+  module Test    
+    module Parsers
+      
+      class KIFParser
+        attr_accessor :report, :builder
+        
+        def initialize(report = Xcode::Test::Report.new)
+          @report = report
+          @awaiting_scenario_name = false
+          yield self if block_given?
+        end
+    
+        def flush
+          @report.finish
+        end
+    
+        def <<(piped_row)
+          if @awaiting_scenario_name
+            if match = piped_row.match(/\[\d+\:.+\]\s(.+)/)
+              name = match[1].strip
+              @report.add_suite name, Time.now            
+              @awaiting_scenario_name = false
+            end
+            return
+          end
+          
+          case piped_row.force_encoding("UTF-8")
+            
+            when /BEGIN KIF TEST RUN: (\d+) scenarios/
+              @report.start
+            
+            when /BEGIN SCENARIO (\d+)\/(\d+) \(\d+ steps\)/
+              @awaiting_scenario_name = true
+              
+            when /END OF SCENARIO \(duration (\d+\.\d+)s/
+              @report.in_current_suite do |suite|
+                suite.finish(Time.now)
+              end
+              
+            when /(PASS|FAIL) \((\d+\.\d+s)\): (.+)/
+              duration = $2.to_f
+              name = $3.strip
+              @report.in_current_suite do |suite|
+                test = suite.add_test_case(name)
+                
+                if $1 == 'PASS'
+                  test.passed(duration)
+                else
+                  test.failed(duration)
+                end
+              end
+              
+            when /KIF TEST RUN FINISHED: \d+ failures \(duration (\d+\.\d+)s\)/
+              @report.finish
+
+            when /(.*): error: -\[(\S+) (\S+)\] : (.*)/
+              message = $4
+              location = $1
+              @report.in_current_test do |test|
+                test.add_error(message, location)
+              end
+            
+            # when /failed with exit code (\d+)/, 
+            when /BUILD FAILED/
+              @report.finish
+            
+            when /Segmentation fault/
+              @report.abort
+            
+            when /the iPhoneSimulator platform does not currently support application-hosted tests/
+              raise "Application tests are not currently supported by the iphone simulator.  If these are logic tests, try unsetting TEST_HOST in your project config"
+            else
+              @report.in_current_test do |test|
+                test << piped_row
+              end
+          end # case
+        
+        end # <<
+      
+      end # OCUnitParser
+    end # Parsers
+  end # Test
+end # Xcode

data/lib/xcode/test/parsers/ocunit_parser.rb

@@ -7,17 +7,17 @@ module Xcode
       
       class OCUnitParser
         attr_accessor :report, :builder
-        
+
         def initialize(report = Xcode::Test::Report.new)
           @report = report          
           yield self if block_given?
         end
     
-        def flush
+        def close
           @report.finish
         end
     
-        def <<(piped_row)
+        def << piped_row
           case piped_row.force_encoding("UTF-8")
     
             when /Test Suite '(\S+)'.*started at\s+(.*)/

data/lib/xcode/version.rb

@@ -1,3 +1,3 @@
 module Xcode
-  VERSION = "0.1.15"
+  VERSION = "0.1.18"
 end

data/lib/xcode/workspace.rb

@@ -15,9 +15,13 @@ module Xcode
       doc = Nokogiri::XML(open("#{@path}/contents.xcworkspacedata"))
       doc.search("FileRef").each do |file|
         location = file["location"]
-        if matcher = location.match(/^group:(.+)$/)
+        if (matcher = location.match(/^group:(.+\.xcodeproj)$/i))
           project_path = "#{workspace_root}/#{matcher[1]}"
-          @projects << Xcode::Project.new(project_path)
+          begin
+            @projects << Xcode::Project.new(project_path)
+          rescue => e
+            puts "Skipping project file #{project_path} referened by #{self} as it failed to parse"
+          end
         end
       end
     end    
@@ -41,8 +45,8 @@ module Xcode
     # @return [Scheme] the specific scheme that matches the name specified
     #
     def scheme(name)
-      scheme = schemes.select {|t| t.name == name.to_s}.first
-      raise "No such scheme #{name}, available schemes are #{schemes.map {|t| t.name}.join(', ')}" if scheme.nil?
+      scheme = schemes.select {|t| t.name == name.to_s and t.parent == self}.first
+      raise "No such scheme #{name} in #{self}, available schemes are #{schemes.map {|t| t.to_s}.join(', ')}" if scheme.nil?
       yield scheme if block_given?
       scheme
     end
@@ -58,10 +62,14 @@ module Xcode
     #
     def project(name)
       project = @projects.select {|c| c.name == name.to_s}.first
-      raise "No such project #{name}, available projects are #{@projects.map {|c| c.name}.join(', ')}" if project.nil?
+      raise "No such project #{name} in #{self}, available projects are #{@projects.map {|c| c.name}.join(', ')}" if project.nil?
       yield project if block_given?
       project
     end
+
+    def to_s
+      "#{name} (Workspace)"
+    end
     
     def describe
       puts "Workspace #{name} contains:"

data/lib/xcoder.rb

@@ -1,90 +1,92 @@
 require 'find'
 require 'fileutils'
+require 'xcode/terminal_output'
 require "xcode/version"
 require "xcode/project"
 require "xcode/info_plist"
-require "xcode/shell"
+require 'xcode/shell/command'
 require 'plist'
 require 'xcode/keychain'
 require 'xcode/workspace'
-require 'xcode/buildfile'
+require 'xcode/platform'
+require 'multi_json'
 
 module Xcode
-  
+
   @@projects = nil
   @@workspaces = nil
   @@sdks = nil
-  
+
   #
   # Find all the projects within the current working directory.
-  # 
+  #
   # @return [Array<Project>] an array of the all the Projects found.
-  # 
+  #
   def self.projects
     @@projects = parse_projects if @@projects.nil?
-    @@projects  
+    @@projects
   end
-  
+
   #
   # Find all the workspaces within the current working directory.
-  # 
+  #
   # @return [Array<Workspaces>] an array of all the Workspaces found.
-  # 
+  #
   def self.workspaces
     @@workspaces = parse_workspaces if @@workspaces.nil?
     @@workspaces
   end
-  
+
   #
   # Find the project with the specified name within the current working directory.
-  # 
+  #
   # @note this method will raise an error when it is unable to find the project
   #   specified.
-  # 
+  #
   # @param [String] name of the project (e.g. NAME.xcodeproj) that is attempting
   #   to be found.
-  # 
+  #
   # @return [Project] the project found; an error is raise if a project is unable
   #   to be found.
-  # 
+  #
   def self.project(name)
     name = name.to_s
-    
+
     return Xcode::Project.new(name) if name=~/\.xcodeproj/
-    
+
     self.projects.each do |p|
       return p if p.name == name
     end
     raise "Unable to find a project named #{name}.  However, I did find these projects: #{self.projects.map {|p| p.name}.join(', ') }"
   end
-  
+
   #
   # Find the workspace with the specified name within the current working directory.
-  # 
+  #
   # @note this method will raise an error when it is unable to find the workspace
   #   specified.
-  # 
+  #
   # @param [String] name of the workspace (e.g. NAME.xcworkspace) that is attempting
   #   to be found.
-  # 
+  #
   # @return [Project] the workspace found; an error is raise if a workspace is unable
   #   to be found.
-  # 
+  #
   def self.workspace(name)
     name = name.to_s
-    
+
     return Xcode::Workspace.new(name) if name=~/\.xcworkspace/
-    
+
     self.workspaces.each do |p|
       return p if p.name == name
     end
     raise "Unable to find a workspace named #{name}.  However, I did find these workspaces: #{self.workspaces.map {|p| p.name}.join(', ') }"
   end
-  
+
   #
   # @param [String] dir the path to search for projects; defaults to using
   #   the current working directory.
-  # 
+  #
   # @return [Array<Project>] the projects found at the specified directory.
   #
   def self.find_projects(dir='.')
@@ -99,17 +101,17 @@ module Xcode
     parse_sdks if @@sdks.nil?
     @@sdks.values.include? sdk
   end
-  
+
   #
   # Available SDKs available on this particular system.
-  # 
+  #
   # @return [Array<String>] the available SDKs on the current system.
-  # 
+  #
   def self.available_sdks
     parse_sdks if @@sdks.nil?
     @@sdks
   end
- 
+
   private
   def self.parse_sdks
     @@sdks = {}
@@ -126,7 +128,7 @@ module Xcode
       end
     end
   end
-  
+
   def self.parse_workspaces(dir='.')
     projects = []
     Find.find(dir) do |path|