firespring_dev_commands 2.1.28 → 2.1.29.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 887cf6fa6942ca683459b0a7325fee216656f7575f750932a0236a3a67246f4c
-  data.tar.gz: b238f37f30f93e543018915924c8a2aefde74b771400846804bf974649711a76
+  metadata.gz: baa5ac0c4b177560aa4b26d69a90e73922c0d08f1754998810e4340506ca4c4f
+  data.tar.gz: e5fc7ec49280a1a12b960d95f8c1247372d463ca55d4df175064d60337fad6fe
 SHA512:
-  metadata.gz: b2e3bd5b15893d2397969c0cc5a7f1aa1c64603dec853b415f81d71fac90450126ee68ffa8a4f1d20093e44453a2ad1a501529c2defca1f8689b67456760ccf9
-  data.tar.gz: a845da667386b9c289ce4dfc4f121a734271b8ef6347f1ab77aa08f179e77947c4c6c80176cae6407aacb068d0c6058c75d836ace68cf4b6cd97fb595bd22372
+  metadata.gz: 3c72a389ad590e3359ee71f2be1824d806bc5fc82e8ec8154d3c268ee39a1bca8c68e810e15b38f1d04542c809bf7bdbe623639c4e9202fcb40e7825e5e423e4
+  data.tar.gz: 15a2b5e3560c8f813f501c0e41094571149cf35003cb2733a66e1de45c127074fdad3371de92aab18aaeb6831c9ae013e52f41d03a59813fc6cb3e20b8e169b6

data/lib/firespring_dev_commands/common.rb

@@ -196,5 +196,16 @@ module Dev
       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.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: #{filesize(info['SpaceReclaimed'])}"
+      LOG.info "Total reclaimed space: #{Dev::Common.new.filesize(info['SpaceReclaimed'])}"
     end
 
     # Print the given filesize using the most appropriate units
@@ -182,28 +182,53 @@ module Dev
     end
 
     # Copies the source path on your local machine to the destination path on the container
-    def copy_to_container(container, source_path, dest_path)
-      dest_path = File.join(working_dir(container), dest_path) unless dest_path.start_with?(File::SEPARATOR)
-      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?
+    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
     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_path, dest_path, required: true)
-      source_path = File.join(working_dir(container), source_path) unless source_path.start_with?(File::SEPARATOR)
-      LOG.info "Copying #{source_path} to #{dest_path}... "
+    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}..."
 
       tar = StringIO.new
       begin
-        container.archive_out(source_path) do |chunk|
+        container.archive_out(source) do |chunk|
           tar.write(chunk)
         end
       rescue => e
@@ -212,7 +237,7 @@ module Dev
         puts 'Not Found'
       end
 
-      Dev::Tar.new(tar).unpack(source_path, dest_path)
+      Dev::Tar.new(tar).unpack(source, destination)
     end
 
     # rubocop:disable Metrics/ParameterLists
@@ -250,7 +275,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 = filesize(image.info&.dig('Size'))
+        size = Dev::Common.new.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/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.1.28'.freeze
+    VERSION = '2.1.29.pre.alpha.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.1.28
+  version: 2.1.29.pre.alpha.2
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-25 00:00:00.000000000 Z
+date: 2024-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -412,9 +412,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.10
 signing_key: