cocoapods-testing 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76065a3c016950e1fd62065bd8d8e520776fcfc4
-  data.tar.gz: 42e4d3f2cdaac12190702a68b303d435bb0dbb7e
+  metadata.gz: 60978cc8a272b1bce1fec928fd77045b608b8b50
+  data.tar.gz: 3e5c75046d96388c3e30fa60b43cc31b505423a0
 SHA512:
-  metadata.gz: 281a6c69b75e3604affc0acd0355d9159b28d025382a2f0392ef77c511a6e93aba805fe0d370c0ce55a84e4ea019f35b3e722728fd3286e4a5d9d48966bbbd71
-  data.tar.gz: 570267a9ffcf00fd49ffb21e686f5368ba3a246904f980dd60ffc0010aac133823e1b06708b416f194ba6dabe8033cbf9c909486af4fdf916f2fcf346ee5637c
+  metadata.gz: 4508ba8cad21997b30c53ffeb199b777dbdc02e88fa5b98370360d33ace2bc14c894af3eb1e2d92325cefe3e3d85f7e9111e99f3093e529120dbd7693f37482b
+  data.tar.gz: 13b949c608595a767a6ac88046e978270386bc867a16aa82cf1055b709cda01f5a5d6cb4170f040fdf135b97daf0202d7d575ab0b62bea9b2536f28006a43f44

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in cocoapods-testing.gemspec
 gemspec
+
+gem 'nokogiri', '= 1.6.3.1'

data/Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     cocoapods-testing (0.0.6)
-      xctasks
+      xctasks (>= 0.5.0)
 
 GEM
   remote: https://rubygems.org/
@@ -11,7 +11,7 @@ GEM
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     rake (10.3.2)
-    xctasks (0.4.1)
+    xctasks (0.5.0)
       nokogiri (~> 1.6, >= 1.6.3.1)
       rake (~> 10.0, >= 10.0.0)
 
@@ -21,4 +21,5 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.3)
   cocoapods-testing!
+  nokogiri (= 1.6.3.1)
   rake

data/README.md

@@ -8,4 +8,4 @@ Run tests for any pod from the command line without any prior knowledge.
 
 ## Usage
 
-    $ pod spec testing POD_NAME
+    $ pod lib testing POD_NAME

data/cocoapods_testing.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'xctasks'
+  spec.add_dependency 'xctasks', '>= 0.5.0'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/cocoapods_testing.rb

@@ -1,3 +1,3 @@
 module CocoapodsTesting
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

data/lib/pod/command/lib/testing.rb

@@ -13,27 +13,89 @@ module Pod
 
         def self.options
           [
+            ['--dry-run', 'Show which tests would be executed.'],
             ['--verbose', 'Show full xcodebuild output.']
           ]
         end
 
         def initialize(argv)
+          @@dry_run = argv.flag?('dry-run')
           @@verbose = argv.flag?('verbose')
           @@args = argv.arguments!
+
+          @@found_projects = []
+          @@found_tests = false
           super
         end
 
+        def self.handle_projects_in_dir(dir)
+          workspaces_in_dir(dir).each do |workspace_path|
+            next if workspace_path.end_with?('.xcworkspace')
+
+            project = Xcodeproj::Project.open(Pathname.new(workspace_path))
+            yield project, workspace_path
+          end
+        end
+
         def self.handle_workspaces_in_dir(dir)
           workspaces_in_dir(dir).each do |workspace_path|
-              next if workspace_path.end_with?('.xcodeproj')
+            next if workspace_path.end_with?('.xcodeproj')
 
-              workspace = Xcodeproj::Workspace.new_from_xcworkspace(workspace_path)
-              yield workspace, workspace_path
-            end
+            workspace = Xcodeproj::Workspace.new_from_xcworkspace(workspace_path)
+            yield workspace, workspace_path
+          end
         end
 
         :private
 
+        def handle_xcode_artifacts_in_dir(dir)
+          self.class.handle_workspaces_in_dir(dir) do |workspace, workspace_path|
+            handle_workspace(workspace, workspace_path)
+          end
+
+          self.class.handle_projects_in_dir(dir) do |project, project_path|
+            handle_project(project, project_path)
+          end
+        end
+
+        def handle_project(project, project_location, workspace_location = nil)
+          return if @@found_projects.include?(project_location)
+
+          schemes = Dir[Xcodeproj::XCScheme.shared_data_dir(project_location).to_s + '/*']
+          schemes += Dir[Xcodeproj::XCScheme.user_data_dir(project_location).to_s + '/*']
+
+          scheme_map = Hash.new
+          schemes.each do |path|
+            next if File.directory?(path)
+            doc = REXML::Document.new(File.new(path))
+            REXML::XPath.each(doc, '//TestAction') do |action|
+              blueprint_name = REXML::XPath.first(action, 
+                '//BuildableReference/@BlueprintName').value
+              scheme_name = File.basename(path, '.xcscheme')
+              scheme_map[blueprint_name] = scheme_name
+            end
+          end
+
+          project.targets.each do |target|
+            product_type = nil
+
+            begin
+              product_type = target.product_type.to_s
+            rescue
+              next
+            end
+
+            if product_type.end_with?('bundle.unit-test')
+              scheme = scheme_map[target.name]
+              # Fallback to first scheme if none is found for this target
+              next if not scheme_map.first
+              scheme = scheme_map.first[1] unless scheme && scheme.length > 0
+              @@found_projects << project_location
+              run_tests(workspace_location || project_location, target.name, scheme)
+            end
+          end
+        end
+
         def handle_workspace(workspace, workspace_location)
           workspace.file_references.each do |ref|
             if ref.path.end_with?('.xcodeproj')
@@ -41,37 +103,7 @@ module Pod
                 next
               end
               project = Xcodeproj::Project.open(ref.path)
-
-              schemes = Dir[Xcodeproj::XCScheme.shared_data_dir(ref.path).to_s + '/*']
-              schemes += Dir[Xcodeproj::XCScheme.user_data_dir(ref.path).to_s + '/*']
-
-              scheme_map = Hash.new
-              schemes.each do |path|
-                doc = REXML::Document.new(File.new(path))
-                REXML::XPath.each(doc, '//TestAction') do |action|
-                  blueprint_name = REXML::XPath.first(action, 
-                    '//BuildableReference/@BlueprintName').value
-                  scheme_name = File.basename(path, '.xcscheme')
-                  scheme_map[blueprint_name] = scheme_name
-                end
-              end
-
-              project.targets.each do |target|
-                product_type = nil
-
-                begin
-                  product_type = target.product_type.to_s
-                rescue
-                  next
-                end
-
-                if product_type.end_with?('bundle.unit-test')
-                  scheme = scheme_map[target.name]
-                  # Fallback to first scheme if none is found for this target
-                  scheme = scheme_map.first[1] unless scheme && scheme.length > 0
-                  run_tests(workspace_location, target.name, scheme)
-                end
-              end
+              handle_project(project, ref.path, workspace_location)
             end
           end
         end
@@ -84,12 +116,17 @@ module Pod
         end
 
         def run_tests(workspace, target_name, scheme_name)
-          # TODO: Figure out what this was supposed to do:
-          #   new(test: 'server:autostart')
+          @@found_tests = true
+
           XCTasks::TestTask.new do |t|
             t.actions = %w(clean build test)
             t.runner = @@verbose ? :xcodebuild : :xcpretty
-            t.workspace   = workspace
+
+            if workspace.end_with? 'workspace'
+              t.workspace   = workspace
+            else
+              t.project = workspace
+            end
 
             t.actions << @@args unless @@args.nil?
 
@@ -107,10 +144,10 @@ module Pod
           end
 
           UI.puts 'Running tests for ' + target_name
-          # puts Rake.application.tasks
-          Rake::Task['test:unit'].invoke
+          Rake::Task['test:unit'].invoke unless @@dry_run
         end
 
+        # TODO: Refactor to remove all projects which are part of a workspace
         def self.workspaces_in_dir(dir)
           glob_match = Dir.glob("#{dir}/**/*.xc{odeproj,workspace}")
           glob_match = glob_match.reject do |p|
@@ -138,21 +175,22 @@ module Pod
             # TODO: How to link specs to projects/workspaces?
             # spec = Specification.from_file(path)
 
-            self.class.handle_workspaces_in_dir(Pathname.pwd) do |workspace, workspace_path|
-              handle_workspace(workspace, workspace_path)
-            end
+            handle_xcode_artifacts_in_dir(Pathname.pwd)
 
             Dir['*'].each do |dir| 
               next if !File.directory?(dir)
               original_dir = Pathname.pwd
               Dir.chdir(dir)
 
-              self.class.handle_workspaces_in_dir(Pathname.pwd) do |workspace, workspace_path|
-                handle_workspace(workspace, workspace_path)
-              end
+              handle_xcode_artifacts_in_dir(Pathname.pwd)
 
               Dir.chdir(original_dir)
             end
+
+            if not @@found_tests
+              puts('No suitable test targets found.'.yellow)
+              exit(1)
+            end
           end
         end
       end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-testing
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xctasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Run tests for any pod from the command line without any prior knowledge.
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -80,12 +80,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []