firespring_dev_commands 1.5.1 → 1.5.2.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3c168777840a74d673865425bb46fc40829a400da55eaf02ff41ed49ea313d6
-  data.tar.gz: bdd2000d78e663d5bd2b1cfe2cf0c0f343eed6041bdb38cf3936939b64a93c85
+  metadata.gz: 25122e7d7a7eb50aff267813f1331a063f2d9a236f2ab36a97ac8d480b30393c
+  data.tar.gz: 94cd0be8b52b37c9c621d81ce5f6e99bdfc479c7160e07f391a586d62280078e
 SHA512:
-  metadata.gz: cfa2fc2f86ec206c038883915b483a52608d020b9ad1251b22c8a76aa2704c98417f6a13f1528a4d66d412233d533333b6aebad3a6a136ea362f0d7cd600ef3a
-  data.tar.gz: 4c08e59208aa3298b04ee2dcb7367fcfd66192bbb5adad7644fa7dd34be197541badbfab8c16c16fea3476fad60d27ec5491fc787e373811df8daae6b3e53355
+  metadata.gz: cce2ac75453d81e00e6ded5e4d0cd9dd1eedf4221b74b12bc2d9f9cae3b31d96321b553a3b93fefd6b2d8d4f0496f2a013225e6d2b38c477b1e0247031e1ce30
+  data.tar.gz: 2b34bf1d37005e14f0868dace08ad41d0c6fccfee2fac6ab9f18354eb2f46993dcd6fa08253339b54cb45381b17d25e1d03bbdfbff2a266e67dd2c6a43074e7a

data/lib/firespring_dev_commands/docker.rb

@@ -170,33 +170,37 @@ module Dev
       Dev::Tar.new(tar).unpack(source_path, dest_path)
     end
 
+    # rubocop:disable Metrics/ParameterLists
     # Display a nicely formatted table of images and their associated information
     def print_images
       reposize   = 70
-      tagsize    = 79
+      tagsize    = 70
+      archsize   = 9
       imagesize  = 15
       createsize = 20
       sizesize   = 10
-      total = reposize + tagsize + imagesize + createsize + sizesize
+      total = reposize + tagsize + archsize + imagesize + createsize + sizesize
 
       # If there is additional width available, add it to the repo and tag columns
       additional = [((Rake.application.terminal_width - total) / 2).floor, 0].max
       reposize += additional
       tagsize += additional
 
-      format = "%-#{reposize}s%-#{tagsize}s%-#{imagesize}s%-#{createsize}s%s"
-      puts format(format, :REPOSITORY, :TAG, :'IMAGE ID', :CREATED, :SIZE)
+      format = "%-#{reposize}s%-#{tagsize}s%-#{archsize}s%-#{imagesize}s%-#{createsize}s%s"
+      puts format(format, :REPOSITORY, :TAG, :ARCH, :'IMAGE ID', :CREATED, :SIZE)
       ::Docker::Image.all.each do |image|
-        image_info(image).each do |repo, tag, id, created, size|
-          puts format(format, repo, tag, id, created, size)
+        image_info(image).each do |repo, tag, arch, id, created, size|
+          puts format(format, repo, tag, arch, id, created, size)
         end
       end
     end
+    # rubocop:enable Metrics/ParameterLists
 
     # rubocop:disable Metrics/CyclomaticComplexity
     # Take the given image and grab all of the parts of it which will be used to display the image info
     private def image_info(image)
       [].tap do |ary|
+        arch = image.json&.dig('Architecture')
         id = image.info&.dig('id')&.split(':')&.last&.slice(0..11)
         created = timesince(Time.at(image.info&.dig('Created')))
         size = filesize(image.info&.dig('Size'))
@@ -206,7 +210,7 @@ module Dev
         repo_urls.each do |repo_url|
           repo, tag = repo_url.split(':')
           tag ||= '<none>'
-          ary << [repo, tag, id, created, size]
+          ary << [repo, tag, arch, id, created, size]
         end
       end
     end
@@ -215,24 +219,32 @@ module Dev
     # Display a nicely formatted table of containers and their associated information
     def print_containers
       idsize = 15
-      imagesize = 25
-      commandsize = 25
-      createsize = 17
-      statussize = 16
-      portsize = 25
-      namesize = 10
-      total = idsize + imagesize + commandsize + createsize + statussize + portsize + namesize
+      imagesize = 20
+      archsize = 7
+      commandsize = 20
+      createsize = 15
+      statussize = 15
+      portsize = 20
+      namesize = 16
+      total = idsize + imagesize + archsize + commandsize + createsize + statussize + portsize + namesize
 
       # If there is additional width available, add it to the repo and tag columns
-      additional = [((Rake.application.terminal_width - total) / 2).floor, 0].max
+      additional = [((Rake.application.terminal_width - total) / 3).floor, 0].max
+
+      # If there's enough extra, give some to the name as well
+      if additional > 40
+        namesize += 15
+        additional -= 5
+      end
       imagesize += additional
+      commandsize += additional
       portsize += additional
 
-      format = "%-#{idsize}s%-#{imagesize}s%-#{commandsize}s%-#{createsize}s%-#{statussize}s%-#{portsize}s%s"
-      puts format(format, :'CONTAINER ID', :IMAGE, :COMMAND, :CREATED, :STATUS, :PORTS, :NAMES)
+      format = "%-#{idsize}s%-#{imagesize}s%-#{archsize}s%-#{commandsize}s%-#{createsize}s%-#{statussize}s%-#{portsize}s%-#{namesize}s"
+      puts format(format, :'CONTAINER ID', :IMAGE, :ARCH, :COMMAND, :CREATED, :STATUS, :PORTS, :NAMES)
       ::Docker::Container.all.each do |container|
-        id, image, command, created, status, ports, names = container_info(container)
-        puts format(format, id, image, command, created, status, ports, names)
+        id, image, arch, command, created, status, ports, names = container_info(container)
+        puts format(format, id, image.truncate(imagesize - 5), arch, command.truncate(commandsize - 5), created, status, ports.truncate(portsize - 5), names)
       end
     end
 
@@ -241,8 +253,8 @@ module Dev
     private def container_info(container)
       id = container.id&.slice(0..11)
       image = container.info&.dig('Image')
-
-      command = container.info&.dig('Command')&.truncate(20)
+      arch = ::Docker::Image.get(image).json&.dig('Architecture')
+      command = container.info&.dig('Command')
       created = timesince(Time.at(container.info&.dig('Created')))
       status = container.info&.dig('Status')
 
@@ -257,7 +269,7 @@ module Dev
       end&.join(', ')
       names = container.info&.dig('Names')&.map { |name| name.split('/').last }&.join(', ')
 
-      [id, image, command, created, status, ports, names]
+      [id, image, arch, command, created, status, ports, names]
     end
     # rubocop:enable Metrics/CyclomaticComplexity
 

data/lib/firespring_dev_commands/templates/docker/default.rb

@@ -4,7 +4,8 @@ module Dev
   module Template
     # Module containing all default docker rake tasks
     module Docker
-      # Class containing default rake tasks which are application agnostic (run against all containers)
+      # Class containing default rake tasks which are application agnostic
+      # This means the commands will be run against all containers in the docker compose file (no service specified)
       class Default < Dev::Template::BaseInterface
         # Create the rake task which runs a docker compose build
         def create_build_task!

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 = '1.5.1'.freeze
+    VERSION = '1.5.2.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: 1.5.1
+  version: 1.5.2.pre.alpha.1
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-06 00:00:00.000000000 Z
+date: 2023-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -453,11 +453,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.25
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Development environment maintenance command library