earlgrey 1.12.1 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 322b35eec3f40e100c7f91912d20e6cd2a326f06
-  data.tar.gz: df765c3578e6fd7565c3ae1a7533b2007a9ebafb
+  metadata.gz: d27489bee95f5108c5762737e346df7c19465cd5
+  data.tar.gz: f16b00bbef00425cbea57313bef664f15e7e0435
 SHA512:
-  metadata.gz: 0ed870a45ff609f923a947508032ea44a62bad42e8287f278b52e24496254afecad7063ed082df305381cf2dabe74877cce94fe20265d18f644dc2e7ca2eefe8
-  data.tar.gz: 55c9d48c1d123a17499c6e31843a292217160fc16975b4402954f062755e2df185c44dfe1e4b3eff43194915449361a8c342072b1aceff550573fa72b0c83a11
+  metadata.gz: bf5678c94c3b26dae74540f519e53b55afcfe79e919787d4270694166b4f2c707caee868ed8561fb081b778212df261b2ed97f9731ec52e4579cf929c6258fdb
+  data.tar.gz: 2864b1265244c21224f029d321b8ada71fa0814706a62b69475be06330eda33df2a1805151a64cd52e579b79ffd11936fd9b8b8aa203cd527a3746b822041a09

data/lib/earlgrey/cli.rb

@@ -14,8 +14,6 @@
 #  limitations under the License.
 require 'earlgrey/configure_earlgrey'
 require 'thor'
-
-# rubocop:disable Metrics/LineLength
 module EarlGrey
   class CLI < Thor
     package_name 'EarlGrey'

data/lib/earlgrey/configure_earlgrey.rb

@@ -148,9 +148,11 @@ module EarlGrey
       set_defaults(project_name, test_target_name, scheme_file, opts)
 
       # Add DYLD_INSERT_LIBRARIES to the schemes
+      # rubocop:disable Performance/HashEachMethods
       modify_scheme_for_actions(user_project, [test_target]).each do |_, scheme|
         scheme.save!
       end
+      # rubocop:enable Performance/HashEachMethods
 
       # Add a Copy Files Build Phase for EarlGrey.framework to embed it into
       # the app under test.
@@ -314,9 +316,7 @@ module EarlGrey
         end
 
         settings[HEADER_SEARCH_PATHS] = Array(settings[HEADER_SEARCH_PATHS])
-        unless settings[HEADER_SEARCH_PATHS].include?(CARTHAGE_HEADERS_IOS)
-          settings[HEADER_SEARCH_PATHS] << CARTHAGE_HEADERS_IOS
-        end
+        settings[HEADER_SEARCH_PATHS] << CARTHAGE_HEADERS_IOS unless settings[HEADER_SEARCH_PATHS].include?(CARTHAGE_HEADERS_IOS)
       end
       target
     end
@@ -342,9 +342,7 @@ module EarlGrey
     #        the framework reference pointing to the EarlGrey.framework
     def add_earlgrey_framework(target, framework_ref)
       linked_frameworks = target.frameworks_build_phase.files.map(&:display_name)
-      unless linked_frameworks.include? EARLGREY_FRAMEWORK
-        target.frameworks_build_phase.add_file_reference framework_ref, true
-      end
+      target.frameworks_build_phase.add_file_reference framework_ref, true unless linked_frameworks.include? EARLGREY_FRAMEWORK
     end
 
     # Check if the target contains a swift source file
@@ -383,9 +381,7 @@ module EarlGrey
                      'Falling back to version 3.0.'
         swift_fallback = 'Swift-3.0'
         src_swift = File.join(src_root, swift_fallback, src_swift_name)
-        unless File.exist?(src_swift)
-          raise "Unable to locate #{swift_fallback} file at path #{src_swift}."
-        end
+        raise "Unable to locate #{swift_fallback} file at path #{src_swift}." unless File.exist?(src_swift)
       end
       dst_swift = File.join(dst_root, src_swift_name)
 
@@ -405,9 +401,7 @@ module EarlGrey
       unless existing_sources.include? src_swift_name
         target_files = test_target_group.files
         earlgrey_swift_file_ref = target_files.find { |f| f.display_name == src_swift_name }
-        unless earlgrey_swift_file_ref
-          raise 'EarlGrey.swift not found in testing target'
-        end
+        raise 'EarlGrey.swift not found in testing target' unless earlgrey_swift_file_ref
         target.source_build_phase.add_file_reference earlgrey_swift_file_ref, true
       end
     end

data/lib/earlgrey/extensions/analyzer_extensions.rb

@@ -15,19 +15,25 @@
 
 require_relative '../configure_earlgrey'
 require_relative 'aggregate_target_extensions'
+require_relative 'earlgrey_yaml'
 
 module EarlGrey
   module AnalyzerExtension
     def analyze(*_)
       result = super
+      earlgrey_yaml = EarlGreyYaml.new(result, podfile)
       eg_targets = result.targets.select(&:is_earlgrey?).each do |target|
         target.user_targets.each do |native_target|
-          EarlGrey.copy_swift_files(target.user_project, native_target,
-                                    target.target_definition.swift_version)
+          config = earlgrey_yaml.lookup_target native_target
+
+          if config[EarlGreyYaml::ADD_SWIFT]
+            EarlGrey.copy_swift_files(target.user_project, native_target,
+                                      target.target_definition.swift_version)
+          end
 
           framework_ref = EarlGrey.add_earlgrey_product target.user_project, false
-          EarlGrey.add_earlgrey_copy_files_script native_target, framework_ref
-          EarlGrey.add_earlgrey_framework native_target, framework_ref
+          EarlGrey.add_earlgrey_copy_files_script native_target, framework_ref if config[EarlGreyYaml::ADD_BUILD_PHASE]
+          EarlGrey.add_earlgrey_framework native_target, framework_ref if config[EarlGreyYaml::ADD_FRAMEWORK]
         end
       end
 

data/lib/earlgrey/extensions/earlgrey_yaml.rb

@@ -0,0 +1,59 @@
+class EarlGreyYaml
+  ADD_SWIFT       = 'add_swift'.freeze
+  ADD_BUILD_PHASE = 'add_build_phase'.freeze
+  ADD_FRAMEWORK   = 'add_framework'.freeze
+
+  def initialize(analyzer, podfile)
+    @analyzer         = analyzer
+    earlgrey_yml_path = File.join(File.dirname(podfile.defined_in_file), 'earlgrey_gem.yml')
+
+    @earlgrey_yml = {}
+    @earlgrey_yml = YAML.safe_load(File.read(earlgrey_yml_path)) if File.exist?(earlgrey_yml_path)
+
+    validate_targets
+    validate_keys
+  end
+
+  def validate_targets
+    config_targets   = @earlgrey_yml.keys
+    existing_targets = @analyzer.targets.map(&:user_targets).flatten.map(&:name)
+    missing_targets  = (config_targets - existing_targets).join(', ')
+
+    unless missing_targets.empty?
+      error = "ERROR: earlgrey_gem.yml references missing targets: #{missing_targets}\n"
+      error += "Valid targets: #{existing_targets}"
+
+      abort error
+    end
+  end
+
+  def validate_keys
+    unknown_keys  = []
+    existing_keys = @earlgrey_yml.values.flatten.map(&:keys).flatten
+    existing_keys.each do |key|
+      unknown_keys << key unless [ADD_SWIFT, ADD_BUILD_PHASE, ADD_FRAMEWORK].include?(key)
+    end
+    unknown_keys = unknown_keys.join(', ')
+
+    abort "ERROR: earlgrey_gem.yml contains unknown keys: #{unknown_keys}".red unless unknown_keys.empty?
+  end
+
+  def lookup_target(native_target)
+    target = begin
+      @earlgrey_yml.fetch(native_target.name, {})
+      # rubocop:disable Style/RescueStandardError
+    rescue
+      abort("Invalid earlgrey_gem.yaml. Unable to fetch: #{native_target.name}")
+    end
+    # rubocop:enable Style/RescueStandardError
+
+    tmp = {}
+    target.map { |obj| obj.map { |k, v| tmp[k] = v } }
+
+    {
+      ADD_SWIFT       => tmp.fetch(ADD_SWIFT, true),
+      ADD_BUILD_PHASE => tmp.fetch(ADD_BUILD_PHASE, true),
+      ADD_FRAMEWORK   => tmp.fetch(ADD_FRAMEWORK, true)
+    }
+  end
+end

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

@@ -97,9 +97,17 @@ 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 {
+                         file: StaticString = #file,
+                         line: UInt = #line) -> GREYElementInteraction {
     return EarlGreyImpl.invoked(fromFile: file.description, lineNumber: line)
              .selectElement(with: matcher)
   }
@@ -132,12 +140,32 @@ open class EarlGrey: NSObject {
 
 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)
+    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,

data/lib/earlgrey/version.rb

@@ -14,5 +14,5 @@
 #  limitations under the License.
 
 module EarlGrey
-  VERSION = '1.12.1'.freeze unless defined? ::EarlGrey::VERSION
+  VERSION = '1.13.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.12.1
+  version: 1.13.0
 platform: ruby
 authors:
 - khandpur
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-01 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -28,89 +28,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: xcodeproj
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 0.10.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 0.10.3
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: '11.1'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: 0.39.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: 0.39.0
 description: Command line tool for installing EarlGrey into an iOS Unit Testing target
 email: 
 executables:
@@ -126,6 +126,7 @@ files:
 - lib/earlgrey/extensions.rb
 - 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/version.rb
@@ -141,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -149,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: EarlGrey installer gem