fastlane-plugin-bugsnag 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d54ad579cd0a281435a4f43689f426a9a911ca1e
-  data.tar.gz: 588f1effd56cb664c7e0106c54022296c51be9e6
+  metadata.gz: 699cd6ec58789101875e421f44903f7e63f4fa47
+  data.tar.gz: 6c24799a2a13a819bc1a6e36840b82aa9cf1bd87
 SHA512:
-  metadata.gz: 861014d528c7e88bbbaebe096ebe1f96782e50ac1f08645f40ef4a315fbbf3695e5d778aabb14dd8e33b38bc603b1bce7838ebe5b12f7401e704d3c606fb7d4d
-  data.tar.gz: f0ad580b698cb1478f2b76d4a0448d6856ad2a7d11a8cdfd38cc3aba6e3368e4cfed76f015661dfab9d828541dc1ef73f7530ecf05740909179f457c922fb8e8
+  metadata.gz: 2ebfc59a0886a70e3bbdf01ff9ffc227e7de5f3449c7e175f60c7faf5cf9e809f8574db9e754cc643e67b1d9a388084a6baedf4865fdc5380c69da34c987c147
+  data.tar.gz: c45e9a8d16301c30c684c6abac68b298925284a1f0af6d5d241a1cff40ec43dbb798740b7337075787dfa6e2c48bdb827b821ad025d7801f88ff557fc6e3859f

data/bugsnag-dsym-upload

@@ -20,7 +20,8 @@ function print_usage() {
     echo "                    upload. Requires dsymutil."
     echo "--upload-server URL The server receiving dSYM files. Set this value if"
     echo "                    using an on-premise Bugsnag installation"
-    echo
+    echo "--project-root DIR  The root directory of the project. This will help to"
+    echo "                    group error reports by project"
     echo "dSYMS_PATH          A directory or .zip file containing *.dSYM bundles to"
     echo "                    upload"
 }
@@ -49,6 +50,7 @@ unset symbol_maps
 unset dsym_dir
 unset verbose
 unset silent
+unset project_root
 
 while [[ $# -gt 0 ]]; do
     case $1 in
@@ -69,6 +71,10 @@ while [[ $# -gt 0 ]]; do
             upload_server=$2
             shift
             shift;;
+        --project-root)
+            project_root=$2
+            shift
+            shift;;
         -*)
             exit_with_usage "Invalid parameter provided: $1";;
         *)
@@ -125,7 +131,11 @@ for dsym in $dsym_dir/*.dSYM; do
         uuid=$(dwarfdump -u $file 2>/dev/null)
         if [[ $uuid == UUID* ]]; then
             log Uploading $uuid
-            output=$(curl --silent --show-error $upload_server -F dsym=@\"$file\")
+            if [[ ! -z $project_root ]]; then
+                output=$(curl --silent --show-error $upload_server -F dsym=@\"$file\" -F projectRoot=$project_root)
+            else
+                output=$(curl --silent --show-error $upload_server -F dsym=@\"$file\")
+            fi
             if [ $? -eq 0 ]; then
                 success_count=$((success_count+1))
             else

data/lib/fastlane/plugin/bugsnag/actions/send_build_to_bugsnag.rb

@@ -34,7 +34,7 @@ module Fastlane
           UI.user_error! missing_api_key_message(params)
         end
         if payload[:appVersion].nil?
-          UI.user_error! missing_api_key_message(params)
+          UI.user_error! missing_app_version_message(params)
         end
         send_notification(params[:endpoint], ::JSON.dump(payload))
       end
@@ -163,26 +163,43 @@ module Fastlane
 
       def self.load_default_values
         options = {releaseStage: "production", user: `whoami`.chomp}
-        if file_path = default_android_manifest_path
-          options.merge!(options_from_android_manifest(file_path))
-          build_gradle_path = Dir.glob("app/build.gradle").first
-          build_gradle_path ||= Dir.glob("build.gradle")
-          options.merge!(options_from_build_gradle(build_gradle_path)) if build_gradle_path
-        elsif file_path = default_info_plist_path
-          options.merge!(options_from_info_plist(file_path))
+        case lane_context[:PLATFORM_NAME]
+        when nil
+          if file_path = default_android_manifest_path
+            options.merge!(load_default_android_values(file_path))
+          elsif file_path = default_info_plist_path
+            options.merge!(options_from_info_plist(file_path))
+          end
+        when :android
+          if file_path = default_android_manifest_path
+            options.merge!(load_default_android_values(file_path))
+          end
+        else
+          if file_path = default_info_plist_path
+            options.merge!(options_from_info_plist(file_path))
+          end
         end
+
         if git_opts = git_remote_options
           options.merge!(git_opts)
         end
         options
       end
 
+      def self.load_default_android_values file_path
+        options = options_from_android_manifest(file_path)
+        build_gradle_path = Dir.glob("{android/,}app/build.gradle").first
+        build_gradle_path ||= Dir.glob("build.gradle").first
+        options.merge!(options_from_build_gradle(build_gradle_path)) if build_gradle_path
+        options
+      end
+
       def self.default_android_manifest_path
-        Dir.glob("./{app,}/src/main/AndroidManifest.xml").first
+        Dir.glob("./{android/,}{app,}/src/main/AndroidManifest.xml").first
       end
 
       def self.default_info_plist_path
-        Dir.glob("./*/Info.plist").first
+        Dir.glob("./{ios/,}*/Info.plist").reject {|path| path.include?('build/') }.first
       end
 
       def self.options_from_info_plist file_path

data/lib/fastlane/plugin/bugsnag/actions/upload_symbols_to_bugsnag.rb

@@ -8,7 +8,7 @@ module Fastlane
       def self.run(params)
         parse_dsym_paths(params[:dsym_path]).each do |dsym_path|
           if dsym_path.end_with?(".zip") or File.directory?(dsym_path)
-            args = upload_args(dsym_path, params[:symbol_maps_path], params[:upload_url])
+            args = upload_args(dsym_path, params[:symbol_maps_path], params[:upload_url], params[:project_root])
             success = Kernel.system(UPLOAD_SCRIPT_PATH, *args)
             UI.success("Uploaded dSYMs in #{dsym_path}") if success
           else
@@ -73,16 +73,22 @@ module Fastlane
                                        description: "Path to the BCSymbolMaps directory to build complete dSYM files",
                                        default_value: nil,
                                        optional: true,
-                                       verify_block: validate_symbol_maps)
+                                       verify_block: validate_symbol_maps),
+          FastlaneCore::ConfigItem.new(key: :project_root,
+                                       env_name: "BUGSNAG_PROJECT_ROOT",
+                                       description: "Root path of the project",
+                                       default_value: Dir::pwd,
+                                       optional: true)
         ]
       end
 
       private
 
-      def self.upload_args dir, symbol_maps_dir, upload_url
+      def self.upload_args dir, symbol_maps_dir, upload_url, project_root
         args = ["--silent"]
         args += ["--upload-server", upload_url] unless upload_url.nil?
         args += ["--symbol-maps", symbol_maps_dir] unless symbol_maps_dir.nil?
+        args += ["--project-root", project_root] unless project_root.nil?
         args << dir
         args
       end

data/lib/fastlane/plugin/bugsnag/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Bugsnag
-    VERSION = "1.2.1"
+    VERSION = "1.3.0"
   end
 end

data/spec/bugsnag_upload_dsym_action_spec.rb

@@ -75,6 +75,15 @@ describe Action do
       Action.run({dsym_path: [dsym1, dsym2]})
     end
 
+    it 'accepts a project root argument' do
+      root_path = "/test/test/test"
+      expect(Kernel).to receive(:system).with(Action::UPLOAD_SCRIPT_PATH,
+                                              "--silent",
+                                              "--project-root", root_path,
+                                              FIXTURE_PATH)
+      Action.run({dsym_path: FIXTURE_PATH, project_root: root_path})
+    end
+
     context 'using a private server' do
       it 'uploads to the private server' do
         expect(Kernel).to receive(:system).with(Action::UPLOAD_SCRIPT_PATH,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-bugsnag
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Delisa Mason
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple