xctasks 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5d0e8565d04149c6de73c61d731fb0472c24d37
-  data.tar.gz: 84bff82ae95bdb2b2a2b1f0f67465fd412783aab
+  metadata.gz: 8def5c8a26145c94427549a366caab5948f7b9ea
+  data.tar.gz: 2c7b17dbe330e73a1dd968fd2849bf20007a19fd
 SHA512:
-  metadata.gz: 10038f24a8ed42d632c5a72b07a0b57a198aeea624b1f501001eb11aa55f346610d0fc800d0fda550eae13404f3ab058b4a160c5d1a5c750d358744dcb65ef56
-  data.tar.gz: f67207b2a07fc77b22a9f656d1371af67f98e591ab34a28ba65617e09187f92d443084ab071ecb17faec396a8a3bce41ead65f47ab8e934985becee9c6d0945c
+  metadata.gz: 14f9d086b5cd23e8f9d1c9860b805e88fdd8775d1ece4276a76cb8c8e226a70d0e5a9b7cf9b7b41cbb285ac7780f672b8b04946eaac705b5503454815103d876
+  data.tar.gz: 9c04c2b49bdf955958b479c8ea1f9b732963c1016d28180508254a38c01263aca0f80bc1a7f71534d3ac3b33c9c3444aa9b9e427897b753090b078fe419ec977

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # XCTasks Changelog
 
+## v0.5.0
+
+* Added support for working with projects as well as workspaces. Compliments of [kylef](https://github.com/kylef).
+
 ## v0.4.1
 
 * Reworked output redirection into an optional feature.

data/lib/xctasks/test_task.rb

@@ -100,7 +100,8 @@ module XCTasks
     class Configuration
       SETTINGS = [:workspace, :schemes_dir, :sdk, :runner, :xctool_path,
                   :xcodebuild_path, :settings, :destinations, :actions,
-                  :scheme, :ios_versions, :output_log, :env, :redirect_stderr]
+                  :scheme, :ios_versions, :output_log, :env, :redirect_stderr,
+                  :project]
       HELPERS = [:destination, :xctool?, :xcpretty?, :xcodebuild?]
 
       # Configures delegations to pass through configuration accessor when extended
@@ -235,19 +236,21 @@ module XCTasks
       end
 
       def run_tests(options = {})
-        ios_version = options[:ios_version]      
+        ios_version = options[:ios_version]
         XCTasks::Command.run(%q{killall "iPhone Simulator"}, false) if sdk == :iphonesimulator
 
+        target = workspace ? "-workspace #{workspace}" : "-project #{project}"
+
         output_log_command = output_log ? "| tee -a #{output_log}" : nil
         redirect_suffix = redirect_stderr ? "2> #{redirect_stderr}" : nil
         success = if xctool?
           actions_arg << " -freshSimulator" if ios_version
-          Command.run(["#{xctool_path} -workspace #{workspace} -scheme '#{scheme}' -sdk #{sdk}#{ios_version}", destination_arg, actions_arg, settings_arg, redirect_suffix, output_log_command].grep(String).join(' '))
+          Command.run(["#{xctool_path} #{target} -scheme '#{scheme}' -sdk #{sdk}#{ios_version}", destination_arg, actions_arg, settings_arg, redirect_suffix, output_log_command].grep(String).join(' '))
         elsif xcodebuild?
-          Command.run(["#{xcodebuild_path} -workspace #{workspace} -scheme '#{scheme}' -sdk #{sdk}#{ios_version}", destination_arg, actions_arg, settings_arg, redirect_suffix, output_log_command].grep(String).join(' '))
+          Command.run(["#{xcodebuild_path} #{target} -scheme '#{scheme}' -sdk #{sdk}#{ios_version}", destination_arg, actions_arg, settings_arg, redirect_suffix, output_log_command].grep(String).join(' '))
         elsif xcpretty?
           xcpretty_bin = runner.is_a?(String) ? runner : "xcpretty -c"
-          Command.run(["#{xcodebuild_path} -workspace #{workspace} -scheme '#{scheme}' -sdk #{sdk}#{ios_version}", destination_arg, actions_arg, settings_arg, redirect_suffix, output_log_command, "| #{xcpretty_bin} ; exit ${PIPESTATUS[0]}"].grep(String).join(' '))
+          Command.run(["#{xcodebuild_path} #{target} -scheme '#{scheme}' -sdk #{sdk}#{ios_version}", destination_arg, actions_arg, settings_arg, redirect_suffix, output_log_command, "| #{xcpretty_bin} ; exit ${PIPESTATUS[0]}"].grep(String).join(' '))
         end
 
         XCTasks::TestReport.instance.add_result(self, options, success)
@@ -275,7 +278,7 @@ module XCTasks
 
       def write_environment_variables_to_scheme
         if env.any?
-          path = "#{workspace}/xcshareddata/xcschemes/#{scheme}.xcscheme"
+          path = "#{workspace || project}/xcshareddata/xcschemes/#{scheme}.xcscheme"
           doc = Nokogiri::XML(File.read(path))
           testable_node = doc.at('TestAction')
           env_variables_node = Nokogiri::XML::Node.new "EnvironmentVariables", doc
@@ -305,7 +308,7 @@ module XCTasks
       @prepare_dependency = namespace_name.kind_of?(Hash) ? namespace_name.values.first : nil
 
       yield self if block_given?
-      raise ConfigurationError, "A workspace must be configured" unless workspace
+      raise ConfigurationError, "A workspace or project must be configured" unless workspace || project
       raise ConfigurationError, "At least one subtask must be configured" if subtasks.empty?
       define_rake_tasks
     end
@@ -327,12 +330,17 @@ module XCTasks
     def define_rake_tasks
       namespace self.namespace_name do
         task (prepare_dependency ? { prepare: prepare_dependency} : :prepare ) do
-          fail "No such workspace: #{workspace}" unless File.exists?(workspace)
+          if workspace
+            fail "No such workspace: #{workspace}" unless File.exists?(workspace)
+          else
+            fail "No such project: #{project}" unless File.exists?(project)
+          end
+
           fail "Invalid schemes directory: #{schemes_dir}" unless schemes_dir.nil? || File.exists?(schemes_dir)
           File.truncate(output_log, 0) if output_log && File.exists?(output_log)
           if schemes_dir
-            FileUtils::Verbose.mkdir_p "#{workspace}/xcshareddata/xcschemes"
-            FileUtils::Verbose.cp Dir.glob("#{schemes_dir}/*.xcscheme"), "#{workspace}/xcshareddata/xcschemes"
+            FileUtils::Verbose.mkdir_p "#{workspace || project}/xcshareddata/xcschemes"
+            FileUtils::Verbose.cp Dir.glob("#{schemes_dir}/*.xcscheme"), "#{workspace || project}/xcshareddata/xcschemes"
           end
           subtasks.each { |subtask| subtask.prepare }
         end

data/lib/xctasks/version.rb

@@ -1,3 +1,3 @@
 module XCTasks
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/spec/test_task_spec.rb

@@ -19,6 +19,7 @@ describe XCTasks::TestTask do
 
     Dir.mktmpdir.tap do |path|
       FileUtils.mkdir_p(path + '/LayerKit.xcworkspace/xcshareddata/xcschemes')
+      FileUtils.mkdir_p(path + '/LayerKit.xcodeproj/xcshareddata/xcschemes')
       FileUtils.mkdir_p(path + '/Tests/Schemes')
       Dir.chdir(path)
     end
@@ -44,6 +45,21 @@ describe XCTasks::TestTask do
       end
     end
 
+    context "when the given project does not exist" do
+      let!(:task) do
+        XCTasks::TestTask.new do |t|
+          t.project = 'Invalid.xcodeproj'
+          t.schemes_dir = 'Tests/Schemes'
+          t.runner = :xcpretty
+          t.subtasks = { unit: 'Unit Tests', functional: 'Functional Tests' }
+        end
+      end
+
+      it "fails" do
+        expect { subject.invoke }.to raise_error(RuntimeError, "No such project: Invalid.xcodeproj")
+      end
+    end
+
     context "when the given schemes_dir is nil" do
       let!(:task) do
         XCTasks::TestTask.new do |t|
@@ -75,7 +91,37 @@ describe XCTasks::TestTask do
     end
   end
 
-  describe 'simple task' do
+  describe 'simple task with a project' do
+    let!(:task) do
+      XCTasks::TestTask.new do |t|
+        t.project = 'LayerKit.xcodeproj'
+        t.schemes_dir = 'Tests/Schemes'
+        t.runner = :xcpretty
+        t.redirect_stderr = true
+        t.subtasks = { unit: 'Unit Tests' }
+      end
+    end
+
+    it "configures the project" do
+      task.project.should == 'LayerKit.xcodeproj'
+    end
+
+    describe 'tasks' do
+      describe 'spec:unit' do
+        subject { Rake.application['test:unit'] }
+
+        it "executes the appropriate commands" do
+          subject.invoke
+          @commands.should == ["mkdir -p LayerKit.xcodeproj/xcshareddata/xcschemes",
+                               "cp [] LayerKit.xcodeproj/xcshareddata/xcschemes",
+                               "killall \"iPhone Simulator\"",
+                               "/usr/bin/xcodebuild -project LayerKit.xcodeproj -scheme 'Unit Tests' -sdk iphonesimulator clean build test 2> /dev/null | xcpretty -c ; exit ${PIPESTATUS[0]}"]
+        end
+      end
+    end
+  end
+
+  describe 'simple task with a workspace' do
     let!(:task) do
       XCTasks::TestTask.new do |t|
         t.workspace = 'LayerKit.xcworkspace'
@@ -197,6 +243,31 @@ describe XCTasks::TestTask do
     end
   end
 
+  describe 'task with a project with environment variables' do
+    let!(:task) do
+      XCTasks::TestTask.new do |t|
+        t.project = 'LayerKit.xcodeproj'
+        t.schemes_dir = 'Tests/Schemes'
+        t.runner = 'xcpretty -s'
+        t.output_log = 'output.log'
+        t.env["LAYER_TEST_HOST"] = "10.66.0.35"
+        t.subtasks = { unit: 'Unit Tests' }
+      end
+    end
+
+    subject { Rake.application['test:unit'] }
+
+    it "writes the environment variables into the scheme" do
+      FileUtils.cp File.dirname(__FILE__) + '/Unit Tests.xcscheme', "LayerKit.xcodeproj/xcshareddata/xcschemes/"
+      subject.invoke
+      doc = Nokogiri::XML File.read("LayerKit.xcodeproj/xcshareddata/xcschemes/Unit Tests.xcscheme")
+      node = doc.at('TestAction/EnvironmentVariables/EnvironmentVariable')
+      expect(node).not_to be_nil
+      attributes = node.attributes.inject({}) { |hash, pair| hash[pair[0]] = pair[1].to_s; hash }
+      attributes.should == {"key"=>"LAYER_TEST_HOST", "value"=>"10.66.0.35", "isEnabled"=>"YES"}
+    end
+  end
+
   describe 'advanced task' do
     let!(:task) do
       XCTasks::TestTask.new do |t|
@@ -345,13 +416,14 @@ describe XCTasks::TestTask do
       end
     end
 
-    context "when a workspace is not configured" do
+    context "when a workspace or project is not configured" do
       it "raises an exception" do
         expect do
           XCTasks::TestTask.new do |t|
             t.workspace = nil
+            t.project = nil
           end
-        end.to raise_error(XCTasks::TestTask::ConfigurationError, "A workspace must be configured")
+        end.to raise_error(XCTasks::TestTask::ConfigurationError, "A workspace or project must be configured")
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xctasks
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Blake Watters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake