xcodebuild-rb 0.2.0 → 0.3.0

data/lib/xcode_build/build_action.rb

@@ -4,13 +4,14 @@ require "xcode_build/build_step"
 
 module XcodeBuild
   class BuildAction
-    attr_reader :steps_completed
+    attr_reader :steps_completed, :warnings
     attr_writer :finished_at
 
     def initialize(metadata)
       @steps_completed = []
       @metadata = metadata
       @started_at = Time.now
+      @warnings = []
       super()
     end
 
@@ -51,6 +52,14 @@ module XcodeBuild
     def has_errors?
       failed_steps.any?
     end
+    
+    def has_warnings?
+      warnings.any?
+    end
+    
+    def error_count
+      has_errors? ? (failed_steps.map { |s| s.errors.length }) : 0
+    end
 
     def duration
       return nil unless finished?
@@ -76,5 +85,17 @@ module XcodeBuild
     def default_configuration?
       @metadata[:default]
     end
+    
+    def add_warning(params)
+      @warnings << Warning.new(params)
+    end
+    
+    private
+    
+    class Warning < OpenStruct
+      def warning_detail
+        "in #{self.file}:#{self.line.to_s}"
+      end
+    end
   end
 end

data/lib/xcode_build/build_step.rb

@@ -45,7 +45,7 @@ module XcodeBuild
     class Error < OpenStruct
       def error_detail
         if self.file
-          "in #{err.file}:#{err.line.to_s}"
+          "in #{self.file}:#{self.line.to_s}"
         elsif self.command
           "#{self.command} failed with exit code #{self.exit_code}"
         end

data/lib/xcode_build/formatters/progress_formatter.rb

@@ -8,10 +8,17 @@ module XcodeBuild
       
       def initialize(output = STDOUT)
         @output = output
+        @action_count = 0
+      end
+      
+      def build_action_starting(action_type)
+        puts cyan("=> Running xcodebuild #{action_type}")
+        @action_count = 0
       end
       
       def clean_started(clean)
         report_started("Cleaning", clean)
+        @action_count += 1
       end
       
       def clean_step_finished(step)
@@ -24,6 +31,7 @@ module XcodeBuild
       
       def build_started(build)
         report_started("Building", build)
+        @action_count += 1
       end
       
       def build_step_finished(step)
@@ -34,15 +42,24 @@ module XcodeBuild
         report_finished(build)
       end
       
+      def warning_detected
+        print yellow("x")
+      end
+      
       def report_finished(object)
         puts
+        report_warnings(object)
         puts
         puts "Finished in #{object.duration} seconds."
         
         if object.successful?
-          puts green("#{object.label} succeeded.")
+          if object.has_warnings?
+            puts green("#{object.label} succeeded.") + yellow(" (#{object.warnings.length} warnings)")
+          else
+            puts green("#{object.label} succeeded.")
+          end
         else
-          puts red("#{object.label} failed.")
+          puts red("#{object.label} failed. (#{object.error_count} errors)")
           puts
           puts "Failed #{object.label.downcase} steps:"
           puts
@@ -53,9 +70,9 @@ module XcodeBuild
             puts indent("#{error_counter}) #{step.type} #{step.arguments.join(" ")}")
 
             step.errors.each do |err|
-              print indent("   #{red(err.message)}")
+              puts indent(indent(red(err.message.capitalize)))
               if err.error_detail
-                puts indent(cyan(err.error_detail)) 
+                puts indent(indent(cyan(err.error_detail))) 
               else
                 puts
               end
@@ -68,6 +85,21 @@ module XcodeBuild
         puts
       end
       
+      def report_warnings(object)
+        return unless object.respond_to?(:warnings)
+        return unless object.warnings.count > 0
+        
+        puts
+        puts "The following warnings were reported:"
+        puts
+        
+        object.warnings.each_with_index do |warning, index|
+          puts indent(yellow("#{index+1}) #{warning.message}"))
+          puts indent(cyan(warning.warning_detail))
+          puts
+        end
+      end
+      
       private
       
       def puts(str = "")
@@ -83,6 +115,7 @@ module XcodeBuild
       end
       
       def report_started(type, object)
+        puts unless @action_count.zero?
         puts
         banner = "#{type} target: #{object.target} (in #{object.project_name}.xcproject)"
         puts bold(banner)

data/lib/xcode_build/reporter.rb

@@ -19,6 +19,10 @@ module XcodeBuild
     def beginning_translation_of_line(line)
       (@output_stream << line) if @output_stream
     end
+    
+    def report_running_action(action)
+      notify :build_action_starting, action
+    end
 
     private
 

data/lib/xcode_build/reporting/build_reporting.rb

@@ -28,6 +28,11 @@ module XcodeBuild
         build.last_step.add_error(params)
       end
       
+      def build_warning_detected(params)
+        build.add_warning(params)
+        notify :warning_detected
+      end
+      
       def build_env_variable_detected(key, value)
         build.set_environment_variable(key, value)
       end

data/lib/xcode_build/tasks/build_task.rb

@@ -17,6 +17,7 @@ module XcodeBuild
       attr_accessor :formatter
       attr_accessor :invoke_from_within
       attr_accessor :reporter_klass
+      attr_accessor :xcodebuild_log_path
 
       def initialize(namespace = :xcode, &block)
         @namespace = namespace
@@ -53,11 +54,11 @@ module XcodeBuild
 
       def build_opts
         [].tap do |opts|
-          opts << "-project #{project_name}" if project_name
-          opts << "-target #{target}" if target
-          opts << "-workspace #{workspace}" if workspace
-          opts << "-scheme #{scheme}" if scheme
-          opts << "-configuration #{configuration}" if configuration
+          opts << "-project \"#{project_name}\"" if project_name
+          opts << "-target \"#{target}\"" if target
+          opts << "-workspace \"#{workspace}\"" if workspace
+          opts << "-scheme \"#{scheme}\"" if scheme
+          opts << "-configuration \"#{configuration}\"" if configuration
           opts << "-arch #{arch}" if arch
           opts << "-sdk #{sdk}" if sdk
           opts << "-xcconfig #{xcconfig}" if xcconfig
@@ -80,6 +81,9 @@ module XcodeBuild
 
       def xcodebuild(action)
         reporter.direct_raw_output_to = output_to unless formatter
+        reporter.direct_raw_output_to = File.open(xcodebuild_log_path, 'w') if xcodebuild_log_path
+        
+        reporter.report_running_action(action) if reporter.respond_to?(:report_running_action)
         
         status = Dir.chdir(invoke_from_within) do
           XcodeBuild.run(build_opts_string(action), output_buffer)

data/lib/xcode_build/translations/building.rb

@@ -28,8 +28,18 @@ module XcodeBuild
         end
 
         case line
-        when /^(.*):(\d+):(\d+): error: (.*)$/
-          notify_build_error($1, $2, $3, $4)
+        when /^(.*):(\d+):(\d+):(.*): (error|warning): (.*)$/ # xcode 4.3.2
+          if $5 == 'error'
+            notify_build_error($1, $2, $3, $6)
+          else
+            notify_build_warning($1, $2, $3, $6)
+          end
+        when /^(.*):(\d+):(\d+): (error|warning): (.*)$/ # xcode < 4.3.2
+          if $4 == 'error'
+            notify_build_error($1, $2, $3, $5)
+          else
+            notify_build_warning($1, $2, $3, $5)
+          end
         when /^\s+setenv (\w+) (.*)/
           notify_env_var($1, $2)
         when /^Command (.*) failed with exit code (\d+)/
@@ -50,8 +60,8 @@ module XcodeBuild
       def notify_build_started(line)
         @building = true
         
-        target = line.match(/TARGET (\w+)/)[1]
-        project = line.match(/PROJECT (\w+)/)[1]
+        target = line.match(/TARGET ([\w\-\.]+)/)[1]
+        project = line.match(/PROJECT ([\w\-\.]+)/)[1]
 
         if line =~ /DEFAULT CONFIGURATION \((\w+)\)/
           configuration = $1
@@ -82,6 +92,15 @@ module XcodeBuild
         }])
       end
       
+      def notify_build_warning(file, line, char, message)
+        notify_delegate(:build_warning_detected, :args => [{
+             :file => file,
+             :line => line.to_i,
+             :char => char.to_i,
+          :message => message
+        }])
+      end
+      
       def notify_build_step_command_failed(command, exit_code)
         notify_delegate(:build_error_detected, :args => [{:command => command, :exit_code => exit_code.to_i}])
       end

data/spec/build_task_spec.rb

@@ -34,27 +34,27 @@ describe XcodeBuild::Tasks::BuildTask do
 
     it "includes the project" do
       task.project_name = "TestProject.xcproject"
-      task.build_opts.should include("-project TestProject.xcproject")
+      task.build_opts.should include(%{-project "TestProject.xcproject"})
     end
 
     it "includes the target" do
       task.target = "TestTarget"
-      task.build_opts.should include("-target TestTarget")
+      task.build_opts.should include(%{-target "TestTarget"})
     end
 
     it "includes the workspace" do
       task.workspace = "SomeWorkspace.xcworkspace"
-      task.build_opts.should include("-workspace SomeWorkspace.xcworkspace")
+      task.build_opts.should include(%{-workspace "SomeWorkspace.xcworkspace"})
     end
 
     it "includes the scheme" do
       task.scheme = "TestScheme"
-      task.build_opts.should include("-scheme TestScheme")
+      task.build_opts.should include(%{-scheme "TestScheme"})
     end
 
     it "includes the configuration" do
       task.configuration = "TestConfiguration"
-      task.build_opts.should include("-configuration TestConfiguration")
+      task.build_opts.should include(%{-configuration "TestConfiguration"})
     end
 
     it "includes the arch" do
@@ -102,7 +102,19 @@ describe XcodeBuild::Tasks::BuildTask do
       XcodeBuild.stub(:run).with(anything, anything).and_return(0)
       task.run(task_name)
     end
-
+    
+    it "uses a file output buffer if xcodebuild_log_path is specified even if a formatter is set" do
+      task = XcodeBuild::Tasks::BuildTask.new do |t|
+        t.formatter = stub('formatter')
+        t.xcodebuild_log_path = 'path/to/xcodebuild.log'
+        t.scheme = 'TestScheme'
+      end
+      File.should_receive(:open).with('path/to/xcodebuild.log', 'w').and_return(buffer = stub)
+      task.reporter.should_receive(:direct_raw_output_to=).with(buffer)
+      XcodeBuild.stub(:run).with(anything, anything).and_return(0)
+      task.run(task_name)
+    end
+    
     it "raises if xcodebuild returns a non-zero exit code" do
       task = XcodeBuild::Tasks::BuildTask.new { |t| t.scheme = 'TestScheme' }
       XcodeBuild.stub(:run).with(anything, anything).and_return(99)

data/spec/reporting/build_reporting_spec.rb

@@ -155,19 +155,19 @@ describe XcodeBuild::Reporting::BuildReporting do
     end
     
     it "tracks the time a build takes" do
-      Timecop.travel(Chronic.parse("10 seconds ago")) do
+      Timecop.travel(Time.parse("01 Jan 2012 00:00:00")) do
         event({:build_started=>
           {:target=>"ExampleProject",
            :project=>"ExampleProject",
            :configuration=>"Release",
            :default=>true}})
            
-        Timecop.travel(Chronic.parse("5 seconds from now")) do
+        Timecop.travel(Time.parse("01 Jan 2012 00:00:05")) do
           event({:build_succeeded=>["BUILD"]})
         end
       end
       
-      reporter.build.duration.should be_within(0.01).of(5)
+      reporter.build.duration.should be_within(0.001).of(5)
     end
     
     it "tracks any environment variables reported by the build" do
@@ -175,6 +175,39 @@ describe XcodeBuild::Reporting::BuildReporting do
       event({:build_env_variable_detected=>["TEST_AFTER_BUILD", "YES"]})
       reporter.build.environment["TEST_AFTER_BUILD"].should == "YES"
     end
+    
+    it "tracks any warnings that occur" do
+      assume_build_started
+      
+      event({:build_warning_detected=>
+        {:file=>
+          "/Users/luke/Code/mine/xcodebuild/resources/ExampleProject/ExampleProject/main.m",
+         :line=>16,
+         :char=>42,
+         :message=>"expected ';' after expression [1]"}})
+      
+      event({:build_warning_detected=>
+       {:file=>
+         "/Users/luke/Code/mine/xcodebuild/resources/ExampleProject/ExampleProject/main.m",
+        :line=>16,
+        :char=>180,
+        :message=>"expected ';' after expression [1]"}})
+        
+      reporter.build.should have(2).warnings
+    end
+    
+    it "notifies it's delegate of any warnings" do
+      assume_build_started
+      
+      delegate.should_receive(:warning_detected)
+      
+      event({:build_warning_detected=>
+        {:file=>
+          "/Users/luke/Code/mine/xcodebuild/resources/ExampleProject/ExampleProject/main.m",
+         :line=>16,
+         :char=>42,
+         :message=>"expected ';' after expression [1]"}})
+    end
   end
   
   context "once a build has started" do

data/spec/reporting/clean_reporting_spec.rb

@@ -112,19 +112,19 @@ describe XcodeBuild::Reporting::CleanReporting do
     end
     
     it "tracks the time a clean takes" do
-      Timecop.travel(Chronic.parse("10 seconds ago")) do
+      Timecop.travel(Time.parse("01 Jan 2012 00:00:00")) do
         event({:clean_started=>
           {:target=>"ExampleProject",
            :project=>"ExampleProject",
            :configuration=>"Release",
            :default=>true}})
            
-        Timecop.travel(Chronic.parse("5 seconds from now")) do
+        Timecop.travel(Time.parse("01 Jan 2012 00:00:05")) do
           event({:clean_succeeded=>{}})
         end
       end
       
-      reporter.clean.duration.should be_within(0.01).of(5)
+      reporter.clean.duration.should be_within(0.001).of(5)
     end
   end
   

data/spec/spec_helper.rb

@@ -15,8 +15,8 @@ end
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'xcodebuild'
-require 'chronic'
 require 'timecop'
+require 'time'
 
 def delegate_should_respond_to(method)
   mock_should_respond?(delegate, method, true)

data/spec/translations/building_translations_spec.rb

@@ -20,36 +20,46 @@ describe XcodeBuild::Translations::Building do
     end
     
     it "notifies the delegate of the start of a build with the default configuration" do
-      delegate.stub(:beginning_translation_of_line)
       delegate.should_receive(:build_started).with(
                 :target => "ExampleProject",
-               :project => "ExampleProject",
+               :project => "ExampleProject.xcodeproj",
          :configuration => "Release",
                :default => true
       )
-      translator << "=== BUILD NATIVE TARGET ExampleProject OF PROJECT ExampleProject WITH THE DEFAULT CONFIGURATION (Release) ==="
+      translator << "=== BUILD NATIVE TARGET ExampleProject OF PROJECT ExampleProject.xcodeproj WITH THE DEFAULT CONFIGURATION (Release) ==="
     end
     
     it "notifies the delegate of the start of a build with a non-default configuration" do
-      delegate.stub(:beginning_translation_of_line)
       delegate.should_receive(:build_started).with(
                 :target => "ExampleProject",
-               :project => "ExampleProject",
+               :project => "ExampleProject.xcodeproj",
          :configuration => "Debug",
                :default => false
       )
-      translator << "=== BUILD NATIVE TARGET ExampleProject OF PROJECT ExampleProject WITH THE CONFIGURATION Debug ==="
+      translator << "=== BUILD NATIVE TARGET ExampleProject OF PROJECT ExampleProject.xcodeproj WITH THE CONFIGURATION Debug ==="
     end
 
     it "treats :build_started as a required delegate message and raise if it doesn't respond" do
       delegate_should_not_respond_to(:build_started)
       lambda { 
-        translator << "=== BUILD NATIVE TARGET ExampleProject OF PROJECT ExampleProject WITH THE CONFIGURATION Debug ==="
+        translator << "=== BUILD NATIVE TARGET ExampleProject OF PROJECT ExampleProject.xcodeproj WITH THE CONFIGURATION Debug ==="
 
       }.should raise_error(XcodeBuild::OutputTranslator::MissingDelegateMethodError)
     end
   end
   
+  context "when translating a built started line" do
+    it "handles hyphens in the target name" do
+      delegate.should_receive(:build_started).with(
+                :target => "ExampleProject-Test",
+               :project => "ExampleProject.xcodeproj",
+         :configuration => "Release",
+               :default => true
+      )
+      translator << "=== BUILD NATIVE TARGET ExampleProject-Test OF PROJECT ExampleProject.xcodeproj WITH THE DEFAULT CONFIGURATION (Release) ==="
+    end
+  end
+  
   context "once a build start has been detected" do
     before do
       translation.stub(:building?).and_return(true)
@@ -116,7 +126,7 @@ describe XcodeBuild::Translations::Building do
       translator << "\tCodeSign build/Debug-iphoneos/ExampleProject.app"
     end
 
-    it "notifies the delegate of errors that occur throughout the build" do
+    it "notifies the delegate of errors that occur throughout the build on < Xcode 4.3.2" do
       delegate.should_receive(:build_error_detected).with(
              :file => "/ExampleProject/main.m", 
              :line => 16,
@@ -125,6 +135,15 @@ describe XcodeBuild::Translations::Building do
       )
       translator << "/ExampleProject/main.m:16:42: error: expected ';' after expression [1]"
     end
+    it "notifies the delegate of errors that occur throughout the build on >= Xcode 4.3.2" do
+      delegate.should_receive(:build_error_detected).with(
+             :file => "/ExampleProject/main.m", 
+             :line => 16,
+             :char => 42,
+          :message => "expected ';' after expression [1]"
+      )
+      translator << "/ExampleProject/main.m:16:42:{16:42-16:80}: error: expected ';' after expression [1]"
+    end
 
     it "notifies the delegate of errors for different build steps" do
       delegate.should_receive(:build_error_detected).with(
@@ -162,6 +181,30 @@ describe XcodeBuild::Translations::Building do
       )
       translator << "Command /bin/sh failed with exit code 1"
     end
+    
+    it "notifies the delegate of warnings on < Xcode 4.3.2" do
+      delegate.should_receive(:build_warning_detected).with(
+             :file => "/ExampleProject/main.m", 
+             :line => 16,
+             :char => 42,
+          :message => "'foo:' is deprecated"
+      )
+      translator << "CompileC ExampleProject/main.m normal"
+      translator << "/ExampleProject/main.m:16:42: warning: 'foo:' is deprecated"
+      translator << "1 warning generated."
+    end
+    
+    it "notifies the delegate of warnings on >= Xcode 4.3.2" do
+      delegate.should_receive(:build_warning_detected).with(
+             :file => "/ExampleProject/main.m", 
+             :line => 16,
+             :char => 42,
+          :message => "'foo:' is deprecated"
+      )
+      translator << "CompileC ExampleProject/main.m normal"
+      translator << "/ExampleProject/main.m:16:42:{16:42-16:80}: warning: 'foo:' is deprecated"
+      translator << "1 warning generated."
+    end
 
     it "treats :build_error_detected as an optional delegate message" do
       delegate_should_not_respond_to(:build_error_detected)
@@ -169,6 +212,12 @@ describe XcodeBuild::Translations::Building do
       translator << "/ExampleProject/main.m:16:42: error: expected ';' after expression [1]"
     end
     
+    it "treats :build_warning_detected as an optional delegate message" do
+      delegate_should_not_respond_to(:build_warning_detected)
+      delegate.should_not_receive(:build_warning_detected)
+      translator << "/ExampleProject/main.m:16:42: warning: expected ';' after expression [1]"
+    end
+    
     it "notifies the delegate of any environment variables that the build outputs" do
       delegate.should_receive(:build_env_variable_detected).with("ARCHS", "armv7")
       translator << "   setenv ARCHS armv7"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcodebuild-rb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &2171080080 !ruby/object:Gem::Requirement
+  requirement: &70169454206120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2171080080
+  version_requirements: *70169454206120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2171079680 !ruby/object:Gem::Requirement
+  requirement: &70169454216780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2171079680
+  version_requirements: *70169454216780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2171079140 !ruby/object:Gem::Requirement
+  requirement: &70169454226380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *2171079140
+  version_requirements: *70169454226380
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2171078640 !ruby/object:Gem::Requirement
+  requirement: &70169454221180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *2171078640
+  version_requirements: *70169454221180
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2171078260 !ruby/object:Gem::Requirement
+  requirement: &70169454236540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2171078260
+  version_requirements: *70169454236540
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &2171022220 !ruby/object:Gem::Requirement
+  requirement: &70169454235020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2171022220
+  version_requirements: *70169454235020
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2171021800 !ruby/object:Gem::Requirement
+  requirement: &70169454231400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,18 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2171021800
-- !ruby/object:Gem::Dependency
-  name: chronic
-  requirement: &2171021380 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2171021380
+  version_requirements: *70169454231400
 description: 
 email: luke@lukeredpath.co.uk
 executables:
@@ -151,13 +140,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2470516518150277683
+      hash: 142715360176815376
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 142715360176815376
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11