neetob 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab7271fb7040070268b0c67e53a7dfabae013e6294265f19fc5f38de85952075
-  data.tar.gz: cee7a555e9d0a17f7006aefb26932cbd70d44297f2f0c13b59dde2a787f9f4f4
+  metadata.gz: 7fa4fc2f085419e84e0bbacf6cec1e365a60e276c26583dfc7fbebe969d49d8c
+  data.tar.gz: c45d3baa3ff401dec0fad7335f136242023ff031f377591e03ce9773545b7fb5
 SHA512:
-  metadata.gz: 07b0a97173101a0f6a67f632641c7e67f2b42155177704fa3efeefa015ca9f269b372308cc0b1503e37931158ae178625e5e3c6f2361da5f234aa9f0c90bbd25
-  data.tar.gz: 3cdae7098530aeaf351b82e7b31944e606bf086235fd9964842f1ad19cc59276ed10fb1130c4647a86770c326b670121e37574e25397aecba8ec4345eb290bb8
+  metadata.gz: 01c2ddc361ec88eb2aaa4c84ed4485db66950a87dc572e7a1d705b35a95b92ea6311f736100add1c7938b050d68e37c0db5286c819ff9ef6537e7f81f27bc16d
+  data.tar.gz: 503235621a7d75727728500fcd51c238332ff39c05323b3a3d8e160b4c13fd792d77516f1ff9de215154a3ea1446b92af5ed9acf6a1ecc4784f1b8267524416c

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## [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)
 
 

data/Gemfile.lock

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

data/lib/neetob/cli/base.rb

@@ -19,12 +19,13 @@ module Neetob
 
     private
 
-      def find_all_matching_apps_or_repos(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_or_repos(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(repos, all_neeto_repos)
-          if (repos.nil? && !all_neeto_repos) || (!repos.nil? && all_neeto_repos)
-            ui.error("Please provide either \"repos\" or \"all-neeto-repos\" option.")
-            exit
-          end
-        end
-
         private
 
           def read_and_parse_auth_params_from_env

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

@@ -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 :repos, type: :array, aliases: "-r", desc: "Github repo 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[:repos], 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/issues/commands.rb

@@ -14,7 +14,7 @@ module Neetob
           class_option :repos,
             {
               type: :array, aliases: "-r", required: true,
-              desc: "Github repo names. Can be matched using the '*' wildcard. Example: \"neeto*\" \"neeto-cal-web\""
+              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"

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

@@ -16,21 +16,18 @@ module Neetob
       module Labels
         class Commands < SubCommandBase
           class_option :repos,
-            type: :array, aliases: "-r",
-            desc: "Github repo 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"
+            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[:repos], 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[:repos], 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[:repos], 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[:repos], 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[:repos], 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[:repos], 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 :repos, :sandbox, :labels, :all_neeto_repos
+          attr_accessor :repos, :sandbox, :labels
 
-          def initialize(repos, labels, sandbox = false, all_neeto_repos = false)
+          def initialize(repos, labels, sandbox = false)
             super()
             @labels = labels
             @repos = repos
             @sandbox = sandbox
-            @all_neeto_repos = all_neeto_repos
           end
 
           def run
-            check_for_apps_and_all_neeto_repos_option(repos, all_neeto_repos)
-            matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox, false, all_neeto_repos)
+            matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox)
             matching_repos.each do |repo|
-              ui.info("\n Deleting labels from #{repo} repo \n")
+              ui.info("\nDeleting labels from #{repo} repo \n")
               labels.each do |label|
-                delete_label(repo, 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 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")
-              else
-                ui.error("The \"#{label}\" label can't be deleted. Please check and try again")
+                ui.success(" ↳The \"#{label}\" label deleted successfully")
               end
             end
         end

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

@@ -9,18 +9,16 @@ module Neetob
     module Github
       module Labels
         class DeleteAll < Base
-          attr_accessor :repos, :sandbox, :all_neeto_repos
+          attr_accessor :repos, :sandbox
 
-          def initialize(repos, sandbox = false, all_neeto_repos = false)
+          def initialize(repos, sandbox = false)
             super()
             @repos = repos
             @sandbox = sandbox
-            @all_neeto_repos = all_neeto_repos
           end
 
           def run
-            check_for_apps_and_all_neeto_repos_option(repos, all_neeto_repos)
-            matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox, false, all_neeto_repos)
+            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

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

@@ -9,18 +9,16 @@ module Neetob
     module Github
       module Labels
         class List < Base
-          attr_accessor :repos, :sandbox, :all_neeto_repos
+          attr_accessor :repos, :sandbox
 
-          def initialize(repos, sandbox = false, all_neeto_repos = false)
+          def initialize(repos, sandbox = false)
             super()
             @repos = repos
             @sandbox = sandbox
-            @all_neeto_repos = all_neeto_repos
           end
 
           def run
-            check_for_apps_and_all_neeto_repos_option(repos, all_neeto_repos)
-            matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox, false, all_neeto_repos)
+            matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox)
             matching_repos.each do |repo|
               ui.info("\n  Labels of #{repo}  \n")
               begin

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

@@ -9,19 +9,17 @@ module Neetob
     module Github
       module Labels
         class Show < Base
-          attr_accessor :repos, :label_name, :sandbox, :all_neeto_repos
+          attr_accessor :repos, :label_name, :sandbox
 
-          def initialize(repos, label_name, sandbox = false, all_neeto_repos = false)
+          def initialize(repos, label_name, sandbox = false)
             super()
             @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(repos, all_neeto_repos)
-            matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox, false, all_neeto_repos)
+            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

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

@@ -9,20 +9,18 @@ module Neetob
     module Github
       module Labels
         class Update < Base
-          attr_accessor :repos, :sandbox, :old_name, :new_name, :all_neeto_repos
+          attr_accessor :repos, :sandbox, :old_name, :new_name
 
-          def initialize(repos, old_name, new_name, sandbox = false, all_neeto_repos = false)
+          def initialize(repos, old_name, new_name, sandbox = false)
             super()
             @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(repos, all_neeto_repos)
-            matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox, false, all_neeto_repos)
+            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

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

@@ -11,23 +11,21 @@ module Neetob
         class Upsert < Base
           WHITE_COLOR_HEX_CODE = "ffffff"
 
-          attr_accessor :repos, :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(repos, 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()
             @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(repos, all_neeto_repos)
-            matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox, false, all_neeto_repos)
+            matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox)
             inform_about_default_labels_file
             matching_repos.each do |repo|
               ui.info("\nWorking on #{repo} repo\n")

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

@@ -6,20 +6,18 @@ module Neetob
   class CLI
     module Github
       class ProtectBranch < Base
-        attr_accessor :branch_name, :required_rules_json_file_path, :repos, :sandbox, :all_neeto_repos
+        attr_accessor :branch_name, :required_rules_json_file_path, :repos, :sandbox
 
-        def initialize(branch_name, repos, 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
           @repos = repos
           @sandbox = sandbox
-          @all_neeto_repos = all_neeto_repos
         end
 
         def run
-          check_for_apps_and_all_neeto_repos_option(repos, all_neeto_repos)
-          matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox, false, all_neeto_repos)
+          matching_repos = find_all_matching_apps_or_repos(repos, :github, sandbox)
           inform_about_default_rules_file
           matching_repos.each do |repo|
             ui.info("\n Working on \"#{repo}\" repo")

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_or_repos(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.3"
+  VERSION = "0.2.4"
 end

metadata

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