fastlane-plugin-sunny_project 0.1.12 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce09a7dbac996131b1ab79160b61e18b6e96fdc7386063ef2eb79db761a90f3a
-  data.tar.gz: acbbf5f6d56e25ddf67d27a04092c2f0f5bdd1c7dc63e570154a5b8add3fd507
+  metadata.gz: 2dfd5aef10653d40dc1168eb8786fb2ce725d042edd857885457fb53168cf0b9
+  data.tar.gz: 99935fc62ee0f83a08565a752d9ec8cbe8051de6a3353281a2c1c8cc47335236
 SHA512:
-  metadata.gz: 88c00465254af98b556b1069d65e7b80519a1be8f966318ecded71b3151d4fab0a47df88a99b92ce29b0a199282a4b74f8c82cc0688d87bfd53c544f02fa8930
-  data.tar.gz: d3da7a78490ee8032fe0afed0f72f923e92299fbdaa82da56641629ec5acdb81b936b211589a382ce4979c2902cb3b4f48cc5bd14fe75a4416c7354f3e6e4f56
+  metadata.gz: 47ac16ee68dc8a51d2dd47fe69f960beb812181fb88b41f19090a978ab59e8d5cab2dd0c8a8ef5448e4a09ffcf060911f534766200eb32d162799f8e7f5c700c
+  data.tar.gz: 48c5bcaffc61037efd2becd065859079dcf5693f2c9f789e51df80835b68504bd37ca65bd1c64f5bb7d07e1283b642c215627b76aa5b6842fa1a81778b8ef2ae

data/lib/fastlane/plugin/sunny_project/actions/finalize_version_action.rb

@@ -8,15 +8,15 @@ module Fastlane
         version = Sunny.current_semver
         # If we got this far, let's commit the build number and update the git tags.  If the rest of the pro
         # process fails, we should revert this because it will mess up our commit logs
-        Fastlane::Actions::GitCommitAction.run(path: %w[./pubspec.yaml ./pubspec.lock ./CHANGELOG.md],
-                                               allow_nothing_to_commit: true,
-                                               message: "Version bump to: #{version.major}.#{version.minor}.#{version.patch}#800#{version.build}")
-        Fastlane::Actions::AddGitTagAction.run(
-            tag: "sunny/builds/v#{version.build}",
-            force: true,
-            sign: false,
+        Sunny.run_action(GitCommitAction, path: %w[./pubspec.yaml ./pubspec.lock ./CHANGELOG.md],
+                         allow_nothing_to_commit: true,
+                         message: "Version bump to: #{version.major}.#{version.minor}.#{version.patch}#800#{version.build}")
+        Sunny.run_action(AddGitTagAction,
+                         tag: "sunny/builds/v#{version.build}",
+                         force: true,
+                         sign: false,
         )
-        Fastlane::Actions::PushGitTagsAction.run(log: true)
+        Sunny.run_action(PushGitTagsAction, force: true)
         if File.exist?(Sunny.release_notes_file)
           File.delete(Sunny.release_notes_file)
         end
@@ -41,13 +41,12 @@ module Fastlane
 
       def self.available_options
         [
-            FastlaneCore::ConfigItem.new(key: :tag_group,
-                                         env_name: "SUNNY_PROJECT_TAG_GROUP",
-                                         description: "The name of the tag group",
-                                         optional: false,
-                                         type: String,
-                                         default_value: "sunny/builds"),
-
+          FastlaneCore::ConfigItem.new(key: :tag_group,
+                                       env_name: "SUNNY_PROJECT_TAG_GROUP",
+                                       description: "The name of the tag group",
+                                       optional: false,
+                                       type: String,
+                                       default_value: "sunny/builds"),
 
         ]
       end

data/lib/fastlane/plugin/sunny_project/actions/increase_version_action.rb

@@ -31,13 +31,13 @@ module Fastlane
           UI.error "Invalid option: #{value} Must be 'build' or 'patch'" unless value == "build" or value == "patch"
         end
         [
-            FastlaneCore::ConfigItem.new(key: :type,
-                                         env_name: "SUNNY_PROJECT_TYPE",
-                                         description: "Whether to make a patch or build version change",
-                                         optional: true,
-                                         verify_block: verify_type,
-                                         default_value: 'build',
-                                         type: String)
+          FastlaneCore::ConfigItem.new(key: :type,
+                                       env_name: "SUNNY_PROJECT_TYPE",
+                                       description: "Whether to make a patch or build version change",
+                                       optional: true,
+                                       verify_block: verify_type,
+                                       default_value: 'build',
+                                       type: String)
         ]
       end
 

data/lib/fastlane/plugin/sunny_project/actions/release_notes_action.rb

@@ -8,53 +8,7 @@ module Fastlane
 
     class ReleaseNotesAction < Action
       def self.run(options)
-        changes = Sunny.string(options[:changes])
-        if Sunny.blank(changes)
-          if File.file?(Sunny.release_notes_file)
-            changes = Sunny.string(File.read(Sunny.release_notes_file))
 
-            UI.message "Found release notes: \n#####################################################\n\n#{changes}\n\n#####################################################\n"
-            sleep(5)
-            return changes
-          end
-          unless File.file?(Sunny.release_notes_file)
-            changes =  Sunny.string(Fastlane::Actions::ChangelogFromGitCommitsAction.run(
-                path: "./",
-                pretty: "%B",
-                ancestry_path: false,
-                match_lightweight_tag: true,
-                quiet: false,
-                merge_commit_filtering: ":exclude_merges"
-            ))
-
-            if Sunny.blank(changes)
-              changes = Sunny.string(Fastlane::Actions::PromptAction.run(
-                  text: "Please Enter a description of what changed.\nWhen you are finished, type END\n Changelog: ",
-                  multi_line_end_keyword: 'END'))
-            end
-          end
-          unless Sunny.blank(changes)
-            File.open(Sunny.release_notes_file, 'w') { |file|
-              file.write(changes)
-            }
-          end
-          if File.file?(Sunny.release_notes_file)
-            changes = Sunny.string(File.read(Sunny.release_notes_file))
-          end
-        end
-
-        if File.file?("CHANGELOG.md")
-          f = File.open("CHANGELOG.md", "r+")
-          lines = f.readlines
-          f.close
-          v = Sunny.current_semver
-          lines = ["## [#{v}]\n", " * #{changes}\n", "\n"] + lines
-
-          output = File.new("CHANGELOG.md", "w")
-          lines.each { |line| output.write line }
-          output.close
-        end
-        changes
       end
 
       def self.description

data/lib/fastlane/plugin/sunny_project/actions/sunny_release_action.rb

@@ -0,0 +1,306 @@
+require_relative '../helper/sunny_project_helper'
+require 'semantic'
+require 'yaml'
+
+require_relative '../helper/plugin_options'
+
+def resort_keys(input)
+  resort = {}
+  keys = []
+  input.each_key do |key|
+    puts("Key #{key} #{key.class}")
+    keys.push("#{key}")
+  end
+
+  keys = keys.sort
+  puts("Sorted keys: #{keys}")
+  keys.each do |k|
+    resort[k] = input[k]
+  end
+  resort
+end
+
+module Fastlane
+  UI = FastlaneCore::UI unless Fastlane.const_defined?("UI")
+  module Actions
+    class SunnyReleaseAction < Action
+      def self.run(options)
+        unless options[:skip_dirty_check]
+          Sunny.run_action(EnsureGitStatusCleanAction)
+        end
+
+
+        sunny_file = Sunny.config(SunnyProject::Options.available_options, {})
+        sunny_file.load_configuration_file("Sunnyfile")
+
+        app_file = CredentialsManager::AppfileConfig
+        firebase_app_id=sunny_file[:firebase_app_id]
+        unless firebase_app_id
+          UI.user_error!("Missing firebase_app_id.  Set this in Sunnyfile")
+        end
+
+        old_version = Sunny.current_semver
+        build_number = ''
+        ## If we're not going to build, we don't need to update
+        # version numbers.
+        if options[:build] and not options[:no_bump]
+          if options[:release]
+            build_number = Sunny.do_increase_version(build: true, patch: true)
+          else
+            build_number = Sunny.do_increase_version(build: true)
+          end
+
+          unless build_number
+            UI.user_error!("Version incrementing failed")
+            return
+          end
+        end
+
+        # Whatever happened with the incrementing, this is the build number we're
+        # going with
+        version = Sunny.current_semver
+        UI.command_output("Build Version: #{version}")
+        changes = Sunny.release_notes(options)
+        UI.important('--------------- CHANGELOG ------------------')
+        UI.important(changes)
+        UI.important('--------------------------------------------')
+
+        # TRY to execute a build.  if it fails, revert the version number changes
+        begin
+          if options[:build]
+            if options[:skip_flutter_build]
+              UI.important "Skipping Flutter Build"
+            else
+              UI.header "Run Flutter Build"
+              Sunny.build_ios(build_number)
+            end
+            require 'match'
+            build_opts = options[:build_options]
+
+            # Load match parameters.  The paths get hosed somehow
+            match_opts = Sunny.config(Match::Options.available_options, {
+              type: build_opts[0]
+            })
+
+            match_opts.load_configuration_file("Matchfile")
+
+            UI.header "Read Appfile info"
+            # Read the app identifier from Appfile
+            app_identifier = app_file.try_fetch_value(:app_identifier)
+            UI.command_output "App: #{app_identifier}"
+            unless app_identifier
+              UI.user_error!("No app_identifier could be found")
+            end
+
+            MatchAction.run(match_opts)
+            UI.header "Run Xcode Build"
+            Sunny.run_action(BuildAppAction, workspace: "ios/Runner.xcworkspace",
+                             scheme: "Runner",
+                             export_method: build_opts[1],
+                             silent: options[:verbose] != true,
+                             suppress_xcode_output: options[:verbose] != true,
+                             clean: options[:clean],
+                             export_options: {
+                               provisioningProfiles: {
+                                 "#{app_identifier}" => "match #{build_opts[2]} #{app_identifier}",
+                               }
+                             },
+                             output_directory: "build/ios")
+
+          end
+        rescue StandardError => e
+          # Put the version back like it was
+          UI.important("Restoring old version: #{old_version}")
+          Sunny.override_version(version: old_version)
+          UI.user_error!(">> build ios failed #{e} << \n  #{e.backtrace.join("\n")}")
+          return
+        end
+
+        app_name = options[:app_name]
+        # Commits the version number, deletes changelog file
+        if options[:build] or options[:post_build]
+          unless options[:skip_symbols]
+            UI.header "Upload Symbols to Crashlytics"
+            Sunny.run_action(UploadSymbolsToCrashlyticsAction, dsym_path: "./build/ios/#{app_name}.app.dSYM.zip",
+                             binary_path: "./ios/Pods/FirebaseCrashlytics/upload-symbols")
+          end
+
+          UI.header "Commit pubspec.yaml, Info.plist for version updates"
+          # If we got this far, let's commit the build number and update the git tags.  If the rest of the pro
+          # process fails, we should revert this because it will mess up our commit logs
+          Sunny.run_action(GitCommitAction,
+                           allow_nothing_to_commit: true,
+                           path: %w[./pubspec.yaml ./pubspec.lock ./Gemfile.lock ./ios/Runner/Info.plist],
+                           message: "\"Version bump to: #{version.major}.#{version.minor}.#{version.patch}#800#{version.build}\"")
+          UI.header "Tagging repo v#{version.build}"
+          Sunny.run_action(AddGitTagAction,
+                           grouping: "sunny-builds",
+                           prefix: "v",
+                           force: true,
+                           build_number: version.build
+          )
+          Sunny.run_action(PushGitTagsAction, force: false)
+        end
+
+        unless options[:no_upload]
+
+          # platform :ios do
+          release_target = options[:release_target]
+          if release_target == "firebase"
+            UI.header "Firebase: uploading build/ios/#{app_name}.ipa"
+            #require 'fastlane-plugin-firebase_app_distribution'
+
+            Sunny.run_action(FirebaseAppDistributionAction,
+                             app: firebase_app_id,
+                             ipa_path: "build/ios/#{app_name}.ipa",
+                             release_notes: changes,
+                             debug: true
+            )
+          elsif release_target == "testflight"
+            UI.header "Testflight: uploading build/ios/#{app_name}.ipa"
+            Sunny.run_action(UploadToTestflightAction,
+                             ipa: "build/ios/#{app_name}.ipa",
+                             localized_build_info: {
+                               default: {
+                                 whats_new: changes
+                               }
+                             }
+            )
+          else
+            UI.user_error!("No release target specified.  Must be 'testflight' or 'firebase'")
+            return
+          end
+          # end
+
+        end
+        UI.command_output("Removing release notes file")
+        File.delete(Sunny.release_notes_file) if File.exist?(Sunny.release_notes_file)
+      end
+
+      def self.description
+        "Modify pubspec for local or git development"
+      end
+
+      def self.authors
+        ["ericmartineau"]
+      end
+
+      def self.return_value
+        # If your method provides a return value, you can describe here what it does
+      end
+
+      def self.details
+        # Optional:
+        ""
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :no_bump,
+                                       env_name: "SUNNY_NO_BUMP",
+                                       description: "Whether to skip a bump",
+                                       optional: true, type: Object),
+          FastlaneCore::ConfigItem.new(key: :build,
+                                       env_name: "SUNNY_BUILD",
+                                       description: "Whether to perform a complete build",
+                                       optional: true, type: Object),
+          FastlaneCore::ConfigItem.new(key: :post_build,
+                                       env_name: "SUNNY_POST_BUILD",
+                                       description: "Whether to execute actions after building",
+                                       optional: true, type: Object),
+          FastlaneCore::ConfigItem.new(key: :skip_dirty_check,
+                                       env_name: "SUNNY_SKIP_DIRTY_CHECK",
+                                       description: "Whether to skip dirty repo check",
+                                       optional: true, type: Object),
+          FastlaneCore::ConfigItem.new(key: :clean,
+                                       env_name: "SUNNY_CLEAN",
+                                       description: "Whether to do a clean build",
+                                       optional: true, type: Object),
+          FastlaneCore::ConfigItem.new(key: :release,
+                                       env_name: "SUNNY_RELEASE",
+                                       description: "Whether to make a release vs patch build",
+                                       optional: true, type: Object),
+          FastlaneCore::ConfigItem.new(key: :changelog,
+                                       env_name: "SUNNY_CHANGELOG",
+                                       description: "Changelog",
+                                       optional: true),
+
+          FastlaneCore::ConfigItem.new(key: :no_upload,
+                                       env_name: "SUNNY_NO_UPLOAD",
+                                       description: "Whether to skip uploading the build",
+                                       optional: true, type: Object),
+
+          FastlaneCore::ConfigItem.new(key: :flutter,
+                                       env_name: "SUNNY_FLUTTER",
+                                       description: "Override path to flutter",
+                                       optional: true),
+
+          FastlaneCore::ConfigItem.new(key: :release_target,
+                                       env_name: "SUNNY_RELEASE_TARGET",
+                                       description: "Where we're releasing to",
+                                       optional: false,
+                                       type: String),
+
+          FastlaneCore::ConfigItem.new(key: :skip_flutter_build,
+                                       env_name: "SKIP FLUTTER BUILD",
+                                       description: "Skip the initial flutter build",
+                                       optional: true,
+                                       type: Object),
+          FastlaneCore::ConfigItem.new(key: :verbose,
+                                       env_name: "SUNNY_VERBOSE",
+                                       description: "Verbose",
+                                       optional: true,
+                                       type: Object),
+
+          FastlaneCore::ConfigItem.new(key: :app_name,
+                                       env_name: "SUNNY_APP_NAME",
+                                       description: "The name of the ios release target",
+                                       optional: false,
+                                       type: String),
+
+          FastlaneCore::ConfigItem.new(key: :skip_symbols,
+                                       env_name: "SUNNY_SKIP_SYMBOLS",
+                                       description: "Skip uploading symbols to firebase",
+                                       optional: true, type: Object),
+          FastlaneCore::ConfigItem.new(key: :build_options,
+                                       env_name: "SUNNY_BUILD_OPTIONS",
+                                       description: "A Hash of build options",
+                                       optional: false,
+                                       type: Array),
+
+        ]
+      end
+
+      def self.is_supported?(platform)
+        # Adjust this if your plugin only works for a particular platform (iOS vs. Android, for example)
+        # See: https://docs.fastlane.tools/advanced/#control-configuration-by-lane-and-by-platform
+        #
+        # [:ios, :mac, :android].include?(platform)
+        true
+      end
+    end
+
+    class CustomVisitor < Psych::Visitors::Emitter
+      def initialize(io)
+        super(io)
+      end
+
+      def visit_Psych_Nodes_Scalar(o)
+        if o.value.is_a?(String)
+          str = "#{o.value}"
+          if str.start_with?('^') || str.start_with?('..')
+            @handler.scalar(o.value, o.anchor, o.tag, o.plain, o.quoted, 1)
+          elsif str.start_with?('https://') || str.start_with?('git@')
+            @handler.scalar(o.value, o.anchor, o.tag, o.plain, o.quoted, 3)
+          else
+            @handler.scalar(o.value, o.anchor, o.tag, o.plain, o.quoted, o.style)
+          end
+          return
+        end
+        @handler.scalar(o.value, o.anchor, o.tag, o.plain, o.quoted, o.style)
+      end
+    end
+
+  end
+end
+

data/lib/fastlane/plugin/sunny_project/helper/plugin_options.rb

@@ -17,6 +17,16 @@ module Fastlane
                                          description: "The plugins",
                                          type: Hash,
                                          optional: true,),
+            FastlaneCore::ConfigItem.new(key: :firebase_app_id,
+                                         env_name: "SUNNY_FIREBASE_APP_ID",
+                                         description: "Firebase app id",
+                                         type: String,
+                                         optional: true,),
+            FastlaneCore::ConfigItem.new(key: :firebase_cli_path,
+                                         env_name: "SUNNY_FIREBASE_CLI_PATH",
+                                         description: "Firebase cli path",
+                                         type: String,
+                                         optional: true,),
             FastlaneCore::ConfigItem.new(key: :sunny_plugin_folder,
                                          env_name: "SUNNY_PLUGIN_FOLDER",
                                          description: "Folder that contains the packages",

data/lib/fastlane/plugin/sunny_project/helper/sunny_project_helper.rb

@@ -21,6 +21,13 @@ module Fastlane
       end
     end
 
+    def self.config(available_options, options)
+      FastlaneCore::Configuration.create(available_options, options)
+    end
+
+    def self.run_action(action, **options)
+      action.run(self.config(action.available_options, options))
+    end
 
     def self.do_increase_version(options)
       command = "pubver bump #{options[:type]} "
@@ -45,6 +52,7 @@ module Fastlane
       else
         if args[:cmd_out]
           UI.command_output name
+        elsif args[:quiet]
         else
           UI.command name
         end
@@ -64,6 +72,84 @@ module Fastlane
       Semantic::Version.new current_version_string
     end
 
+    def self.release_notes(options)
+      changes = Sunny.string(options[:changelog])
+      if Sunny.blank(changes)
+        if File.file?(Sunny.release_notes_file)
+          changes = Sunny.string(File.read(Sunny.release_notes_file))
+          return changes
+        end
+        unless File.file?(Sunny.release_notes_file)
+          changes = Sunny.string(Fastlane::Actions::ChangelogFromGitCommitsAction.run(
+            path: "./",
+            pretty: "%B",
+            ancestry_path: false,
+            match_lightweight_tag: true,
+            quiet: false,
+            merge_commit_filtering: ":exclude_merges"
+          ))
+
+          if Sunny.blank(changes)
+            changes = Sunny.string(Fastlane::Actions::PromptAction.run(
+              text: "Please Enter a description of what changed.\nWhen you are finished, type END\n Changelog: ",
+              multi_line_end_keyword: 'END'))
+          end
+        end
+        unless Sunny.blank(changes)
+          File.open(Sunny.release_notes_file, 'w') { |file|
+            file.write(changes)
+          }
+        end
+        if File.file?(Sunny.release_notes_file)
+          changes = Sunny.string(File.read(Sunny.release_notes_file))
+        end
+      end
+
+      if File.file?("CHANGELOG.md")
+        f = File.open("CHANGELOG.md", "r+")
+        lines = f.readlines
+        f.close
+        v = Sunny.current_semver
+        lines = ["## [#{v}]\n", " * #{changes}\n", "\n"] + lines
+
+        output = File.new("CHANGELOG.md", "w")
+        lines.each { |line| output.write line }
+        output.close
+      end
+      changes
+    end
+
+    def self.get_flutter(provided = nil)
+      provided || ".fvm/flutter_sdk/bin/flutter"
+    end
+
+    def self.override_version(**options)
+      semver = options[:version]
+      unless semver
+        UI.user_error! "No version parameter found"
+        return
+      end
+      self.exec_cmd("set_version", "pubver set #{semver}", quiet: true)
+      self.sync_version_number(semver)
+    end
+
+    def self.sync_version_number(version)
+      if version
+        self.run_action(Fastlane::Actions::IncrementVersionNumberAction,
+                        version_number: "#{version.major}.#{version.minor}.#{version.patch}",
+                        xcodeproj: "ios/Runner.xcodeproj"
+        )
+      else
+        UI.user_error! "No version found"
+      end
+
+    end
+
+    def self.build_ios(build_num, **options)
+      flutter = get_flutter(options[:flutter])
+      self.exec_cmd("build flutter ios release #{build_num}", "#{flutter} build ios --release --no-tree-shake-icons --no-codesign --build-number=#{build_num}")
+    end
+
     ### Reads the latest version from pubspec.yaml
     def self.current_semver_path
       version = nil
@@ -79,7 +165,7 @@ module Fastlane
 
     ## Retrieves the current semver based on git tags
     def self.current_version_string
-      self.exec_cmd("get version", "pubver get")
+      self.exec_cmd("get version", "pubver get", quiet: true)
     end
 
     # lane :ximg do |options|
@@ -108,10 +194,10 @@ module Fastlane
 
     def self.underscore(str)
       str.gsub(/::/, '/').
-          gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
-          gsub(/([a-z\d])([A-Z])/, '\1_\2').
-          tr("-", "_").
-          downcase
+        gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
+        gsub(/([a-z\d])([A-Z])/, '\1_\2').
+        tr("-", "_").
+        downcase
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module SunnyProject
-    VERSION = "0.1.12"
+    VERSION = "0.1.18"
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-sunny_project
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.18
 platform: ruby
 authors:
 - ericmartineau
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2020-12-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ci
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +128,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.168.0
+        version: 2.169.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.168.0
+        version: 2.169.0
 description:
 email: smartytime@gmail.com
 executables: []
@@ -168,6 +154,7 @@ files:
 - lib/fastlane/plugin/sunny_project/actions/pubspec_doctor_action.rb
 - lib/fastlane/plugin/sunny_project/actions/release_notes_action.rb
 - lib/fastlane/plugin/sunny_project/actions/rename_assets_action.rb
+- lib/fastlane/plugin/sunny_project/actions/sunny_release_action.rb
 - lib/fastlane/plugin/sunny_project/helper/plugin_options.rb
 - lib/fastlane/plugin/sunny_project/helper/sunny_project_helper.rb
 - lib/fastlane/plugin/sunny_project/version.rb