earlgrey 1.13.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d27489bee95f5108c5762737e346df7c19465cd5
-  data.tar.gz: f16b00bbef00425cbea57313bef664f15e7e0435
+SHA256:
+  metadata.gz: b0fd78736a6bd318523f914889b82f8d73bcc0ef05ab43df222bb5606de0693e
+  data.tar.gz: 626a0e999f96bcd70e1083bd50866b271219d5862f6826275e9efaf123398f63
 SHA512:
-  metadata.gz: bf5678c94c3b26dae74540f519e53b55afcfe79e919787d4270694166b4f2c707caee868ed8561fb081b778212df261b2ed97f9731ec52e4579cf929c6258fdb
-  data.tar.gz: 2864b1265244c21224f029d321b8ada71fa0814706a62b69475be06330eda33df2a1805151a64cd52e579b79ffd11936fd9b8b8aa203cd527a3746b822041a09
+  metadata.gz: 4980ec74cb857edf363a0a034dbd750adeb6a2e4f2bf2e854299e9b939a5fa19d8634e9ab379dab7b5079e07ea375f102b903f9450e1620abf4fafcb66591869
+  data.tar.gz: d4fe8be26881f0860e95f70e2a668e9bdb46a2a9abc52c9b7a5ef7de3fad80385ae3675c03545d2a87703cc7f83ffff6b91084475e94c9b29f4ce131198cd33e

data/lib/earlgrey/cli.rb

@@ -23,7 +23,7 @@ module EarlGrey
     method_option :project, aliases: '-p', type: :string, required: false, desc: 'Project'
     method_option :scheme,  aliases: '-s', type: :string, required: false, desc: 'EarlGreyTestTarget.xcscheme'
     method_option :swift, type: :boolean, default: true
-    method_option :swift_version, type: :string, default: '3.0', enum: %w[2.3 3.0]
+    method_option :swift_version, type: :string, default: '4.0', enum: %w[3.0 4.0]
     method_option :target, aliases: '-t', type: :string, required: true, desc: 'EarlGreyTestTarget'
 
     PROJECT  = 'project'.freeze

data/lib/earlgrey/configure_earlgrey.rb

@@ -105,7 +105,7 @@ module EarlGrey
     def set_defaults(project_name, test_target_name, scheme_file, opts = {})
       @swift = opts.fetch(:swift, false)
       @carthage = opts.fetch(:carthage, false)
-      @swift_version = opts.fetch(:swift_version, '3.0')
+      @swift_version = opts.fetch(:swift_version, '4.0')
 
       puts_magenta "Checking and Updating #{project_name} for EarlGrey."
       project_file = path_for project_name, '.xcodeproj'
@@ -368,7 +368,7 @@ module EarlGrey
 
       raise "Test target group not found! #{test_target_group}" unless test_target_group
 
-      swift_version ||= '3.0'
+      swift_version ||= '4.0'
       src_root = File.join(__dir__, 'files')
       dst_root = test_target_group.real_path
       raise "Missing target folder #{dst_root}" unless File.exist? dst_root
@@ -378,8 +378,8 @@ module EarlGrey
 
       unless File.exist? src_swift
         puts_magenta "EarlGrey.swift for version #{swift_version} not found. " \
-                     'Falling back to version 3.0.'
-        swift_fallback = 'Swift-3.0'
+                     'Falling back to version 4.0.'
+        swift_fallback = 'Swift-4.0'
         src_swift = File.join(src_root, swift_fallback, src_swift_name)
         raise "Unable to locate #{swift_fallback} file at path #{src_swift}." unless File.exist?(src_swift)
       end

data/lib/earlgrey/extensions/earlgrey_yaml.rb

@@ -5,7 +5,7 @@ class EarlGreyYaml
 
   def initialize(analyzer, podfile)
     @analyzer         = analyzer
-    earlgrey_yml_path = File.join(File.dirname(podfile.defined_in_file), 'earlgrey_gem.yml')
+    earlgrey_yml_path = File.join(File.dirname(podfile.defined_in_file.to_s), 'earlgrey_gem.yml')
 
     @earlgrey_yml = {}
     @earlgrey_yml = YAML.safe_load(File.read(earlgrey_yml_path)) if File.exist?(earlgrey_yml_path)

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

@@ -48,15 +48,17 @@ public func GREYAssertNotEqual(_ left: @autoclosure () -> AnyObject?,
 }
 
 public func GREYAssertEqualObjects<T: Equatable>( _ left: @autoclosure () -> T?,
-                                                  _ right: @autoclosure () -> T?, reason: String) {
-  GREYAssert(left() == right(), reason, details: "Expected object of the left term to be equal" +
-    " to the object of the right term")
+                                                  _ right: @autoclosure () -> 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>( _ left: @autoclosure () -> T?,
-                                      _ right: @autoclosure () -> T?, reason: String) {
-  GREYAssert(left() != right(), reason, details: "Expected object of the left term to not" +
-    " equal the object of the right term")
+                                                     _ right: @autoclosure () -> T?,
+                                                     reason: String) {
+  GREYAssert(left() != right(), reason, details: "Expected object of the left term to not " +
+    "equal the object of the right term")
 }
 
 public func GREYFail(_ reason: String) {
@@ -97,34 +99,26 @@ private func GREYWaitUntilIdle() {
 }
 
 open class EarlGrey: NSObject {
-  public static func selectElement(with matcher: GREYMatcher,
-                                   file: StaticString = #file,
-                                   line: UInt = #line) -> GREYInteraction {
-    return EarlGreyImpl.invoked(fromFile: file.description, lineNumber: line)
-             .selectElement(with: matcher)
-  }
-
-  @available(*, deprecated, renamed: "selectElement(with:)")
   open class func select(elementWithMatcher matcher:GREYMatcher,
                          file: StaticString = #file,
                          line: UInt = #line) -> GREYElementInteraction {
     return EarlGreyImpl.invoked(fromFile: file.description, lineNumber: line)
-             .selectElement(with: matcher)
+      .selectElement(with: matcher)
   }
 
   open class func setFailureHandler(handler: GREYFailureHandler,
-                                      file: StaticString = #file,
-                                      line: UInt = #line) {
+                                    file: StaticString = #file,
+                                    line: UInt = #line) {
     return EarlGreyImpl.invoked(fromFile: file.description, lineNumber: line)
-             .setFailureHandler(handler)
+      .setFailureHandler(handler)
   }
 
   open class func handle(exception: GREYFrameworkException,
-                           details: String,
-                           file: StaticString = #file,
-                           line: UInt = #line) {
+                         details: String,
+                         file: StaticString = #file,
+                         line: UInt = #line) {
     return EarlGreyImpl.invoked(fromFile: file.description, lineNumber: line)
-             .handle(exception, details: details)
+      .handle(exception, details: details)
   }
 
   @discardableResult open class func rotateDeviceTo(orientation: UIDeviceOrientation,
@@ -132,40 +126,20 @@ open class EarlGrey: NSObject {
                                                     file: StaticString = #file,
                                                     line: UInt = #line)
     -> Bool {
-    return EarlGreyImpl.invoked(fromFile: file.description, lineNumber: line)
-             .rotateDevice(to: orientation,
-                           errorOrNil: errorOrNil)
+      return EarlGreyImpl.invoked(fromFile: file.description, lineNumber: line)
+        .rotateDevice(to: orientation,
+                      errorOrNil: errorOrNil)
   }
 }
 
 extension GREYInteraction {
   @discardableResult public func assert(_ matcher: @autoclosure () -> GREYMatcher) -> Self {
-    return self.__assert(with: matcher())
+    return self.assert(with:matcher())
   }
 
   @discardableResult public func assert(_ matcher: @autoclosure () -> GREYMatcher,
                                         error:UnsafeMutablePointer<NSError?>!) -> Self {
-    return self.__assert(with: matcher(), error: error)
-  }
-
-  @available(*, deprecated, renamed: "assert(_:)")
-  @discardableResult public func assert(with matcher: GREYMatcher!) -> Self {
-    return self.__assert(with: matcher)
-  }
-
-  @available(*, deprecated, renamed: "assert(_:error:)")
-  @discardableResult public func assert(with matcher: GREYMatcher!,
-                                        error:UnsafeMutablePointer<NSError?>!) -> Self {
-    return self.__assert(with: matcher, error: error)
-  }
-
-  @discardableResult public func perform(_ action: GREYAction!) -> Self {
-    return self.__perform(action)
-  }
-
-  @discardableResult public func perform(_ action: GREYAction!,
-                                         error:UnsafeMutablePointer<NSError?>!) -> Self {
-    return self.__perform(action, error: error)
+    return self.assert(with: matcher(), error: error)
   }
 
   @discardableResult public func using(searchAction: GREYAction,
@@ -181,6 +155,6 @@ extension GREYCondition {
 
   open func waitWithTimeout(seconds: CFTimeInterval, pollInterval: CFTimeInterval)
     -> Bool {
-    return self.wait(withTimeout: seconds, pollInterval: pollInterval)
+      return self.wait(withTimeout: seconds, pollInterval: pollInterval)
   }
 }

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

@@ -0,0 +1,188 @@
+//
+// Copyright 2018 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
+import Foundation
+
+public func GREYAssert(_ expression: @autoclosure () -> Bool, reason: String) {
+  GREYAssert(expression, reason, details: "Expected expression to be true")
+}
+
+public func GREYAssertTrue(_ expression: @autoclosure () -> Bool, reason: String) {
+  GREYAssert(expression(), reason, details: "Expected the boolean expression to be true")
+}
+
+public func GREYAssertFalse(_ expression: @autoclosure () -> Bool, reason: String) {
+  GREYAssert(!expression(), reason, details: "Expected the boolean expression to be false")
+}
+
+public func GREYAssertNotNil(_ expression: @autoclosure ()-> Any?, reason: String) {
+  GREYAssert(expression() != nil, reason, details: "Expected expression to be not nil")
+}
+
+public func GREYAssertNil(_ expression: @autoclosure () -> Any?, reason: String) {
+  GREYAssert(expression() == nil, reason, details: "Expected expression to be nil")
+}
+
+public func GREYAssertEqual(_ left: @autoclosure () -> AnyObject?,
+                            _ right: @autoclosure () -> AnyObject?, reason: String) {
+  GREYAssert(left() === right(), reason, details: "Expected left term to be equal to right term")
+}
+
+public func GREYAssertNotEqual(_ left: @autoclosure () -> AnyObject?,
+                               _ right: @autoclosure () -> AnyObject?, reason: String) {
+  GREYAssert(left() !== right(), reason, details: "Expected left term to not equal the right term")
+}
+
+public func GREYAssertEqualObjects<T: Equatable>( _ left: @autoclosure () -> T?,
+                                                  _ right: @autoclosure () -> 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>( _ left: @autoclosure () -> T?,
+                                                     _ right: @autoclosure () -> T?,
+                                                     reason: String) {
+  GREYAssert(left() != right(), reason, details: "Expected object of the left term to not " +
+    "equal the object of the right term")
+}
+
+public func GREYFail(_ reason: String) {
+  EarlGrey.handle(exception: GREYFrameworkException(name: kGREYAssertionFailedException,
+                                                    reason: reason),
+                  details: "")
+}
+
+public func GREYFailWithDetails(_ reason: String, details: String) {
+  EarlGrey.handle(exception: GREYFrameworkException(name: kGREYAssertionFailedException,
+                                                    reason: reason),
+                  details: details)
+}
+
+private func GREYAssert(_ expression: @autoclosure () -> Bool,
+                        _ reason: String, details: String) {
+  GREYSetCurrentAsFailable()
+  GREYWaitUntilIdle()
+  if !expression() {
+    EarlGrey.handle(exception: GREYFrameworkException(name: kGREYAssertionFailedException,
+                                                      reason: reason),
+                    details: details)
+  }
+}
+
+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)
+  }
+}
+
+private func GREYWaitUntilIdle() {
+  GREYUIThreadExecutor.sharedInstance().drainUntilIdle()
+}
+
+open class EarlGrey: NSObject {
+  public static func selectElement(with matcher: GREYMatcher,
+                                   file: StaticString = #file,
+                                   line: UInt = #line) -> GREYInteraction {
+    return EarlGreyImpl.invoked(fromFile: file.description, lineNumber: line)
+      .selectElement(with: matcher)
+  }
+
+  @available(*, deprecated, renamed: "selectElement(with:)")
+  open class func select(elementWithMatcher matcher:GREYMatcher,
+                         file: StaticString = #file,
+                         line: UInt = #line) -> GREYElementInteraction {
+    return EarlGreyImpl.invoked(fromFile: file.description, lineNumber: line)
+      .selectElement(with: matcher)
+  }
+
+  open class func setFailureHandler(handler: GREYFailureHandler,
+                                    file: StaticString = #file,
+                                    line: UInt = #line) {
+    return EarlGreyImpl.invoked(fromFile: file.description, lineNumber: line)
+      .setFailureHandler(handler)
+  }
+
+  open class func handle(exception: GREYFrameworkException,
+                         details: String,
+                         file: StaticString = #file,
+                         line: UInt = #line) {
+    return EarlGreyImpl.invoked(fromFile: file.description, lineNumber: line)
+      .handle(exception, details: details)
+  }
+
+  @discardableResult open class func rotateDeviceTo(orientation: UIDeviceOrientation,
+                                                    errorOrNil: UnsafeMutablePointer<NSError?>!,
+                                                    file: StaticString = #file,
+                                                    line: UInt = #line)
+    -> Bool {
+      return EarlGreyImpl.invoked(fromFile: file.description, lineNumber: line)
+        .rotateDevice(to: orientation,
+                      errorOrNil: errorOrNil)
+  }
+}
+
+extension GREYInteraction {
+  @discardableResult public func assert(_ matcher: @autoclosure () -> GREYMatcher) -> Self {
+    return self.__assert(with: matcher())
+  }
+
+  @discardableResult public func assert(_ matcher: @autoclosure () -> GREYMatcher,
+                                        error:UnsafeMutablePointer<NSError?>!) -> Self {
+    return self.__assert(with: matcher(), error: error)
+  }
+
+  @available(*, deprecated, renamed: "assert(_:)")
+  @discardableResult public func assert(with matcher: GREYMatcher!) -> Self {
+    return self.__assert(with: matcher)
+  }
+
+  @available(*, deprecated, renamed: "assert(_:error:)")
+  @discardableResult public func assert(with matcher: GREYMatcher!,
+                                        error:UnsafeMutablePointer<NSError?>!) -> Self {
+    return self.__assert(with: matcher, error: error)
+  }
+
+  @discardableResult public func perform(_ action: GREYAction!) -> Self {
+    return self.__perform(action)
+  }
+
+  @discardableResult public func perform(_ action: GREYAction!,
+                                         error:UnsafeMutablePointer<NSError?>!) -> Self {
+    return self.__perform(action, error: error)
+  }
+
+  @discardableResult public func using(searchAction: GREYAction,
+                                       onElementWithMatcher matcher: GREYMatcher) -> Self {
+    return self.usingSearch(searchAction, onElementWith: matcher)
+  }
+}
+
+extension GREYCondition {
+  open func waitWithTimeout(seconds: CFTimeInterval) -> Bool {
+    return self.wait(withTimeout: seconds)
+  }
+
+  open func waitWithTimeout(seconds: CFTimeInterval, pollInterval: CFTimeInterval)
+    -> Bool {
+      return self.wait(withTimeout: seconds, pollInterval: pollInterval)
+  }
+}

data/lib/earlgrey/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: earlgrey
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - khandpur
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -127,8 +127,8 @@ files:
 - lib/earlgrey/extensions/aggregate_target_extensions.rb
 - lib/earlgrey/extensions/analyzer_extensions.rb
 - lib/earlgrey/extensions/earlgrey_yaml.rb
-- lib/earlgrey/files/Swift-2.3/EarlGrey.swift
 - lib/earlgrey/files/Swift-3.0/EarlGrey.swift
+- lib/earlgrey/files/Swift-4.0/EarlGrey.swift
 - lib/earlgrey/version.rb
 homepage: https://github.com/google/EarlGrey
 licenses:
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: EarlGrey installer gem

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

@@ -1,115 +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
-import Foundation
-
-let greyFailureHandler =
-  NSThread.currentThread().threadDictionary
-    .valueForKey(kGREYFailureHandlerKey) as! GREYFailureHandler
-
-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()
-  GREYWaitUntilIdle()
-  if !expression().boolValue {
-    greyFailureHandler.handleException(GREYFrameworkException(name: kGREYAssertionFailedException,
-      reason: reason),
-      details: details)
-  }
-}
-
-private func GREYWaitUntilIdle() {
-  GREYUIThreadExecutor.sharedInstance().drainUntilIdle()
-}
-
-private func GREYSetCurrentAsFailable(file: String = #file, line: UInt = #line) {
-  let greyFailureHandlerSelector =
-      #selector(GREYFailureHandler.setInvocationFile(_:andInvocationLine:))
-  if greyFailureHandler.respondsToSelector(greyFailureHandlerSelector) {
-    greyFailureHandler.setInvocationFile!(file, andInvocationLine: line)
-  }
-}