firespring_dev_commands 2.1.28.pre.alpha.1 → 2.1.29.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cdbf7bd3018268faebfd9301f055ea1ab48c2c98bb6a1327000f6677f45f3da
-  data.tar.gz: 7b4cf7884dd2bbc167f4ec8434f5e07aaa6c8ee503a5fb3ac9fd13460deec80a
+  metadata.gz: 87729055135e487595d40ce6629354b1fc473ae963383965e2b5570c9938055c
+  data.tar.gz: adcc648f8bcbfd326b5aad54dc7868dc2ee93c3d18e7483f98eb8d5e98ff5d14
 SHA512:
-  metadata.gz: 30e7bc37e599f73d3f01287600466ce84fdf8ec2bc5da20f99b50c6cea26c3d4ee6b8c156749ea89739b2ee96cee44ade8c53f079076bb3d455d31750e38e6ac
-  data.tar.gz: 6c619223341b4379007a3c4826d9b2c6684a67c740847a528520931534b31d1296e871665b939c0ae99481fec6eff2e554afc7049901a832da6524fc3e8ece42
+  metadata.gz: 8ab9a8f2b52c1711e338917077aed4c32fa77b65da6518908c04f52e7f119a2abae8f5117e594d1e69597b889a385682d5e0e23d806ec56a3f328355185942e4
+  data.tar.gz: e8c21faaf030c75f1dccda8308ef15b5ada63e4ef6c2bd3f0a529f62b8300f062fc8286e948b74461ae442f89a893f43d8dfe36ca8e72a9a009ef44a6d3b9863

data/lib/firespring_dev_commands/docker.rb

@@ -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

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.pre.alpha.1'.freeze
+    VERSION = '2.1.29.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.1.28.pre.alpha.1
+  version: 2.1.29.pre.alpha.1
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-22 00:00:00.000000000 Z
+date: 2024-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport