earlgrey 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 956e2568138465c89585c545e8fa3aafa5b846da
-  data.tar.gz: f1b1122cc33bab6ea53045cbef4413ea95cd918b
+  metadata.gz: 0d7557e70415ea529dc8798d99d1e95cdd2c293e
+  data.tar.gz: b136a903e5e8240a135e9f1bdf00e42f21707061
 SHA512:
-  metadata.gz: 4ccbd458b26a57c1b41c6abc25273f90aa30f68ec981678b327152848612d460fa339d5995b3caeaa89be6c3518b239af373bd6c26973b376110df059497ad38
-  data.tar.gz: 3f25987e1861f2a31ffe586411e933ddfefe6bd967393bf52dada86a3e35729a638da28318bd4307f6dfddcb19df140f8bc6d85ae142a485a0d25a6c135b3644
+  metadata.gz: c8011f8f8e222be5bff18a0494debadb8271f63234c25eadd5a44e106b94bc7cd251a04e921a3c98585e733ff0dad1715a846c36a9e62f2d5900a5808011b933
+  data.tar.gz: a9851beaefc20fb8db5721c41efbc8826c578c2c945a40a58963a04767917605a76492d6a0f246e35a59234e5f69429ab0ca1f7fd851ce1e203cffa47d31b351

data/lib/earlgrey.rb

@@ -1 +1,16 @@
+#
+#  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.
+
 require_relative 'earlgrey/earlgrey'

data/lib/earlgrey/cli.rb

@@ -13,6 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
+# rubocop:disable Metrics/LineLength
 module EarlGrey
   class CLI < Thor
     package_name 'EarlGrey'

data/lib/earlgrey/{configure_earlgrey_pods.rb → configure_earlgrey.rb}

@@ -84,13 +84,21 @@ module EarlGrey
         E
       end
 
+      # must reset state on every configure
+      @add_earlgrey_product = nil
+
       @project_name = project_name
       @test_target_name = test_target_name
       @scheme_file = File.basename(scheme_file, '.*') + '.xcscheme'
       @user_project = Xcodeproj::Project.open(project_file)
       all_targets = user_project.targets
       @test_target = all_targets.find { |target| target.name == test_target_name }
-      raise "Unable to find target: #{test_target_name}. Targets are: #{all_targets.map(&:name)}" unless test_target
+      unless test_target
+        error <<-E
+          Unable to find target: #{test_target_name}.
+          Targets are: #{all_targets.map(&:name)}
+        E
+      end
 
       # Add a Test Action to the User Project Scheme.
       scheme = modify_scheme_for_actions
@@ -107,7 +115,10 @@ module EarlGrey
 
       save_earlgrey_scheme_changes(scheme) unless scheme.nil?
 
-      puts_blue "EarlGrey setup complete. You can use the Test Target: #{test_target_name} for EarlGrey testing."
+      puts_blue <<-S
+        EarlGrey setup complete.
+        You can use the Test Target: #{test_target_name} for EarlGrey testing."
+      S
     end
 
     # Scheme changes to ensure that EarlGrey is correctly loaded before main() is called.
@@ -215,9 +226,10 @@ module EarlGrey
         # Add in the Environment Variables
         launch_action_env_vars.elements.each('EnvironmentVariable') do |launch_action_env_var|
           environment_variable = REXML::Element.new 'EnvironmentVariable'
-          environment_variable.attributes['key'] = launch_action_env_var.attributes['key']
-          environment_variable.attributes['value'] = launch_action_env_var.attributes['value']
-          environment_variable.attributes['isEnabled'] = launch_action_env_var.attributes['isEnabled']
+          launch_attributes = launch_action_env_var.attributes
+          environment_variable.attributes['key'] = launch_attributes['key']
+          environment_variable.attributes['value'] = launch_attributes['value']
+          environment_variable.attributes['isEnabled'] = launch_attributes['isEnabled']
           test_action_env_vars.add_element(environment_variable)
         end
 
@@ -264,7 +276,8 @@ module EarlGrey
       end
 
       unless earlgrey_copy_files_exists
-        new_copy_files_phase = test_target.new_copy_files_build_phase(earlgrey_copy_files_phase_name)
+        name = earlgrey_copy_files_phase_name
+        new_copy_files_phase = test_target.new_copy_files_build_phase(name)
         new_copy_files_phase.dst_path = '$(TEST_HOST)/../'
         new_copy_files_phase.dst_subfolder_spec = '0'
 
@@ -339,7 +352,8 @@ module EarlGrey
       FileUtils.copy src_header, dst_header
       FileUtils.copy src_swift, dst_swift
 
-      test_target_group = user_project.main_group.children.find { |g| g.display_name == test_target_name }
+      project_test_targets = user_project.main_group.children
+      test_target_group = project_test_targets.find { |g| g.display_name == test_target_name }
       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.
@@ -354,7 +368,8 @@ module EarlGrey
       # Add EarlGrey.swift to sources build phase
       existing_sources = test_target.source_build_phase.files.map(&:display_name)
       unless existing_sources.include? src_swift_name
-        earlgrey_swift_file_ref = test_target_group.files.find { |f| f.display_name == src_swift_name }
+        target_files = test_target_group.files
+        earlgrey_swift_file_ref = target_files.find { |f| f.display_name == src_swift_name }
         raise 'EarlGrey.swift not found in testing target' unless earlgrey_swift_file_ref
         test_target.source_build_phase.add_file_reference earlgrey_swift_file_ref
       end

data/lib/earlgrey/earlgrey.rb

@@ -21,5 +21,5 @@ require 'thor'
 require 'fileutils'
 
 require_relative 'version'
-require_relative 'configure_earlgrey_pods'
+require_relative 'configure_earlgrey'
 require_relative 'cli'

data/lib/earlgrey/files/BridgingHeader.h

@@ -1 +1,16 @@
+#
+#  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/EarlGrey.swift

@@ -14,10 +14,18 @@
 // limitations under the License.
 //
 
-public func EarlGrey() -> EarlGreyImpl {
+public func EarlGrey() -> EarlGreyImpl! {
   return EarlGreyImpl.invokedFromFile(#file, lineNumber: #line)
 }
 
+func grey_allOfMatchers(args: AnyObject...) -> GREYMatcher! {
+  return GREYAllOf.init(matchers: args)
+}
+
+func grey_anyOfMatchers(args: AnyObject...) -> GREYMatcher! {
+  return GREYAnyOf.init(matchers: args)
+}
+
 public func GREYAssert(@autoclosure expression: () -> BooleanType, reason: String) {
   GREYAssert(expression, reason, details: "Expected expression to be true")
 }
@@ -75,4 +83,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.4'.freeze unless defined? ::EarlGrey::VERSION
+  VERSION = '0.0.5'.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.4
+  version: 0.0.5
 platform: ruby
 authors:
 - khandpur
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-15 00:00:00.000000000 Z
+date: 2016-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +134,7 @@ files:
 - bin/earlgrey
 - lib/earlgrey.rb
 - lib/earlgrey/cli.rb
-- lib/earlgrey/configure_earlgrey_pods.rb
+- lib/earlgrey/configure_earlgrey.rb
 - lib/earlgrey/earlgrey.rb
 - lib/earlgrey/files/BridgingHeader.h
 - lib/earlgrey/files/EarlGrey.swift