xcoder 0.1.13 → 0.1.14

data/lib/xcode/registry.rb

@@ -48,7 +48,7 @@ module Xcode
     #   identifier; false if it is not.
     # 
     def self.is_identifier? value
-      value =~ /^[0-9A-F]{24,}$/
+      value =~ /^[0-9a-fA-F]{24,}$/
     end
 
     #

data/lib/xcode/scheme.rb

@@ -1,60 +1,107 @@
 require 'nokogiri'
 
 module Xcode
-  
+
   # Schemes are an XML file that describe build, test, launch and profile actions
   # For the purposes of Xcoder, we want to be able to build and test
-  # The scheme's build action only describes a target, so we need to look at launch for the config
   class Scheme
-    attr_reader :path, :name, :launch, :test
-    def initialize(path)
-      @path = File.expand_path(path)
-      @root = File.expand_path "#{@path}/../../../../"
-      @name = File.basename(path).gsub(/\.xcscheme$/,'')
-      doc = Nokogiri::XML(open(@path))
-      
-      @launch = parse_action(doc, 'launch')
-      @test = parse_action(doc, 'test')
+    attr_reader :parent, :path, :name, :build_config, :build_targets
+
+    #
+    # Parse all the schemes given the current project.
+    #
+    def self.find_in_project(project)
+      find_in_path(project, project.path)
     end
-    
-    # def project
-    #   launch.target.project
-    # end
-    
-    def builder
-      Xcode::Builder.new(self)
+
+    #
+    # Parse all the schemes given the current workspace.
+    #
+    def self.find_in_workspace(workspace)
+      schemes = find_in_path(workspace, workspace.path)
+      
+      # Project level schemes
+      workspace.projects.each do |project|
+        schemes+=project.schemes
+      end
+      
+      schemes
     end
     
-    #
-    # Parse all the scheme files that can be found in the given project or workspace. Schemes
+    # Parse all the scheme files that can be found at the given path. Schemes
     # can be defined as `shared` schemes and then `user` specific schemes. Parsing
     # the schemes will load the shared ones and then the current acting user's
     # schemes.
+    #
     # 
+    # @param project or workspace in which the scheme is contained
     # @return [Array<Scheme>] the shared schemes and user specific schemes found
-    #   within the projet/workspace at the path defined for schemes.
+    #   within the project/workspace at the path defined for schemes.
     #
-    def self.find_in_path(path)
-      shared_schemes = Dir["#{path}/xcshareddata/xcschemes/*.xcscheme"]
-      user_specific_schemes = Dir["#{path}/xcuserdata/#{ENV['USER']}.xcuserdatad/xcschemes/*.xcscheme"]
-      
-      (shared_schemes + user_specific_schemes).map do |scheme|
-        Xcode::Scheme.new(scheme)
+    def self.find_in_path(parent, path)
+      all_schemes_paths(path).map do |scheme_path|
+        Xcode::Scheme.new(parent: parent, root: path, path: scheme_path)
       end
     end
     
-    private 
-    
-    def parse_action(doc, action_name)
-      action = doc.xpath("//#{action_name.capitalize}Action").first
-      buildableReference = action.xpath('BuildableProductRunnable/BuildableReference').first
-      return nil if buildableReference.nil?
+    def initialize(params={})
+      @parent = params[:parent]
+      @path = File.expand_path params[:path]
+      @root = File.expand_path(File.join(params[:root],'..'))
+      @name = File.basename(path).gsub(/\.xcscheme$/,'')
+      doc = Nokogiri::XML(open(@path))      
       
+      parse_build_actions(doc)
+    end
+    
+    # Returns a builder for building this scheme
+    def builder
+      Xcode::Builder::SchemeBuilder.new(self)
+    end
+
+    private
+
+    #
+    # @return an array of all the scheme filepaths found within the project
+    # or workspace path provided.
+    #
+    def self.all_schemes_paths(path)
+      shared_schemes_paths(path) + current_user_schemes_paths(path)
+    end
+
+    #
+    # @return an array of all the shared scheme filespaths found within the
+    # project or workspace path provided.
+    #
+    def self.shared_schemes_paths(root)
+      Dir["#{root}/xcshareddata/xcschemes/*.xcscheme"]
+    end
+
+    #
+    # @return an array of all the current user's scheme filespaths found within the
+    # project or workspace path provided.
+    #
+    def self.current_user_schemes_paths(root)
+      Dir["#{root}/xcuserdata/#{ENV['USER']}.xcuserdatad/xcschemes/*.xcscheme"]
+    end
+    
+    def target_from_build_reference(buildableReference)
       project_name  = buildableReference['ReferencedContainer'].gsub(/^container:/,'')
-      project       = Xcode.project "#{@root}/#{project_name}"    
       target_name   = buildableReference['BlueprintName']
+      project_path  = File.join @root, project_name  
+      project       = Xcode.project project_path 
+      project.target(target_name)
+    end
+    
+    def parse_build_actions(doc)
+      # Build Config
+      @build_targets = []
       
-      project.target(target_name).config(action['buildConfiguration'])
+      @build_config = doc.xpath("//LaunchAction").first['buildConfiguration']
+      
+      build_action_entries = doc.xpath("//BuildAction//BuildableReference").each do |ref|
+        @build_targets << target_from_build_reference(ref) 
+      end
     end
 
   end

data/lib/xcode/shell.rb

@@ -1,3 +1,5 @@
+require 'xcode/shell/command.rb'
+
 module Xcode
   module Shell
     
@@ -5,7 +7,7 @@ module Xcode
     
     def self.execute(bits, show_output=true)
       out = []
-      cmd = bits.is_a?(Array) ? bits.join(' ') : bits
+      cmd = bits.is_a?(Xcode::Shell::Command) ? bits.to_s : bits
       
       puts "EXECUTE: #{cmd}"
       IO.popen (cmd) do |f| 

data/lib/xcode/shell/command.rb

@@ -0,0 +1,42 @@
+require 'set'
+
+module Xcode
+  module Shell
+    class Command
+      attr_accessor :env
+
+      def initialize(cmd, environment={})
+        @cmd = cmd
+        @args = []
+        @env = environment
+      end
+    
+      def <<(arg)
+        @args << arg
+      end
+    
+      def to_s
+        "#{to_a.join(' ')}"
+      end
+      
+      def to_a
+        out = []
+        out << @cmd
+        out+=@args
+        out+=(@env.map {|k,v| "#{k}=#{v}"})
+        out
+      end
+      
+      def ==(obj)
+        return false unless obj.is_a? Xcode::Shell::Command
+        # to_s==obj.to_s
+        Set.new(obj.to_a) == Set.new(self.to_a)
+      end
+      
+      def execute(show_output=true, &block) #:yield: output
+        Xcode::Shell.execute(self, show_output, &block)
+      end
+      
+    end
+  end
+end

data/lib/xcode/version.rb

@@ -1,3 +1,3 @@
 module Xcode
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

data/lib/xcode/workspace.rb

@@ -27,7 +27,8 @@ module Xcode
     #
     def schemes
       return @schemes unless @schemes.nil?
-      @schemes = Xcode::Scheme.find_in_path @path
+      @schemes = Xcode::Scheme.find_in_workspace(self)
+      @schemes
     end
     
     #

data/spec/builder_spec.rb

@@ -10,25 +10,35 @@ describe Xcode::Builder do
 
     describe "#build" do
       
-      let(:default_build_parameters) do
-        [ "xcodebuild", 
-          "-sdk #{configuration.target.project.sdk}", 
-          "-project \"#{configuration.target.project.path}\"", 
-          "-target \"#{configuration.target.name}\"", 
-          "-configuration \"#{configuration.name}\"", 
-          "OBJROOT=\"#{File.dirname(configuration.target.project.path)}/build/\"", 
-          "SYMROOT=\"#{File.dirname(configuration.target.project.path)}/build/\"" ]
+      let(:default_build_parameters) do        
+        cmd = Xcode::Shell::Command.new "xcodebuild"
+        cmd << "-project \"#{configuration.target.project.path}\""
+        cmd << "-target \"#{configuration.target.name}\"" 
+        cmd << "-config \"#{configuration.name}\""
+        cmd << "-sdk #{configuration.target.project.sdk}"
+        cmd.env["OBJROOT"]="\"#{File.dirname(configuration.target.project.path)}/build/\"" 
+        cmd.env["SYMROOT"]="\"#{File.dirname(configuration.target.project.path)}/build/\"" 
+        cmd
+      end
+      
+      let(:macosx_build_parameters) do
+        cmd = Xcode::Shell::Command.new "xcodebuild"
+        cmd << "-project \"#{configuration.target.project.path}\""
+        cmd << "-target \"#{configuration.target.name}\"" 
+        cmd << "-config \"#{configuration.name}\""
+        cmd << "-sdk macosx10.7"
+        cmd.env["OBJROOT"]="\"#{File.dirname(configuration.target.project.path)}/build/\"" 
+        cmd.env["SYMROOT"]="\"#{File.dirname(configuration.target.project.path)}/build/\"" 
+        cmd
       end
 
       it "should build the project with the default parameters" do
-        Xcode::Shell.should_receive(:execute).with(default_build_parameters)
+        Xcode::Shell.should_receive(:execute).with(default_build_parameters,true)
         subject.build
       end
       
       it "should allow the override of the sdk" do
-        expected = default_build_parameters
-        expected[1] = '-sdk macosx10.7'
-        Xcode::Shell.should_receive(:execute).with(expected)
+        Xcode::Shell.should_receive(:execute).with(macosx_build_parameters, true)
         subject.build :sdk => 'macosx10.7'
       end
       
@@ -70,27 +80,27 @@ describe Xcode::Builder do
       end
       
       let(:iphonesimulator_test_parameters) do
-        [ "xcodebuild", 
-          "-sdk iphonesimulator", 
-          "-project \"#{configuration.target.project.path}\"", 
-          "-target \"#{configuration.target.name}\"", 
-          "-configuration \"#{configuration.name}\"", 
-          "OBJROOT=\"#{File.dirname(configuration.target.project.path)}/build/\"", 
-          "SYMROOT=\"#{File.dirname(configuration.target.project.path)}/build/\"",
-          "TEST_AFTER_BUILD=YES"
-          ]
+        cmd = Xcode::Shell::Command.new "xcodebuild"
+        cmd << "-project \"#{configuration.target.project.path}\""
+        cmd << "-target \"#{configuration.target.name}\"" 
+        cmd << "-config \"#{configuration.name}\""
+        cmd << "-sdk iphonesimulator"
+        cmd.env["OBJROOT"]="\"#{File.dirname(configuration.target.project.path)}/build/\"" 
+        cmd.env["SYMROOT"]="\"#{File.dirname(configuration.target.project.path)}/build/\"" 
+        cmd.env["TEST_AFTER_BUILD"]="YES"
+        cmd
       end
       
       let(:macosx_test_parameters) do
-        [ "xcodebuild", 
-          "-sdk macosx10.7", 
-          "-project \"#{configuration.target.project.path}\"", 
-          "-target \"#{configuration.target.name}\"", 
-          "-configuration \"#{configuration.name}\"", 
-          "OBJROOT=\"#{File.dirname(configuration.target.project.path)}/build/\"", 
-          "SYMROOT=\"#{File.dirname(configuration.target.project.path)}/build/\"",
-          "TEST_AFTER_BUILD=YES",
-          ]
+        cmd = Xcode::Shell::Command.new "xcodebuild"
+        cmd << "-project \"#{configuration.target.project.path}\""
+        cmd << "-target \"#{configuration.target.name}\"" 
+        cmd << "-config \"#{configuration.name}\""
+        cmd << "-sdk macosx10.7"
+        cmd.env["OBJROOT"]="\"#{File.dirname(configuration.target.project.path)}/build/\"" 
+        cmd.env["SYMROOT"]="\"#{File.dirname(configuration.target.project.path)}/build/\"" 
+        cmd.env["TEST_AFTER_BUILD"]="YES"
+        cmd
       end
       
       
@@ -99,15 +109,8 @@ describe Xcode::Builder do
         subject.test :sdk => 'iphonesimulator'
       end
 
-      it "should be able to run the test target on macosx10.7" do
-        Xcode::Shell.should_receive(:execute).with(macosx_test_parameters, false)
-        subject.test :sdk => 'macosx10.7'
-      end
-      
       it "should allow the override of the sdk" do
-        expected = macosx_test_parameters
-        expected[1] = '-sdk macosx10.7'
-        Xcode::Shell.should_receive(:execute).with(expected, false)
+        Xcode::Shell.should_receive(:execute).with(macosx_test_parameters, false)
         subject.test :sdk => 'macosx10.7'
       end
       
@@ -125,19 +128,20 @@ describe Xcode::Builder do
     describe "#clean" do
 
       let(:default_clean_parameters) do
-        [ "xcodebuild", 
-          "-project \"#{configuration.target.project.path}\"", 
-          "-sdk iphoneos",
-          "-target \"#{configuration.target.name}\"", 
-          "-configuration \"#{configuration.name}\"", 
-          "OBJROOT=\"#{File.dirname(configuration.target.project.path)}/build/\"", 
-          "SYMROOT=\"#{File.dirname(configuration.target.project.path)}/build/\"",
-          "clean" ]
+        cmd = Xcode::Shell::Command.new "xcodebuild"
+        cmd << "-project \"#{configuration.target.project.path}\""
+        cmd << "-target \"#{configuration.target.name}\"" 
+        cmd << "-config \"#{configuration.name}\""
+        cmd << "-sdk iphoneos"
+        cmd << "clean"
+        cmd.env["OBJROOT"]="\"#{File.dirname(configuration.target.project.path)}/build/\"" 
+        cmd.env["SYMROOT"]="\"#{File.dirname(configuration.target.project.path)}/build/\"" 
+        cmd
       end
 
 
       it "should clean the project with the default parameter" do
-        Xcode::Shell.should_receive(:execute).with(default_clean_parameters)
+        Xcode::Shell.should_receive(:execute).with(default_clean_parameters, true)
         subject.clean
       end
 
@@ -154,16 +158,17 @@ describe Xcode::Builder do
     describe "#build" do
       
       let(:default_build_parameters) do
-        [ "xcodebuild",
-          "-sdk iphoneos",
-          "-project \"#{scheme.launch.target.project.path}\"",
-          "-scheme \"#{scheme.name}\"",
-          "OBJROOT=\"#{File.dirname(scheme.launch.target.project.path)}/build/\"", 
-          "SYMROOT=\"#{File.dirname(scheme.launch.target.project.path)}/build/\"" ]
+        cmd = Xcode::Shell::Command.new "xcodebuild"
+        cmd << "-project \"#{scheme.build_targets.last.project.path}\""
+        cmd << "-scheme \"#{scheme.name}\""
+        cmd << "-sdk iphoneos"
+        cmd.env["OBJROOT"]="\"#{File.dirname(scheme.build_targets.last.project.path)}/build/\"" 
+        cmd.env["SYMROOT"]="\"#{File.dirname(scheme.build_targets.last.project.path)}/build/\"" 
+        cmd
       end
 
       it "should build the project with the default parameters" do
-        Xcode::Shell.should_receive(:execute).with(default_build_parameters)
+        Xcode::Shell.should_receive(:execute).with(default_build_parameters, true)
         subject.build
       end
       
@@ -172,18 +177,19 @@ describe Xcode::Builder do
     describe "#clean" do
 
       let(:default_clean_parameters) do
-        [ "xcodebuild",
-          "-project \"#{scheme.launch.target.project.path}\"",
-          "-sdk iphoneos",
-          "-scheme \"#{scheme.name}\"",
-          "OBJROOT=\"#{File.dirname(scheme.launch.target.project.path)}/build/\"", 
-          "SYMROOT=\"#{File.dirname(scheme.launch.target.project.path)}/build/\"",
-          "clean" ]
+        cmd = Xcode::Shell::Command.new "xcodebuild"
+        cmd << "-project \"#{scheme.build_targets.last.project.path}\""
+        cmd << "-scheme \"#{scheme.name}\""
+        cmd << "-sdk iphoneos"
+        cmd << "clean"
+        cmd.env["OBJROOT"]="\"#{File.dirname(scheme.build_targets.last.project.path)}/build/\"" 
+        cmd.env["SYMROOT"]="\"#{File.dirname(scheme.build_targets.last.project.path)}/build/\""
+        cmd
       end
 
 
       it "should clean the project with the default parameter" do
-        Xcode::Shell.should_receive(:execute).with(default_clean_parameters)
+        Xcode::Shell.should_receive(:execute).with(default_clean_parameters, true)
         subject.clean
       end
 

data/spec/registry_spec.rb

@@ -0,0 +1,51 @@
+require_relative 'spec_helper'
+
+describe Xcode::Registry do
+
+  def self.is_identifier? value
+    value =~ /^[0-9A-F]{24,}$/
+  end
+
+  describe "ClassMethods" do
+    subject { described_class }
+
+    describe "#is_identifier?" do
+      context "when the value is valid hexadecimal 24 character length string" do
+        context "when it is all uppercase" do
+          let(:input) { "0123456789ABCDEF01234567" }
+
+          it "should be an identifier" do
+            subject.is_identifier?(input).should be_true
+          end
+        end
+
+        context "when it uses lowercase characters" do
+          let(:input) { "0123456789abcdef01234567" }
+
+          it "should be an identifier" do
+            subject.is_identifier?(input).should be_true
+          end
+        end
+      end
+
+      context "when the value is less than 24 characters" do
+        let(:input) { "0123456789ABCDEF" }
+
+        it "should not be an identifier" do
+          subject.is_identifier?(input).should be_false
+        end
+      end
+
+      context "when it contains other than hexadecimal characters" do
+        let(:input) { "0123456789ABCDEFGHIJKLMNO" }
+
+        it "should not be an identifier" do
+          subject.is_identifier?(input).should be_false
+        end
+      end
+
+    end
+  end
+
+
+end