fastlane-plugin-increment_version_code 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edd96715880ec66e9519c06c6a12ecfb2368cc1f
-  data.tar.gz: 3d97edd7c01443a6878a5e02af31cfc11044804f
+  metadata.gz: 4861466762cdb494bb1be875b90495e1dc4790a3
+  data.tar.gz: b894fe24a67f76def65ca74addedb66881a4a498
 SHA512:
-  metadata.gz: 998050bf9ed0cff7c7408f5d4ebeb7ede479366e860892d78ca7254e98b4fa128c0b140b3f9d7f8f86322c6490fbd6374481f22d9c8affb5d7f04fc7229ebb68
-  data.tar.gz: b22c681ea384f2b7c3cb06ea9d83fc9396ee575636778d9c603a9030ab37e3db5cf14432f70782832610317aaf833280d783808abd36eb82f3bda00f49a4ead2
+  metadata.gz: 4f23831ca0b39fc26a1ec79211b6cf3b5615c84cd3d407b5e1b4eaf70b6ae087669e78150c26321a789dc92cccb4a2dc3545faca73f9d037f2a8e8ea97a21550
+  data.tar.gz: 28c7f16d273aae9cca2c5bfcda199bc98d83cf2f84585fd21af1461373021438ecc237a30300c1dab0b95f7da64262c8f8081596f8dc3a81523fdaa1b1adc244

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Jérémy TOUDIC <jeremy.toudic@aufeminin.com>
+Copyright (c) 2017 Jérémy TOUDIC <jeremy.toudic@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -5,68 +5,79 @@ module Fastlane
   module Actions
     class IncrementVersionCodeAction < Action
       def self.run(params)
-        app_folder_name ||= params[:app_folder_name]
-        UI.message("The get_version_code plugin is looking inside your project folder (#{app_folder_name})!")
 
         version_code = "0"
         new_version_code ||= params[:version_code]
-        UI.message("new version code = #{new_version_code}")
 
-        temp_file = Tempfile.new('fastlaneIncrementVersionCode')
-        foundVersionCode = "false"
-        Dir.glob("**/#{app_folder_name}/build.gradle") do |path|
-            UI.message(" -> Found a build.gradle file at path: (#{path})!")
-                begin
-                    temp_file = Tempfile.new('fastlaneIncrementVersionCode')
-                  File.open(path, 'r') do |file|
-                    file.each_line do |line|
-                        if line.include? "versionCode " and foundVersionCode=="false"
+        constant_name ||= params[:ext_constant_name]
 
-                           versionComponents = line.strip.split(' ')
-                           version_code = versionComponents[1].tr("\"","")
-                           if new_version_code <= 0
-                               new_version_code = version_code.to_i + 1
-                           end
-                           if !!(version_code =~ /\A[-+]?[0-9]+\z/)
-                               line.replace line.sub(version_code, new_version_code.to_s)
-                               foundVersionCode = "true"
-                           end
-                           temp_file.puts line
-                       else
-                           temp_file.puts line
-                       end
-                    end
-
-                    if foundVersionCode=="true"
-                        break
-                    end
-                    file.close
-                  end
-                  temp_file.rewind
-                  temp_file.close
-                  FileUtils.mv(temp_file.path, path)
-                  temp_file.unlink
-                ensure
-                    if foundVersionCode=="true"
-
-                        break
-                    end
+        gradle_file_path ||= params[:gradle_file_path]
+        if gradle_file_path != nil
+            UI.message("The increment_version_code plugin will use gradle file at (#{gradle_file_path})!")
+            new_version_code = incrementVersion(gradle_file_path, new_version_code, constant_name)
+        else
+            app_folder_name ||= params[:app_folder_name]
+            UI.message("The get_version_code plugin is looking inside your project folder (#{app_folder_name})!")
 
+            #temp_file = Tempfile.new('fastlaneIncrementVersionCode')
+            #foundVersionCode = "false"
+            Dir.glob("**/#{app_folder_name}/build.gradle") do |path|
+                UI.message(" -> Found a build.gradle file at path: (#{path})!")
+                new_version_code = incrementVersion(path, new_version_code, constant_name)
             end
-        end
 
+        end
 
-        if version_code == "0" || new_version_code == "1"
-            UI.user_error!("Impossible to find the version code in the current project folder #{app_folder_name} 😭")
+        if new_version_code == -1
+            UI.user_error!("Impossible to find the version code with the specified properties 😭")
         else
             # Store the version name in the shared hash
             Actions.lane_context["VERSION_CODE"]=new_version_code
-            UI.success("☝️ Version code has been changed from #{version_code} to #{new_version_code}")
+            UI.success("☝️ Version code has been changed to #{new_version_code}")
         end
 
         return new_version_code
       end
 
+      def self.incrementVersion(path, new_version_code, constant_name)
+          if !File.file?(path)
+              UI.message(" -> No file exist at path: (#{path})!")
+              return -1
+          end
+          begin
+              foundVersionCode = "false"
+              temp_file = Tempfile.new('fastlaneIncrementVersionCode')
+              File.open(path, 'r') do |file|
+                  file.each_line do |line|
+                      if line.include? constant_name and foundVersionCode=="false"
+                          UI.message(" -> line: (#{line})!")
+                        versionComponents = line.strip.split(' ')
+                        version_code = versionComponents[versionComponents.length-1].tr("\"","")
+                        if new_version_code <= 0
+                            new_version_code = version_code.to_i + 1
+                        end
+                        if !!(version_code =~ /\A[-+]?[0-9]+\z/)
+                            line.replace line.sub(version_code, new_version_code.to_s)
+                            foundVersionCode = "true"
+                        end
+                        temp_file.puts line
+                      else
+                      temp_file.puts line
+                   end
+              end
+              file.close
+            end
+            temp_file.rewind
+            temp_file.close
+            FileUtils.mv(temp_file.path, path)
+            temp_file.unlink
+          end
+          if foundVersionCode == "true"
+              return new_version_code
+          end
+          return -1
+      end
+
       def self.description
         "Increment the version code of your android project."
       end
@@ -83,12 +94,24 @@ module Fastlane
                                       optional: true,
                                           type: String,
                                  default_value:"app"),
+             FastlaneCore::ConfigItem.new(key: :gradle_file_path,
+                                     env_name: "INCREMENTVERSIONCODE_GRADLE_FILE_PATH",
+                                  description: "The relative path to the gradle file containing the version code parameter (default:app/build.gradle)",
+                                     optional: true,
+                                         type: String,
+                                default_value: nil),
               FastlaneCore::ConfigItem.new(key: :version_code,
                                       env_name: "INCREMENTVERSIONCODE_VERSION_CODE",
                                    description: "Change to a specific version (optional)",
                                       optional: true,
                                           type: Integer,
-                                 default_value: 0)
+                                 default_value: 0),
+              FastlaneCore::ConfigItem.new(key: :ext_constant_name,
+                                      env_name: "INCREMENTVERSIONCODE_EXT_CONSTANT_NAME",
+                                   description: "If the version code is set in an ext constant, specify the constant name (optional)",
+                                      optional: true,
+                                          type: String,
+                                 default_value: "versionCode")
           ]
       end
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module IncrementVersionCode
-    VERSION = "0.3.1"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-increment_version_code
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Jems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry