fastlane_core 0.36.6 → 0.36.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e012f676ebfba7da674bbdc5f49579c541303bd
-  data.tar.gz: fde98f7042208536ac8359492f90ebb2368e0b53
+  metadata.gz: a58b8eb2829c478608f6cb0af3327d62679643d6
+  data.tar.gz: d2af2134d20ba7a068087ef99196522c2e2790c1
 SHA512:
-  metadata.gz: 262e0f7815aeff18e44d2bb71bbefc728bcb44744807d71f086de7ccd73559c66db4bce87aa32d5dd393fff543fa4ad835ee9d0abe2068f5e66fb2ba113177a3
-  data.tar.gz: 1edfcd1009efa2d29b81037f6af6ec126c0ea0d265713b1356d7853785bd020ddc521008f783272997120de75f2d19ea7604962b5242642efdbbf8aa79c70b0f
+  metadata.gz: 8826c880f603b461eb065011c61db790e9763cdd8e35c9a447013901c0634c010cc03f806cf9b5f74688b2ff7da2df9d0b96bebfc17d134f2ccd90ef9b03277d
+  data.tar.gz: 9456075a321b5e117c0ef8f7ab3ad6c157c498c9d0d35ced90cfe4f76a301978394214ad6dcd26d7480f26d8ac164e0482458273aa0827b34a492ba119743bb8

data/README.md

@@ -1,24 +1,24 @@
 <h3 align="center">
-  <a href="https://github.com/fastlane/fastlane">
+  <a href="https://github.com/fastlane/playground/tree/master/fastlane">
     <img src="assets/fastlane.png" width="150" />
     <br />
     fastlane
   </a>
 </h3>
 <p align="center">
-  <a href="https://github.com/fastlane/deliver">deliver</a> &bull; 
-  <a href="https://github.com/fastlane/snapshot">snapshot</a> &bull; 
-  <a href="https://github.com/fastlane/frameit">frameit</a> &bull; 
-  <a href="https://github.com/fastlane/pem">pem</a> &bull; 
-  <a href="https://github.com/fastlane/sigh">sigh</a> &bull; 
-  <a href="https://github.com/fastlane/produce">produce</a> &bull;
-  <a href="https://github.com/fastlane/cert">cert</a> &bull;
-  <a href="https://github.com/fastlane/spaceship">spaceship</a> &bull;
-  <a href="https://github.com/fastlane/pilot">pilot</a> &bull;
+  <a href="https://github.com/fastlane/playground/tree/master/deliver">deliver</a> &bull; 
+  <a href="https://github.com/fastlane/playground/tree/master/snapshot">snapshot</a> &bull; 
+  <a href="https://github.com/fastlane/playground/tree/master/frameit">frameit</a> &bull; 
+  <a href="https://github.com/fastlane/playground/tree/master/pem">pem</a> &bull; 
+  <a href="https://github.com/fastlane/playground/tree/master/sigh">sigh</a> &bull; 
+  <a href="https://github.com/fastlane/playground/tree/master/produce">produce</a> &bull;
+  <a href="https://github.com/fastlane/playground/tree/master/cert">cert</a> &bull;
+  <a href="https://github.com/fastlane/playground/tree/master/spaceship">spaceship</a> &bull;
+  <a href="https://github.com/fastlane/playground/tree/master/pilot">pilot</a> &bull;
   <a href="https://github.com/fastlane/boarding">boarding</a> &bull;
-  <a href="https://github.com/fastlane/gym">gym</a> &bull;
-  <a href="https://github.com/fastlane/scan">scan</a> &bull;
-  <a href="https://github.com/fastlane/match">match</a>
+  <a href="https://github.com/fastlane/playground/tree/master/gym">gym</a> &bull;
+  <a href="https://github.com/fastlane/playground/tree/master/scan">scan</a> &bull;
+  <a href="https://github.com/fastlane/playground/tree/master/match">match</a>
 </p>
 -------
 

data/lib/fastlane_core/cert_checker.rb

@@ -11,11 +11,9 @@ module FastlaneCore
     end
 
     # Legacy Method, use `installed?` instead
-    # rubocop:disable Style/PredicateName
     def self.is_installed?(path)
       installed?(path)
     end
-    # rubocop:enable Style/PredicateName
 
     def self.installed_identies
       install_wwdr_certificate unless wwdr_certificate_installed?

data/lib/fastlane_core/configuration/configuration.rb

@@ -84,6 +84,9 @@ module FastlaneCore
         index = @available_options.find_index { |item| item.key == current }
         current = @available_options[index]
 
+        # ignore conflicts because option value is nil
+        next if @values[current.key].nil?
+
         next if current.conflicting_options.nil?
 
         conflicts = current.conflicting_options & option_keys
@@ -93,6 +96,9 @@ module FastlaneCore
           index = @available_options.find_index { |item| item.key == conflicting_option_key }
           conflicting_option = @available_options[index]
 
+          # ignore conflicts because because value of conflict option is nil
+          next if @values[conflicting_option.key].nil?
+
           if current.conflict_block
             begin
               current.conflict_block.call(conflicting_option)

data/lib/fastlane_core/helper.rb

@@ -9,12 +9,12 @@ module FastlaneCore
       $stdout.sync = true
 
       if is_test?
-        @@log ||= Logger.new(nil) # don't show any logs when running tests
+        @log ||= Logger.new(nil) # don't show any logs when running tests
       else
-        @@log ||= Logger.new($stdout)
+        @log ||= Logger.new($stdout)
       end
 
-      @@log.formatter = proc do |severity, datetime, progname, msg|
+      @log.formatter = proc do |severity, datetime, progname, msg|
         string = "#{severity} [#{datetime.strftime('%Y-%m-%d %H:%M:%S.%2N')}]: " if $verbose
         string = "[#{datetime.strftime('%H:%M:%S')}]: " unless $verbose
         second = "#{msg}\n"
@@ -34,7 +34,7 @@ module FastlaneCore
         [string, second].join("")
       end
 
-      @@log
+      @log
     end
 
     # This method can be used to add nice lines around the actual log
@@ -73,7 +73,6 @@ module FastlaneCore
     end
 
     # Use Helper.test? and Helper.ci? instead (legacy calls)
-    # rubocop:disable Style/PredicateName
     def self.is_test?
       self.test?
     end
@@ -85,7 +84,6 @@ module FastlaneCore
     def self.is_mac?
       self.mac?
     end
-    # rubocop:enable Style/PredicateName
 
     # Do we want to disable the colored output?
     def self.colors_disabled?
@@ -142,7 +140,7 @@ module FastlaneCore
 
     def self.fastlane_enabled?
       # This is called from the root context on the first start
-      @@enabled ||= File.directory? "./fastlane"
+      @enabled ||= File.directory? "./fastlane"
     end
 
     # Path to the installed gem to load resources (e.g. resign.sh)

data/lib/fastlane_core/itunes_transporter.rb

@@ -23,9 +23,9 @@ module FastlaneCore
 
     # This will be called from the Deliverfile, and disables the logging of the transporter output
     def self.hide_transporter_output
-      @@hide_transporter_output = true
+      @hide_transporter_output = true
 
-      @@hide_transporter_output = false if $verbose
+      @hide_transporter_output = false if $verbose
     end
 
     # Returns a new instance of the iTunesTransporter.
@@ -107,7 +107,7 @@ module FastlaneCore
       @errors = []
       @warnings = []
 
-      if defined?@@hide_transporter_output
+      if defined?@hide_transporter_output
         # Show a one time message instead
         Helper.log.info "Waiting for iTunes Connect transporter to be finished.".green
         Helper.log.info "iTunes Transporter progress... this might take a few minutes...".green
@@ -180,7 +180,7 @@ module FastlaneCore
         end
       end
 
-      if !defined?@@hide_transporter_output and line =~ OUTPUT_REGEX
+      if !defined?@hide_transporter_output and line =~ OUTPUT_REGEX
         # General logging for debug purposes
         unless output_done
           Helper.log.debug "[Transporter]: #{$1}"

data/lib/fastlane_core/project.rb

@@ -87,7 +87,6 @@ module FastlaneCore
 
     # Let the user select a scheme
     # Use a scheme containing the preferred_to_include string when multiple schemes were found
-    # rubocop:disable Metrics/AbcSize
     def select_scheme(preferred_to_include: nil)
       if options[:scheme].to_s.length > 0
         # Verify the scheme is available
@@ -126,7 +125,6 @@ module FastlaneCore
         raise "No Schemes found".red
       end
     end
-    # rubocop:enable Metrics/AbcSize
 
     # Get all available configurations in an array
     def configurations

data/lib/fastlane_core/update_checker/update_checker.rb

@@ -25,7 +25,7 @@ module FastlaneCore
     end
 
     def self.server_results
-      @@results ||= {}
+      @results ||= {}
     end
 
     def self.update_available?(gem_name, current_version)

data/lib/fastlane_core/version.rb

@@ -1,3 +1,3 @@
 module FastlaneCore
-  VERSION = "0.36.6"
+  VERSION = "0.36.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane_core
 version: !ruby/object:Gem::Version
-  version: 0.36.6
+  version: 0.36.7
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json