fastlane-plugin-commit_android_version_bump 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01869368555b39ad959a85f3bfa82e6b7f3e3782
-  data.tar.gz: 005b048892a011c28efcede41d091455e839e165
+  metadata.gz: e4c5d5656c8ccddd9e5aeb0df88f70117d4925f1
+  data.tar.gz: dced72431c36bb6b4fd927d866c6053c2ea7e284
 SHA512:
-  metadata.gz: 0333a3ef774aa7cc0ed0250756c3ba95e486fdc4c1a8f17ae13bb569ad50ce6f3bf2554e5f24e243f5515a8ac685e989aaf5a6037e99160a9ccc9cec6c769c31
-  data.tar.gz: a2e28d5c6073710b2df941ba684305bba9a05872bcc06f15e05ff5083820fdb2f4fba3415b8e2103be1a5ff38ebb555c8387070262b67f7b393b86896852abe8
+  metadata.gz: 844932b6deb51c53cd8cb8b4efacdc2dda1b0fa9e58e02dc736dca9d3c76269ffd71e1fee9448c0bf08de876052dcc92a1dbc959ea68bfe75c17575d15e47690
+  data.tar.gz: dbfa09bef5975e4d72208278bcf8dac757642c5cfdb6b81dbc4c590cf35a023c6c41e4f20ba862c15bb0e5a8bc3083ad7f1be3068480db9390d17c959a02f3d8

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Jérémy TOUDIC <jeremy.toudic@aufeminin.com>
+Copyright (c) 2016 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/commit_android_version_bump/actions/commit_android_version_bump_action.rb

@@ -7,38 +7,50 @@ module Fastlane
           require 'set'
         require 'shellwords'
 
-        app_folder_name ||= params[:app_folder_name]
-        UI.message("The commit_android_version_bump plugin is looking inside your project folder (#{app_folder_name})!")
-
-        build_folder_paths = Dir[File.expand_path(File.join('**/',app_folder_name))].reject { |file| file.include?('build/') }
-        # no build.gradle found: error
-        UI.user_error!('Could not find a build folder in the current repository\'s working directory.') if build_folder_paths.count == 0
-
-        UI.message("Found the following project path: #{build_folder_paths}")
-        # too many projects found: error
-        if build_folder_paths.count > 1
-            UI.user_error!("Found multiple build.gradle projects in the current repository's working directory.")
+        build_file_folder ||= params[:gradle_file_folder]
+        if build_file_folder != nil
+            UI.message("The commit_android_version_bump plugin will use gradle file at (#{build_file_folder})!")
+
+            absolute_path = File.expand_path(build_file_folder)
+            build_file_path = build_file_folder+"/build.gradle"
+            # find the repo root path
+            repo_path = Actions.sh("git -C #{absolute_path} rev-parse --show-toplevel").strip
+            repo_pathname = Pathname.new(repo_path)
+        else
+            app_folder_name ||= params[:app_folder_name]
+            UI.message("The commit_android_version_bump plugin is looking inside your project folder (#{app_folder_name})!")
+
+            build_folder_paths = Dir[File.expand_path(File.join('**/', app_folder_name))].reject { |file| ['build/', 'node_modules/'].any? { |part| file.include? part } }
+            # no build.gradle found: error
+            UI.user_error!('Could not find a build folder in the current repository\'s working directory.') if build_folder_paths.count == 0
+
+            UI.message("Found the following project path: #{build_folder_paths}")
+            # too many projects found: error
+            if build_folder_paths.count > 1
+                UI.user_error!("Found multiple build.gradle projects in the current repository's working directory.")
+            end
+
+            build_folder_path = build_folder_paths.first
+
+            # find the repo root path
+            repo_path = Actions.sh("git -C #{build_folder_path} rev-parse --show-toplevel").strip
+            repo_pathname = Pathname.new(repo_path)
+
+
+            build_file_paths = Dir[File.expand_path(File.join('**/', app_folder_name, 'build.gradle'))].reject { |file| file.include? 'node_modules/' }
+
+            # no build.gradle found: error
+            UI.user_error!('Could not find a build.gradle in the current repository\'s working directory.') if
+                build_file_paths.count == 0
+            # too many projects found: error
+            if build_file_paths.count > 1
+                UI.user_error!("Found multiple build.gradle projects in the current repository's working directory.")
+            end
+
+            build_file_path = build_file_paths.first
+            build_file_path.replace build_file_path.sub("#{repo_pathname}/", "")
         end
 
-        build_folder_path = build_folder_paths.first
-
-        # find the repo root path
-        repo_path = Actions.sh("git -C #{build_folder_path} rev-parse --show-toplevel").strip
-        repo_pathname = Pathname.new(repo_path)
-
-
-        build_file_paths = Dir[File.expand_path(File.join('**/',app_folder_name,'build.gradle'))]
-
-        # no build.gradle found: error
-        UI.user_error!('Could not find a build.gradle in the current repository\'s working directory.') if build_file_paths.count == 0
-        # too many projects found: error
-        if build_file_paths.count > 1
-            UI.user_error!("Found multiple build.gradle projects in the current repository's working directory.")
-        end
-
-        build_file_path = build_file_paths.first
-        build_file_path.replace build_file_path.sub("#{repo_pathname}/", "")
-
         # create our list of files that we expect to have changed, they should all be relative to the project root, which should be equal to the git workdir root
         expected_changed_files = []
         expected_changed_files << build_file_path
@@ -98,7 +110,7 @@ module Fastlane
       end
 
       def self.authors
-        ["jems"]
+        ["Jems"]
       end
 
       def self.available_options
@@ -113,6 +125,12 @@ module Fastlane
                                     optional: true,
                                         type: String,
                                 default_value:"app"),
+            FastlaneCore::ConfigItem.new(key: :gradle_file_folder,
+                                    env_name: "CVB_GRADLE_FILE_FOLDER",
+                                 description: "The relative path to the folder that contains the gradle file containing the modification to commit (example :project/app)",
+                                    optional: true,
+                                        type: String,
+                                   default_value: nil),
            FastlaneCore::ConfigItem.new(key: :force,
                                    env_name: "CVB_FORCE_COMMIT",
                                 description: "Forces the commit, even if other files than the ones containing the version number have been modified",

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

@@ -1,5 +1,5 @@
 module Fastlane
   module CommitAndroidVersionBump
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-commit_android_version_bump
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - jems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry