Setup OSX CI & use externalproject for GMock and GTest & cucmber 1.3.20

.travis.yml

@@ -1,11 +1,27 @@
 language: cpp
-
+sudo: required
+dist: trusty
+os:
+  - linux
+  - osx
 compiler:
   - clang
   - gcc
+rvm:
+  - 1.9.3
+  - 2.0
+  - 2.2
+addons:
+  apt:
+    # List of whitelisted in travis packages for ubuntu-precise can be found here:
+    #   https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
+    # List of whitelisted in travis apt-sources:
+    #   https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json
+    packages:
+      - libboost-thread-dev 
+      - libboost-system-dev
+      - libboost-regex-dev
+      - libboost-date-time-dev 
+      - libboost-test-dev
 
-before_script:
-  - "sudo apt-get install libboost-thread-dev libboost-system-dev libboost-regex-dev libboost-date-time-dev libboost-test-dev google-mock"
-  - "cd /usr/src/gtest && sudo cmake . && sudo cmake --build . && sudo mv libg* /usr/local/lib/ ; cd -"
-
-script: "cmake -E make_directory build && cmake -E chdir build cmake -DCUKE_ENABLE_EXAMPLES=on .. && cmake --build build && cmake --build build --target test && cmake --build build --target features"
+script: ./travis.sh

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.12)
 
 project(Cucumber-Cpp)
 
@@ -86,22 +86,63 @@ endif()
 #
 
 if(NOT CUKE_DISABLE_GTEST)
-    find_package(GTest)
-    find_package(GMock)
-    if(GMOCK_FOUND AND GTEST_FOUND)
-        set(CUKE_TEST_LIBRARIES ${GTEST_LIBRARIES} ${GMOCK_BOTH_LIBRARIES})
-        if(UNIX)
-            find_package(Threads) # GTest needs this and it's a static library
-            set(CUKE_TEST_LIBRARIES ${CUKE_TEST_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-        endif()
+    if(UNIX)
+        find_package(Threads REQUIRED) # GTest needs this and it's a static library
     endif()
+
+    #Gtest as externalproject
+
+    # Enable ExternalProject CMake module
+    include(ExternalProject)
+
+    # Download and install GoogleMock
+    ExternalProject_Add(
+        gmock
+        URL https://googlemock.googlecode.com/files/gmock-1.7.0.zip
+        PREFIX ${CMAKE_CURRENT_BINARY_DIR}/gmock
+        # Disable install step
+        INSTALL_COMMAND ""
+        # Wrap download, configure and build steps in a script to log output
+        LOG_DOWNLOAD ON
+        LOG_CONFIGURE ON
+        LOG_BUILD ON
+    )
+    # Create a libgmock target to be used as a dependency by test programs
+    add_library(libgmock IMPORTED STATIC GLOBAL)
+    add_dependencies(libgmock gmock)
+
+    # Set gmock properties
+    ExternalProject_Get_Property(gmock source_dir binary_dir)
+    set_target_properties(libgmock PROPERTIES
+        "IMPORTED_LOCATION" "${binary_dir}/libgmock.a"
+        "IMPORTED_LINK_INTERFACE_LIBRARIES" "${CMAKE_THREAD_LIBS_INIT}"
+    #    "INTERFACE_INCLUDE_DIRECTORIES" "${source_dir}/include"
+    )
+    set(GMOCK_INCLUDE_DIRS ${source_dir}/include)
+    set(GTEST_INCLUDE_DIRS ${source_dir}/gtest/include) 
+
+    if(MSVC)
+        set(Suffix ".lib")
+    else()
+        set(Suffix ".a")
+    endif()
+    set(CUKE_GTEST_LIBRARIES 
+        "${binary_dir}/gtest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest${Suffix}" 
+        ${CMAKE_THREAD_LIBS_INIT}
+    )
+    set(CUKE_GMOCK_LIBRARIES 
+        "${binary_dir}/gtest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest${Suffix}"
+        "${binary_dir}/libgmock${Suffix}"
+        "${binary_dir}/libgmock_main${Suffix}"
+        ${CMAKE_THREAD_LIBS_INIT}
+    )
 endif()
 
 #
 # Cucumber-Cpp
 #
 
-set(CUKE_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
+set(CUKE_INCLUDE_DIR ${CUKE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 include_directories(${CUKE_INCLUDE_DIR})
 

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 group :test do
-  gem 'cucumber', "=1.3.6"
+  gem 'cucumber', "=1.3.20"
   gem 'aruba'
   gem 'rspec'
 end

examples/Calc/CMakeLists.txt

@@ -4,10 +4,10 @@ include_directories(${CUKE_INCLUDE_DIRS} src)
 
 add_library(Calc src/Calculator)
 
-if(GTEST_FOUND)
+if(NOT CUKE_DISABLE_GTEST)
     include_directories(${GTEST_INCLUDE_DIRS})
     add_executable(GTestCalculatorSteps features/step_definitions/GTestCalculatorSteps)
-    target_link_libraries(GTestCalculatorSteps Calc ${GTEST_LIBRARIES} ${CUKE_LIBRARIES})
+    target_link_libraries(GTestCalculatorSteps Calc ${CUKE_LIBRARIES} ${CUKE_GTEST_LIBRARIES})
 endif()
 
 if(CPPSPEC_FOUND)

examples/FeatureShowcase/CMakeLists.txt

@@ -2,12 +2,12 @@ project(FeatureShowcase)
 
 include_directories(${CUKE_INCLUDE_DIRS})
 
-if(GTEST_FOUND)
+if(NOT CUKE_DISABLE_GTEST)
     include_directories(${GTEST_INCLUDE_DIRS})
 
     function(add_cucumber_executable)
         add_executable(FeatureShowcaseSteps ${ARGV})
-        target_link_libraries(FeatureShowcaseSteps ${GTEST_LIBRARIES} ${CUKE_LIBRARIES})
+        target_link_libraries(FeatureShowcaseSteps ${CUKE_LIBRARIES} ${CUKE_GTEST_LIBRARIES})
         foreach(_arg ${ARGN})
             get_filename_component(OBJECT_PREFIX ${_arg} NAME_WE)
             set_source_files_properties(${_arg} PROPERTIES COMPILE_FLAGS "-DCUKE_OBJECT_PREFIX=${OBJECT_PREFIX}")

features/step_definitions/cucumber_cpp_mappings.rb

@@ -172,11 +172,11 @@ def assert_executed_scenarios *scenario_offsets
   end
 
   def assert_world_variable_held_value_at_time(value, time)
-    check_exact_file_content "#{WORLD_VARIABLE_LOG_FILE}.#{time}", value
+    check_file_content("#{WORLD_VARIABLE_LOG_FILE}.#{time}", value, true)
   end
 
   def assert_world_function_called
-    check_file_presence [WORLD_FUNCTION_LOG_FILE], true
+    expect(WORLD_FUNCTION_LOG_FILE).to be_existing_file
   end
 
   def assert_cycle_sequence *args
@@ -192,15 +192,15 @@ def assert_cycle_sequence_excluding *args
 
   def assert_complete_cycle_sequence *args
     expected_string = "#{CYCLE_SEQUENCE_SEPARATOR}#{args.join(CYCLE_SEQUENCE_SEPARATOR)}"
-    check_exact_file_content(CYCLE_LOG_FILE, expected_string)
+    check_file_content(CYCLE_LOG_FILE, expected_string, true)
   end
 
   def assert_data_table_equals_json(json)
     prep_for_fs_check do
       log_file_contents = IO.read(DATA_TABLE_LOG_FILE)
       actual_array      = JSON.parse(log_file_contents)
       expected_array    = JSON.parse(json)
-      actual_array.should == expected_array
+      expect(actual_array).to be == expected_array
     end
   end
 
@@ -302,7 +302,7 @@ def write_main_step_definitions_file
 
   def compile_step_definitions
     compiler_output = %x[ #{COMPILE_STEP_DEFINITIONS_CMD} ]
-    expect($?.success?).to be_true, "Compilation failed!\n#{compiler_output}"
+    expect($?.success?).to be == true, "Compilation failed!\n#{compiler_output}"
   end
 
   def create_wire_file

include/cucumber-cpp/internal/hook/HookRegistrar.hpp

@@ -35,7 +35,7 @@ class BeforeHook : public Hook {
 
 class AroundStepHook : public Hook {
 public:
-    virtual void invokeHook(Scenario *scenario, CallableStep *step);
+    virtual void invokeHookWithStep(Scenario *scenario, CallableStep *step);
     virtual void skipHook();
 protected:
     CallableStep *step;

include/cucumber-cpp/internal/hook/Tag.hpp

@@ -16,6 +16,7 @@ class TagExpression {
 public:
     typedef std::vector<std::string> tag_list;
 
+    virtual ~TagExpression() { }
     virtual bool matches(const tag_list &tags) = 0;
 };
 

include/cucumber-cpp/internal/step/StepManager.hpp

@@ -62,6 +62,11 @@ class InvokeArgs {
 
     template<class T> T getInvokeArg(size_type i) const;
     const Table & getTableArg() const;
+
+    size_type argsSize() const {
+      return args.size();
+    }
+
 private:
     Table tableArg;
     args_type args;
@@ -91,7 +96,7 @@ class InvokeResult {
 
     bool isSuccess() const;
     bool isPending() const;
-    const InvokeResultType getType() const;
+    InvokeResultType getType() const;
     const std::string &getDescription() const;
 };
 
@@ -157,7 +162,7 @@ class StepManager {
 };
 
 
-static std::string toSourceString(const char *filePath, const int line) {
+static inline std::string toSourceString(const char *filePath, const int line) {
     using namespace std;
     stringstream s;
     string file(filePath);

include/cucumber-cpp/internal/utils/Regex.hpp

@@ -1,8 +1,11 @@
 #ifndef CUKE_REGEX_HPP_
 #define CUKE_REGEX_HPP_
 
+#include <string>
 #include <vector>
 
+#define BOOST_REGEX_V4_CHAR_REGEX_TRAITS_HPP
+
 #include <boost/regex.hpp>
 
 namespace cucumber {

run.sh

@@ -0,0 +1,13 @@
+#rvm install 2.2
+ruby -v
+gem install bundler
+rm Gemfile.lock
+rm build -rf
+cmake -E make_directory build
+cmake -E chdir build cmake -DCUKE_ENABLE_EXAMPLES=on -DCUKE_DISABLE_BOOST_TEST=on ..
+cmake --build build
+cmake --build build --target test
+cmake --build build --target features
+build/examples/Calc/GTestCalculatorSteps >/dev/null &
+cucumber examples/Calc
+killall GTestCalculatorSteps 

src/CMakeLists.txt

@@ -14,7 +14,7 @@ set(CUKE_SOURCES
     connectors/wire/WireProtocolCommands.cpp
 )
 
-if(GTEST_FOUND)
+if(NOT CUKE_DISABLE_GTEST)
     include_directories(${GTEST_INCLUDE_DIRS})
     list(APPEND CUKE_SOURCES drivers/GTestDriver.cpp)
 endif()