fastlane_core 0.43.2 → 0.43.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67e9a9b7c43aaf99b8346244fb9d460ab63610ff
-  data.tar.gz: 0916bd2dfe4f685ada0504433c875c07f3c04ecd
+  metadata.gz: dec70f9af0189cb95d059bf6235e5fdb06bdd566
+  data.tar.gz: 42c1c4810eec48f3485a90d68297f8904d7788b5
 SHA512:
-  metadata.gz: 9b4e6fc941e132c16918f11cfd660ff8f1340eae0d3649ee412788ae4db1f13d0da817f13835c4572752b0294e26941892c6201f98e2933fad3b6cc41314df71
-  data.tar.gz: 1cd457d395a3b4acd24155c3d2c641a02b6f21dd6d48d67c0b6a8c23be0b0cdb178df9763bca2907a3a03b25fe3847a7e014dc0c097830de34c708ce77d35581
+  metadata.gz: d15cbd14e8e175e139caa99dcc27b2ce1513bf2fd3f479f6c994c8df6fee287a6b944c82d20d1e57ce5f8b183cf6b3d05f8d73af783073189bd649afea255e45
+  data.tar.gz: eff76516a1a921b4edbdeb7ea5f9ab0ec4508f10dd555957b79a8ce48bdd401590f5f72bd23f178c5d3a3deb0104026228065049a1aa754255c920259e988ca7

data/lib/fastlane_core.rb

@@ -1,4 +1,8 @@
 require 'json'
+
+# Ruby monkey-patches - should be before almost all else
+require 'fastlane_core/core_ext/string'
+
 require 'fastlane_core/version'
 require 'fastlane_core/helper'
 require 'fastlane_core/xcodebuild_list_output_parser'

data/lib/fastlane_core/core_ext/string.rb

@@ -0,0 +1,17 @@
+class String
+  def fastlane_class
+    split('_').collect!(&:capitalize).join
+  end
+
+  def fastlane_module
+    self == "pem" ? 'PEM' : self.fastlane_class
+  end
+
+  def fastlane_underscore
+    self.gsub(/::/, '/').
+      gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
+      gsub(/([a-z\d])([A-Z])/, '\1_\2').
+      tr("-", "_").
+      downcase
+  end
+end

data/lib/fastlane_core/tool_collector.rb

@@ -1,17 +1,58 @@
 module FastlaneCore
   class ToolCollector
-    HOST_URL = "https://fastlane-enhancer.herokuapp.com"
+    HOST_URL = ENV['FASTLANE_ENHANCER_URL'] || "https://fastlane-enhancer.herokuapp.com"
 
+    # This is the original error reporting mechanism, which has always represented
+    # either controlled (UI.user_error!), or uncontrolled (UI.crash!, anything else)
+    # exceptions.
+    #
+    # Thus, if you call `did_crash`, it will record the failure both here, and in the
+    # newer, more specific `crash` field.
+    #
+    # This value is a String, which is the name of the tool that caused the error
     attr_reader :error
 
+    # This is the newer field for tracking only uncontrolled exceptions.
+    #
+    # This is written to only when `did_crash` is called, and therefore excludes
+    # controlled exceptions.
+    #
+    # This value is a boolean, which is true if the error was an uncontrolled exception
+    attr_reader :crash
+
+    def initialize
+      @crash = false
+    end
+
     def did_launch_action(name)
       name = name.to_sym
-      launches[name] += 1 if is_official?(name)
+
+      if is_official?(name)
+        launches[name] += 1
+        versions[name] ||= determine_version(name)
+      end
     end
 
+    # Call when the problem is a caught/controlled exception (e.g. via UI.user_error!)
     def did_raise_error(name)
       name = name.to_sym
-      @error = name if is_official?(name)
+      if is_official?(name)
+        @error = name
+        # Don't write to the @crash field so that we can distinguish this exception later
+        # as being controlled
+      end
+    end
+
+    # Call when the problem is an uncaught/uncontrolled exception (e.g. via UI.crash!)
+    def did_crash(name)
+      name = name.to_sym
+      if is_official?(name)
+        # Write to the @error field to maintain the historical behavior of the field, so
+        # that the server gets the same data in that field from old and new clients
+        @error = name
+        # Also specifically note that this exception was uncontrolled in the @crash field
+        @crash = true
+      end
     end
 
     def did_finish
@@ -24,8 +65,10 @@ module FastlaneCore
       require 'excon'
       url = HOST_URL + '/did_launch?'
       url += URI.encode_www_form(
+        versions: versions.to_json,
         steps: launches.to_json,
-        error: @error
+        error: @error,
+        crash: @crash ? @error : nil
       )
 
       if Helper.is_test? # don't send test data
@@ -57,6 +100,19 @@ module FastlaneCore
       @launches ||= Hash.new(0)
     end
 
+    # Maintains a hash of tool names to their detected versions.
+    #
+    # This data is sent in the same manner as launches, as an inline form-encoded JSON value in the POST.
+    # For example:
+    #
+    # {
+    #   match: '0.5.0',
+    #   fastlane: '1.86.1'
+    # }
+    def versions
+      @versions ||= {}
+    end
+
     def is_official?(name)
       return true
     end
@@ -67,5 +123,34 @@ module FastlaneCore
       File.write(path, '1') unless did_show
       did_show
     end
+
+    def determine_version(name)
+      begin
+        name = name.to_s.downcase
+
+        # We need to pre-load the version file because tools that are invoked through their actions
+        # will not yet have run their action, and thus will not yet have loaded the file which defines
+        # the module and constant we need.
+        require File.join(name, "version")
+
+        # Go from :foo_bar to 'FooBar'
+        module_name = name.fastlane_module
+
+        # Look up the VERSION constant defined for the given tool name,
+        # or return 'unknown' if we can't find it where we'd expect
+        if Kernel.const_defined?(module_name)
+          tool_module = Kernel.const_get(module_name)
+
+          if tool_module.const_defined?('VERSION')
+            return tool_module.const_get('VERSION')
+          end
+        end
+      rescue LoadError
+        # If there is no version file to load, this is not a tool for which
+        # we can report a particular version
+      end
+
+      return nil
+    end
   end
 end

data/lib/fastlane_core/ui/fastlane_runner.rb

@@ -24,7 +24,6 @@ module Commander
       begin
         collector.did_launch_action(@program[:name])
         run_active_command
-        collector.did_finish
       rescue InvalidCommandError => e
         abort "#{e}. Use --help for more information"
       rescue Interrupt => ex
@@ -43,8 +42,10 @@ module Commander
         collector.did_raise_error(@program[:name])
         display_user_error!(e, e.message)
       rescue => e # high chance this is actually FastlaneCore::Interface::FastlaneCrash, but can be anything else
-        collector.did_raise_error(@program[:name])
+        collector.did_crash(@program[:name])
         handle_unknown_error!(e)
+      ensure
+        collector.did_finish
       end
     end
 

data/lib/fastlane_core/update_checker/changelog.rb

@@ -22,7 +22,10 @@ module FastlaneCore
 
       def releases(gem_name)
         url = "https://api.github.com/repos/fastlane/#{gem_name}/releases"
-        JSON.parse(Excon.get(url).body)
+        # We have to follow redirects, since some repos were moved away into a separate org
+        server_response = Excon.get(url,
+                                    middlewares: Excon.defaults[:middlewares] + [Excon::Middleware::RedirectFollower])
+        JSON.parse(server_response.body)
       end
     end
   end

data/lib/fastlane_core/version.rb

@@ -1,3 +1,3 @@
 module FastlaneCore
-  VERSION = "0.43.2".freeze
+  VERSION = "0.43.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane_core
 version: !ruby/object:Gem::Version
-  version: 0.43.2
+  version: 0.43.3
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -355,6 +355,7 @@ files:
 - lib/fastlane_core/configuration/config_item.rb
 - lib/fastlane_core/configuration/configuration.rb
 - lib/fastlane_core/configuration/configuration_file.rb
+- lib/fastlane_core/core_ext/string.rb
 - lib/fastlane_core/crash_reporting/clean_stack_trace.rb
 - lib/fastlane_core/crash_reporting/crash_reporting.rb
 - lib/fastlane_core/device_manager.rb
@@ -400,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Contains all shared code/dependencies of the fastlane.tools