guardian-angel 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa1d8955513a660d1b1d388fd12325528fa3f392
-  data.tar.gz: a4cf0ea6e13f48e6bdc59dd79d6146cbca6447c5
+  metadata.gz: 4c3d7a4126ea074120b6b45eefd6e1318a88c441
+  data.tar.gz: 3ccfdf46e4bd7310da9a2c4d83d0cf55d84425a5
 SHA512:
-  metadata.gz: 5a091afeeb1b9a16f63df72fe85a19ed1f119371dfef0a48ecc500da3cf59db2d7565bcd7d1d89591ce97f69a90fa03aab44c08d6b1cab6d78efcdebf2517203
-  data.tar.gz: 0e6e83763a3f99afb4a1d64b75faea84661d35a6724b28d9b2c78f1892956fb5979b5ad891156f2db846540ff012210db381c4cbb821aded36521235a8685f7d
+  metadata.gz: ed8f3b0d935e3e7f974a5e2e0a2f282ab2c1afe8b71cc4149784c36c81b3689bd2e4494a47f443abb9f3bd4b252a8d0fc682c5de0ad1d24497c570070ff7ddcd
+  data.tar.gz: 3393584c81d0e82d6448febe7b9d8117aaf8aecc16a5d58a1174d95022cebd4ac944e45f20bcadac7f5f6824e428ed0d6a7524cd49d8c37e0cc087712aee4795

data/lib/ga_runner.rb

@@ -1,6 +1,7 @@
 require 'ga_logger'
 require 'guardian_angel'
 require 'xctool_runner'
+require 'xcodebuild_runner'
 
 # @author Vittorio Monaco
 class GARunner
@@ -12,7 +13,7 @@ class GARunner
   def initialize(configuration, filename)
       @configuration=configuration
       @filename=filename
-      @runner=XctoolRunner.new(configuration)
+      @runner=XcodebuildRunner.new(configuration)
   end
   
   # Runs unit tests for the given filename, if a tests file exists
@@ -34,11 +35,9 @@ class GARunner
   
   # Tries to run unit tests for the filename setup during initialization
   # 
-  # @note if the filename is a tests file, this method strips the tests suffix and runs the tests for the right file instead, after having built the tests project first
-  # (see #buildIfNeeded)
   # (see #testIfAvailable)
   def test()    
-    buildIfNeeded()
+    @runner.prepareForFile(@filename)
     testIfAvailable(codeFilename())
   end
   
@@ -57,14 +56,4 @@ class GARunner
     
     return stripped
   end
-  
-  # This method builds the tests project if the filename setup during initialization is a tests file
-  # (see #isTest)
-  def buildIfNeeded()
-    if isTest()
-       GALogger.log(@filename + ' is a test, building all the tests...')
-    end
-    
-    GuardianAngel.buildWithConfiguration(@configuration)
-  end
 end

data/lib/guardian_angel.rb

@@ -1,5 +1,6 @@
 require 'ga_logger'
 require 'xctool_runner'
+require 'xcodebuild_runner'
 
 # @author Vittorio Monaco
 class GuardianAngel
@@ -8,7 +9,7 @@ class GuardianAngel
   # @param configuration [GAConfiguration] the configuration you want to use to run the tests (see #GAConfiguration)
   def initialize(configuration)
     @configuration=configuration
-    @runner=XctoolRunner.new(configuration)
+    @runner=XcodebuildRunner.new(configuration)
   end
      
   # Convenience method to build tests in a stand-alone fashion

data/lib/xcodebuild_runner.rb

@@ -0,0 +1,89 @@
+require 'ga_logger'
+
+# @author Vittorio Monaco
+class XcodebuildRunner
+  # Creates a new instance given a GAConfiguration object
+  #
+  # @param configuration [GAConfiguration] the configuration you want to use to build and run the tests (see #GAConfiguration)
+  def initialize(configuration)
+    @configuration=configuration
+  end
+  
+  # Tells the runner to prepare the environment for a subsequent test run
+  #
+  # @param filename [String] the name of the file the caller wishes to test
+  #
+  # @note since xcodebuild doesn't offer a way to test single files, this method doesn't do anything
+  # (see #build)
+  def prepareForFile(filename)
+  end
+    
+  # Builds (and runs) the tests target through xcodebuild
+  #
+  # @note This method supports both workspace- and project-based environments
+  def build()
+    workspace = @configuration.workspace
+    scheme = @configuration.scheme
+    target = @configuration.target
+    project = @configuration.project
+    xctool = @configuration.xctool_path
+    
+    building = workspace
+    building = project if workspace.nil?
+    
+    GALogger.log("Building " + building + " with scheme " + scheme + "...")
+    
+    toBuild = buildArgument()
+    buildSucceeded = system("xcodebuild" + toBuild + 
+                            ' -scheme ' + scheme +
+                            ' -sdk iphonesimulator' +
+                            ' test | xcpretty -tc', out: $stdout, err: :out)
+                            
+    if buildSucceeded
+      GALogger.log('Tests are fine. Start coding :)', :Success)
+    else
+      GALogger.log('Tests failed. Fix them before you start iterating.', :Error)
+    end
+  end
+  
+  # Returns the main argument for xctool to build the project/workspace
+  #
+  # Example:
+  # -workspace 'MyWorkspace.xcworkspace'
+  # or
+  # -project 'MyProject.xcodeproj'
+  def buildArgument()
+     workspace = @configuration.workspace
+     scheme = @configuration.scheme
+     project = @configuration.project
+     
+     toBuild = ''
+     if workspace.nil?
+       toBuild = " -project '" + project + ".xcodeproj'"
+     else  
+       toBuild = " -workspace '" + workspace + ".xcworkspace'"
+     end 
+     
+     return toBuild
+  end
+  
+  # Runs tests for the specified file
+  #
+  # @param filename [String] the file you wish to run the tests for
+  # @note This method supports both workspace- and project-based environments
+  def test(filename)
+    scheme = @configuration.scheme
+    target = @configuration.target
+    xctool = @configuration.xctool_path
+    reporter = @configuration.reporter
+    suffix = @configuration.suffix
+    
+    GALogger.log("Running tests for file " + filename + '...')
+    
+    toBuild = buildArgument()
+    system("xcodebuild" + toBuild +
+           ' -scheme ' + scheme +
+           ' -sdk iphonesimulator' +
+           ' test | xcpretty -tc', out: $stdout, err: :out)
+  end
+end

data/lib/xctool_runner.rb

@@ -8,6 +8,16 @@ class XctoolRunner
   def initialize(configuration)
     @configuration=configuration
   end
+  
+  # Tells the runner to prepare the environment for a subsequent test run
+  #
+  # @param filename [String] the name of the file the caller wishes to test
+  #
+  # @note since xctool needs to build the tests every time, this method just calls build
+  # (see #build)
+  def prepareForFile(filename)
+    build()
+  end
     
   # Builds the tests target through xctool
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guardian-angel
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Vittorio Monaco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-01 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filewatcher
@@ -38,7 +38,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
-description: A file watcher for iOS developers that runs tests for the modified files
+- !ruby/object:Gem::Dependency
+  name: xcpretty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+description: A file watcher for iOS developers that makes it quicker to iterate through
+  TDD
 email: vittorio.monaco1@gmail.com
 executables:
 - guardian-angel
@@ -53,8 +68,9 @@ files:
 - lib/ga_logger.rb
 - lib/ga_runner.rb
 - lib/guardian_angel.rb
+- lib/xcodebuild_runner.rb
 - lib/xctool_runner.rb
-homepage: http://vittoriomonaco.it/guardian-angel
+homepage: https://github.com/vittoriom/GuardianAngel
 licenses:
 - MIT
 metadata: {}