fastlane-plugin-android_versioning 0.3.1 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6333c5aac52eaaedce5f2d2fe5b225dddb30a27
-  data.tar.gz: 238cee201f9cade2f8bb356f9ee934588279a9c8
+  metadata.gz: b18ed0f97fbda93363f1a8bc6a17f088f371925e
+  data.tar.gz: 8d3a32e846a7ab93d4bba16934e07ddc095ad644
 SHA512:
-  metadata.gz: 2ea2e3cb881d543fd4f789078d797b07cf4043ffcff3ba8934a45636694a0ac96248110840174e4d3f4873b50e26c8bf085b5419286d0f45e121e788e4b24cd6
-  data.tar.gz: eda795b415b473fcee2ecc76c6c8f47517c70b1f3957c11dad5bb8e75373149436a19d96f5119510f455ac02a6d89ae3b971d2109359261543b2390c2e5b0f2f
+  metadata.gz: 95f9076481db3b049d168028332d04317a2ee2e0cbc703f3bec50a8c569a13ef06f683f319a0b3070d19d85937fa71cdac9d018a468e4a0e92ce55c569cd3059
+  data.tar.gz: 62c6d541464f545696747fa56934b849e394ff06a4a7bbf3355ae0429b0f35611de45149d866bc436825e5e5c5bd8122f469ecd86cd969620b6b49d86127da17

data/README.md

@@ -2,6 +2,7 @@
 
 [![fastlane Plugin Badge](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-android_versioning)
 [![Gem Version](https://badge.fury.io/rb/fastlane-plugin-android_versioning.svg)](https://badge.fury.io/rb/fastlane-plugin-android_versioning)
+[![CircleCI](https://circleci.com/gh/otkmnb2783/fastlane-plugin-android_versioning.svg?style=svg)](https://circleci.com/gh/otkmnb2783/fastlane-plugin-android_versioning)
 
 ## Getting Started
 
@@ -19,7 +20,7 @@ Allows to set/get app version name and version code directly to/from build.gradl
 
 ## Example
 
-Check out the [example `Fastfile`](fastlane/Fastfile) to see how to use this plugin. Try it by cloning the repo, running `fastlane install_plugins` and `bundle exec fastlane test`.
+Check out the [example `Fastfile`](fastlane/Fastfile) to see how to use this plugin. Try it by cloning the repo, running `fastlane install_plugins` and `bundle exec fastlane show_version`.
 
 **Note to author:** Please set up a sample project to make it easy for users to explore what your plugin does. Provide everything that is necessary to try out the plugin in this project (including a sample Xcode/Android project if necessary)
 

data/lib/fastlane/plugin/android_versioning/actions/get_value_from_build.rb

@@ -5,17 +5,39 @@ module Fastlane
     class GetValueFromBuildAction < Action
       def self.run(params)
         app_project_dir ||= params[:app_project_dir]
+        regex = Regexp.new(/(?<key>#{params[:key]}\s+)(?<left>[\'\"]?)(?<value>[a-zA-Z0-9\.\_]*)(?<right>[\'\"]?)(?<comment>.*)/)
+        flavor = params[:flavor]
+        flavorSpecified = !(flavor.nil? or flavor.empty?)
+        regex_flavor = Regexp.new(/[ \t]#{flavor}[ \t]/)
         value = ""
         found = false
+        flavorFound = false
+        productFlavorsSection = false
         Dir.glob("#{app_project_dir}/build.gradle") do |path|
+          UI.verbose("path: #{path}")
+          UI.verbose("absolute_path: #{File.expand_path(path)}")
           begin
             File.open(path, 'r') do |file|
               file.each_line do |line|
-                unless line.include? "#{params[:key]} " and !found
+
+                if flavorSpecified and !productFlavorsSection
+                  unless line.include? "productFlavors"
+                    next
+                  end
+                  productFlavorsSection = true
+                end
+
+                if flavorSpecified and !flavorFound
+                  unless line.match(regex_flavor)
+                    next
+                  end
+                  flavorFound = true
+                end
+
+                unless line.match(regex) and !found
                   next
                 end
-                components = line.strip.split(' ').reject { |item| item.start_with?("//") }
-                value = components.last.tr("\"", "").tr("\'", "")
+                key, left, value, right, comment = line.match(regex).captures
                 break
               end
               file.close
@@ -36,6 +58,11 @@ module Fastlane
                                   optional: true,
                                       type: String,
                              default_value: "android/app"),
+          FastlaneCore::ConfigItem.new(key: :flavor,
+                                    env_name: "ANDROID_VERSIONING_FLAVOR",
+                                 description: "The product flavor name (optional)",
+                                    optional: true,
+                                        type: String),
           FastlaneCore::ConfigItem.new(key: :key,
                                description: "The property key",
                                       type: String)

data/lib/fastlane/plugin/android_versioning/actions/get_version_code.rb

@@ -6,6 +6,7 @@ module Fastlane
       def self.run(params)
         GetValueFromBuildAction.run(
           app_project_dir: params[:app_project_dir],
+          flavor: params[:flavor],
           key: "versionCode"
         )
       end
@@ -20,7 +21,12 @@ module Fastlane
                                  description: "The path to the application source folder in the Android project (default: android/app)",
                                     optional: true,
                                         type: String,
-                               default_value: "android/app")
+                               default_value: "android/app"),
+          FastlaneCore::ConfigItem.new(key: :flavor,
+                                    env_name: "ANDROID_VERSIONING_FLAVOR",
+                                 description: "The product flavor name (optional)",
+                                    optional: true,
+                                        type: String)
         ]
       end
 

data/lib/fastlane/plugin/android_versioning/actions/get_version_name.rb

@@ -6,6 +6,7 @@ module Fastlane
       def self.run(params)
         GetValueFromBuildAction.run(
           app_project_dir: params[:app_project_dir],
+          flavor: params[:flavor],
           key: "versionName"
         )
       end
@@ -20,7 +21,12 @@ module Fastlane
                                  description: "The path to the application source folder in the Android project (default: android/app)",
                                     optional: true,
                                         type: String,
-                               default_value: "android/app")
+                               default_value: "android/app"),
+          FastlaneCore::ConfigItem.new(key: :flavor,
+                                    env_name: "ANDROID_VERSIONING_FLAVOR",
+                                 description: "The product flavor name (optional)",
+                                    optional: true,
+                                        type: String)
         ]
       end
 

data/lib/fastlane/plugin/android_versioning/actions/increment_version_code.rb

@@ -9,9 +9,19 @@ module Fastlane
     class IncrementVersionCodeAction < Action
       def self.run(params)
         current_version_code = GetVersionCodeAction.run(params)
-        new_version_code = params[:version_code].nil? ? current_version_code.to_i + 1 : params[:version_code].to_i
+
+        new_version_code =
+          if params[:version_code].nil?
+            current_version_code.to_i + 1
+          elsif params[:version_code] == -1
+            ((Time.now.to_f * 1000).to_i / (60 * 1000)).to_i
+          else
+            params[:version_code].to_i
+          end
+
         SetValueInBuildAction.run(
           app_project_dir: params[:app_project_dir],
+          flavor: params[:flavor],
           key: "versionCode",
           value: new_version_code
         )
@@ -24,17 +34,22 @@ module Fastlane
       #####################################################
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(key: :app_project_dir,
-                                    env_name: "ANDROID_VERSIONING_APP_PROJECT_DIR",
-                                 description: "The path to the application source folder in the Android project (default: android/app)",
-                                    optional: true,
-                                        type: String,
-                               default_value: "android/app"),
-          FastlaneCore::ConfigItem.new(key: :version_code,
-                                  env_name: "ANDROID_VERSIONING_VERSION_CODE",
-                               description: "Change to a specific version (optional)",
-                                  optional: true,
-                                      type: Integer)
+            FastlaneCore::ConfigItem.new(key: :app_project_dir,
+                                         env_name: "ANDROID_VERSIONING_APP_PROJECT_DIR",
+                                         description: "The path to the application source folder in the Android project (default: android/app)",
+                                         optional: true,
+                                         type: String,
+                                         default_value: "android/app"),
+            FastlaneCore::ConfigItem.new(key: :flavor,
+                                         env_name: "ANDROID_VERSIONING_FLAVOR",
+                                         description: "The product flavor name (optional)",
+                                         optional: true,
+                                         type: String),
+            FastlaneCore::ConfigItem.new(key: :version_code,
+                                         env_name: "ANDROID_VERSIONING_VERSION_CODE",
+                                         description: "Change to a specific version (optional)",
+                                         optional: true,
+                                         type: Integer)
         ]
       end
 

data/lib/fastlane/plugin/android_versioning/actions/increment_version_name.rb

@@ -31,6 +31,7 @@ module Fastlane
         end
         SetValueInBuildAction.run(
           app_project_dir: params[:app_project_dir],
+          flavor: params[:flavor],
           key: "versionName",
           value: new_version
         )
@@ -49,6 +50,11 @@ module Fastlane
                                   optional: true,
                                       type: String,
                              default_value: "android/app"),
+          FastlaneCore::ConfigItem.new(key: :flavor,
+                                    env_name: "ANDROID_VERSIONING_FLAVOR",
+                                 description: "The product flavor name (optional)",
+                                    optional: true,
+                                        type: String),
           FastlaneCore::ConfigItem.new(key: :bump_type,
                                   env_name: "ANDROID_VERSIONING_BUMP_TYPE",
                                description: "Change to a specific type (optional)",

data/lib/fastlane/plugin/android_versioning/actions/set_value_in_build.rb

@@ -6,19 +6,40 @@ module Fastlane
     class SetValueInBuildAction < Action
       def self.run(params)
         app_project_dir ||= params[:app_project_dir]
+        regex = Regexp.new(/(?<key>#{params[:key]}\s+)(?<left>[\'\"]?)(?<value>[a-zA-Z0-9\.\_]*)(?<right>[\'\"]?)(?<comment>.*)/)
+        flavor = params[:flavor]
+        flavorSpecified = !(flavor.nil? or flavor.empty?)
+        regex_flavor = Regexp.new(/[ \t]#{flavor}[ \t]/)
         found = false
+        productFlavorsSection = false
+        flavorFound = false
         Dir.glob("#{app_project_dir}/build.gradle") do |path|
           begin
             temp_file = Tempfile.new('versioning')
             File.open(path, 'r') do |file|
               file.each_line do |line|
-                unless line.include? "#{params[:key]} " and !found
+
+                if flavorSpecified and !productFlavorsSection
+                  unless line.include? "productFlavors" or productFlavorsSection
+                    temp_file.puts line
+                    next
+                  end
+                  productFlavorsSection = true
+                end
+
+                if flavorSpecified and !flavorFound
+                  unless line.match(regex_flavor)
+                    temp_file.puts line
+                    next
+                  end
+                  flavorFound = true
+                end
+
+                unless line.match(regex) and !found
                   temp_file.puts line
                   next
                 end
-                components = line.strip.split(' ')
-                value = components.last.tr("\"", "").tr("\'", "")
-                line.replace line.sub(value, params[:value].to_s)
+                line = line.gsub regex, "\\k<key>\\k<left>#{params[:value]}\\k<right>\\k<comment>"
                 found = true
                 temp_file.puts line
               end
@@ -43,6 +64,11 @@ module Fastlane
                                   optional: true,
                                       type: String,
                              default_value: "android/app"),
+          FastlaneCore::ConfigItem.new(key: :flavor,
+                                    env_name: "ANDROID_VERSIONING_FLAVOR",
+                                 description: "The product flavor name (optional)",
+                                    optional: true,
+                                        type: String),
           FastlaneCore::ConfigItem.new(key: :key,
                                description: "The property key",
                                       type: String),

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

@@ -1,5 +1,5 @@
 module Fastlane
   module AndroidVersioning
-    VERSION = "0.3.1"
+    VERSION = "0.5.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-android_versioning
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.4
 platform: ruby
 authors:
 - Manabu OHTAKE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-11 00:00:00.000000000 Z
+date: 2021-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Allows to set/get app version name and version code directly to/from build.gradle