ghunit 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8638f90dde2cbeef02f93482452a754bd4c5680
-  data.tar.gz: d966cbfe9b37f23cf3c3e7cddba49cd64036bc06
+  metadata.gz: 4453afa37f08a27da84256ee07d229280a94d87e
+  data.tar.gz: a4ae97eed3cc96fa45cf2abbd696e41f119d04f4
 SHA512:
-  metadata.gz: af75e8afaa8d464e198d47badf975fa7ceb52b09cbe0343fb5bc7fee87ba6dedfe6d7aaba0280e5bef392be89b2b01d3a1ea3ad222faf19d11b33814acff65aa
-  data.tar.gz: bcc2c167b724589f66a7a88e862ecab7f58df9d383a07c43fdd3e83a1bc2129bf652255067ae9317e1963dfb6104d5c3ce35e9ec6a85ec9cb41ee6b608069aff
+  metadata.gz: aed987506648cabd4a3926f40d826667eca793d1b2d2b643e3247279bbf2363d43c0fc4390f10e110747e8c228bce8a71f69d68933f5227dc39d90709a16e729
+  data.tar.gz: c8dc8180e9919d98a3a25d0acb294a983f937c617bc0408dfbc21b36500c96a2e9ed9e7947765f612190623deee8b6fe12d3b75dfae19bc99e9c3cdc40c185ba

data/bin/ghunit

@@ -2,35 +2,72 @@
 
 require 'slop'
 require 'ghunit'
-require 'colorize'
 
-opts = Slop.parse do
-  banner "Usage: ghunit [options]"
+def require_opt(opts, key, desc)
+  if !opts[key]
+    puts " "
+    puts desc.red
+    puts " "
+    puts opts.to_s
+    puts " "
+    exit 1
+  end
+end
 
-  on :n, :name=, "Project name"
-  on :p, :path=, "Project path, defaults to <Project Name>.xcodeproj", argument: :optional
-  on :t, :test_target=, "Test target name, defaults to Tests", argument: :optional
+Slop.parse do
+  banner "Usage: ghunit install|run|add [options]"
 
-end
+  command "install" do
+    on :n, :name=, "Project name"
+    on :p, :path=, "Project path, defaults to <Project Name>.xcodeproj", argument: :optional
+    on :t, :test_target=, "Test target name, defaults to Tests", argument: :optional
 
-if !opts[:name]
-  puts " "
-  puts "Need to specify project name.".red
-  puts " "
-  puts opts.to_s
-  puts " "
-  exit 1
-end
+    run do |opts, args|
+      project = GHUnit::Project.open_from_opts(opts)
+      project.create_test_target
+    end
+  end
 
-target_name = opts[:name]
-project_path = opts[:path] || "#{target_name}.xcodeproj"
-test_target_name = opts[:test_target] || "Tests"
+  command "add" do
+    on :n, :name=, "Project name"
+    on :f, :file=, "Test name, MyTest"
+    #on :r, :framework=, "Test case framework (kiwi,ghunit), defaults to ghunit"
+    on :p, :path=, "Project path, defaults to <Project Name>.xcodeproj", argument: :optional
+    on :t, :test_target=, "Test target name, defaults to Tests", argument: :optional
 
-project = GHUnit::Project.open(project_path, target_name, test_target_name)
-if project
-  puts " "
-  puts " "
-  project.create_test_target
-end
+    run do |opts, args|
+      require_opt(opts, :file, "Need to specify a test name with -f.")
+      project = GHUnit::Project.open_from_opts(opts)
+      project.create_test(opts[:file]) #, opts[:framework])
+      project.save
+    end
+  end
+
+  command "run" do
+    on :n, :name=, "Project name"
+    on :t, :test_target=, "Test target name, defaults to Tests", argument: :optional
+    on :p, :path=, "Workspace path, defaults to <Project Name>.xcworkspace", argument: :optional
 
+    run do |opts, args|
+      require_opt(opts, :name, "Need to specify a project name with -n.")
 
+      name = opts[:name]
+      # Scheme name should match the test target name
+      test_target = opts[:test_target] || "Tests"
+      path = opts[:path] || "#{name}.xcworkspace"
+      system("GHUNIT_CLI=1 xcodebuild -workspace #{path} -scheme #{test_target} -configuration Debug -sdk iphonesimulator build")
+    end
+  end
+
+  command "install_cli" do
+    on :n, :name=, "Project name"
+    on :t, :test_target=, "Test target name, defaults to Tests", argument: :optional
+    on :p, :path=, "Workspace path, defaults to <Project Name>.xcworkspace", argument: :optional
+
+    run do |opts, args|
+      project = GHUnit::Project.open_from_opts(opts)
+      project.install_run_tests_script
+    end
+  end
+
+end

data/lib/ghunit/project.rb

@@ -3,6 +3,14 @@ require 'xcodeproj/ext'
 require 'fileutils'
 require 'logger'
 require 'colorize'
+require 'erb'
+require 'ostruct'
+
+class ErbalT < OpenStruct
+  def render(template)
+    ERB.new(template).result(binding)
+  end
+end
 
 class GHUnit::Project
 
@@ -49,6 +57,9 @@ class GHUnit::Project
   end
 
   class << self
+
+    # Initialize and open a project.
+    #
     def open(project_path, target_name, test_target_name, logger=nil)
       project = GHUnit::Project.new(project_path, target_name, test_target_name, logger)
       if project.open
@@ -57,6 +68,27 @@ class GHUnit::Project
         nil
       end
     end
+
+    # Open from slop options.
+    # This is only meant to be called from the ghunit bin executable,
+    # it outputs to STDOUT and calls exit.
+    #
+    def open_from_opts(opts)
+      target_name = opts[:name]
+      project_path = opts[:path] || "#{target_name}.xcodeproj"
+      test_target_name = opts[:test_target] || "Tests"
+
+      if !target_name
+        puts " "
+        puts "Need to specify a project name.".red
+        puts " "
+        puts opts.to_s
+        puts " "
+        exit 1
+      end
+
+      self.open(project_path, target_name, test_target_name)
+    end
   end
 
   def find_test_target
@@ -101,16 +133,16 @@ class GHUnit::Project
       create_test_file("main.m", template("main.m"), true)
       create_test("MyTest")
 
+      # Use same resources build phase as main target
+      # Have to compare with class name because of funky const loading in xcodeproj gem
+      resources_build_phase = main_target.build_phases.select { |p|
+        p.class == Xcodeproj::Project::Object::PBXResourcesBuildPhase }.first
+      test_target.build_phases << resources_build_phase if resources_build_phase
+
     else
       logger.debug "Test target already exists, skipping..."
     end
 
-    # Use same resources build phase as main target
-    # Have to compare with class name because of funky const loading in xcodeproj gem
-    resources_build_phase = main_target.build_phases.select { |p|
-      p.class.to_s == "Xcodeproj::Project::Object::PBXResourcesBuildPhase" }.first
-    test_target.build_phases << resources_build_phase if resources_build_phase
-
     # Get main target prefix header
     prefix_header = main_target.build_settings("Debug")["GCC_PREFIX_HEADER"]
 
@@ -121,6 +153,9 @@ class GHUnit::Project
       c.build_settings["GCC_PREFIX_HEADER"] = prefix_header if prefix_header
     end
 
+    # Write any test support files
+    write_test_file("RunTests.sh", template("RunTests.sh"), true)
+
     # Create test scheme if it doesn't exist
     logger.debug "Checking for Test scheme..."
     schemes = Xcodeproj::Project.schemes(project_path)
@@ -140,15 +175,19 @@ class GHUnit::Project
     check_pod
   end
 
-  def template(name)
+  def template(name, template_vars=nil)
     template_path = File.join(File.dirname(__FILE__), "templates", name)
-    File.read(template_path)
+    content = File.read(template_path)
+
+    if template_path.end_with?(".erb")
+      et = ErbalT.new(template_vars)
+      content = et.render(content)
+    end
+    content
   end
 
-  # Create a file with content and add to the test target
-  #
-  def create_test_file(file_name, content, force=false)
-    # Create main.m for test target
+  def write_test_file(file_name, content, force=false)
+    # Create file in tests dir
     path = File.join(test_target_name, file_name)
 
     if !force && File.exists?(path)
@@ -157,7 +196,13 @@ class GHUnit::Project
 
     logger.debug "Creating: #{path}"
     File.open(path, "w") { |f| f.write(content) }
+    path
+  end
 
+  # Create a file with content and add to the test target
+  #
+  def create_test_file(file_name, content, force=false)
+    path = write_test_file(file_name, content, force)
     add_test_file(path)
     path
   end
@@ -182,10 +227,31 @@ class GHUnit::Project
     true
   end
 
-  def create_test(name)
-    name = "#{name}.m" unless name.end_with?(".m")
-    path = create_test_file(name, template("Test.m"))
-    logger.debug "Created test: #{path}"
+  # Create test file and add it to the test target.
+  #
+  # @param name Name of test class and file name
+  # @param template_type nil or "kiwi"
+  #
+  def create_test(name, template_type=nil)
+    template_type ||= :ghunit
+
+    template_name = case template_type.to_sym
+    when :kiwi
+      "TestKiwi.m.erb"
+    when :ghunit
+      "Test.m.erb"
+    end
+
+    if name.end_with?(".m")
+      name = name[0...-2]
+    end
+    template_vars = {test_class_name: name}
+    path = create_test_file("#{name}.m", template(template_name, template_vars))
+    path
+  end
+
+  def save
+    @project.save
   end
 
   # Check the Podfile or just display some Podfile help
@@ -201,4 +267,21 @@ Make sure to open the .xcworkspace.
 
 EOS
   end
+
+  def install_run_tests_script
+    run_script_name = "Run Tests (CLI)"
+    # Find run script build phase and install RunTests.sh
+    test_target = find_test_target
+    run_script_phase = test_target.build_phases.select { |p|
+      p.class == Xcodeproj::Project::Object::PBXShellScriptBuildPhase &&
+      p.name == run_script_name }.first
+    if !run_script_phase
+      logger.debug "Installing run tests script..."
+      run_script_phase = project.new(Xcodeproj::Project::Object::PBXShellScriptBuildPhase)
+      run_script_phase.name = run_script_name
+      run_script_phase.shell_script = "sh Tests/RunTests.sh"
+      test_target.build_phases << run_script_phase
+    end
+    project.save
+  end
 end

data/lib/ghunit/templates/RunTests.sh

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# If we aren't running from the command line, then exit
+if [ "$GHUNIT_CLI" = "" ] && [ "$GHUNIT_AUTORUN" = "" ]; then
+  exit 0
+fi
+
+TEST_TARGET_EXECUTABLE_PATH="$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH"
+
+if [ ! -e "$TEST_TARGET_EXECUTABLE_PATH" ]; then
+  echo ""
+  echo "  ------------------------------------------------------------------------"
+  echo "  Missing executable path: "
+  echo "     $TEST_TARGET_EXECUTABLE_PATH."
+  echo "  The product may have failed to build."
+  echo "  ------------------------------------------------------------------------"
+  echo ""
+  exit 1
+fi
+
+RUN_CMD="ios-sim launch \"$TEST_TARGET_EXECUTABLE_PATH\""
+
+echo "Running: $RUN_CMD"
+set +o errexit # Disable exiting on error so script continues if tests fail
+eval $RUN_CMD
+RETVAL=$?
+set -o errexit
+
+if [ -n "$WRITE_JUNIT_XML" ]; then
+  MY_TMPDIR=`/usr/bin/getconf DARWIN_USER_TEMP_DIR`
+  RESULTS_DIR="${MY_TMPDIR}test-results"
+
+  if [ -d "$RESULTS_DIR" ]; then
+  `$CP -r "$RESULTS_DIR" "$BUILD_DIR" && rm -r "$RESULTS_DIR"`
+  fi
+fi
+
+exit $RETVAL

data/lib/ghunit/templates/Test.m.erb

@@ -0,0 +1,15 @@
+//
+//  <%= test_class_name %>.m
+//
+#import <GHUnit/GHUnit.h>
+
+@interface <%= test_class_name %> : GHTestCase
+@end
+
+@implementation <%= test_class_name %>
+
+- (void)test {
+
+}
+
+@end

data/lib/ghunit/templates/TestKiwi.m.erb

@@ -0,0 +1,16 @@
+//
+//  <%= test_class_name %>.m
+//
+#import "Kiwi.h"
+
+SPEC_BEGIN(<%= test_class_name %>)
+
+describe(@"Math", ^{
+    it(@"is pretty cool", ^{
+        NSUInteger a = 16;
+        NSUInteger b = 26;
+        [[theValue(a + b) should] equal:theValue(43)];
+    });
+});
+
+SPEC_END

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghunit
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Gabriel Handford
@@ -59,11 +59,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/ghunit.rb
 - lib/ghunit/project.rb
-- lib/ghunit/templates/Podfile
-- lib/ghunit/templates/Test.m
 - lib/ghunit/templates/main.m
+- lib/ghunit/templates/Podfile
+- lib/ghunit/templates/RunTests.sh
+- lib/ghunit/templates/Test.m.erb
+- lib/ghunit/templates/TestKiwi.m.erb
+- lib/ghunit.rb
 - bin/ghunit
 homepage: https://github.com/gh-unit/gh-unit
 licenses:

data/lib/ghunit/templates/Test.m

@@ -1,12 +0,0 @@
-#import <GHUnit/GHUnit.h>
-
-@interface MyTest : GHTestCase
-@end
-
-@implementation MyTest
-
-- (void)test {
-
-}
-
-@end