earlgrey 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46aa3e8075a3c2e64532d02147f9c8af44011465
-  data.tar.gz: ecd5085ef4ed240ee96472697cd9d6b49cf34008
+  metadata.gz: 9470ec4d55223545549f0cff7e10ab358d8432f2
+  data.tar.gz: 0ea808ef1fb028ad51e6ed111f87e8526fdb78b2
 SHA512:
-  metadata.gz: 16593d96574caa5dfe4d6b7034010b2df5c237b27e42a55cc4e8dbcdc3fcd175def3ead2f28e04e6e9c792441938455606d9adf966cf1af03b816ca4fed57e97
-  data.tar.gz: 1cad513f5e793f5737d91325164e90fd329de205abce70ffed1e6cbd1a1cfcb42e34e27361c54e73f6a4d4fb5f47430b068619e92bfd1cf00d0b71e16075c1d5
+  metadata.gz: 658d37923f9456953c0c925859ecc23de782b26b953e8442d15ab8722a6b4a11c7efd8e745823c6ab7027cebff7ff01ae7d9e88ef69abac564e28abff2aaab29
+  data.tar.gz: 6cb926fa4edbb13449a5908b0d5a1c3754563c4af2143310d6e0eabba416f59b6db37baae337d70ab12695c7a1b566b4a472eed58723e0e25a009cb2e459a241

data/lib/earlgrey/configure_earlgrey.rb

@@ -126,7 +126,7 @@ module EarlGrey
       # Add header/framework search paths for carthage
       add_carthage_search_paths
 
-      # Adds BridgingHeader.h, EarlGrey.swift and sets bridging header.
+      # Adds EarlGrey.swift
       copy_swift_files
 
       save_earlgrey_scheme_changes(scheme) unless scheme.nil?
@@ -334,11 +334,8 @@ module EarlGrey
       user_project.save
     end
 
-    SWIFT_OBJC_BRIDGING_HEADER = 'SWIFT_OBJC_BRIDGING_HEADER'.freeze
-
-    # Copies Swift bridging header and configures the test target's build configuration to use it.
     # Copies EarlGrey.swift and adds it to the project.
-    # Adds EarlGrey.swift and BridgingHeader.h to project's test target group.
+    # Adds EarlGrey.swift to project's test target group.
     # Adds EarlGrey.swift to testing target's source build phase
     # Adds Link Binary With Libraries phase to test target for EarlGrey.framework
     # Adds shell script phase that runs Carthage copy-frameworks
@@ -346,31 +343,17 @@ module EarlGrey
     # No op if swift isn't true
     def copy_swift_files
       return unless swift
-      bridge_path = '$(TARGET_NAME)/BridgingHeader.h'
-
-      test_target.build_configurations.each do |config|
-        settings = config.build_settings
-        settings[SWIFT_OBJC_BRIDGING_HEADER] = bridge_path
-      end
-
-      user_project.save
 
       src_root = File.join(__dir__, 'files')
       dst_root = File.join(dir_path, test_target_name)
       raise "Missing target folder #{dst_root}" unless File.exist? dst_root
 
-      src_header_name = 'BridgingHeader.h'
-      src_header = File.join(src_root, src_header_name)
-      raise 'Bundled header missing' unless File.exist? src_header
-      dst_header = File.join(dst_root, src_header_name)
-
       src_swift_name = 'EarlGrey.swift'
       src_swift = File.join(src_root, "Swift-#{swift_version}", src_swift_name)
 
       raise 'Bundled swift missing' unless File.exist? src_swift
       dst_swift = File.join(dst_root, src_swift_name)
 
-      FileUtils.copy src_header, dst_header
       FileUtils.copy src_swift, dst_swift
 
       project_test_targets = user_project.main_group.children
@@ -378,7 +361,7 @@ module EarlGrey
       raise "Test target group not found! #{test_target_group}" unless test_target_group
 
       # Add files to testing target group otherwise Xcode can't read them.
-      new_files = [src_header_name, src_swift_name]
+      new_files = [src_swift_name]
       existing_files = test_target_group.children.map(&:display_name)
 
       new_files.each do |file|

data/lib/earlgrey/files/Swift-2.3/EarlGrey.swift

@@ -14,6 +14,13 @@
 // limitations under the License.
 //
 
+import EarlGrey
+import Foundation
+
+let greyFailureHandler =
+  NSThread.currentThread().threadDictionary
+    .valueForKey(kGREYFailureHandlerKey) as! GREYFailureHandler
+
 public func grey_allOfMatchers(args: AnyObject...) -> GREYMatcher! {
   return GREYAllOf(matchers: args)
 }

data/lib/earlgrey/files/Swift-3.0/EarlGrey.swift

@@ -14,6 +14,9 @@
 // limitations under the License.
 //
 
+import EarlGrey
+import Foundation
+
 public func GREYAssert(_ expression: @autoclosure () -> Bool, reason: String) {
   GREYAssert(expression, reason, details: "Expected expression to be true")
 }
@@ -81,6 +84,8 @@ private func GREYAssert(_ expression: @autoclosure () -> Bool,
 private func GREYSetCurrentAsFailable() {
   let greyFailureHandlerSelector =
     #selector(GREYFailureHandler.setInvocationFile(_:andInvocationLine:))
+  let greyFailureHandler =
+    Thread.current.threadDictionary.value(forKey: kGREYFailureHandlerKey) as! GREYFailureHandler
   if greyFailureHandler.responds(to: greyFailureHandlerSelector) {
     greyFailureHandler.setInvocationFile!(#file, andInvocationLine:#line)
   }

data/lib/earlgrey/version.rb

@@ -14,5 +14,5 @@
 #  limitations under the License.
 
 module EarlGrey
-  VERSION = '0.1.1'.freeze unless defined? ::EarlGrey::VERSION
+  VERSION = '0.1.3'.freeze unless defined? ::EarlGrey::VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: earlgrey
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - khandpur
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -136,8 +136,6 @@ files:
 - lib/earlgrey/cli.rb
 - lib/earlgrey/configure_earlgrey.rb
 - lib/earlgrey/earlgrey.rb
-- lib/earlgrey/files/BridgingHeader.h
-- lib/earlgrey/files/Swift-2.2/EarlGrey.swift
 - lib/earlgrey/files/Swift-2.3/EarlGrey.swift
 - lib/earlgrey/files/Swift-3.0/EarlGrey.swift
 - lib/earlgrey/version.rb
@@ -161,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: EarlGrey installer gem

data/lib/earlgrey/files/BridgingHeader.h

@@ -1,16 +0,0 @@
-//
-//  Copyright 2016 Google Inc.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-
-#import <EarlGrey/EarlGrey.h>

data/lib/earlgrey/files/Swift-2.2/EarlGrey.swift

@@ -1,111 +0,0 @@
-//
-// Copyright 2016 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-public func grey_allOfMatchers(args: AnyObject...) -> GREYMatcher! {
-  return GREYAllOf(matchers: args)
-}
-
-public func grey_anyOfMatchers(args: AnyObject...) -> GREYMatcher! {
-  return GREYAnyOf(matchers: args)
-}
-
-public func EarlGrey(file: String = #file, line: UInt = #line) -> EarlGreyImpl! {
-  return EarlGreyImpl.invokedFromFile(file, lineNumber: line)
-}
-
-public func GREYAssert(@autoclosure expression: () -> BooleanType, reason: String) {
-  GREYAssert(expression, reason, details: "Expected expression to be true")
-}
-
-public func GREYAssertTrue(@autoclosure expression: () -> BooleanType, reason: String) {
-  GREYAssert(expression().boolValue,
-    reason,
-    details: "Expected the boolean expression to be true")
-}
-
-public func GREYAssertFalse(@autoclosure expression: () -> BooleanType, reason: String) {
-  GREYAssert(!expression().boolValue,
-    reason,
-    details: "Expected the boolean expression to be false")
-}
-
-public func GREYAssertNotNil(@autoclosure expression: () -> Any?, reason: String) {
-  GREYAssert(expression() != nil, reason, details: "Expected expression to be not nil")
-}
-
-public func GREYAssertNil(@autoclosure expression: () -> Any?, reason: String) {
-  GREYAssert(expression() == nil, reason, details: "Expected expression to be nil")
-}
-
-public func GREYAssertEqual(@autoclosure left: () -> AnyObject?,
-    @autoclosure _ right: () -> AnyObject?, reason: String) {
-  GREYAssert(left() === right(), reason, details: "Expected left term to be equal to right term")
-}
-
-public func GREYAssertNotEqual(@autoclosure left: () -> AnyObject?,
-    @autoclosure _ right: () -> AnyObject?, reason: String) {
-  GREYAssert(left() !== right(), reason, details: "Expected left term to not be equal to right" +
-    " term")
-}
-
-public func GREYAssertEqualObjects<T : Equatable>(@autoclosure left: () -> T?,
-    @autoclosure _ right: () -> T?, reason: String) {
-  GREYAssert(left() == right(), reason, details: "Expected object of the left term to be equal" +
-    " to the object of the right term")
-}
-
-public func GREYAssertNotEqualObjects<T : Equatable>(@autoclosure left: () -> T?,
-    @autoclosure _ right: () -> T?, reason: String) {
-  GREYAssert(left() != right(), reason, details: "Expected object of the left term to not be" +
-    " equal to the object of the right term")
-}
-
-public func GREYFail(reason: String) {
-  greyFailureHandler.handleException(GREYFrameworkException(name: kGREYAssertionFailedException,
-    reason: reason),
-    details: "")
-}
-
-@available(*, deprecated=1.2.0, message="Please use GREYFAIL::withDetails instead.")
-public func GREYFail(reason: String, details: String) {
-  greyFailureHandler.handleException(GREYFrameworkException(name: kGREYAssertionFailedException,
-    reason: reason),
-    details: details)
-}
-
-public func GREYFailWithDetails(reason: String, details: String) {
-  greyFailureHandler.handleException(GREYFrameworkException(name: kGREYAssertionFailedException,
-    reason: reason),
-    details: details)
-}
-
-private func GREYAssert(@autoclosure expression: () -> BooleanType,
-                        _ reason: String, details: String) {
-  GREYSetCurrentAsFailable()
-  if !expression().boolValue {
-    greyFailureHandler.handleException(GREYFrameworkException(name: kGREYAssertionFailedException,
-      reason: reason),
-      details: details)
-  }
-}
-
-private func GREYSetCurrentAsFailable(file: String = #file, line: UInt = #line) {
-  let greyFailureHandlerSelector =
-      #selector(GREYFailureHandler.setInvocationFile(_:andInvocationLine:))
-  if greyFailureHandler.respondsToSelector(greyFailureHandlerSelector) {
-    greyFailureHandler.setInvocationFile!(file, andInvocationLine: line)
-  }
-}