earlgrey 0.0.14 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65c301807050c57123110ae6f49ca194084836b1
-  data.tar.gz: c2971e809b71d8966b05d0d9af0e147b74d9cff7
+  metadata.gz: 9d7fb300c3c71332a9c40faf927b1477b588593c
+  data.tar.gz: ffb47cc5861696af54c6427c82ef1da51790c7b8
 SHA512:
-  metadata.gz: 3e0ec4554e0216c1d3b1f2c023dadd684f38ae00b2526502b00102d1730575748f60f0bd3e3db27abc3e4b770056ad5d554aaf63a1c07b19e45daee641dc1f81
-  data.tar.gz: 6e34a68b52fac4afaeba8068e6691d500a34ed33b43e1f4647263b6d7c1874553ff46b97f6b7bd0275e8ed09e4aab5337800c86ef2b9477ffe4545712e8c354e
+  metadata.gz: 0ff4eb41e7a980fe55e7d25ebca85f63d02fc321d224a9a28fbf6bf82b7e3d155ab2454819f8cbf29d36ca333d52a402a5e5ab9d157dc17216099f738eb081da
+  data.tar.gz: f301f51cf914857b3dfec7276dec862318a8d26b3a00a94942b6871f2b8342d97270676a94eab53aed2b9110f5e9de3791d085a6fa59a942ab715d1e0fcde94c

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.2 3.0]
+    method_option :swift_version, type: :string, default: '3.0', enum: %w[2.3 3.0]
     method_option :target, aliases: '-t', type: :string, required: true, desc: 'EarlGreyTestTarget'
 
     PROJECT  = 'project'.freeze

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

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-import EarlGrey
-
 public func grey_allOfMatchers(args: AnyObject...) -> GREYMatcher! {
   return GREYAllOf(matchers: args)
 }
@@ -24,7 +22,7 @@ public func grey_anyOfMatchers(args: AnyObject...) -> GREYMatcher! {
   return GREYAnyOf(matchers: args)
 }
 
-public func EarlGrey(file: String = __FILE__, line: UInt = __LINE__) -> EarlGreyImpl! {
+public func EarlGrey(file: String = #file, line: UInt = #line) -> EarlGreyImpl! {
   return EarlGreyImpl.invokedFromFile(file, lineNumber: line)
 }
 
@@ -78,7 +76,7 @@ public func GREYAssertNotEqualObjects<T : Equatable>(@autoclosure left: () -> T?
 public func GREYFail(reason: String) {
   greyFailureHandler.handleException(GREYFrameworkException(name: kGREYAssertionFailedException,
     reason: reason),
-                                     details: "")
+    details: "")
 }
 
 @available(*, deprecated=1.2.0, message="Please use GREYFAIL::withDetails instead.")
@@ -95,18 +93,18 @@ public func GREYFailWithDetails(reason: String, details: String) {
 }
 
 private func GREYAssert(@autoclosure expression: () -> BooleanType,
-  _ reason: String, details: String) {
-    GREYSetCurrentAsFailable()
-    if !expression().boolValue {
-      greyFailureHandler.handleException(GREYFrameworkException(name: kGREYAssertionFailedException,
-        reason: reason),
-        details: details)
-    }
+                        _ 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__) {
+private func GREYSetCurrentAsFailable(file: String = #file, line: UInt = #line) {
   let greyFailureHandlerSelector =
-  Selector("GREYFailureHandler.setInvocationFile(__FILE__, andInvocationLine:__LINE__)")
+      #selector(GREYFailureHandler.setInvocationFile(_:andInvocationLine:))
   if greyFailureHandler.respondsToSelector(greyFailureHandlerSelector) {
     greyFailureHandler.setInvocationFile!(file, andInvocationLine: line)
   }

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

@@ -0,0 +1,111 @@
+//
+// 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)
+  }
+}

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

@@ -14,98 +14,123 @@
 // 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) {
+public func GREYAssert(_ expression: @autoclosure () -> Bool, 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 GREYAssertTrue(_ expression: @autoclosure () -> Bool, reason: String) {
+  GREYAssert(expression(), 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 GREYAssertFalse(_ expression: @autoclosure () -> Bool, reason: String) {
+  GREYAssert(!expression(), reason, details: "Expected the boolean expression to be false")
 }
 
-public func GREYAssertNotNil(@autoclosure expression: () -> Any?, reason: String) {
+public func GREYAssertNotNil(_ expression: @autoclosure ()-> Any?, reason: String) {
   GREYAssert(expression() != nil, reason, details: "Expected expression to be not nil")
 }
 
-public func GREYAssertNil(@autoclosure expression: () -> Any?, reason: String) {
+public func GREYAssertNil(_ expression: @autoclosure () -> Any?, reason: String) {
   GREYAssert(expression() == nil, reason, details: "Expected expression to be nil")
 }
 
-public func GREYAssertEqual(@autoclosure left: () -> AnyObject?,
-    @autoclosure _ right: () -> AnyObject?, reason: String) {
+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(@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 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>(@autoclosure left: () -> T?,
-    @autoclosure _ right: () -> T?, reason: String) {
+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>(@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 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) {
-  greyFailureHandler.handleException(GREYFrameworkException(name: kGREYAssertionFailedException,
-    reason: reason),
-    details: "")
+public func GREYFail(_ reason: String) {
+  EarlGrey.handle(exception: 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) {
+  EarlGrey.handle(exception: 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,
+private func GREYAssert(_ expression: @autoclosure () -> Bool,
                         _ reason: String, details: String) {
   GREYSetCurrentAsFailable()
-  if !expression().boolValue {
-    greyFailureHandler.handleException(GREYFrameworkException(name: kGREYAssertionFailedException,
-      reason: reason),
-      details: details)
+  if !expression() {
+    EarlGrey.handle(exception: GREYFrameworkException(name: kGREYAssertionFailedException,
+                                                      reason: reason),
+                    details: details)
   }
 }
 
-private func GREYSetCurrentAsFailable(file: String = #file, line: UInt = #line) {
+private func GREYSetCurrentAsFailable() {
   let greyFailureHandlerSelector =
-      #selector(GREYFailureHandler.setInvocationFile(_:andInvocationLine:))
-  if greyFailureHandler.respondsToSelector(greyFailureHandlerSelector) {
-    greyFailureHandler.setInvocationFile!(file, andInvocationLine: line)
+    #selector(GREYFailureHandler.setInvocationFile(_:andInvocationLine:))
+  if greyFailureHandler.responds(to: greyFailureHandlerSelector) {
+    greyFailureHandler.setInvocationFile!(#file, andInvocationLine:#line)
+  }
+}
+
+class EarlGrey: NSObject {
+  public class func select(elementWithMatcher matcher:GREYMatcher,
+                           file: String = #file,
+                           line: UInt = #line) -> GREYElementInteraction {
+    return EarlGreyImpl.invoked(fromFile: file, lineNumber: line).selectElement(with: matcher)
+  }
+
+  public class func setFailureHandler(handler: GREYFailureHandler,
+                                      file: String = #file,
+                                      line: UInt = #line) {
+    return EarlGreyImpl.invoked(fromFile: file, lineNumber: line).setFailureHandler(handler)
+  }
+
+  public class func handle(exception: GREYFrameworkException,
+                           details: String,
+                           file: String = #file,
+                           line: UInt = #line) {
+    return EarlGreyImpl.invoked(fromFile: file, lineNumber: line).handle(exception,
+                                                                           details: details)
+  }
+
+  @discardableResult public class func rotateDeviceTo(orientation: UIDeviceOrientation,
+                                                      errorOrNil: UnsafeMutablePointer<NSError?>!,
+                                                      file: String = #file,
+                                                      line: UInt = #line)
+    -> Bool {
+    return EarlGreyImpl.invoked(fromFile: file, 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)
+  }
+
+
+  @discardableResult public func using(searchAction: GREYAction,
+                                       onElementWithMatcher matcher: GREYMatcher) -> Self {
+    return self.usingSearch(searchAction, onElementWith: matcher)
   }
 }

data/lib/earlgrey/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: earlgrey
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.1.0
 platform: ruby
 authors:
 - khandpur
@@ -10,118 +10,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-08 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.39.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.39.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.13
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '11.1'
 description: Command line tool for installing EarlGrey into an iOS Unit Testing target
@@ -138,6 +138,7 @@ files:
 - 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
 homepage: https://github.com/google/EarlGrey
@@ -150,12 +151,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []