neetob 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0efeb267893c2c4b205174f5c8e98f995b96ecb9c897802a7a6ebb69b35c948b
-  data.tar.gz: b67600bfdfbb52cc703ca194db5d68e2353dc0d3533f038b2a2a3085a4ab37b6
+  metadata.gz: 9fd60283a5ac6d285fe20a16357e39d0c72d9c48964d44016915eda55cd41a41
+  data.tar.gz: dc89a8882804bd9d774c6ae8e7f91760fb15ad000a7d0eb6ec89d7bb447c717d
 SHA512:
-  metadata.gz: 37aaf0fc506ab02bf04450e54de083cefe1b953620f8ec73ad08e0dbb35dc245420af2b98fdd1cc4acb3c4ee5b58ddf377dd5c7ae7f4af9a43bb812eb12edcfe
-  data.tar.gz: e09bebaa6f439bcbb217de61a9822df674bfaab52f1a22680b4eccb45a0bd2d759122c257a487bacb582c4a8ae5d815c7ed0359e53a2dbe6630c0d7ca84e3b83
+  metadata.gz: 3a373c5ca6a6e9a77071e5714d7b08c9ebdd03e2c0567ac1b7280233d28659c7491255ede9d20a185bdb5764b7d6b6746ce31a0ab43333a02f4f16fce77edf55
+  data.tar.gz: 1208e7c0d1dc21e242bbcaa68b58e07f4e4d544f39e63582599b85597c0340effa7fb8ff10a78fce4f0456b20569eba442d85a2f077772b57a437b9b7d1db01b

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## [Unreleased]
 
+### [0.4.3](https://www.github.com/bigbinary/neetob/compare/v0.4.2...v0.4.3) (2023-04-25)
+
+
+### Bug Fixes
+
+* Added frontend packages option for make-pr command ([#255](https://www.github.com/bigbinary/neetob/issues/255)) ([a884e24](https://www.github.com/bigbinary/neetob/commit/a884e24a5160ba28cae90ba73e9a4853587be4e6))
+
+### [0.4.2](https://www.github.com/bigbinary/neetob/compare/v0.4.1...v0.4.2) (2023-04-14)
+
+
+### Bug Fixes
+
+* Allow regex values for path and keyword in github search command. ([#233](https://www.github.com/bigbinary/neetob/issues/233)) ([f6866db](https://www.github.com/bigbinary/neetob/commit/f6866dbe3decf897c483a5b77aaa8989a21192d4))
+
 ### [0.4.1](https://www.github.com/bigbinary/neetob/compare/v0.4.0...v0.4.1) (2023-04-05)
 
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    neetob (0.4.1)
+    neetob (0.4.3)
       brakeman (~> 5.0)
       chronic
       dotenv (~> 2.8.1)
@@ -148,9 +148,9 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
-    nokogiri (1.13.10-x86_64-darwin)
+    nokogiri (1.14.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.10-x86_64-linux)
+    nokogiri (1.14.3-x86_64-linux)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
@@ -166,7 +166,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.0)
-    racc (1.6.1)
+    racc (1.6.2)
     rack (2.2.6.4)
     rack-test (2.0.2)
       rack (>= 1.3)

data/README.md

@@ -164,6 +164,16 @@ Searches for keywords across multiple neeto projects within specified files by u
 neetob github search --keyword neeto --path README.md --repos "neeto-*-staging"
 ```
 
+We can also use regular-expressions as the value for both the keyword and the path of the file.
+
+```sh
+neetob github search --keyword "ne*to" --path ".*\.md$" --repos "neeto-*-staging"
+```
+
+The above command searches for all occurrences of any word matching the given reg-expression in all files with the extension ".md".
+
+We can pass the `--replace` option to replace all found instances of the keyword with another word.
+
 ### Protect branch
 
 Updates branch protection rules in neeto repos by using the `protect_branch` command.
@@ -218,6 +228,10 @@ neetob github make-pr compliance-fix --nanos
 # The `script` command runs the given script for each product and create a PR
 neetob github make-pr script --path ~/Desktop/fix-folders.sh --branch "neetob-test" \
 --title "PR title" --description "PR description"
+
+# Create PRs using script in neeto frontend packages
+neetob github make-pr script --path ~/Desktop/fix-folders.sh --branch "neetob-test" \
+--title "PR title" --description "PR description" --frontend-packages
 ```
 
 ### Gems

data/lib/neetob/cli/base.rb

@@ -100,5 +100,10 @@ module Neetob
         all_available_gems = NeetoCompliance::NeetoRepos.nanos_backend
         match_apps(gems || ["*"], all_available_gems)
       end
+
+      def find_all_matching_frontend_packages(packages = ["*"])
+        all_available_packages = NeetoCompliance::NeetoRepos.nanos_frontend
+        match_apps(packages || ["*"], all_available_packages)
+      end
   end
 end

data/lib/neetob/cli/github/commands.rb

@@ -31,8 +31,9 @@ module Neetob
         option :keyword, type: :string, aliases: "-k", desc: "Keyword which needs to be searched", required: true
         option :path, type: :string, aliases: "-p",
           desc: "Path of the file in which you want to search the given keyword.", required: true
+        option :replace, type: :string, aliases: "-s", desc: "Word with which you want to replace the found instances of the keyword"
         def search
-          Search.new(options[:repos], options[:keyword], options[:path], options[:sandbox]).run
+          Search.new(options[:repos], options[:keyword], options[:path], options[:replace], options[:sandbox]).run
         end
 
         desc "login", "Update the Github access token by authenticating via browser"

data/lib/neetob/cli/github/make_pr/base.rb

@@ -36,6 +36,10 @@ module Neetob
               `git clone --quiet --depth 1 git@github.com:#{repo}.git /tmp/neetob/#{repo_name_without_org_suffix(repo)}`
             end
 
+            def clone_repo_in_tmp_dir(repo)
+              `git clone --quiet git@github.com:#{repo}.git /tmp/neetob/#{repo_name_without_org_suffix(repo)}`
+            end
+
             def add_commmit_and_push_changes(repo)
               `#{cd_to_repo_in_tmp_dir(repo)} && git add . && \\
               git commit -m "#{pr_title}" && git push -u origin #{branch_name} --force`
@@ -74,6 +78,14 @@ module Neetob
             def add_org_suffix(repos)
               repos.map { |repo| "bigbinary/#{repo}" }
             end
+
+            def build_matching_repos_list(should_fix_nanos, should_fix_frontend_packages = false)
+              return add_org_suffix(find_all_matching_gems) if should_fix_nanos
+
+              return add_org_suffix(find_all_matching_frontend_packages) if should_fix_frontend_packages
+
+              find_all_matching_apps_or_repos(repos, :github, sandbox)
+            end
         end
       end
     end

data/lib/neetob/cli/github/make_pr/commands.rb

@@ -27,10 +27,11 @@ module Neetob
           option :title, type: :string, aliases: "-t", desc: "Title for the PR"
           option :branch, type: :string, aliases: "-b", desc: "Feature branch name for the PR"
           option :description, type: :string, aliases: "-d", desc: "Description of the PR"
+          option :frontend_packages, type: :boolean, aliases: "-f", default: false, desc: "Use this flag to make PRs for the neeto frontend packages"
           def script
             Script.new(
               options[:repos], options[:path], options[:title], options[:branch], options[:description],
-              options[:nanos], options[:sandbox]).run
+              options[:nanos], options[:frontend_packages], options[:sandbox]).run
           end
         end
       end

data/lib/neetob/cli/github/make_pr/compliance_fix.rb

@@ -20,9 +20,7 @@ module Neetob
           end
 
           def run
-            matching_repos = should_fix_nanos ?
-              add_org_suffix(find_all_matching_gems) :
-              find_all_matching_apps_or_repos(repos, :github, sandbox)
+            matching_repos = build_matching_repos_list(should_fix_nanos)
             @failed_repos = matching_repos.clone
             delete_and_create_temp_neetob_dir
             matching_repos.each do |repo|

data/lib/neetob/cli/github/make_pr/script.rb

@@ -9,22 +9,22 @@ module Neetob
     module Github
       module MakePr
         class Script < Base
-          attr_accessor :repos, :sandbox, :path_to_the_script_file, :pr_description, :should_fix_nanos
+          attr_accessor :repos, :sandbox, :path_to_the_script_file, :pr_description, :should_fix_nanos,
+            :should_fix_frontend_packages
 
           def initialize(repos, path_to_the_script_file, pr_title,
-            branch_name, pr_description, should_fix_nanos, sandbox = false)
+            branch_name, pr_description, should_fix_nanos, should_fix_frontend_packages = false, sandbox = false)
             super(pr_title, branch_name)
             @repos = repos
             @sandbox = sandbox
             @path_to_the_script_file = path_to_the_script_file
             @pr_description = pr_description
             @should_fix_nanos = should_fix_nanos
+            @should_fix_frontend_packages = should_fix_frontend_packages
           end
 
           def run
-            matching_repos = should_fix_nanos ?
-              add_org_suffix(find_all_matching_gems) :
-              find_all_matching_apps_or_repos(repos, :github, sandbox)
+            matching_repos = build_matching_repos_list(should_fix_nanos, should_fix_frontend_packages)
             delete_and_create_temp_neetob_dir
             matching_repos.each do |repo|
               ui.info("\n  Working on #{repo}  \n")

data/lib/neetob/cli/github/search.rb

@@ -1,37 +1,99 @@
 # frozen_string_literal: true
 
-require_relative "base"
+require_relative "./make_pr/base"
 
 module Neetob
   class CLI
     module Github
-      class Search < Base
-        attr_accessor :repos, :key_to_search, :search_file_path, :sandbox
+      class Search < MakePr::Base
+        attr_accessor :repos, :key_to_search, :search_file_path, :replacement_term, :sandbox
 
-        def initialize(repos, key_to_search, search_file_path, sandbox = false)
-          super()
-          @repos = repos
+        def initialize(repos, key_to_search, search_file_path, replacement_term, sandbox = false)
           @key_to_search = key_to_search
+          @replacement_term = replacement_term
+          branch_name = build_branch_name
+          pr_title = build_pr_title
+          super(pr_title, branch_name)
           @search_file_path = search_file_path
+          @repos = repos
           @sandbox = sandbox
         end
 
         def run
           matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox)
           matching_repos.each do |repo|
+            ui.info("\nSearching in #{repo}")
+            clone_repo_in_tmp_dir(repo)
             begin
-              ui.info("\n Searching in \"#{repo}/#{search_file_path}\" for \"#{key_to_search}\"\n")
-              content = Base64.decode64(client.contents(repo, path: search_file_path).content)
-              ui.error("Keyword not found") and next unless content.include? key_to_search
+              if replacement_term.nil?
+                find_and_print_matching_lines(repo)
+              else
+                check_and_delete_remote_branch(repo)
+                find_and_replace_keyword(repo)
+                ui.say("No changes were made to #{repo}, check if keyword exists.") and next if !are_changes_made?(repo)
 
-              content.each_line do |line|
-                ui.success(line) if line.include?(key_to_search)
+                ui.info(add_commmit_and_push_changes(repo))
+                delete_local_feature_branch(repo)
+                pull_request = client.create_pull_request(repo, "main", branch_name, pr_title)
+                ui.success("Successfully replaced \"#{key_to_search}\" with \"#{replacement_term}\" in #{repo}")
+                ui.success("PR Link:- #{pull_request.html_url}")
               end
             rescue StandardError => e
               ExceptionHandler.new(e).process
             end
           end
+          `rm -rf /tmp/neetob`
         end
+
+        private
+
+          def search_for_keyword(repo)
+            `#{cd_to_repo_in_tmp_dir(repo)} && \
+              find . -type f -iregex "#{search_file_path}" | xargs grep -E "#{key_to_search}"`
+          end
+
+          def find_and_print_matching_lines(repo)
+            files_with_matching_lines = find_matching_files(repo)
+            files_with_matching_lines.empty? ? ui.error("Keyword not found")
+              : print_matching_lines(files_with_matching_lines)
+          end
+
+          def find_matching_files(repo)
+            result = search_for_keyword(repo)
+            result.each_line.reduce({}) do |lines_by_file, line|
+              filename, content = line.split(":", 2)
+              lines_by_file[filename] ||= []
+              lines_by_file[filename] << content.strip
+              lines_by_file
+            end
+          end
+
+          def print_matching_lines(files_with_matching_lines)
+            files_with_matching_lines.each do |file, list_of_lines|
+              ui.info("#{file}")
+              list_of_lines.each { |line| ui.success(" ↳#{line}") }
+            end
+          end
+
+          def are_changes_made?(repo)
+            changes_made = `#{cd_to_repo_in_tmp_dir(repo)} && git checkout #{branch_name} && git status`
+            !changes_made.include?("nothing to commit")
+          end
+
+          def find_and_replace_keyword(repo)
+            `#{cd_to_repo_in_tmp_dir(repo)} && \
+             find . -type f -regex #{search_file_path} -print0 | \
+             xargs -0 sed -i '' 's/#{key_to_search}/#{replacement_term}/g'`
+          end
+
+          def build_pr_title
+            "Replaced \"#{key_to_search}\" with \"#{replacement_term}\""
+          end
+
+          def build_branch_name
+            branch_name = "search-#{key_to_search}-and-replace-with-#{replacement_term}"
+            branch_name.gsub(/\W/, "_")
+          end
       end
     end
   end

data/lib/neetob/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Neetob
-  VERSION = "0.4.1"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neetob
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Udai Gupta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-05 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor