firespring_dev_commands 2.1.34 → 2.5.0.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa188df0b1a042594409df9d0c288298a1c2899ccf0a420f213f34f6bd463950
-  data.tar.gz: 474383072092cf5be3bbbcc5c92dcb5b0fbfc426a55ce93dd46e174e6a3b9217
+  metadata.gz: e146e8c9d9c3422dfd7641c6a09ca8c2cdfad6ed430d73aec5808de28ed5d880
+  data.tar.gz: 273923aae5ccce231fc77174ed89cbe0e4f5ad59b52219b04303f983e9966e1d
 SHA512:
-  metadata.gz: 1d21358d2fcd8fe2dfed28327c553b6795e7095433ff6667d41bcca6d89268ab03367a0a166535d53d1623368716aadb15bcda65f24eb18e40efd895e7147d20
-  data.tar.gz: 20a2bedaed3177859237c8d3cf4e7ab36c4d8382906068bd489456617de50cfd430a4c145afe917b4acb1963bd76435dd51fde2898ae5ed5190c1ba6b4af89a3
+  metadata.gz: 67223e6ba12a10f798d7fee6b1cab844da41cd3dc65a449330e8c8bd0ef86180cc297889b7365b7b68f5ca8054919e9881693707ecfde02e539d0a7e22c6af51
+  data.tar.gz: ada0e13a3f2d8022687a2542503bad6bc847bf32fc17604116d17e06ed46ee7efa18aea35635c31a26c07f5ccdd6a3c5083235edaafd77684528bc487c17f3c7

data/README.md

@@ -28,7 +28,7 @@ Dev::Template::Docker::Node::Application.new('foo')
 ```
 * If you run `rake -T` now, you should have base rake commands and application rake commands for an app called `foo`
 
-* (optional) Add AWS login template commands
+* (optinoal) Add AWS login template commands
 ```
 # Configure AWS accounts and create tasks
 Dev::Aws::Account::configure do |c|

data/lib/firespring_dev_commands/audit/report.rb

@@ -3,12 +3,11 @@ module Dev
   class Audit
     # The class containing standardized information about an audit report
     class Report
-      attr_accessor :items, :min_severity, :error_on_unknown, :ignorelist, :filtered_items
+      attr_accessor :items, :min_severity, :ignorelist, :filtered_items
 
       def initialize(
         items,
         min_severity: ENV.fetch('MIN_SEVERITY', nil),
-        error_on_unknown: ENV.fetch('ERROR_ON_UNKNOWN', nil),
         ignorelist: ENV['IGNORELIST'].to_s.split(/\s*,\s*/)
       )
         # Items should be an array of Item objects
@@ -16,18 +15,12 @@ module Dev
         raise 'items must all be report items' unless @items.all?(Dev::Audit::Report::Item)
 
         @min_severity = min_severity || Level::HIGH
-        @error_on_unknown = error_on_unknown
         @ignorelist = Array(ignorelist).compact
       end
 
       # Get all severities greater than or equal to the minimum severity
       def desired_severities
-        max_severity = if error_on_unknown.to_s.strip == 'true'
-                         -1
-                       else
-                         -2
-                       end
-        LEVELS.slice(LEVELS.find_index(min_severity)..max_severity)
+        LEVELS.slice(LEVELS.find_index(min_severity)..-1)
       end
 
       # Run the filters against the report items and filter out any which should be excluded

data/lib/firespring_dev_commands/aws/cloudformation.rb

@@ -21,10 +21,9 @@ module Dev
       # Finished status
       FINISHED = :finished
 
-      attr_accessor :client, :name, :template_filename, :parameters, :capabilities, :failure_behavior, :preserve_parameters_on_update, :state
+      attr_accessor :client, :name, :template_filename, :parameters, :capabilities, :failure_behavior, :state
 
-      def initialize(name, template_filename, parameters: Dev::Aws::Cloudformation::Parameters.new, capabilities: [], failure_behavior: 'ROLLBACK',
-                     preserve_parameters_on_update: false)
+      def initialize(name, template_filename, parameters: Dev::Aws::Cloudformation::Parameters.new, capabilities: [], failure_behavior: 'ROLLBACK')
         raise 'parameters must be an intsance of parameters' unless parameters.is_a?(Dev::Aws::Cloudformation::Parameters)
 
         @client = nil
@@ -33,7 +32,6 @@ module Dev
         @parameters = parameters
         @capabilities = capabilities
         @failure_behavior = failure_behavior
-        @preserve_parameters_on_update = preserve_parameters_on_update
         @state = NOT_STARTED
       end
 
@@ -83,16 +81,11 @@ module Dev
         # Call upload function to get the s3 url
         template_url = upload(template_filename)
 
-        update_parameters = if preserve_parameters_on_update
-                              parameters.preserve
-                            else
-                              parameters.default
-                            end
         # Update the cloudformation stack
         client.update_stack(
           stack_name: name,
           template_url:,
-          parameters: update_parameters,
+          parameters: parameters.preserve,
           capabilities:
         )
         @state = STARTED

data/lib/firespring_dev_commands/common.rb

@@ -100,8 +100,8 @@ module Dev
     # Receive a string from the user on stdin unless non_interactive is set to true
     # If a default value was specified and no answer was given, return the default
     def gather_input(default: nil)
-      answer = $stdin.gets unless ENV['NON_INTERACTIVE'] == 'true'
-      answer = answer.to_s.strip
+      answer = $stdin.gets.to_s.strip unless ENV['NON_INTERACTIVE'] == 'true'
+      answer.to_s.strip
       return default if default && answer.empty?
 
       answer
@@ -187,25 +187,5 @@ module Dev
         return false
       end
     end
-
-    # Center the string and pad on either side with the given padding character
-    def center_pad(string = '', pad: '-', len: 80)
-      string = " #{string} " unless string.strip.empty?
-      center_dash = len / 2
-      string = string.to_s
-      center_str = string.length / 2
-      string.rjust(center_dash + center_str - 1, pad).ljust(len - 1, pad)
-    end
-
-    # Print the given filesize using the most appropriate units
-    def filesize(size)
-      return '0.0 B' if size.to_i.zero?
-
-      units = %w(B KB MB GB TB Pb EB)
-      exp = (Math.log(size) / Math.log(1024)).to_i
-      exp = 6 if exp > 6
-
-      format('%.1f %s', size.to_f / (1024**exp), units[exp])
-    end
   end
 end

data/lib/firespring_dev_commands/docker/status.rb

@@ -33,26 +33,6 @@ module Dev
         EXITED,
         DEAD
       ].freeze
-
-      # TODO: Can we use 'curses' here and overwrite the correct line?
-      def response_callback(response)
-        response.split("\n").each do |line|
-          data = JSON.parse(line)
-          if data.include?('status')
-            if data['id']
-              LOG.info "#{data['id']}: #{data['status']}"
-            else
-              LOG.info (data['status']).to_s
-            end
-          elsif data.include?('errorDetail')
-            raise data['errorDetail']['message']
-          elsif data.include?('aux')
-            next
-          else
-            raise "Unrecognized message from docker: #{data}"
-          end
-        end
-      end
     end
   end
 end

data/lib/firespring_dev_commands/docker.rb

@@ -103,7 +103,7 @@ module Dev
       LOG.info "\nDeleted #{type.capitalize}"
       deleted_items = info["#{type}Deleted"] || []
       deleted_items.each { |it| LOG.info "  #{it}" }
-      LOG.info "Total reclaimed space: #{Dev::Common.new.filesize(info['SpaceReclaimed'])}"
+      LOG.info "Total reclaimed space: #{filesize(info['SpaceReclaimed'])}"
     end
 
     # Print the given filesize using the most appropriate units
@@ -117,44 +117,6 @@ module Dev
       format('%.1f %s', size.to_f / (1024**exp), units[exp])
     end
 
-    # Push the local version of the docker image to the defined remote repository
-    def push_image(image, name, tag = nil)
-      unless tag
-        if name.include?(':')
-          name, tag = name.split(':')
-        else
-          tag = 'latest'
-        end
-      end
-
-      puts "Pushing to #{name}:#{tag}"
-      image.push(::Docker.creds, repo_tag: "#{name}:#{tag}") { |response| Dev::Docker::Status.new.response_callback(response) }
-    end
-
-    # Push the remote version of the docker image from the defined remote repository
-    def pull_image(name, tag = nil)
-      unless tag
-        if name.include?(':')
-          name, tag = name.split(':')
-        else
-          tag = 'latest'
-        end
-      end
-
-      puts "\nPulling #{name}:#{tag}"
-      opts = {
-        fromImage: "#{name}:#{tag}",
-        platform: Dev::Platform.new.architecture
-      }
-      ::Docker::Image.create(**opts) { |response| Dev::Docker::Status.new.response_callback(response) }
-    end
-
-    # Remove the local version of the given docker image
-    def untag_image(image, name, tag)
-      puts "Untagging #{name}:#{tag}"
-      image.remove(name: "#{name}:#{tag}")
-    end
-
     # Remove docker images with the "force" option set to true
     # This will remove the images even if they are currently in use and cause unintended side effects.
     def force_remove_images(name_and_tag)
@@ -176,59 +138,27 @@ module Dev
       Docker::Compose.new.mapped_public_port(name, private_port)
     end
 
-    # Gets the default working dir of the container
-    def working_dir(container)
-      container.json['Config']['WorkingDir']
-    end
-
     # Copies the source path on your local machine to the destination path on the container
-    def copy_to_container(container, source, destination)
-      # Add the working dir of the container onto the destination (if it doesn't start a path separator)
-      destination = File.join(working_dir(container), destination) unless destination.start_with?(File::SEPARATOR)
-      LOG.info "Copying #{source} to #{destination}..."
-
-      # Need to determine the type of the destination (file or directory or nonexistant)
-      noexist_code = 22
-      file_code = 33
-      directory_code = 44
-      unknown_code = 55
-      filetype_cmd = [
-        'bash',
-        '-c',
-        "set -e; [ ! -e '#{destination}' ] && exit #{noexist_code}; [ -f '#{destination}' ] " \
-        "&& exit #{file_code}; [ -d '#{destination}' ] && exit #{directory_code}; exit #{unknown_code}"
-      ]
-      destination_filetype_code = container.exec(filetype_cmd).last
-
-      # If destination_filetype_code is a file - that means the user passed in a destination filename
-      # Unfortunately the archive_in command does not support that so we will strip it off and use it later (if needed)
-      source_filename = File.basename(source)
-      destination_filename = File.basename(source)
-      destination, _, destination_filename = destination.rpartition(File::SEPARATOR) if destination_filetype_code == file_code
-
-      container.archive_in(source, destination, overwrite: true)
-
-      if File.directory?(source)
-        # If the source was a directory, then the archive_in command leaves it as a tar on the system - so we need to unpack it
-        # TODO: Can we find a better solution for this? Seems pretty brittle
-        retcode = container.exec(['bash', '-c', "cd #{destination}; tar -xf #{destination_filename}; rm -f #{destination_filename}"]).last
-        raise 'Unable to unpack on container' unless retcode.zero?
-      elsif destination_filetype_code == file_code && source_filename != destination_filename
-        # If the destination was a file _and_ the filename is different than the source filename, then we need to rename it
-        retcode = container.exec(['bash', '-c', "cd #{destination}; mv #{source_filename} #{destination_filename}"]).last
-        raise "Unable to rename '#{source_filename}' to '#{destination_filename}' on container" unless retcode.zero?
-      end
+    def copy_to_container(container, source_path, dest_path)
+      LOG.info "Copying #{source_path} to #{dest_path}... "
+
+      container.archive_in(source_path, dest_path, overwrite: true)
+      return unless File.directory?(source_path)
+
+      dest_file = File.basename(source_path)
+      # TODO: Can we find a better solution for this? Seems pretty brittle
+      retcode = container.exec(['bash', '-c', "cd #{dest_path}; tar -xf #{dest_file}; rm -f #{dest_file}"])[-1]
+      raise 'Unable to unpack on container' unless retcode.zero?
     end
 
     # Copies the source path on the container to the destination path on your local machine
     # If required is set to true, the command will fail if the source path does not exist on the container
-    def copy_from_container(container, source, destination, required: true)
-      source = File.join(working_dir(container), source) unless source.start_with?(File::SEPARATOR)
-      LOG.info "Copying #{source} to #{destination}..."
+    def copy_from_container(container, source_path, dest_path, required: true)
+      LOG.info "Copying #{source_path} to #{dest_path}... "
 
       tar = StringIO.new
       begin
-        container.archive_out(source) do |chunk|
+        container.archive_out(source_path) do |chunk|
           tar.write(chunk)
         end
       rescue => e
@@ -237,7 +167,7 @@ module Dev
         puts 'Not Found'
       end
 
-      Dev::Tar.new(tar).unpack(source, destination)
+      Dev::Tar.new(tar).unpack(source_path, dest_path)
     end
 
     # rubocop:disable Metrics/ParameterLists
@@ -275,7 +205,7 @@ module Dev
         arch = "#{arch}/#{variant}" if variant
         id = image.info&.dig('id')&.split(':')&.last&.slice(0..11)
         created = timesince(Time.at(image.info&.dig('Created')))
-        size = Dev::Common.new.filesize(image.info&.dig('Size'))
+        size = filesize(image.info&.dig('Size'))
 
         repo_urls = image.info&.dig('RepoTags')
         repo_urls ||= ["#{image.info&.dig('RepoDigests')&.first&.split(':')&.first&.split('@')&.first}:<none>"]

data/lib/firespring_dev_commands/eol/aws.rb

@@ -72,23 +72,19 @@ module Dev
       # Queries and returns product versions for rds instance products
       def rds_instance_products
         aws_engines = %w(mysql postgresql)
-        aws_sqlserver_engines = %w(sqlserver-ee sqlserver-ex sqlserver-se sqlserver-web)
         client = ::Aws::RDS::Client.new
 
         [].tap do |ary|
           Dev::Aws.each_page(client, :describe_db_instances) do |response|
             response.db_instances.each do |instance|
               name = instance.db_instance_identifier
-              engine = instance.engine.gsub('aurora-', '')
+              engine = instance.engine.tr('aurora-', '')
               product = if aws_engines.include?(engine)
                           "amazon-rds-#{engine}"
-                        elsif aws_sqlserver_engines.include?(engine)
-                          'mssqlserver'
                         else
                           engine
                         end
               version = instance.engine_version.reverse.split('.')[-2..].join('.').reverse
-              version.chop! if version.end_with?('.00')
               ary << Dev::EndOfLife::ProductVersion.new(product, version, name)
             end
           end
@@ -98,23 +94,19 @@ module Dev
       # Queries and returns product versions for rds cluster products
       def rds_cluster_products
         aws_engines = %w(mysql postgresql)
-        aws_sqlserver_engines = %w(sqlserver-ee sqlserver-ex sqlserver-se sqlserver-web)
         client = ::Aws::RDS::Client.new
 
         [].tap do |ary|
           Dev::Aws.each_page(client, :describe_db_clusters) do |response|
             response.db_clusters.each do |cluster|
               name = cluster.db_cluster_identifier
-              engine = cluster.engine.gsub('aurora-', '')
+              engine = cluster.engine.tr('aurora-', '')
               product = if aws_engines.include?(engine)
                           "amazon-rds-#{engine}"
-                        elsif aws_sqlserver_engines.include?(engine)
-                          'mssqlserver'
                         else
                           engine
                         end
               version = cluster.engine_version.reverse.split('.')[-2..].join('.').reverse
-              version.chop! if version.end_with?('.00')
               ary << Dev::EndOfLife::ProductVersion.new(product, version, name)
             end
           end

data/lib/firespring_dev_commands/eol.rb

@@ -46,23 +46,13 @@ module Dev
       @products
     end
 
-    # Prints all of the product version statuses
-    def status
-      product_versions.sort_by(&:name).each(&:print_status)
-    end
-
-    # Returns true if any of the products are EOL
-    def eol?
-      product_versions.any?(&:eol)
-    end
-
     # Prints all of the product version statuses
     # Raises an error if any products are EOL
     def check
       puts
-      status
+      product_versions.sort_by(&:name).each(&:print_status)
       puts
-      raise 'found EOL versions' if eol?
+      raise 'found EOL versions' if product_versions.any?(&:eol)
     end
   end
 end

data/lib/firespring_dev_commands/git.rb

@@ -113,10 +113,10 @@ module Dev
         next unless File.exist?(project_dir)
 
         repo_basename = File.basename(File.realpath(project_dir))
-        header = "#{repo_basename} (#{original_branches[project_dir]})"
-        puts Dev::Common.new.center_pad(header).light_green
+        header = " #{repo_basename} (#{original_branches[project_dir]}) "
+        puts center_pad(header).light_green
         @success &= status(dir: project_dir)
-        puts Dev::Common.new.center_pad.light_green
+        puts center_pad.light_green
       end
       puts
 
@@ -165,10 +165,10 @@ module Dev
         next unless File.exist?(project_dir)
 
         repo_basename = File.basename(File.realpath(project_dir))
-        header = "#{repo_basename} (#{original_branches[project_dir]})"
-        puts Dev::Common.new.center_pad(header).light_green
+        header = " #{repo_basename} (#{original_branches[project_dir]}) "
+        puts center_pad(header).light_green
         reset(dir: project_dir)
-        puts Dev::Common.new.center_pad.light_green
+        puts center_pad.light_green
       end
       puts
     end
@@ -191,9 +191,10 @@ module Dev
         next unless File.exist?(project_dir)
 
         repo_basename = File.basename(File.realpath(project_dir))
-        puts Dev::Common.new.center_pad(repo_basename).light_green
+        header = " #{repo_basename} "
+        puts center_pad(header).light_green
         @success &= checkout(branch, dir: project_dir)
-        puts Dev::Common.new.center_pad.light_green
+        puts center_pad.light_green
       end
       puts
 
@@ -284,9 +285,10 @@ module Dev
         next unless File.exist?(project_dir)
 
         repo_basename = File.basename(File.realpath(project_dir))
-        puts Dev::Common.new.center_pad(repo_basename).light_green
+        header = " #{repo_basename} "
+        puts center_pad(header).light_green
         @success &= merge(branch, dir: project_dir)
-        puts Dev::Common.new.center_pad.light_green
+        puts center_pad.light_green
       end
       puts
 
@@ -332,9 +334,10 @@ module Dev
         next unless File.exist?(project_dir)
 
         repo_basename = File.basename(File.realpath(project_dir))
-        puts Dev::Common.new.center_pad(repo_basename).light_green
+        header = " #{repo_basename} "
+        puts center_pad(header).light_green
         @success &= pull(dir: project_dir)
-        puts Dev::Common.new.center_pad.light_green
+        puts center_pad.light_green
       end
       puts
 
@@ -370,9 +373,10 @@ module Dev
         next unless File.exist?(project_dir)
 
         repo_basename = File.basename(File.realpath(project_dir))
-        puts Dev::Common.new.center_pad(repo_basename).light_green
+        header = " #{repo_basename} "
+        puts center_pad(header).light_green
         @success &= push(dir: project_dir)
-        puts Dev::Common.new.center_pad.light_green
+        puts center_pad.light_green
       end
       puts
 
@@ -435,10 +439,11 @@ module Dev
     end
 
     # Center the string and pad on either side with the given padding character
-    # @deprecated Please use {Dev::Common#center_pad} instead
     def center_pad(string = '', pad: '-', len: 80)
-      warn '[DEPRECATION] `Dev::Git#center_pad` is deprecated. Please use `Dev::Common#center_pad` instead.'
-      Dev::Common.new.center_pad(string, pad:, len:)
+      center_dash = len / 2
+      string = string.to_s
+      center_str = string.length / 2
+      string.rjust(center_dash + center_str - 1, pad).ljust(len - 1, pad)
     end
 
     # Exclude the command from the message and print all error lines

data/lib/firespring_dev_commands/jira/issue.rb

@@ -5,13 +5,11 @@ module Dev
       # Issue subtypes which do not map to a story type
       NON_STORY_TYPES = ['epic', 'review', 'sub-task', 'code review sub-task', 'pre-deploy sub-task', 'deploy sub-task', 'devops sub-task'].freeze
 
-      attr_accessor :data, :project, :parent, :id, :title, :points, :assignee, :resolved_date, :histories,
-                    :last_in_progress_history, :first_in_review_history, :last_closed_history
+      attr_accessor :data, :project, :id, :title, :points, :assignee, :resolved_date, :histories, :last_in_progress_history, :first_in_review_history, :last_closed_history
 
       def initialize(data)
         @data = data
         @project = Jira::Project.new(data)
-        @parent = Jira::Parent.new(data) if data.respond_to?(:parent)
         @id = data.key
         @title = data.summary
         @points = calculate_points(data)

data/lib/firespring_dev_commands/node.rb

@@ -96,7 +96,7 @@ module Dev
       test
     end
 
-    # Build the node test command
+    # Build the node test (with coverage) command
     def test_coverage_command
       test = base_command
       test << 'run' << 'test:coverage'

data/lib/firespring_dev_commands/php.rb

@@ -8,12 +8,11 @@ module Dev
     DEFAULT_PACKAGE_FILE = 'composer.json'.freeze
 
     # Config object for setting top level git config options
-    Config = Struct.new(:container_path, :local_path, :package_file, :coverage) do
+    Config = Struct.new(:container_path, :local_path, :package_file) do
       def initialize
         self.container_path = DEFAULT_PATH
         self.local_path = DEV_COMMANDS_ROOT_DIR
         self.package_file = DEFAULT_PACKAGE_FILE
-        self.coverage = nil
       end
     end
 
@@ -31,14 +30,12 @@ module Dev
       alias_method :configure, :config
     end
 
-    attr_accessor :container_path, :local_path, :package_file, :coverage
+    attr_accessor :container_path, :local_path, :package_file
 
-    def initialize(container_path: nil, local_path: nil, package_file: nil, coverage: nil)
+    def initialize(container_path: nil, local_path: nil, package_file: nil)
       @container_path = container_path || self.class.config.container_path
       @local_path = local_path || self.class.config.local_path
       @package_file = package_file || self.class.config.package_file
-      @coverage = coverage || Dev::Coverage::None.new
-      raise 'coverage must be an instance of the base class' unless @coverage.is_a?(Dev::Coverage::Base)
     end
 
     # The base npm command that is the starting point for all subsequent commands
@@ -61,12 +58,9 @@ module Dev
     end
 
     # Build the command to fix any security vulnerabilities that were found
-    # def audit_fix_command
-    #  audit_fix = base_command
-    #  audit_fix << 'audit' << 'fix'
-    #  audit_fix.concat(Dev::Common.new.tokenize(ENV['OPTS'].to_s))
-    #  audit_fix
-    # end
+    def audit_fix_command
+      raise 'not implemented'
+    end
 
     # Build the php install command
     def install_command
@@ -79,7 +73,7 @@ module Dev
     # Build the php lint command
     def lint_command
       lint = base_command
-      lint << 'lint'
+      lint << 'run' << 'lint'
       lint.concat(Dev::Common.new.tokenize(ENV['OPTS'].to_s))
       lint
     end
@@ -87,7 +81,7 @@ module Dev
     # Build the php lint fix command
     def lint_fix_command
       lint_fix = base_command
-      lint_fix << 'lint-fix'
+      lint_fix << 'run' << 'lint-fix'
       lint_fix.concat(Dev::Common.new.tokenize(ENV['OPTS'].to_s))
       lint_fix
     end
@@ -95,24 +89,14 @@ module Dev
     # Build the php test command
     def test_command
       test = []
-      test << './vendor/bin/phpunit'
-      test.concat(coverage.php_options) if coverage
+      lint_fix << 'run' << 'test'
       test.concat(Dev::Common.new.tokenize(ENV['OPTS'].to_s))
       test
     end
 
-    # Run the check to ensure code coverage meets the desired threshold
-    def check_test_coverage(application:)
-      coverage.check(application:)
-    end
-
-    # Build the php fast test command
-    def test_fast_command(processes = 4)
-      test = []
-      test << './vendor/bin/paratest'
-      test.concat(Dev::Common.new.tokenize(ENV['OPTS'].to_s))
-      test << "-p#{processes}" << '--runner=WrapperRunner'
-      test
+    # Build the php test (with coverage) command
+    def test_coverage_command
+      raise 'not implemented'
     end
   end
 end