earlgrey 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02fa8958c3c796f4286ae8d8470b833bb39390de
-  data.tar.gz: ea7e9627197aefffd7b508db177c638b46110587
+  metadata.gz: 01d2551c5ab8e45b99bae72609f18eef5c850254
+  data.tar.gz: d61567b0e24731ff80fbfe70de49b9dd9928444a
 SHA512:
-  metadata.gz: 1b6e95a222326594ca32a66c4949014115fa7aa0053e7c5d0692ab2838fe21f37a6260aac6da1adefbe1901e2befde8fb17b2037d3daf838b684b027afc820fb
-  data.tar.gz: 4b471bf13f77c30e7dfff460c4179b6f32d40699062b16baca9cf916a14498f14c451b4aae10eaacbd7abe4576017e14712b9aca5b2a626ffaef3a628926b6e6
+  metadata.gz: eca3ab5658c323722269955165565188bd060a2f2ba367bc1349c9e877f02999fe3b6f7fe58e958589d7b476e19b20457635bdd07705257de65c16863f262a65
+  data.tar.gz: a16b767b4bcd7a3f047261df047bac952225443aece4afdedc4bdfaa0a70a6a25d70a5fbe3d6689f1b626a71749af5599807baefb78458ed0750a79cbf7a7de1

data/lib/earlgrey/cli.rb

@@ -19,24 +19,26 @@ module EarlGrey
     package_name 'EarlGrey'
 
     desc 'install', 'Installs EarlGrey into an Xcode unit test target'
+    method_option :carthage, type: :boolean, default: true
     method_option :project, aliases: '-p', type: :string, required: false, desc: 'Project'
-    method_option :target,  aliases: '-t', type: :string, required: true, desc: 'EarlGreyTestTarget'
     method_option :scheme,  aliases: '-s', type: :string, required: false, desc: 'EarlGreyTestTarget.xcscheme'
-    method_option :swift,    type: :boolean, default: true
-    method_option :carthage, type: :boolean, default: true
+    method_option :swift, type: :boolean, default: true
+    method_option :swift_version, type: :string, default: '3.0', enum: %w[2.2 3.0]
+    method_option :target, aliases: '-t', type: :string, required: true, desc: 'EarlGreyTestTarget'
 
     PROJECT  = 'project'.freeze
     TARGET   = 'target'.freeze
     SCHEME   = 'scheme'.freeze
     SWIFT    = 'swift'.freeze
     CARTHAGE = 'carthage'.freeze
+    SWIFT_VERSION = 'swift_version'.freeze
 
     def install
       o = options.dup
 
       # CLI will never use Cocoapod's `post_install do |installer|`
       podfile_installer = nil
-      opts = { swift: o[SWIFT], carthage: o[CARTHAGE] }
+      opts = { swift: o[SWIFT], carthage: o[CARTHAGE], swift_version: o[SWIFT_VERSION] }
 
       # Use target as the default Scheme name.
       o[SCHEME] ||= o[TARGET]

data/lib/earlgrey/configure_earlgrey.rb

@@ -21,7 +21,7 @@ end
 module EarlGrey
   class << self
     attr_reader :project_name, :test_target, :test_target_name, :scheme_file,
-                :user_project, :swift, :carthage
+                :user_project, :carthage, :swift, :swift_version
 
     # Returns path to Xcode file, prepending current working dir if necessary.
     # @param xcode_file [String] xcode file path
@@ -66,6 +66,7 @@ module EarlGrey
     def set_defaults(installer, 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')
 
       puts_blue "Checking and Updating #{project_name} for EarlGrey."
       pods_project = installer ? installer.pods_project : true
@@ -260,7 +261,7 @@ module EarlGrey
       framework_path = if carthage
                          '${SRCROOT}/Carthage/Build/iOS/EarlGrey.framework'
                        else
-                         '${SRCROOT}/Pods/EarlGrey/EarlGrey-1.0.0/EarlGrey.framework'
+                         '${SRCROOT}/Pods/EarlGrey/EarlGrey/EarlGrey.framework'
                        end
 
       framework_ref = user_project.products_group.files.find { |f| f.path == framework_path }
@@ -353,7 +354,8 @@ module EarlGrey
       dst_header = File.join(dst_root, src_header_name)
 
       src_swift_name = 'EarlGrey.swift'
-      src_swift = File.join(src_root, src_swift_name)
+      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)
 

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

@@ -0,0 +1,93 @@
+//
+// 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
+
+public func grey_allOfMatchers(args: AnyObject...) -> GREYMatcher! {
+  return GREYAllOf.init(matchers: args)
+}
+
+public func grey_anyOfMatchers(args: AnyObject...) -> GREYMatcher! {
+  return GREYAnyOf.init(matchers: args)
+}
+
+public func EarlGrey() -> 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<T : Equatable>(@autoclosure left: () -> T?,
+    @autoclosure _ right: () -> T?, reason: String) {
+  GREYAssert(left() == right(), reason, details: "Expected left term to be equal to right term")
+}
+
+public func GREYAssertNotEqual<T : Equatable>(@autoclosure left: () -> T?,
+    @autoclosure _ right: () -> T?, reason: String) {
+  GREYAssert(left() != right(), reason, details: "Expected left term to not be equal to right term")
+}
+
+public func GREYFail(reason: String) {
+  greyFailureHandler.handleException(GREYFrameworkException(name: kGREYAssertionFailedException,
+    reason: reason),
+    details: "")
+}
+
+public func GREYFail(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() {
+  let greyFailureHandlerSelector =
+  Selector("GREYFailureHandler.setInvocationFile(__FILE__, andInvocationLine:__LINE__)")
+  if greyFailureHandler.respondsToSelector(greyFailureHandlerSelector) {
+    greyFailureHandler.setInvocationFile!(__FILE__, andInvocationLine: __LINE__)
+  }
+}

data/lib/earlgrey/files/{EarlGrey.swift → Swift-3.0/EarlGrey.swift}

@@ -14,18 +14,18 @@
 // limitations under the License.
 //
 
-public func EarlGrey() -> EarlGreyImpl! {
-  return EarlGreyImpl.invokedFromFile(#file, lineNumber: #line)
-}
-
-func grey_allOfMatchers(args: AnyObject...) -> GREYMatcher! {
+public func grey_allOfMatchers(args: AnyObject...) -> GREYMatcher! {
   return GREYAllOf.init(matchers: args)
 }
 
-func grey_anyOfMatchers(args: AnyObject...) -> GREYMatcher! {
+public func grey_anyOfMatchers(args: AnyObject...) -> GREYMatcher! {
   return GREYAnyOf.init(matchers: args)
 }
 
+public func EarlGrey() -> EarlGreyImpl! {
+  return EarlGreyImpl.invokedFromFile(#file, lineNumber: #line)
+}
+
 public func GREYAssert(@autoclosure expression: () -> BooleanType, reason: String) {
   GREYAssert(expression, reason, details: "Expected expression to be true")
 }
@@ -39,7 +39,7 @@ public func GREYAssertTrue(@autoclosure expression: () -> BooleanType, reason: S
 public func GREYAssertFalse(@autoclosure expression: () -> BooleanType, reason: String) {
   GREYAssert(!expression().boolValue,
     reason,
-    details: "Expected the boolean expression to be true")
+    details: "Expected the boolean expression to be false")
 }
 
 public func GREYAssertNotNil(@autoclosure expression: () -> Any?, reason: String) {
@@ -52,7 +52,12 @@ public func GREYAssertNil(@autoclosure expression: () -> Any?, reason: String) {
 
 public func GREYAssertEqual<T : Equatable>(@autoclosure left: () -> T?,
     @autoclosure _ right: () -> T?, reason: String) {
-  GREYAssert(left() == right(), reason, details: "Expeted left term to be equal to right term")
+  GREYAssert(left() == right(), reason, details: "Expected left term to be equal to right term")
+}
+
+public func GREYAssertNotEqual<T : Equatable>(@autoclosure left: () -> T?,
+    @autoclosure _ right: () -> T?, reason: String) {
+  GREYAssert(left() != right(), reason, details: "Expected left term to not be equal to right term")
 }
 
 public func GREYFail(reason: String) {
@@ -83,4 +88,4 @@ private func GREYSetCurrentAsFailable() {
   if greyFailureHandler.respondsToSelector(greyFailureHandlerSelector) {
     greyFailureHandler.setInvocationFile!(#file, andInvocationLine: #line)
   }
-}
+}

data/lib/earlgrey/version.rb

@@ -14,5 +14,5 @@
 #  limitations under the License.
 
 module EarlGrey
-  VERSION = '0.0.8'.freeze unless defined? ::EarlGrey::VERSION
+  VERSION = '0.0.9'.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.8
+  version: 0.0.9
 platform: ruby
 authors:
 - khandpur
@@ -10,118 +10,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2016-08-19 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.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.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
@@ -137,7 +137,8 @@ files:
 - lib/earlgrey/configure_earlgrey.rb
 - lib/earlgrey/earlgrey.rb
 - lib/earlgrey/files/BridgingHeader.h
-- lib/earlgrey/files/EarlGrey.swift
+- lib/earlgrey/files/Swift-2.2/EarlGrey.swift
+- lib/earlgrey/files/Swift-3.0/EarlGrey.swift
 - lib/earlgrey/version.rb
 homepage: https://github.com/google/EarlGrey
 licenses:
@@ -149,19 +150,18 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: EarlGrey installer gem
 test_files: []
-has_rdoc: