fastlane 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a71f7a01a4b843699d4c8ffa25c8a62288415301
-  data.tar.gz: 8ad55d2dbc5fb2f01860add0db0d46addb3107de
+  metadata.gz: 3719594f0dc113b73b07509a43f5daa459c69879
+  data.tar.gz: f5fede279421253290b123cae0e275e8f73adcfa
 SHA512:
-  metadata.gz: 594ed8eb7a14f84ae83e0d292a79741bc58123d6c3e2a2707d4b16154260fc872d7e9397ecc70361234cdf3c6d91110a4a4e9d7f6987161db0893dc97c42bc46
-  data.tar.gz: 62673a122e8ed81f85df089da8f8794f54be858b965406b3d1aba2351661cccd4e7e7aa3db6edfee35d5fe03c50e98e6c803562fc7de5ce35045e56408010187
+  metadata.gz: 2c0d4bf339f2ea29298e934611cb7be5a9cfda72c27a6b238dea39479889170f11f6fb332a5b5a0ddd67650ffcc3c321bb498c3190a20b2d1890aec7409d8044
+  data.tar.gz: 2fa46225e0200c809dcfba03662958eb085a4c614a21b21ce0a48cf6c3d64360ccf211be4a84885ba2c59ca261058c8be074d1b180b4ce269e3490078903d27a

data/lib/fastlane/actions/create_keychain.rb

@@ -2,6 +2,10 @@ require 'shellwords'
 
 module Fastlane
   module Actions
+    module SharedValues
+      ORIGINAL_DEFAULT_KEYCHAIN = :ORIGINAL_DEFAULT_KEYCHAIN
+    end
+
     class CreateKeychainAction < Action
       def self.run(params)
         escaped_name = params[:name].shellescape
@@ -10,7 +14,11 @@ module Fastlane
         commands = []
         commands << Fastlane::Actions.sh("security create-keychain -p #{escaped_password} #{escaped_name}", log:false)
 
-        commands << Fastlane::Actions.sh("security default-keychain -s #{escaped_name}", log:false) if params[:default_keychain]
+        if params[:default_keychain]
+          Actions.lane_context[Actions::SharedValues::ORIGINAL_DEFAULT_KEYCHAIN] = Fastlane::Actions.sh("security default-keychain", log:false).strip
+          commands << Fastlane::Actions.sh("security default-keychain -s #{escaped_name}", log:false)
+        end
+
         commands << Fastlane::Actions.sh("security unlock-keychain -p #{escaped_password} #{escaped_name}", log:false) if params[:unlock]
 
         command = "security set-keychain-settings"

data/lib/fastlane/actions/delete_keychain.rb

@@ -4,6 +4,8 @@ module Fastlane
   module Actions
     class DeleteKeychainAction < Action
       def self.run(params)
+        original = Actions.lane_context[Actions::SharedValues::ORIGINAL_DEFAULT_KEYCHAIN]
+        Fastlane::Actions.sh("security default-keychain -s #{original}", log:false) unless original.nil?
         Fastlane::Actions.sh "security delete-keychain #{params[:name].shellescape}", log:false
       end
 

data/lib/fastlane/lane_context.rb

@@ -0,0 +1,33 @@
+module Fastlane
+  module Actions
+    class LaneContextAction < Action
+      def self.run(params)
+        Actions.lane_context
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "An alias to `Actions.lane_context`"
+      end
+
+      def self.available_options
+        []
+      end
+
+      def self.output
+        []
+      end
+
+      def self.authors        
+        ["KrauseFx"]
+      end
+
+      def self.is_supported?(platform)
+        true
+      end
+    end
+  end
+end

data/lib/fastlane/version.rb

@@ -1,3 +1,3 @@
 module Fastlane
-  VERSION = '1.7.2'
+  VERSION = '1.7.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-11 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: deliver
   requirement: !ruby/object:Gem::Requirement
@@ -482,6 +482,7 @@ files:
 - lib/fastlane/fast_file.rb
 - lib/fastlane/fastlane_folder.rb
 - lib/fastlane/junit_generator.rb
+- lib/fastlane/lane_context.rb
 - lib/fastlane/lane_list.rb
 - lib/fastlane/lane_manager.rb
 - lib/fastlane/new_action.rb