neetob 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfc6be750f749257d3d3f6a10f00a348dc746c34d69bdb1c9ccb76d44c9d260a
-  data.tar.gz: f217db9a99316cec947b70fd74f27b0f5c6285fe127b94fbf627bd6c559b399d
+  metadata.gz: 1a0657b62734699934769a7e533576814055ea5221ef854e3addd5c76915635c
+  data.tar.gz: 230107c6ff888b7d8c666aea78243637bd7747ba2ab741e59527ad1528b9a7c3
 SHA512:
-  metadata.gz: 1edde424e4ff572f7f56ab45580c92bb5f574c411272f89e35f884e41d6aabdd8fa92d029783d8f7bb63551e29897020e58bef6bb1b427ae030d8f0782daf31c
-  data.tar.gz: 6aa6507b68340737f27a8f12910d12d5be7cf60de84796d169afd229fc712623440a0e9828bf42b45df9df8855ef0235062b050862f4050077b213a86c7d3c39
+  metadata.gz: ebdb1be1339eb0ac7ae8929f8da953038c00f07aece1d39095a6cac0b7af7a0d42da21a7140fe4b5c18ec96c18269f8d6667005f0396bc6f64031b364cbf153c
+  data.tar.gz: eae36243252b3cd4fa34cada869589339b799a6f59a1b0e0ca463094bc4ede4769daf535c0b7fb8fba0721cadd7090acc971fc9e1e3711dc4a0d3c71a9c2d378

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## [Unreleased]
 
+### [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)
+
+
+### Bug Fixes
+
+* Updated README.md ([#250](https://www.github.com/bigbinary/neetob/issues/250)) ([ff4f1ed](https://www.github.com/bigbinary/neetob/commit/ff4f1ed67c361805856ed54df02565d7873a45ba))
+
 ## [0.4.0](https://www.github.com/bigbinary/neetob/compare/v0.3.2...v0.4.0) (2023-04-05)
 
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    neetob (0.4.0)
+    neetob (0.4.2)
       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.

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`

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

@@ -23,7 +23,7 @@ module Neetob
             matching_repos = should_fix_nanos ?
               add_org_suffix(find_all_matching_gems) :
               find_all_matching_apps_or_repos(repos, :github, sandbox)
-            @failed_repos = matching_repos
+            @failed_repos = matching_repos.clone
             delete_and_create_temp_neetob_dir
             matching_repos.each do |repo|
               ui.info("\nWorking 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.0"
+  VERSION = "0.4.2"
 end

metadata

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