firespring_dev_commands 2.2.8.pre.alpha.0 → 2.3.0.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5dee68fee762c895021357261186dbf043c9719c2304c3d79893d943f83b10b
-  data.tar.gz: 9df30efd116a01d8688d1cfa5f61a12c3a8b871d797bd028da51f38c05c6e044
+  metadata.gz: 778ff67e973ecdf910d950b09b6eaae4115696dd611d40681edf117056df6785
+  data.tar.gz: cee645397957dcdba5122f3d569cc5800a70b4c6e4695010acd931dba83092d7
 SHA512:
-  metadata.gz: 8140c7df5ccc1b41e74959476d71708687175c5797dcfe4117934e7dbcce55edbaa98c957685209309c5c2582a1a858fe1b0d90e6898d08287b680b12c46b706
-  data.tar.gz: 3003314d63a53c06e6509c45b9e35eb2135a5b7b8a7ea8bc14039c86b062cb9f31a8ee27f22db216c5a117a6c2a39046a381695e821d469bd7b2d9a4090407fc
+  metadata.gz: 77939ad333d8c4ac77623c165ca0541d225361276ac3411dc769cd4dbd469b3543a0b255ce92ba1d8d89a019942f0b0aa6266ffa13321454ae42d6a786592a9d
+  data.tar.gz: 0a86f1791da0270e490ce8fd0cbe6d81ca4fce991db527e900f6ccfbe9aae157bb16177a3ca285ee389c563cf6c2cf7396862e2d14f1e941cf679d77aeaaaf0f

data/lib/firespring_dev_commands/aws/route53.rb

@@ -67,56 +67,18 @@ module Dev
         [response.hosted_zone, response.delegation_set]
       end
 
-      def json_details
-        zone_count = 0
+      def list_zone_details
         zones do |zone|
+          puts
           zone_details, delegation_set = details(zone.id)
           dns_resource = Dev::Dns::Resource.new(zone_details.name)
-          zone_count += 1
-          apex_record = dns_resource.recursive_a_lookup
-          nameserver_names = dns_resource.recursive_nameserver_lookup
-          nameserver_ips = nameserver_names.sort.map { |it| dns_resource.recursive_a_lookup(it) }
-          # Check if the site is dead, no a record or any AWS ips in the lists.
-          # if apex_record.empty? && (!zone_details.name.chomp('.').include? 'firespring') && (!nameserver_ips.join(', ').include? '205.251')
-          if !dns_resource.recursive_a_lookup.empty? && (dns_resource.recursive_nameserver_lookup.include? 'ns1.firespring.com')
-            out_data = {
-              'count' => zone_count,
-              'dns_name' => zone_details.name.chomp('.'),
-              'hosted_zone_id' => zone_details.id,
-              'delegation_set_id' => delegation_set.id,
-              # 'registrar_servers' => dns_resource.registrar_lookup.join(','), # This function is fickle, add with care.
-              'reported_nameservers' => nameserver_names.sort.join(', '),
-              'reported_ns_ips' => nameserver_ips.join(', '),
-              'a_record_ip' => apex_record.sort.join(', ')
-            }
-            # Display contents
-            puts JSON.pretty_generate(out_data)
-          end
-        rescue ::Aws::Route53::Errors::Throttling
-          sleep(1)
-          retry
-        end
-        puts
-      end
 
-      def command_line_details
-        zone_count = 0
-        zones do |zone|
-          zone_details, delegation_set = details(zone.id)
-          dns_resource = Dev::Dns::Resource.new(zone_details.name)
-          zone_count += 1
-          if !dns_resource.recursive_a_lookup.empty? && (dns_resource.recursive_nameserver_lookup.include? 'ns1.firespring.com')
-            puts
-            puts "#{zone_count} - #{zone_details.name.chomp('.')} (#{zone_details.id}):"
-            puts format('  %-50s %s', 'Delegation Set:', delegation_set.id)
-            puts format('  %-50s %s', 'Delegation Defined Nameservers:', delegation_set.name_servers.sort.join(', '))
-            puts format('  %-50s %s', 'WHOIS Reported server:', dns_resource.registrar_lookup.join(','))
-            puts format('  %-50s %s', 'DNS Reported Nameservers:', dns_resource.recursive_nameserver_lookup.sort.join(', '))
-            puts format('  %-50s %s', 'DNS Reported Nameserver IPs:', dns_resource.recursive_nameserver_lookup.sort.map do |it|
-                                                                        dns_resource.recursive_a_lookup(it)
-                                                                      end.join(', '))
-            puts format('  %-50s %s', 'Domain Apex IP Resolution:', dns_resource.recursive_a_lookup.sort.join(', '))
-          end
+          puts "#{zone_details.name.chomp('.').light_white} (#{zone_details.id}):"
+          puts format('  %-50s %s', 'Delegation Set:', delegation_set.id)
+          puts format('  %-50s %s', 'Delegation Defined Nameservers:', delegation_set.name_servers.sort.join(', '))
+          puts format('  %-50s %s', 'DNS Reported Nameservers:', dns_resource.recursive_nameserver_lookup.sort.join(', '))
+          puts format('  %-50s %s', 'DNS Reported Nameserver IPs:', dns_resource.recursive_nameserver_lookup.sort.map { |it| dns_resource.recursive_a_lookup(it) }.join(', '))
+          puts format('  %-50s %s', 'Domain Apex IP Resolution:', dns_resource.recursive_a_lookup.sort.join(', '))
         rescue ::Aws::Route53::Errors::Throttling
           sleep(1)
           retry

data/lib/firespring_dev_commands/dns/resource.rb

@@ -1,5 +1,3 @@
-require 'whois'
-
 module Dev
   class Dns
     class Resource
@@ -24,14 +22,6 @@ module Dev
         value.match?(Resolv::IPv6::Regex)
       end
 
-      # Determines the registrar(s) of the given name. Not perfect and can be rate limited.
-      def registrar_lookup(name = domain)
-        Whois.whois(name.chomp('.')).parts.map(&:host)
-      rescue Whois::Error
-        sleep(0.75)
-        retry
-      end
-
       # Recursively determine the correct nameservers for the given domain.
       # If nameservers are not found, strip subdomains off until we've reached the TLD
       def recursive_nameserver_lookup(name = domain)

data/lib/firespring_dev_commands/git.rb

@@ -185,7 +185,7 @@ module Dev
     end
 
     # Checks out the given branch in all repositories with some additional formatting
-    def checkout_all(branch)
+    def checkout_all(branch, default_branch: nil)
       @success = true
       puts
       puts "Checking out #{branch} in each repo".light_yellow if project_dirs.length > 1
@@ -194,7 +194,7 @@ module Dev
 
         repo_basename = File.basename(File.realpath(project_dir))
         puts Dev::Common.new.center_pad(repo_basename).light_green
-        @success &= checkout(branch, dir: project_dir)
+        @success &= checkout(branch, default: default_branch, dir: project_dir)
         puts Dev::Common.new.center_pad.light_green
       end
       puts
@@ -205,7 +205,7 @@ module Dev
     # Checks out the given branch in the given repo
     # Defaults to the current directory
     # optionally raise errors
-    def checkout(branch, dir: default_project_dir, raise_errors: false)
+    def checkout(branch, default: nil, dir: default_project_dir, raise_errors: false)
       raise 'branch is required' if branch.to_s.strip.empty?
       return unless File.exist?(dir)
 
@@ -218,7 +218,7 @@ module Dev
       # If the branch we are checking out doesn't exist, check out either the staging branch or the main branch
       actual_branch = branch
       unless branch_exists?(dir, branch)
-        actual_branch = [staging_branch, main_branch].uniq.find { |it| branch_exists?(dir, it) }
+        actual_branch = [default, staging_branch, main_branch].uniq.find { |it| branch_exists?(dir, it) }
         puts "Branch #{branch} not found, checking out #{actual_branch} instead".light_yellow
       end
 

data/lib/firespring_dev_commands/templates/aws/services/route53.rb

@@ -6,7 +6,7 @@ module Dev
       module Services
         # Class contains rake templates for managing your AWS settings and logging in
         class Route53 < Dev::Template::BaseInterface
-          def create_pretty_list_zone_details_task!
+          def create_list_zone_details_task!
             # Have to set a local variable to be accessible inside of the instance_eval block
             exclude = @exclude
 
@@ -18,26 +18,7 @@ module Dev
                   desc 'print details for all hosted zones'
                   task list_details: %w(ensure_aws_credentials) do
                     route53 = Dev::Aws::Route53.new(ENV['DOMAINS'].to_s.strip.split(','))
-                    route53.command_line_details
-                  end
-                end
-              end
-            end
-          end
-
-          def create_json_list_zone_details_task!
-            # Have to set a local variable to be accessible inside of the instance_eval block
-            exclude = @exclude
-
-            DEV_COMMANDS_TOP_LEVEL.instance_eval do
-              return if exclude.include?(:json_details)
-
-              namespace :aws do
-                namespace :hosted_zone do
-                  desc 'print details for all hosted zones'
-                  task json_details: %w(ensure_aws_credentials) do
-                    route53 = Dev::Aws::Route53.new(ENV['DOMAINS'].to_s.strip.split(','))
-                    route53.json_details
+                    route53.list_zone_details
                   end
                 end
               end

data/lib/firespring_dev_commands/templates/git.rb

@@ -31,13 +31,15 @@ module Dev
             return if exclude.include?(:checkout)
 
             desc 'Checks out a branch for each repo (alias: git:co)' \
-                 "\n\tuse BRANCH=abc123 to specify the branch of code you with to switch to (required)" \
-                 "\n\tIf the branch does not exist, the configured staging or main branch will be checked out"
+                 "\n\tuse BRANCH=abc123 to specify the branch of code you wish to switch to (required)" \
+                 "\n\tuse DEFAULT=abc456 to specify the branch of code to fall back to" \
+                 "\n\tIf branch and default do not exist, the configured staging or main branch will be checked out"
             task checkout: %w(init) do
               branch = ENV['BRANCH'].to_s.strip
+              default = ENV['DEFAULT'].to_s.strip
               raise 'branch is required' if branch.empty?
 
-              Dev::Git.new.checkout_all(branch)
+              Dev::Git.new.checkout_all(branch, default_branch: default)
             end
 
             task co: %w(init checkout) do

data/lib/firespring_dev_commands/version.rb

@@ -6,6 +6,6 @@ module Dev
     # Use 'v.v.v.pre.alpha.v' for pre-release vesions
     # Use 'v.v.v.beta.v for beta versions
     # Use semantic versioning for any releases (https://semver.org/)
-    VERSION = '2.2.8.pre.alpha.0'.freeze
+    VERSION = '2.3.0.pre.alpha.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.2.8.pre.alpha.0
+  version: 2.3.0.pre.alpha.1
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-28 00:00:00.000000000 Z
+date: 2024-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -360,20 +360,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: whois
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
 description: Ruby library for creating/maintaining your development environment
 email: opensource@firespring.com
 executables: []