fastlane-plugin-android_versioning 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6333c5aac52eaaedce5f2d2fe5b225dddb30a27
-  data.tar.gz: 238cee201f9cade2f8bb356f9ee934588279a9c8
+  metadata.gz: d69aa075985bc7879e590de538aef6063ba89cc5
+  data.tar.gz: 45154aef31fc58000c3a6da179aabe80b50565b4
 SHA512:
-  metadata.gz: 2ea2e3cb881d543fd4f789078d797b07cf4043ffcff3ba8934a45636694a0ac96248110840174e4d3f4873b50e26c8bf085b5419286d0f45e121e788e4b24cd6
-  data.tar.gz: eda795b415b473fcee2ecc76c6c8f47517c70b1f3957c11dad5bb8e75373149436a19d96f5119510f455ac02a6d89ae3b971d2109359261543b2390c2e5b0f2f
+  metadata.gz: f7b510ff63b91377749d67e85e99b7e12db28320a95329006b7fcc7e9d71af3b8303c4ac07b3de17a530c71a51ff67ee3533464415f9e682d9dc21bbc53e86ed
+  data.tar.gz: 76cb8de30f33c41ba9a90fc06233315b7b1c00f7c36ee8707c085c7ed7f1db2289a3a6602b905927d235b070dfd5ae8bc127a52bd33ad2e19cd46548b7476240

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,17 @@ 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>.*)/)
         value = ""
         found = false
         Dir.glob("#{app_project_dir}/build.gradle") do |path|
           begin
             File.open(path, 'r') do |file|
               file.each_line do |line|
-                unless line.include? "#{params[:key]} " and !found
+                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

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

@@ -6,19 +6,18 @@ 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>.*)/)
         found = 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
+                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

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

@@ -1,5 +1,5 @@
 module Fastlane
   module AndroidVersioning
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
   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.4.0
 platform: ruby
 authors:
 - Manabu OHTAKE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-11 00:00:00.000000000 Z
+date: 2018-10-14 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