fastlane 1.32.1 → 1.32.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abd3c0bf13fb26af94569c4c658c603b4f18b011
-  data.tar.gz: 133b65b4c37ddad8870acd182c38913bdfc41f35
+  metadata.gz: ef288c9079f419ba92955bb60da47f34b59e9695
+  data.tar.gz: a9c8eed03f8c6675f5f739723603110429fe6b62
 SHA512:
-  metadata.gz: 6942857004d3a99433b85c6e7f6ad6a1ff67aa6290ab4d4e000a5823c9f539e44d4569e96f7584c33056d12813776fb4a98233d34dd69e4a03fd890d8a5bf6fb
-  data.tar.gz: 9aecebda54550568e3f132ae91e8819aee97472e60dfec551bafcb18d2534caacf83a1c61c862388ed4f0d11848144fdcd75ceb24b30838d6ccf4a053800a9ed
+  metadata.gz: d5f70080f7fe5a8dbeb2dfa51fcee4e1144a8d1e9a64828065b9fd9cc474d069d513f0223055f0cef05ba24c388e48ea77571d202de21a80aa21d514a4de8651
+  data.tar.gz: 01deafb2ead8cc49d457a6a6163b332484009421b0a8b8a743fa8741d460d63ab9948147c574555d8e1f366cc65c7fa1d589c7f3c4959296f28cfb59ee172635

data/lib/fastlane/actions/slather.rb

@@ -9,7 +9,7 @@ module Fastlane
         Actions.verify_gem!('slather')
 
         command = "slather coverage "
-        command += " --build-directory #{params[:build_directory]}"
+        command += " --build-directory #{params[:build_directory]}" if params[:build_directory]
         command += " --input-format #{params[:input_format]}" if params[:input_format]
         command += " --scheme #{params[:scheme]}" if params[:scheme]
         command += " --buildkite" if params[:buildkite]
@@ -49,9 +49,8 @@ Slather is available at https://github.com/venmo/slather
           FastlaneCore::ConfigItem.new(key: :build_directory,
                                        env_name: "FL_SLATHER_BUILD_DIRECTORY", # The name of the environment variable
                                        description: "The location of the build output", # a short description of this parameter
-                                       verify_block: proc do |value|
-                                         raise "No Build Directory specified, pass using `build_directory: 'location/of/your/build/output'`".red unless value and !value.empty?
-                                       end),
+                                       optional: true
+                                      ),
           FastlaneCore::ConfigItem.new(key: :proj,
                                        env_name: "FL_SLATHER_PROJ", # The name of the environment variable
                                        description: "The project file that slather looks at", # a short description of this parameter
@@ -60,11 +59,13 @@ Slather is available at https://github.com/venmo/slather
                                        end),
           FastlaneCore::ConfigItem.new(key: :scheme,
                                        env_name: "FL_SLATHER_SCHEME", # The name of the environment variable
-                                       description: "Scheme to use when calling slather"
+                                       description: "Scheme to use when calling slather",
+                                       optional: true
                                       ),
           FastlaneCore::ConfigItem.new(key: :input_format,
                                        env_name: "FL_SLATHER_INPUT_FORMAT", # The name of the environment variable
-                                       description: "The input format that slather should look for"
+                                       description: "The input format that slather should look for",
+                                       optional: true
                                       ),
           FastlaneCore::ConfigItem.new(key: :buildkite,
                                        env_name: "FL_SLATHER_BUILDKITE_ENABLED", # The name of the environment variable

data/lib/fastlane/actions/unlock_keychain.rb

@@ -25,15 +25,14 @@ module Fastlane
       end
 
       def self.add_keychain_to_search_list(keychain_path)
-        escaped_path = keychain_path.shellescape
+        keychains = Fastlane::Actions.sh("security list-keychains -d user", log: false).shellsplit
 
-        result = Fastlane::Actions.sh("security list-keychains", log: false)
+        # add the keychain to the keychain list
+        unless keychains.include?(keychain_path)
+          keychains << keychain_path
 
-        # add the keychain to the keychains list
-        # the basic strategy is to open the keychain file with Keychain Access
-        unless result.include?(keychain_path)
           commands = []
-          commands << Fastlane::Actions.sh("open #{escaped_path}")
+          commands << Fastlane::Actions.sh("security list-keychains -s #{keychains.shelljoin}", log: false)
           commands
         end
       end

data/lib/fastlane/fast_file.rb

@@ -24,19 +24,31 @@ module Fastlane
                     'you should turn off smart quotes in your editor of choice.'.red
       end
 
-      parse(content)
+      parse(content, @path)
     end
 
-    def parse(data)
+    def parsing_binding
+      binding
+    end
+
+    def parse(data, path = nil)
       @runner ||= Runner.new
 
       Dir.chdir(Fastlane::FastlaneFolder.path || Dir.pwd) do # context: fastlane subfolder
+        # create nice path that we want to print in case of some problem
+        relative_path = path.nil? ? '(eval)' : Pathname.new(path).relative_path_from(Pathname.new(Dir.pwd)).to_s
+
         begin
+          # We have to use #get_binding method, because some test files defines method called `path` (for example SwitcherFastfile)
+          # and local variable has higher priority, so it causes to remove content of original Fastfile for example. With #get_binding
+          # is this always clear and safe to declare any local variables we want, because the eval function uses the instance scope
+          # instead of local.
+
           # rubocop:disable Lint/Eval
-          eval(data) # this is okay in this case
+          eval(data, parsing_binding, relative_path) # using eval is ok for this case
           # rubocop:enable Lint/Eval
         rescue SyntaxError => ex
-          line = ex.to_s.match(/\(eval\):(\d+)/)[1]
+          line = ex.to_s.match(/#{Regexp.escape(relative_path)}:(\d+)/)[1]
           raise "Syntax error in your Fastfile on line #{line}: #{ex}".red
         end
       end
@@ -190,7 +202,7 @@ module Fastlane
       raise "Could not find Fastfile at path '#{path}'".red unless File.exist?(path)
 
       collector.did_launch_action(:import)
-      parse(File.read(path))
+      parse(File.read(path), path)
 
       # Check if we can also import local actions which are in the same directory as the Fastfile
       actions_path = File.join(File.expand_path("..", path), 'actions')

data/lib/fastlane/version.rb

@@ -1,3 +1,3 @@
 module Fastlane
-  VERSION = '1.32.1'
+  VERSION = '1.32.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 1.32.1
+  version: 1.32.2
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -176,7 +176,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.2
+        version: 0.21.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -186,7 +186,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.2
+        version: 0.21.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -196,7 +196,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.9.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -206,7 +206,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.9.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -216,7 +216,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -226,7 +226,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -236,7 +236,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -246,7 +246,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -256,7 +256,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.10.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -266,7 +266,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.10.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -376,7 +376,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -386,7 +386,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -396,7 +396,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -406,7 +406,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0