xctest-runner 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b0410f00c01ffedd26225465d0a883394e4c82f
-  data.tar.gz: b53f6d8a4de812580cd3dd13e2aa7cd543015dcc
+  metadata.gz: b72725d5ad725e2222ce04ffb1d0127bd3e6c897
+  data.tar.gz: f87afd50444feabed1d8ef8383a11b88e1c90955
 SHA512:
-  metadata.gz: 66b9f65e3d63becb6c61fe7c69819643962fb9e56ef351aec1768764db1daef15764060a8bf223ba294f37e95913789635b84a70ef26dc2a992a47e626642eb3
-  data.tar.gz: 5324de9fad5f7954f8c70782158aed8324bab9eebef526fdb220b36c93ebeecb10bd038638272ea00712d06721e9b538a4f08e8829be6e77a82a30f52e23fa14
+  metadata.gz: 6ba9545e2a9e1d0975c34fb286dc9424a08fff53fe1e2a7b1f39ab6261ab2a174bfa085cc279dd3055ce865ff40f8d56ed51c4e3655da0834bd3e46cac27130e
+  data.tar.gz: c6fa012ccf099620052b42eea4df0e494a560ab0d021f4be5d86c754e167c51e79dc54d3995be00d84f877899b49a2737cc4f8178e978c84b78c80c10f243c9c

data/README.md

@@ -18,7 +18,7 @@ $ gem install xctest-runner
 $ xctest-runner
 ```
 
-xctest-runner may be able to find the appropriate Target automatically.
+xctest-runner may be able to find the appropriate Scheme automatically.
 
 ### If you would like to run a specific test case
 
@@ -26,12 +26,6 @@ xctest-runner may be able to find the appropriate Target automatically.
 $ xctest-runner -test SampleTests/testSample
 ```
 
-### If you specify a target
-
-```shell
-$ xctest-runner -target YourTestsTarget
-```
-
 ### If you specify a scheme
 
 ```shell
@@ -44,12 +38,6 @@ $ xctest-runner -scheme YourScheme
 $ xctest-runner -workspace Sample.xcworkspace
 ```
 
-### If you specify a project
-
-```shell
-$ xctest-runner -project Sample.xcodeproj
-```
-
 ## Advanced Usage
 
 ### If you would like to use [CocoaPods](http://cocoapods.org/)

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/bin/xctest-runner

@@ -12,8 +12,6 @@ opts = {}
 opt = OptionParser.new
 opt.on('--scheme NAME', 'build the scheme NAME') {|v| opts[:scheme] = v }
 opt.on('--workspace NAME', 'build the workspace NAME') {|v| opts[:workspace] = v }
-opt.on('--project NAME', 'build the project NAME') {|v| opts[:project] = v }
-opt.on('--target NAME', 'build the target NAME') {|v| opts[:target] = v }
 opt.on('--sdk SDK', 'use SDK as the name or path of the base SDK when building the project') {|v| opts[:sdk] = v }
 opt.on('--arch ARCH', 'build each target for the architecture ARCH') {|v| opts[:arch] = v }
 opt.on('--configuration NAME', 'use the build configuration NAME for building each target') {|v| opts[:configuration] = v }

data/lib/xctest-runner/build-environment.rb

@@ -24,23 +24,23 @@ class XCTestRunner
       execute_command("xcodebuild -list")
     end
 
-    def default_target
-      unless @default_target
-        target = nil
-        is_target = false
+    def default_scheme
+      unless @default_scheme
+        scheme = nil
+        is_scheme = false
 
         output = xcodebuild_list
         output.each_line do |line|
           line = line.strip
           if line =~ /\w+:/
-            is_target = ('Targets:' == line)
-          elsif is_target
-            target = line if target.nil? || line.end_with?('Tests')
+            is_scheme = ('Schemes:' == line)
+          elsif is_scheme
+            scheme = line if scheme.nil? || line.end_with?('Tests')
           end
         end
-        @default_target = target
+        @default_scheme = scheme
       end
-      @default_target
+      @default_scheme
     end
 
   end

data/lib/xctest-runner/scheme-manager.rb

@@ -9,6 +9,10 @@ class XCTestRunner
     TEMP_SCHEME = 'XCTestRunnerTemp'
     TEMP_SCHEME_NAME = "#{TEMP_SCHEME}.xcscheme"
 
+    BUILD_ACTION_TAG = 'Scheme/BuildAction'
+    BUILD_ACTION_ENTRY_TAG = 'Scheme/BuildAction/BuildActionEntries/BuildActionEntry'
+    TEST_REFERENCE_TAG = 'Scheme/TestAction/Testables/TestableReference/BuildableReference'
+
     def temp_scheme
       TEMP_SCHEME
     end
@@ -38,15 +42,37 @@ class XCTestRunner
     def find_xml_need_to_be_updated(scheme_path, &block)
       need_to_be_updated = false
       doc = REXML::Document.new(File.open(scheme_path))
-      doc.elements.each('Scheme/BuildAction/BuildActionEntries/BuildActionEntry') do |element|
-        if 'YES' == element.attributes['buildForTesting'] && 'NO' == element.attributes['buildForRunning']
-          element.attributes['buildForRunning'] = 'YES'
-          need_to_be_updated = true
+      if doc.get_elements(BUILD_ACTION_ENTRY_TAG).empty?
+        need_to_be_updated = add_build_action_entry_to(doc)
+      else
+        doc.elements.each(BUILD_ACTION_ENTRY_TAG) do |element|
+          if element.attributes['buildForTesting'] != element.attributes['buildForRunning']
+            element.attributes['buildForRunning'] = element.attributes['buildForTesting']
+            need_to_be_updated = true
+          end
         end
       end
       block.call(doc) if need_to_be_updated
     end
 
+    def add_build_action_entry_to(doc)
+      buildable_reference = doc.get_elements(TEST_REFERENCE_TAG).first
+      return false unless buildable_reference
+      build_action = doc.get_elements(BUILD_ACTION_TAG).first
+      return false unless build_action
+      entries = build_action.add_element('BuildActionEntries')
+      attributes = {
+        'buildForTesting' => 'YES',
+        'buildForRunning' => 'YES',
+        'buildForProfiling' => 'NO',
+        'buildForArchiving' => 'NO',
+        'buildForAnalyzing' => 'NO',
+      }
+      entry = entries.add_element('BuildActionEntry', attributes)
+      entry.add_element(buildable_reference.name, buildable_reference.attributes)
+      true
+    end
+
     def write_xml(doc, path)
       File.open(path, 'w') do |f|
         f.sync = true

data/lib/xctest-runner.rb

@@ -14,8 +14,6 @@ class XCTestRunner
     @clean = opts[:clean] || false
     @scheme = opts[:scheme] || nil
     @workspace = opts[:workspace] || nil
-    @project = opts[:project] || nil
-    @target = opts[:target] || nil
     @sdk = opts[:sdk] || 'iphonesimulator'
     @configuration = opts[:configuration] || 'Debug'
     @arch = opts[:arch] || nil
@@ -24,6 +22,7 @@ class XCTestRunner
 
     @env = current_environment(build_command)
     @arch = default_build_arch if @arch.nil?
+    @scheme = default_scheme unless @scheme
     @build_option = nil
   end
 
@@ -39,16 +38,20 @@ class XCTestRunner
     @executable_path ||= "#{@env['BUILT_PRODUCTS_DIR']}/#{@env['EXECUTABLE_PATH']}"
   end
 
+  def is_valid_arch?(arch)
+    ['i386', 'x86_64'].include?(arch)
+  end
+
   def native_arch
     unless @native_arch
       arch = `file #{executable_path}`.split(' ').last
-      if 'i386' == arch || 'x86_64' == arch
+      if is_valid_arch?(arch)
         @native_arch = arch
       else
         @native_arch = @env['CURRENT_ARCH']
       end
     end
-    @native_arch || 'i386'
+    is_valid_arch?(@native_arch) ? @native_arch : 'i386'
   end
 
   def arch_command
@@ -79,12 +82,9 @@ class XCTestRunner
       options = []
       options << "-scheme #{@scheme}" if @scheme
       options << "-workspace #{@workspace}" if @workspace
-      options << "-project #{@project}" if @project
-      options << "-target #{@target}" if @target
       options << "-sdk #{@sdk}" if @sdk
       options << "-configuration #{@configuration}" if @configuration
       options << "-arch #{@arch} #{valid_archs}" if @arch
-      options << "-target #{default_target}" if @scheme.nil? && @target.nil? && default_target
       @build_option = options.join(' ')
     end
     @build_option

data/spec/lib/xctest-runner_spec.rb

@@ -47,6 +47,7 @@ describe XCTestRunner do
 
             Schemes:
                 PodSample
+                Tests
       EOS
     }
   end
@@ -56,7 +57,7 @@ describe XCTestRunner do
       expect(opts.count).to eq 3
       expect(opts['-sdk']).to eq 'iphonesimulator'
       expect(opts['-configuration']).to eq 'Debug'
-      expect(opts['-target']).to eq 'PodSampleTests'
+      expect(opts['-scheme']).to eq 'Tests'
     end
 
     it 'doese not run clean command' do
@@ -89,28 +90,6 @@ describe XCTestRunner do
     end
   end
 
-  context '-project option' do
-    let(:arguments) {
-      {:project => 'Sample'}
-    }
-
-    it 'has some build arguments' do
-      expect(opts.count).to eq 4
-      expect(opts['-project']).to eq 'Sample'
-    end
-  end
-
-  context '-target option' do
-    let(:arguments) {
-      {:target => 'Tests'}
-    }
-
-    it 'has some build arguments' do
-      expect(opts.count).to eq 3
-      expect(opts['-target']).to eq 'Tests'
-    end
-  end
-
   context '-sdk option' do
     let(:arguments) {
       {:sdk => 'iphoneos'}
@@ -405,7 +384,10 @@ EOS
             expect(File).to receive(:unlink)
             expect(temp_xml).to receive(:sync=).with(true)
             temp_xml.stub(:write) do |xml|
-              expect(xml.to_s).to_not match /buildForRunning\s*=\s*['"NO]+\s+buildForTesting\s*=\s*['"YES]+/
+              entry = xml.get_elements('Scheme/BuildAction/BuildActionEntries/BuildActionEntry').first
+              expect(entry).to_not be_nil
+              expect(entry.attributes['buildForTesting']).to eq('YES')
+              expect(entry.attributes['buildForRunning']).to eq('YES')
             end
             runner.run
           end
@@ -536,6 +518,87 @@ EOS
           end
         end
 
+        context 'build action entries is not exist' do
+          let(:xcscheme_xml) {
+            StringIO.new <<EOS
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0500"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "xxxxxxx"
+               BuildableName = "Tests.xctest"
+               BlueprintName = "Tests"
+               ReferencedContainer = "container:XXX.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Debug"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
+EOS
+          }
+
+          describe 'write and unlink' do
+            it 'is called' do
+              expect(File).to receive(:open).with(anything(), 'w')
+              expect(File).to receive(:unlink)
+              runner.run
+            end
+          end
+
+          it 'write temp scheme' do
+            expect(File).to receive(:open).with('./XCTestRunnerTemp.xcscheme', 'w').and_yield(temp_xml)
+            expect(File).to receive(:unlink)
+            expect(temp_xml).to receive(:sync=).with(true)
+            temp_xml.stub(:write) do |xml|
+              entry = xml.get_elements('Scheme/BuildAction/BuildActionEntries/BuildActionEntry').first
+              expect(entry).to_not be_nil
+              expect(entry.attributes['buildForTesting']).to eq('YES')
+              expect(entry.attributes['buildForRunning']).to eq('YES')
+            end
+            runner.run
+          end
+        end
+
       end
     end
   end

data/xctest-runner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "xctest-runner"
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["tokorom"]
-  s.date = "2014-01-19"
+  s.date = "2014-01-21"
   s.description = "The unit tests runner for xctest"
   s.email = "tokorom@gmail.com"
   s.executables = ["xctest-runner"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xctest-runner
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - tokorom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec