neetob 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f81625c823e05e9fcddcb86381a5730e3cc2c03acf3f137803a0cbb74d1ee220
-  data.tar.gz: 9a127257a9793d42dc5aa8e3bc7d59356236152f606e262d12ed87a2a937b7ed
+  metadata.gz: 7fa4fc2f085419e84e0bbacf6cec1e365a60e276c26583dfc7fbebe969d49d8c
+  data.tar.gz: c45d3baa3ff401dec0fad7335f136242023ff031f377591e03ce9773545b7fb5
 SHA512:
-  metadata.gz: fab4a057fc1341c2bd0827396e224b632dd7aea72c6627a0b06679efb8e4e2bac704d6f22542ea1afc1eb2bfdb678efc4749a135e77f9df0f36b7cfa25feabe8
-  data.tar.gz: 1cc41989ec73d0cd004b953dc21598e66ec01ae3e39c18a9ed501b172b174d317bc51492a507b0f11e294b68ae86867cb60244cf1d3fd76511af0c794cb8797b
+  metadata.gz: 01c2ddc361ec88eb2aaa4c84ed4485db66950a87dc572e7a1d705b35a95b92ea6311f736100add1c7938b050d68e37c0db5286c819ff9ef6537e7f81f27bc16d
+  data.tar.gz: 503235621a7d75727728500fcd51c238332ff39c05323b3a3d8e160b4c13fd792d77516f1ff9de215154a3ea1446b92af5ed9acf6a1ecc4784f1b8267524416c

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## [Unreleased]
 
+### [0.2.4](https://www.github.com/bigbinary/neetob/compare/v0.2.3...v0.2.4) (2023-03-14)
+
+
+### Bug Fixes
+
+* Fixed commands to execute only for instances mentioned in the single source of truth file ([#206](https://www.github.com/bigbinary/neetob/issues/206)) ([e79a341](https://www.github.com/bigbinary/neetob/commit/e79a3414ad4ed4790333cff42b5376cf1660c47d))
+* Fixed label delete command to skip deletion of labels that aren't found in the repo ([#195](https://www.github.com/bigbinary/neetob/issues/195)) ([d48626b](https://www.github.com/bigbinary/neetob/commit/d48626b1997a60c58e0fb023c3fb2e491e67a4da))
+* Replaced `--all-neeto-repos` flag with the format `--apps "all"` ([#212](https://www.github.com/bigbinary/neetob/issues/212)) ([8c656cd](https://www.github.com/bigbinary/neetob/commit/8c656cd11ba1721a8b68e6e40d3ec439e93977ef))
+
+### [0.2.3](https://www.github.com/bigbinary/neetob/compare/v0.2.2...v0.2.3) (2023-03-10)
+
+
+### Bug Fixes
+
+* Fixed github commands to accept "--repos" arguement instead of "--apps" ([#208](https://www.github.com/bigbinary/neetob/issues/208)) ([a1b419e](https://www.github.com/bigbinary/neetob/commit/a1b419ed4e7cb902962dacfbdd7a7112f84ade4e))
+
 ### [0.2.2](https://www.github.com/bigbinary/neetob/compare/v0.2.1...v0.2.2) (2023-03-06)
 
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    neetob (0.2.2)
+    neetob (0.2.4)
       dotenv (~> 2.8.1)
       launchy (~> 2.5.0)
       octokit (~> 4.0)

data/README.md

@@ -59,6 +59,7 @@ Options:
 
 | Option       | Meaning                           |
 | ------------ | --------------------------------- |
+| --repos      | Target repo names                 |
 | --apps       | Target app names                  |
 | --sandbox    | Sandbox mode                      |
 | --no-sandbox | Non-Sandbox mode                  |
@@ -157,11 +158,11 @@ neetob github help
 
 ```sh
 # Lists and counts all the open issues that are currently unassigned
-neetob github issues list --count --state open --assignee none --apps "neeto-*-staging"
+neetob github issues list --count --state open --assignee none --repos "neeto-*-staging"
 
 # Lists, counts and filters all unassigned open issues that are labeled as "bug"
 neetob github issues list --count --label bug --state open --assignee none \
---apps "neeto-*-staging"
+--repos "neeto-*-staging"
 ```
 
 ### Labels
@@ -170,10 +171,10 @@ The `labels` command provides an interface for interacting with Github labels.
 
 ```sh
 # Lists the details of all the labels in the Github repo
-neetob github labels list --apps "neeto-*-staging"
+neetob github labels list --repos "neeto-*-staging"
 
 # Provides the details for a specific label in the Github repo
-neetob github labels show --name priority --apps "neeto-*-staging"
+neetob github labels show --name priority --repos "neeto-*-staging"
 
 # Changes the name of the label
 neetob github labels update --old-name "High Priority" --new-name \
@@ -183,7 +184,7 @@ neetob github labels update --old-name "High Priority" --new-name \
 neetob github labels upsert --all-neeto-repos
 
 # Accepts a different JSON file using `path` option
-neetob github labels upsert --path ~/Desktop/labels.json --apps "neeto-*-staging"
+neetob github labels upsert --path ~/Desktop/labels.json --repos "neeto-*-staging"
 
 # Upsert a single label using `name`, `color`, and `description` options
 # No `#` is required while adding `color`
@@ -192,10 +193,10 @@ neetob github labels upsert --name UI --color 8250df --description \
 
 # Deletes the given labels from the Github repos
 neetob github labels delete --labels "High Priority" "Priority 1" "bug" \
---apps "neeto-*-staging"
+--repos "neeto-*-staging"
 
 # Deletes all the labels from the Github repos
-neetob github labels delete_all --apps "neeto-*-staging"
+neetob github labels delete_all --repos "neeto-*-staging"
 ```
 
 Check out the default labels [file](data/github-labels.json) for the required JSON file structure.
@@ -216,7 +217,7 @@ Don't use `#` before the color code.
 Searches for keywords across multiple neeto projects within specified files by utilizing the `search` command.
 
 ```sh
-neetob github search --keyword neeto --path README.md --apps "neeto-*-staging"
+neetob github search --keyword neeto --path README.md --repos "neeto-*-staging"
 ```
 
 ### Protect branch
@@ -224,7 +225,7 @@ neetob github search --keyword neeto --path README.md --apps "neeto-*-staging"
 Updates branch protection rules in neeto repos by using the `protect_branch` command.
 
 ```sh
-neetob github protect_branch --branch main --apps "neeto-*-staging"
+neetob github protect_branch --branch main --repos "neeto-*-staging"
 ```
 
 By default, file "data/branch-protection-rules.json" will be used for updating the branch protection rules.
@@ -244,7 +245,7 @@ To update the above-mentioned branch protection rules for the `main` branch of a
 
 ```sh
 neetob github protect_branch --branch main --path ~/Desktop/branch-protection-rules.json \
---apps "neeto-*-staging"
+--repos "neeto-*-staging"
 ```
 
 We can also use the `--all-neeto-repos` option with the above mentioned command so that the

data/lib/neetob/cli/base.rb

@@ -19,12 +19,13 @@ module Neetob
 
     private
 
-      def find_all_matching_apps(apps, platform_name, sandbox_mode, quiet = false, all_neeto_repos = false)
+      def find_all_matching_apps_or_repos(apps, platform_name, sandbox_mode, quiet = false)
+        all_neeto_repos = apps == ["all"]
         inform_about_current_working_mode(sandbox_mode, quiet)
         all_available_apps = sandbox_mode ?
           testing_apps(platform_name) :
           build_app_list_from_neeto_compliance(platform_name, all_neeto_repos)
-        matching_apps = match_apps(apps || ["*"], all_available_apps)
+        matching_apps = all_neeto_repos ? all_available_apps : match_apps(apps || ["*"], all_available_apps)
         if matching_apps.length == 0
           error_msg = sandbox_mode ?
           "Only \"neeto-dummy\" app is available for sandbox mode. Remove the \"--sandbox\" flag to run the given command for all the neeto applications." :
@@ -49,19 +50,20 @@ module Neetob
       end
 
       def build_app_list_from_neeto_compliance(platform_name, all_neeto_repos)
-        apps = all_neeto_repos ? fetch_all_neeto_repos : NeetoCompliance::NeetoRepos.products.keys
-        platform_name == :heroku ? add_env_suffix(apps) : prefix_org_name(apps)
+        neeto_products = NeetoCompliance::NeetoRepos.products
+        apps = all_neeto_repos ? fetch_all_neeto_repos : neeto_products.keys
+        platform_name == :heroku ? add_env_suffix(apps, neeto_products) : prefix_org_name(apps)
       end
 
-      def add_env_suffix(apps)
+      def add_env_suffix(apps, neeto_products)
         [
-          suffix_slug(apps, :staging),
-          suffix_slug(apps, :production)
-        ].flatten.sort
+          suffix_slug(apps, :staging, neeto_products),
+          suffix_slug(apps, :production, neeto_products)
+        ].flatten.compact.sort
       end
 
-      def suffix_slug(apps, suffix)
-        apps.map { |app| "#{app}-#{suffix}" }
+      def suffix_slug(apps, suffix, neeto_products)
+        apps.map { |app| neeto_products.dig(app, suffix.to_s) ? "#{app}-#{suffix}" : nil }
       end
 
       def prefix_org_name(apps)

data/lib/neetob/cli/fetchorupdate_repos/execute.rb

@@ -6,17 +6,16 @@ module Neetob
   class CLI
     module FetchorupdateRepos
       class Execute < Base
-        attr_accessor :sandbox, :apps, :all_neeto_repos
+        attr_accessor :sandbox, :apps
 
-        def initialize(sandbox = false, all_neeto_repos = false, apps = ["*"])
+        def initialize(sandbox = false, apps = ["*"])
           super()
           @sandbox = sandbox
           @apps = apps
-          @all_neeto_repos = all_neeto_repos
         end
 
         def run
-          neeto_apps = find_all_matching_apps(apps, :github, sandbox, false, all_neeto_repos)
+          neeto_apps = find_all_matching_apps_or_repos(apps, :github, sandbox)
           neeto_apps.each do |app|
             app_name = app.split("/").last
             ui.info("\nWorking on #{app_name}\n")

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

@@ -23,13 +23,6 @@ module Neetob
           @client = Octokit::Client.new(access_token: auth_client.access_token)
         end
 
-        def check_for_apps_and_all_neeto_repos_option(apps, all_neeto_repos)
-          if (apps.nil? && !all_neeto_repos) || (!apps.nil? && all_neeto_repos)
-            ui.error("Please provide either \"apps\" or \"all-neeto-repos\" option.")
-            exit
-          end
-        end
-
         private
 
           def read_and_parse_auth_params_from_env

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

@@ -25,13 +25,13 @@ module Neetob
         desc "gems", "Interact with the neeto gems"
         subcommand "gems", Gems::Commands
 
-        desc "search", "Find the lines matching the given keyword in the specified file across all the neeto apps"
-        option :apps, type: :array, aliases: "-a", required: true, desc: "Github app names. Can be matched using the '*' wildcard. Example: \"neeto*\" \"neeto-cal-web\""
+        desc "search", "Find the lines matching the given keyword in the specified file across all the neeto repos"
+        option :repos, type: :array, aliases: "-r", required: true, desc: "Github repo names. Can be matched using the '*' wildcard. Example: \"neeto*\" \"neeto-cal-web\""
         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
         def search
-          Search.new(options[:apps], options[:keyword], options[:path], options[:sandbox]).run
+          Search.new(options[:repos], options[:keyword], options[:path], options[:sandbox]).run
         end
 
         desc "login", "Update the Github access token by authenticating via browser"
@@ -44,13 +44,13 @@ module Neetob
           desc: "Name of the branch whose protections rules needs to be updated", required: true
         option :path, type: :string, aliases: "-p",
           desc: "The JSON file path which specify all the required rules for branch protection"
-        option :apps, type: :array, aliases: "-a", desc: "Github app names. Can be matched using the '*' wildcard. Example: \"neeto*\" \"neeto-cal-web\""
-        option :all_neeto_repos, type: :boolean, aliases: "--all",
-          desc: "Use this flag for working with all neeto repos", default: false
+        option :repos, type: :array, aliases: "-r",
+          desc:
+            "Github repo names. Can be matched using the '*' wildcard. Example: \"neeto*\" \"neeto-cal-web\", also providing \"all\" as value matches all neeto repos.",
+          required: true
         def protect_branch
           ProtectBranch.new(
-            options[:branch], options[:apps], options[:path], options[:sandbox],
-            options[:all_neeto_repos]).run
+            options[:branch], options[:repos], options[:path], options[:sandbox]).run
         end
       end
     end

data/lib/neetob/cli/github/gems/release.rb

@@ -23,7 +23,7 @@ module Neetob
             matching_gems.each do |gem|
               ui.info("\nWorking on #{gem}\n")
               begin
-                clone_app_in_tmp_dir("bigbinary/#{gem}")
+                clone_repo_in_tmp_dir("bigbinary/#{gem}")
                 build_gem(gem)
                 release_gem(gem)
                 if $?.success?
@@ -39,11 +39,11 @@ module Neetob
           private
 
             def build_gem(gem)
-              ui.info(`#{cd_to_app_in_tmp_dir(gem)} && gem build`)
+              ui.info(`#{cd_to_repo_in_tmp_dir(gem)} && gem build`)
             end
 
             def release_gem(gem)
-              ui.info(`#{cd_to_app_in_tmp_dir(gem)} && fury push #{gem}-*.gem --as unnitallman`)
+              ui.info(`#{cd_to_repo_in_tmp_dir(gem)} && fury push #{gem}-*.gem --as unnitallman`)
             end
         end
       end

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

@@ -11,10 +11,10 @@ module Neetob
     module Github
       module Issues
         class Commands < SubCommandBase
-          class_option :apps,
+          class_option :repos,
             {
-              type: :array, aliases: "-a", required: true,
-              desc: "Github app names. Can be matched using the '*' wildcard. Example: \"neeto*\" \"neeto-cal-web\""
+              type: :array, aliases: "-r", required: true,
+              desc: "Github repo names. Can be matched using the '*' wildcard. Example: \"neeto*\" \"neeto-cal-web\", also providing \"all\" as value matches all neeto repos."
             }
 
           desc "list", "List the issues in the Github repos"
@@ -25,7 +25,7 @@ module Neetob
           option :search, type: :string, desc: "Can provide custom query to filter or sort issues. Example: \"created:2022-11-07..2022-11-08 sort:comments-asc\""
           def list
             List.new(
-              options[:apps], options[:assignee], options[:state], options[:search], options[:count],
+              options[:repos], options[:assignee], options[:state], options[:search], options[:count],
               options[:label], options[:sandbox]).run
           end
 
@@ -36,7 +36,7 @@ module Neetob
           option :labels, type: :string, desc: "List of comma separated labels you want to add in this issue. Example: \"--labels bug,ui\""
           def create
             Create.new(
-              options[:apps],
+              options[:repos],
               options[:title],
               options[:description],
               options[:assignee],

data/lib/neetob/cli/github/issues/create.rb

@@ -9,12 +9,12 @@ module Neetob
     module Github
       module Issues
         class Create < Base
-          attr_accessor :apps, :issue_title, :issue_description, :issue_assignee, :issue_labels, :sandbox
+          attr_accessor :repos, :issue_title, :issue_description, :issue_assignee, :issue_labels, :sandbox
 
-          def initialize(apps, issue_title, issue_description = "", issue_assignee = "", issue_labels = "",
+          def initialize(repos, issue_title, issue_description = "", issue_assignee = "", issue_labels = "",
 sandbox = false)
             super()
-            @apps = apps
+            @repos = repos
             @issue_title = issue_title
             @issue_description = issue_description
             @issue_assignee = issue_assignee
@@ -23,12 +23,12 @@ sandbox = false)
           end
 
           def run
-            matching_apps = find_all_matching_apps(apps, :github, sandbox)
-            matching_apps.each do |app|
-              ui.info("\n  Creating issue in \"#{app}\"  \n")
+            matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox)
+            matching_repos.each do |repo|
+              ui.info("\n  Creating issue in \"#{repo}\"  \n")
               begin
                 issue_options = { assignee: issue_assignee, labels: issue_labels }
-                issue = client.create_issue(app, issue_title, issue_description, issue_options)
+                issue = client.create_issue(repo, issue_title, issue_description, issue_options)
                 ui.success("Created the issue successfully \nLink: #{issue[:html_url]}")
               rescue StandardError => e
                 ExceptionHandler.new(e).process

data/lib/neetob/cli/github/issues/list.rb

@@ -12,14 +12,14 @@ module Neetob
         class List < Base
           include ActionView::Helpers::DateHelper
 
-          attr_accessor :apps, :issue_state, :issue_assignee, :issue_search_query, :show_issues_count, :issue_label,
+          attr_accessor :repos, :issue_state, :issue_assignee, :issue_search_query, :show_issues_count, :issue_label,
             :sandbox
 
-          def initialize(apps, issue_assignee = "", issue_state = "open",
+          def initialize(repos, issue_assignee = "", issue_state = "open",
                          issue_search_query = "", show_issues_count = false, issue_label = "",
                          sandbox = false)
             super()
-            @apps = apps
+            @repos = repos
             @issue_state = issue_state
             @issue_assignee = issue_assignee
             @show_issues_count = show_issues_count
@@ -29,11 +29,11 @@ module Neetob
           end
 
           def run
-            matching_apps = find_all_matching_apps(apps, :github, sandbox)
-            matching_apps.each do |app|
-              ui.info("\n  Issues of #{app}  \n")
+            matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox)
+            matching_repos.each do |repo|
+              ui.info("\n  Issues of #{repo}  \n")
               begin
-                issues = client.search_issues(uri_with_query_options(app))
+                issues = client.search_issues(uri_with_query_options(repo))
                 ui.info("There are #{issues[:total_count]} issues with matching query") if show_issues_count
                 table_rows = create_table(issues[:items])
                 table = Terminal::Table.new headings: table_columns, rows: table_rows
@@ -64,10 +64,10 @@ module Neetob
               end
             end
 
-            def uri_with_query_options(app)
-              uri = "repo:#{app} is:issue state:#{issue_state}"
+            def uri_with_query_options(repo)
+              uri = "repo:#{repo} is:issue state:#{issue_state}"
               unless issue_label.nil?
-                check_valid_labels(app)
+                check_valid_labels(repo)
                 uri.concat(" label:#{issue_label}")
               end
               uri.concat(issue_assignee == "none" ? " no:assignee" : " assignee:#{issue_assignee}") if issue_assignee
@@ -78,14 +78,14 @@ module Neetob
               labels.map { |label| label[:name] }.join(", ")
             end
 
-            def check_valid_labels(app)
-              issue_label.split(",").each { |label| valid_label?(app, label) }
+            def check_valid_labels(repo)
+              issue_label.split(",").each { |label| valid_label?(repo, label) }
             end
 
-            def valid_label?(app, label)
-              client.label(app, label)
+            def valid_label?(repo, label)
+              client.label(repo, label)
             rescue Octokit::NotFound => e
-              ui.error("There is no \"#{label}\" label in the \"#{app}\" repo.")
+              ui.error("There is no \"#{label}\" label in the \"#{repo}\" repo.")
             end
         end
       end

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

@@ -15,22 +15,19 @@ module Neetob
     module Github
       module Labels
         class Commands < SubCommandBase
-          class_option :apps,
-            type: :array, aliases: "-a",
-            desc: "Github app names. Can be matched using the '*' wildcard. Example: \"neeto*\" \"neeto-cal-web\""
-          class_option :all_neeto_repos,
-            type: :boolean, aliases: "--all", default: false,
-            desc: "Use this flag for working with all neeto repos"
+          class_option :repos,
+            type: :array, aliases: "-r", required: true,
+            desc: "Github repo names. Can be matched using the '*' wildcard. Example: \"neeto*\" \"neeto-cal-web\", also providing \"all\" as value matches all neeto repos."
 
           desc "list", "List all the labels in the Github repos"
           def list
-            List.new(options[:apps], options[:sandbox], options[:all_neeto_repos]).run
+            List.new(options[:repos], options[:sandbox]).run
           end
 
           desc "show", "Show details about the given label in the Github repos"
           option :name, type: :string, aliases: "-n", required: true, desc: "Name of the label"
           def show
-            Show.new(options[:apps], options[:name], options[:sandbox], options[:all_neeto_repos]).run
+            Show.new(options[:repos], options[:name], options[:sandbox]).run
           end
 
           desc "upsert", "Create and update labels in the Github repos"
@@ -40,19 +37,19 @@ module Neetob
           option :description, type: :string, desc: "Description of the label you want to upsert"
           def upsert
             Upsert.new(
-              options[:apps], options[:path], options[:sandbox], options[:all_neeto_repos], options[:name],
+              options[:repos], options[:path], options[:sandbox], options[:name],
               options[:color], options[:description]).run
           end
 
           desc "delete_all", "Delete all the labels from the Github repos"
           def delete_all
-            DeleteAll.new(options[:apps], options[:sandbox], options[:all_neeto_repos]).run
+            DeleteAll.new(options[:repos], options[:sandbox]).run
           end
 
           desc "delete", "Delete some labels from the Github repos"
           option :labels, type: :array, required: true, desc: "Labels you want to delete from the repos."
           def delete
-            Delete.new(options[:apps], options[:labels], options[:sandbox], options[:all_neeto_repos]).run
+            Delete.new(options[:repos], options[:labels], options[:sandbox]).run
           end
 
           desc "update", "Update a label name in Github repos"
@@ -60,8 +57,7 @@ module Neetob
           option :new_name, type: :string, required: true, desc: "New name for the updated label"
           def update
             Update.new(
-              options[:apps], options[:old_name], options[:new_name], options[:sandbox],
-              options[:all_neeto_repos]).run
+              options[:repos], options[:old_name], options[:new_name], options[:sandbox]).run
           end
         end
       end

data/lib/neetob/cli/github/labels/delete.rb

@@ -9,34 +9,39 @@ module Neetob
     module Github
       module Labels
         class Delete < Base
-          attr_accessor :apps, :sandbox, :labels, :all_neeto_repos
+          attr_accessor :repos, :sandbox, :labels
 
-          def initialize(apps, labels, sandbox = false, all_neeto_repos = false)
+          def initialize(repos, labels, sandbox = false)
             super()
             @labels = labels
-            @apps = apps
+            @repos = repos
             @sandbox = sandbox
-            @all_neeto_repos = all_neeto_repos
           end
 
           def run
-            check_for_apps_and_all_neeto_repos_option(apps, all_neeto_repos)
-            matching_apps = find_all_matching_apps(apps, :github, sandbox, false, all_neeto_repos)
-            matching_apps.each do |app|
-              ui.info("\n Deleting labels from #{app} repo \n")
+            matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox)
+            matching_repos.each do |repo|
+              ui.info("\nDeleting labels from #{repo} repo \n")
               labels.each do |label|
-                delete_label(app, label)
+                begin
+                  check_if_label_exist!(repo, label)
+                  delete_label(repo, label)
+                rescue Octokit::NotFound
+                  ui.say(" ↳The repo doesn't have the label \"#{label}\"")
+                end
               end
             end
           end
 
           private
 
-            def delete_label(app, label)
-              if client.delete_label!(app, label)
-                ui.success("The \"#{label}\" label deleted successfully")
-              else
-                ui.error("The \"#{label}\" label can't be deleted. Please check and try again")
+            def check_if_label_exist!(repo, label)
+              client.label(repo, label)
+            end
+
+            def delete_label(repo, label)
+              if client.delete_label!(repo, label)
+                ui.success(" ↳The \"#{label}\" label deleted successfully")
               end
             end
         end

data/lib/neetob/cli/github/labels/delete_all.rb

@@ -9,24 +9,22 @@ module Neetob
     module Github
       module Labels
         class DeleteAll < Base
-          attr_accessor :apps, :sandbox, :all_neeto_repos
+          attr_accessor :repos, :sandbox
 
-          def initialize(apps, sandbox = false, all_neeto_repos = false)
+          def initialize(repos, sandbox = false)
             super()
-            @apps = apps
+            @repos = repos
             @sandbox = sandbox
-            @all_neeto_repos = all_neeto_repos
           end
 
           def run
-            check_for_apps_and_all_neeto_repos_option(apps, all_neeto_repos)
-            matching_apps = find_all_matching_apps(apps, :github, sandbox, false, all_neeto_repos)
-            matching_apps.each do |app|
-              ui.info("\n Working on #{app} repo \n")
+            matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox)
+            matching_repos.each do |repo|
+              ui.info("\n Working on #{repo} repo \n")
               begin
-                labels = client.labels(app)
+                labels = client.labels(repo)
                 labels.each do |label|
-                  delete_label(app, label)
+                  delete_label(repo, label)
                 end
               rescue StandardError => e
                 ExceptionHandler.new(e).process
@@ -36,8 +34,8 @@ module Neetob
 
           private
 
-            def delete_label(app, label_details)
-              if client.delete_label!(app, label_details[:name])
+            def delete_label(repo, label_details)
+              if client.delete_label!(repo, label_details[:name])
                 ui.success("The \"#{label_details[:name]}\" label deleted successfully")
               else
                 ui.error("The \"#{label_details[:name]}\" label can't be deleted. Please try again")

data/lib/neetob/cli/github/labels/list.rb

@@ -9,22 +9,20 @@ module Neetob
     module Github
       module Labels
         class List < Base
-          attr_accessor :apps, :sandbox, :all_neeto_repos
+          attr_accessor :repos, :sandbox
 
-          def initialize(apps, sandbox = false, all_neeto_repos = false)
+          def initialize(repos, sandbox = false)
             super()
-            @apps = apps
+            @repos = repos
             @sandbox = sandbox
-            @all_neeto_repos = all_neeto_repos
           end
 
           def run
-            check_for_apps_and_all_neeto_repos_option(apps, all_neeto_repos)
-            matching_apps = find_all_matching_apps(apps, :github, sandbox, false, all_neeto_repos)
-            matching_apps.each do |app|
-              ui.info("\n  Labels of #{app}  \n")
+            matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox)
+            matching_repos.each do |repo|
+              ui.info("\n  Labels of #{repo}  \n")
               begin
-                labels = client.labels(app)
+                labels = client.labels(repo)
                 ui.success(labels)
               rescue StandardError => e
                 ExceptionHandler.new(e).process

data/lib/neetob/cli/github/labels/show.rb

@@ -9,23 +9,21 @@ module Neetob
     module Github
       module Labels
         class Show < Base
-          attr_accessor :apps, :label_name, :sandbox, :all_neeto_repos
+          attr_accessor :repos, :label_name, :sandbox
 
-          def initialize(apps, label_name, sandbox = false, all_neeto_repos = false)
+          def initialize(repos, label_name, sandbox = false)
             super()
-            @apps = apps
+            @repos = repos
             @label_name = label_name
             @sandbox = sandbox
-            @all_neeto_repos = all_neeto_repos
           end
 
           def run
-            check_for_apps_and_all_neeto_repos_option(apps, all_neeto_repos)
-            matching_apps = find_all_matching_apps(apps, :github, sandbox, false, all_neeto_repos)
-            matching_apps.each do |app|
-              ui.info("\n \"#{label_name}\" label details from #{app}  \n")
+            matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox)
+            matching_repos.each do |repo|
+              ui.info("\n \"#{label_name}\" label details from #{repo}  \n")
               begin
-                label_details = client.label(app, label_name)
+                label_details = client.label(repo, label_name)
                 ui.success(label_details.inspect)
               rescue StandardError => e
                 ExceptionHandler.new(e).process

data/lib/neetob/cli/github/labels/update.rb

@@ -9,26 +9,24 @@ module Neetob
     module Github
       module Labels
         class Update < Base
-          attr_accessor :apps, :sandbox, :old_name, :new_name, :all_neeto_repos
+          attr_accessor :repos, :sandbox, :old_name, :new_name
 
-          def initialize(apps, old_name, new_name, sandbox = false, all_neeto_repos = false)
+          def initialize(repos, old_name, new_name, sandbox = false)
             super()
-            @apps = apps
+            @repos = repos
             @sandbox = sandbox
             @old_name = old_name
             @new_name = new_name
-            @all_neeto_repos = all_neeto_repos
           end
 
           def run
-            check_for_apps_and_all_neeto_repos_option(apps, all_neeto_repos)
-            matching_apps = find_all_matching_apps(apps, :github, sandbox, false, all_neeto_repos)
-            matching_apps.each do |app|
-              ui.info("\nUpdating label for #{app} repo \n")
+            matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox)
+            matching_repos.each do |repo|
+              ui.info("\nUpdating label for #{repo} repo \n")
               begin
-                update_label!(app, old_name, new_name)
+                update_label!(repo, old_name, new_name)
               rescue Octokit::NotFound
-                ui.say("Ignoring update for #{app} repo as it doesn't have the \"#{old_name}\" label.")
+                ui.say("Ignoring update for #{repo} repo as it doesn't have the \"#{old_name}\" label.")
               rescue StandardError => e
                 ExceptionHandler.new(e).process
               end
@@ -37,12 +35,12 @@ module Neetob
 
           private
 
-            def update_label!(app, old_name, new_name)
-              client.label(app, new_name)
+            def update_label!(repo, old_name, new_name)
+              client.label(repo, new_name)
               ui.error("Label with name \"#{new_name}\" already exists.")
               nil
             rescue Octokit::NotFound
-              client.update_label(app, old_name, { name: new_name })
+              client.update_label(repo, old_name, { name: new_name })
               ui.success("Label \"#{old_name}\" updated to \"#{new_name}\" successfully")
             rescue StandardError => e
               ExceptionHandler.new(e).process

data/lib/neetob/cli/github/labels/upsert.rb

@@ -11,30 +11,28 @@ module Neetob
         class Upsert < Base
           WHITE_COLOR_HEX_CODE = "ffffff"
 
-          attr_accessor :apps, :required_labels_json_file_path, :sandbox, :all_neeto_repos, :name, :color, :description
+          attr_accessor :repos, :required_labels_json_file_path, :sandbox, :name, :color, :description
 
-          def initialize(apps, required_labels_json_file_path = "", sandbox = false, all_neeto_repos = false,
+          def initialize(repos, required_labels_json_file_path = "", sandbox = false,
             name = "", color = "", description = "")
             super()
-            @apps = apps
+            @repos = repos
             @required_labels_json_file_path = required_labels_json_file_path
             @sandbox = sandbox
-            @all_neeto_repos = all_neeto_repos
             @name = name
             @color = color
             @description = description
           end
 
           def run
-            check_for_apps_and_all_neeto_repos_option(apps, all_neeto_repos)
-            matching_apps = find_all_matching_apps(apps, :github, sandbox, false, all_neeto_repos)
+            matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox)
             inform_about_default_labels_file
-            matching_apps.each do |app|
-              ui.info("\nWorking on #{app} repo\n")
+            matching_repos.each do |repo|
+              ui.info("\nWorking on #{repo} repo\n")
               begin
                 required_labels = get_required_labels
                 required_labels.each do |label|
-                  create_or_update_label(app, label)
+                  create_or_update_label(repo, label)
                   sleep(1)
                 end
               rescue StandardError => e
@@ -68,13 +66,13 @@ module Neetob
               ]
             end
 
-            def create_or_update_label(app, label_details)
+            def create_or_update_label(repo, label_details)
               begin
-                client.update_label(app, label_details["name"], label_details)
+                client.update_label(repo, label_details["name"], label_details)
                 ui.success("Label \"#{label_details["name"]}\" updated successfully")
               rescue Octokit::NotFound
                 client.add_label(
-                  app, label_details["name"], label_details["color"] || WHITE_COLOR_HEX_CODE,
+                  repo, label_details["name"], label_details["color"] || WHITE_COLOR_HEX_CODE,
                   label_details)
                 ui.success("Label \"#{label_details["name"]}\" created successfully")
               rescue StandardError => e

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

@@ -24,51 +24,51 @@ module Neetob
               `mkdir /tmp/neetob`
             end
 
-            def app_name_without_org_suffix(app)
-              app.split("/").last
+            def repo_name_without_org_suffix(repo)
+              repo.split("/").last
             end
 
-            def clone_app_in_tmp_dir(app)
-              `git clone --quiet git@github.com:#{app}.git /tmp/neetob/#{app_name_without_org_suffix(app)}`
+            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(app)
-              `#{cd_to_app_in_tmp_dir(app)} && git add . && \\
+            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`
             end
 
-            def delete_local_feature_branch(app)
-              `#{cd_to_app_in_tmp_dir(app)} && git checkout main && git branch -D #{branch_name}`
+            def delete_local_feature_branch(repo)
+              `#{cd_to_repo_in_tmp_dir(repo)} && git checkout main && git branch -D #{branch_name}`
             end
 
-            def checkout_to_new_branch(app)
-              `#{cd_to_app_in_tmp_dir(app)} && git checkout -b #{branch_name}`
+            def checkout_to_new_branch(repo)
+              `#{cd_to_repo_in_tmp_dir(repo)} && git checkout -b #{branch_name}`
             end
 
-            def checkout_to_feature_branch(app)
-              `#{cd_to_app_in_tmp_dir(app)} && git checkout #{branch_name}`
+            def checkout_to_feature_branch(repo)
+              `#{cd_to_repo_in_tmp_dir(repo)} && git checkout #{branch_name}`
             end
 
-            def delete_remote_feature_branch(app)
-              `#{cd_to_app_in_tmp_dir(app)} && git push origin --delete #{branch_name}`
+            def delete_remote_feature_branch(repo)
+              `#{cd_to_repo_in_tmp_dir(repo)} && git push origin --delete #{branch_name}`
             end
 
-            def check_and_delete_remote_branch(app)
-              checkout_to_feature_branch(app)
+            def check_and_delete_remote_branch(repo)
+              checkout_to_feature_branch(repo)
               if $?.success?
                 ui.info("Remote branch found with the name \"#{branch_name}\"")
-                delete_remote_feature_branch(app)
-                delete_local_feature_branch(app)
+                delete_remote_feature_branch(repo)
+                delete_local_feature_branch(repo)
               end
-              checkout_to_new_branch(app)
+              checkout_to_new_branch(repo)
             end
 
-            def cd_to_app_in_tmp_dir(app)
-              "cd /tmp/neetob/#{app_name_without_org_suffix(app)}"
+            def cd_to_repo_in_tmp_dir(repo)
+              "cd /tmp/neetob/#{repo_name_without_org_suffix(repo)}"
             end
 
-            def add_org_suffix(apps)
-              apps.map { |app| "bigbinary/#{app}" }
+            def add_org_suffix(repos)
+              repos.map { |repo| "bigbinary/#{repo}" }
             end
         end
       end

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

@@ -11,14 +11,14 @@ module Neetob
     module Github
       module MakePr
         class Commands < SubCommandBase
-          class_option :apps, type: :array, aliases: "-a", default: ["*"],
-            desc: "Github app names. Can be matched using the '*' wildcard. Example: \"neeto*\" \"neeto-cal-web\""
+          class_option :repos, type: :array, aliases: "-r", default: ["*"],
+            desc: "Github repo names. Can be matched using the '*' wildcard. Example: \"neeto*\" \"neeto-cal-web\""
           class_option :nanos, type: :boolean, aliases: "-n", default: false,
             desc: "Use this flag to make PRs for the neeto gems"
 
           desc "compliance-fix", "Create PRs for fixing neeto compliance in all products"
           def compliance_fix
-            ComplianceFix.new(options[:apps], options[:nanos], options[:sandbox]).run
+            ComplianceFix.new(options[:repos], options[:nanos], options[:sandbox]).run
           end
 
           desc "script", "Create PRs after running the given script for each product."
@@ -29,8 +29,8 @@ module Neetob
           option :description, type: :string, aliases: "-d", desc: "Description of the PR"
           def script
             Script.new(
-              options[:apps], options[:path], options[:title], options[:branch], options[:description], options[:nanos],
-              options[:sandbox]).run
+              options[:repos], options[:path], options[:title], options[:branch], options[:description],
+              options[:nanos], options[:sandbox]).run
           end
         end
       end

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

@@ -9,31 +9,31 @@ module Neetob
     module Github
       module MakePr
         class ComplianceFix < Base
-          attr_accessor :apps, :sandbox, :should_fix_nanos
+          attr_accessor :repos, :sandbox, :should_fix_nanos
 
-          def initialize(apps, should_fix_nanos = false, sandbox = false)
+          def initialize(repos, should_fix_nanos = false, sandbox = false)
             super()
-            @apps = apps
+            @repos = repos
             @sandbox = sandbox
             @should_fix_nanos = should_fix_nanos
           end
 
           def run
-            matching_apps = should_fix_nanos ?
+            matching_repos = should_fix_nanos ?
               add_org_suffix(find_all_matching_gems) :
-              find_all_matching_apps(apps, :github, sandbox)
+              find_all_matching_apps_or_repos(repos, :github, sandbox)
             delete_and_create_temp_neetob_dir
-            matching_apps.each do |app|
-              ui.info("\nWorking on #{app}\n")
+            matching_repos.each do |repo|
+              ui.info("\nWorking on #{repo}\n")
               begin
-                clone_app_in_tmp_dir(app)
-                check_and_delete_remote_branch(app)
-                bundle_install(app)
-                fix_neeto_audit(app)
-                ui.info(add_commmit_and_push_changes(app))
-                delete_local_feature_branch(app)
-                res = client.create_pull_request(app, "main", BRANCH_NAME, PR_TITLE)
-                ui.success("PR created in \"#{app}\" project successfully.")
+                clone_repo_in_tmp_dir(repo)
+                check_and_delete_remote_branch(repo)
+                bundle_install(repo)
+                fix_neeto_audit(repo)
+                ui.info(add_commmit_and_push_changes(repo))
+                delete_local_feature_branch(repo)
+                res = client.create_pull_request(repo, "main", BRANCH_NAME, PR_TITLE)
+                ui.success("PR created in \"#{repo}\" project successfully.")
               rescue StandardError => e
                 ExceptionHandler.new(e).process
               end
@@ -43,12 +43,12 @@ module Neetob
 
           private
 
-            def bundle_install(app)
-              `#{cd_to_app_in_tmp_dir(app)} && bundle install`
+            def bundle_install(repo)
+              `#{cd_to_repo_in_tmp_dir(repo)} && bundle install`
             end
 
-            def fix_neeto_audit(app)
-              `#{cd_to_app_in_tmp_dir(app)} && bundle exec neeto-audit -a`
+            def fix_neeto_audit(repo)
+              `#{cd_to_repo_in_tmp_dir(repo)} && bundle exec neeto-audit -a`
             end
         end
       end

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

@@ -9,12 +9,12 @@ module Neetob
     module Github
       module MakePr
         class Script < Base
-          attr_accessor :apps, :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
 
-          def initialize(apps, path_to_the_script_file, pr_title,
+          def initialize(repos, path_to_the_script_file, pr_title,
             branch_name, pr_description, should_fix_nanos, sandbox = false)
             super(pr_title, branch_name)
-            @apps = apps
+            @repos = repos
             @sandbox = sandbox
             @path_to_the_script_file = path_to_the_script_file
             @pr_description = pr_description
@@ -22,21 +22,21 @@ module Neetob
           end
 
           def run
-            matching_apps = should_fix_nanos ?
+            matching_repos = should_fix_nanos ?
               add_org_suffix(find_all_matching_gems) :
-              find_all_matching_apps(apps, :github, sandbox)
+              find_all_matching_apps_or_repos(repos, :github, sandbox)
             delete_and_create_temp_neetob_dir
-            matching_apps.each do |app|
-              ui.info("\n  Working on #{app}  \n")
+            matching_repos.each do |repo|
+              ui.info("\n  Working on #{repo}  \n")
               begin
-                clone_app_in_tmp_dir(app)
-                check_and_delete_remote_branch(app)
+                clone_repo_in_tmp_dir(repo)
+                check_and_delete_remote_branch(repo)
                 update_script_file_permissions
-                execute_script(app)
-                ui.info(add_commmit_and_push_changes(app))
-                delete_local_feature_branch(app)
-                res = client.create_pull_request(app, "main", branch_name, pr_title, pr_description)
-                ui.success("PR created in \"#{app}\" project successfully.")
+                execute_script(repo)
+                ui.info(add_commmit_and_push_changes(repo))
+                delete_local_feature_branch(repo)
+                res = client.create_pull_request(repo, "main", branch_name, pr_title, pr_description)
+                ui.success("PR created in \"#{repo}\" project successfully.")
               rescue StandardError => e
                 ExceptionHandler.new(e).process
               end
@@ -50,8 +50,8 @@ module Neetob
               `chmod +x #{path_to_the_script_file}`
             end
 
-            def execute_script(app)
-              `#{cd_to_app_in_tmp_dir(app)} && #{path_to_the_script_file}`
+            def execute_script(repo)
+              `#{cd_to_repo_in_tmp_dir(repo)} && #{path_to_the_script_file}`
             end
         end
       end

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

@@ -6,27 +6,25 @@ module Neetob
   class CLI
     module Github
       class ProtectBranch < Base
-        attr_accessor :branch_name, :required_rules_json_file_path, :apps, :sandbox, :all_neeto_repos
+        attr_accessor :branch_name, :required_rules_json_file_path, :repos, :sandbox
 
-        def initialize(branch_name, apps, required_rules_json_file_path = "", sandbox = false, all_neeto_repos = false)
+        def initialize(branch_name, repos, required_rules_json_file_path = "", sandbox = false)
           super()
           @branch_name = branch_name
           @required_rules_json_file_path = required_rules_json_file_path
-          @apps = apps
+          @repos = repos
           @sandbox = sandbox
-          @all_neeto_repos = all_neeto_repos
         end
 
         def run
-          check_for_apps_and_all_neeto_repos_option(apps, all_neeto_repos)
-          matching_apps = find_all_matching_apps(apps, :github, sandbox, false, all_neeto_repos)
+          matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox)
           inform_about_default_rules_file
-          matching_apps.each do |app|
-            ui.info("\n Working on \"#{app}\" repo")
+          matching_repos.each do |repo|
+            ui.info("\n Working on \"#{repo}\" repo")
             ui.info(" Updating \"#{branch_name}\" branch protection rules")
             rules = read_json_file(required_rules_json_file_path || default_rules_file_path)
             rules_with_symbol_keys = rules.transform_keys(&:to_sym)
-            client.protect_branch(app, branch_name, rules_with_symbol_keys)
+            client.protect_branch(repo, branch_name, rules_with_symbol_keys)
             ui.success("Branch protection rules updated successfully")
           end
         end

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

@@ -6,22 +6,22 @@ module Neetob
   class CLI
     module Github
       class Search < Base
-        attr_accessor :apps, :key_to_search, :search_file_path, :sandbox
+        attr_accessor :repos, :key_to_search, :search_file_path, :sandbox
 
-        def initialize(apps, key_to_search, search_file_path, sandbox = false)
+        def initialize(repos, key_to_search, search_file_path, sandbox = false)
           super()
-          @apps = apps
+          @repos = repos
           @key_to_search = key_to_search
           @search_file_path = search_file_path
           @sandbox = sandbox
         end
 
         def run
-          matching_apps = find_all_matching_apps(apps, :github, sandbox)
-          matching_apps.each do |app|
+          matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox)
+          matching_repos.each do |repo|
             begin
-              ui.info("\n Searching in \"#{app}/#{search_file_path}\" for \"#{key_to_search}\"\n")
-              content = Base64.decode64(client.contents(app, path: search_file_path).content)
+              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
 
               content.each_line do |line|

data/lib/neetob/cli/heroku/access/add.rb

@@ -17,7 +17,7 @@ module Neetob
           end
 
           def run
-            matching_apps = find_all_matching_apps(apps, :heroku, sandbox)
+            matching_apps = find_all_matching_apps_or_repos(apps, :heroku, sandbox)
             matching_apps.each do |app|
               `heroku access -a #{app}`
               unless $?.success?

data/lib/neetob/cli/heroku/access/list.rb

@@ -16,7 +16,7 @@ module Neetob
           end
 
           def run
-            matching_apps = find_all_matching_apps(apps, :heroku, sandbox)
+            matching_apps = find_all_matching_apps_or_repos(apps, :heroku, sandbox)
             matching_apps.each do |app|
               ui.info("\n  Users for \"#{app}\" app\n")
               users = `heroku access -a #{app}`

data/lib/neetob/cli/heroku/access/remove.rb

@@ -17,7 +17,7 @@ module Neetob
           end
 
           def run
-            matching_apps = find_all_matching_apps(apps, :heroku, sandbox)
+            matching_apps = find_all_matching_apps_or_repos(apps, :heroku, sandbox)
             matching_apps.each do |app|
               `heroku access -a #{app}`
               unless $?.success?

data/lib/neetob/cli/heroku/config_vars/audit.rb

@@ -20,7 +20,7 @@ module Neetob
           end
 
           def run
-            matching_apps = find_all_matching_apps(apps, :heroku, sandbox)
+            matching_apps = find_all_matching_apps_or_repos(apps, :heroku, sandbox)
             table_rows = []
             expected_config = read_json_file(expected_config_vars_json_file_path || default_config_vars_json_file_path)
             return unless expected_config

data/lib/neetob/cli/heroku/config_vars/list.rb

@@ -18,7 +18,7 @@ module Neetob
           end
 
           def run
-            matching_apps = find_all_matching_apps(apps, :heroku, sandbox)
+            matching_apps = find_all_matching_apps_or_repos(apps, :heroku, sandbox)
             matching_apps.each do |app|
               ui.info("\n  Config of #{app}\n")
               config = `heroku config -a #{app} --json`

data/lib/neetob/cli/heroku/config_vars/remove.rb

@@ -17,7 +17,7 @@ module Neetob
           end
 
           def run
-            matching_apps = find_all_matching_apps(apps, :heroku, sandbox)
+            matching_apps = find_all_matching_apps_or_repos(apps, :heroku, sandbox)
             matching_apps.each do |app|
               `heroku access -a #{app}`
 

data/lib/neetob/cli/heroku/config_vars/upsert.rb

@@ -25,7 +25,7 @@ required_config_vars_with_project_keys_json_file_path, sandbox = false)
             inform_about_current_working_mode(sandbox) if apps.nil?
             apps_to_be_updated = apps.nil? ?
             read_json_file(required_config_vars_with_project_keys_json_file_path) :
-            find_all_matching_apps(apps, :heroku, sandbox)
+            find_all_matching_apps_or_repos(apps, :heroku, sandbox)
             inform_about_default_config_vars_file
 
             apps_to_be_updated.each do |app|

data/lib/neetob/cli/heroku/execute.rb

@@ -17,7 +17,7 @@ module Neetob
         end
 
         def run
-          matching_apps = find_all_matching_apps(apps, :heroku, sandbox)
+          matching_apps = find_all_matching_apps_or_repos(apps, :heroku, sandbox)
           rails_runner_command = "rails runner '#{command_to_execute}'"
           heroku_command = should_run_in_rails_console ? rails_runner_command : command_to_execute
           matching_apps.each do |app|

data/lib/neetob/cli/local/ls.rb

@@ -16,7 +16,7 @@ module Neetob
         end
 
         def run
-          matching_apps = find_all_matching_apps(apps, :github, sandbox, true)
+          matching_apps = find_all_matching_apps_or_repos(apps, :github, sandbox, true)
           matching_apps.each do |app|
             app_name = app.split("/")[1]
             ui.info("\nListing files from #{app_name}/#{dir}\n")

data/lib/neetob/cli/users/audit.rb

@@ -27,7 +27,7 @@ module Neetob
         private
 
           def users_for_all_available_apps
-            find_all_matching_apps(["*"], :github, sandbox, true).map do |app|
+            find_all_matching_apps_or_repos(["*"], :github, sandbox, true).map do |app|
               clone_repo_and_get_users(app).split("\n").map { |user| "#{user} #{app}" }
             end
           end

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

@@ -14,15 +14,12 @@ module Neetob
         end
 
         desc "commits", "List the commits of a user across the neeto apps"
-        option :apps, type: :array, aliases: "-a", default: ["*"], desc: "Github app names. Can be matched using the '*' wildcard. Example: \"neeto*\" \"neeto-cal-web\""
+        option :apps, type: :array, aliases: "-a", default: ["*"], desc: "Github app names. Can be matched using the '*' wildcard. Example: \"neeto*\" \"neeto-cal-web\", also providing \"all\" as value matches all neeto repos."
         option :author, type: :string, required: true, desc: "Github username of the person whose commits you want to list"
         option :duration, type: :string, required: true, desc: "Duration for which you want to list the commits. Example: \"6.months\" \"10.days\""
-        option :all_neeto_repos, type: :boolean, aliases: "--all",
-          desc: "Use this flag for working with all neeto repos", default: false
         def commits
           Commits.new(
-            options[:author], options[:duration], options[:apps],
-            options[:sandbox], options[:all_neeto_repos]).run
+            options[:author], options[:duration], options[:apps], options[:sandbox]).run
         end
       end
     end

data/lib/neetob/cli/users/commits.rb

@@ -11,15 +11,14 @@ module Neetob
       class Commits < Github::Base
         include ActionView::Helpers::DateHelper
 
-        attr_accessor :sandbox, :apps, :author, :duration, :all_neeto_repos
+        attr_accessor :sandbox, :apps, :author, :duration
 
-        def initialize(author, duration, apps = ["*"], sandbox = false, all_neeto_repos = false)
+        def initialize(author, duration, apps = ["*"], sandbox = false)
           super()
           @sandbox = sandbox
           @apps = apps
           @author = author
           @duration = duration
-          @all_neeto_repos = all_neeto_repos
         end
 
         def run
@@ -32,7 +31,7 @@ module Neetob
         private
 
           def build_commit_rows
-            commits = find_all_matching_apps(apps, :github, sandbox, true, all_neeto_repos).map do |app|
+            commits = find_all_matching_apps_or_repos(apps, :github, sandbox, true).map do |app|
               commits = commits_within_range(app)
               if commits&.empty?
                 ui.info("No commits found in \"#{app}\" for the given author and duration.")

data/lib/neetob/cli.rb

@@ -33,10 +33,8 @@ module Neetob
     subcommand "local", Local::Commands
 
     desc "make_repos_uptodate", "Uptodate all neeto repos"
-    option :all_neeto_repos, type: :boolean, aliases: "--all", desc: "Use this flag for working with all neeto repos",
-      default: false
     def make_repos_uptodate
-      FetchorupdateRepos::Execute.new(options[:sandbox], options[:all_neeto_repos]).run
+      FetchorupdateRepos::Execute.new(options[:sandbox]).run
     end
   end
 end

data/lib/neetob/version.rb

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

metadata

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