earlgrey 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d955002733c9d4df4ce57b6254331fc70e30a4c
-  data.tar.gz: 32798a192534763c1c002a357aa1196023adb4d1
+  metadata.gz: f8e040a4f6afd93eb064bddc70db2fa458afb93c
+  data.tar.gz: c5061cec15c361849b1141eac4c365346f24d105
 SHA512:
-  metadata.gz: 01d287d05b1ea8829ea4c1168ca97bd1139e9caa9f66392327a49435a156ece7ad1b7a0aacd2effb2e32cd2c4fa8499bbc27c64ae43b2fc7cab3426fccfd2c69
-  data.tar.gz: 5595d536f1de746d356778fcc839b6fe61d5d3221e811f38706bd70d29ef0e19156fd6a3d344dc3f39aeedd6ba8cd5c96015a53f649af5506f912cb664a4a4fe
+  metadata.gz: 1e02d0cc69416a0e9c2d9ec36a71dd14f7bb378b82b933028e871a8d890e29efabaa28aa211e46d70fc4891878b8cb400802243a765959a7db32258edb464391
+  data.tar.gz: dba32b47751a5732d5fc8e3ae1ced9055d8ae657d862d59263621d8eb3873e5809cf1acdfc12b7ea345215a77b8dd1db635ce95c3bed29ed3f53287386f1b8c8

data/lib/earlgrey/cli.rb

@@ -36,8 +36,7 @@ module EarlGrey
 
       # CLI will never use Cocoapod's `post_install do |installer|`
       podfile_installer = nil
-      EarlGrey.swift    = o[SWIFT]
-      EarlGrey.carthage = o[CARTHAGE]
+      opts = { swift: o[SWIFT], carthage: o[CARTHAGE] }
 
       # Use target as the default Scheme name.
       o[SCHEME] ||= o[TARGET]
@@ -45,7 +44,7 @@ module EarlGrey
       o[PROJECT] ||= Dir.glob(File.join(Dir.pwd, '*.xcodeproj')).first
       raise 'No project found' unless o[PROJECT]
 
-      EarlGrey.configure_for_earlgrey podfile_installer, o[PROJECT], o[TARGET], o[SCHEME]
+      EarlGrey.configure_for_earlgrey podfile_installer, o[PROJECT], o[TARGET], o[SCHEME], opts
     end
   end
 end

data/lib/earlgrey/configure_earlgrey.rb

@@ -20,15 +20,16 @@ end
 
 module EarlGrey
   class << self
-    attr_accessor :swift, :carthage
-    attr_reader :project_name, :test_target, :test_target_name, :scheme_file, :user_project
+    attr_reader :project_name, :test_target, :test_target_name, :scheme_file,
+                :user_project, :swift, :carthage
 
     # Returns path to Xcode file, prepending current working dir if necessary.
     # @param xcode_file [String] xcode file path
     # @param ext [String] xcode file extension
     # @return [String] path to Xcode file
     def path_for(xcode_file, ext)
-      return xcode_file if File.exist? xcode_file
+      ext_match = File.extname(xcode_file) == ext
+      return xcode_file if File.exist?(xcode_file) && ext_match
 
       path = File.join(Dir.pwd, File.basename(xcode_file, '.*') + ext)
       path ? path : nil
@@ -62,14 +63,10 @@ module EarlGrey
       puts strip(string).yellow
     end
 
-    # Main entry point. Configures An Xcode project for use with EarlGrey.
-    #
-    # @param installer [Installer] Cococapods installer object or nil.
-    # @param project_name [String] the xcodeproj file name
-    # @param test_target_name [String] the test target name contained in xcodeproj
-    # @param scheme_file [String] the scheme file name. defaults to project name when nil.
-    # @return [nil]
-    def configure_for_earlgrey(installer, project_name, test_target_name, scheme_file)
+    def set_defaults(installer, project_name, test_target_name, scheme_file, opts={})
+      @swift = opts.fetch(:swift, false)
+      @carthage = opts.fetch(:carthage, false)
+
       puts_blue "Checking and Updating #{project_name} for EarlGrey."
       pods_project = installer ? installer.pods_project : true
       project_file = path_for project_name, '.xcodeproj'
@@ -99,6 +96,17 @@ module EarlGrey
           Targets are: #{all_targets.map(&:name)}
         E
       end
+    end
+
+    # Main entry point. Configures An Xcode project for use with EarlGrey.
+    #
+    # @param installer [Installer] Cococapods installer object or nil.
+    # @param project_name [String] the xcodeproj file name
+    # @param test_target_name [String] the test target name contained in xcodeproj
+    # @param scheme_file [String] the scheme file name. defaults to project name when nil.
+    # @return [nil]
+    def configure_for_earlgrey(installer, project_name, test_target_name, scheme_file, opts={})
+      set_defaults(installer, project_name, test_target_name, scheme_file, opts)
 
       # Add a Test Action to the User Project Scheme.
       scheme = modify_scheme_for_actions
@@ -382,13 +390,15 @@ module EarlGrey
         test_target.frameworks_build_phase.add_file_reference framework_ref
       end
 
-      # Add shell script phase
-      shell_script_name = 'Carthage copy-frameworks Run Script'
-      unless test_target.shell_script_build_phases.map(&:name).include?(shell_script_name)
-        shell_script = test_target.new_shell_script_build_phase shell_script_name
-        shell_script.shell_path = '/bin/bash'
-        shell_script.shell_script = '/usr/local/bin/carthage copy-frameworks'
-        shell_script.input_paths = ['$(SRCROOT)/Carthage/Build/iOS/EarlGrey.framework']
+      if carthage
+        # Add shell script phase
+        shell_script_name = 'Carthage copy-frameworks Run Script'
+        unless test_target.shell_script_build_phases.map(&:name).include?(shell_script_name)
+          shell_script = test_target.new_shell_script_build_phase shell_script_name
+          shell_script.shell_path = '/bin/bash'
+          shell_script.shell_script = '/usr/local/bin/carthage copy-frameworks'
+          shell_script.input_paths = ['$(SRCROOT)/Carthage/Build/iOS/EarlGrey.framework']
+        end
       end
 
       user_project.save

data/lib/earlgrey/version.rb

@@ -14,5 +14,5 @@
 #  limitations under the License.
 
 module EarlGrey
-  VERSION = '0.0.6'.freeze unless defined? ::EarlGrey::VERSION
+  VERSION = '0.0.7'.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.6
+  version: 0.0.7
 platform: ruby
 authors:
 - khandpur