firespring_dev_commands 2.1.21.pre.alpha.3 → 2.1.21.pre.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23ad8131b620682ed6d6e9b496934646615c3aca3c0656886a624e03c73f0041
-  data.tar.gz: 936887064f1e8e3c71193af00a105b3808ede716b5bf72cc959c7db63d459ac0
+  metadata.gz: 831bd71e091dc6ad04f4ce368c343207845a6d9ae175fe12f40e36dee14717c3
+  data.tar.gz: 5eb6f226edc9309bb1a6873127decc4b678aea8d3e8005c5686d9c082096b05d
 SHA512:
-  metadata.gz: 89cd73bbf3342e5ff66a9762311bfd07a5c78f18aa7dc92d3edaef96d55277054a887b011b672a3a9d2689870a98c1a1784ee5061f6539bba8a95856fe86d095
-  data.tar.gz: e0a8077e578697502912063cdf9004d21c993cb32b54cbfb46b158f59b7f7a37ac6362358606070451113ead000bf7759859999cc9818eddbbeba7cdda43965f
+  metadata.gz: 7fb65d68db2549227de42ee2f5921e7a2586020aabfe9fcd54d1e923f089c9ba0e3e16338c8d800c0e526dc18e49d38819364df4a99db209140b13c19cb58680
+  data.tar.gz: e8da4354c580c083584c7e2850bce7865e99ecb4646224170e4a5b519e8a0b0d09557c6125e5fde99f29980eb917ec5b4218bd465c352250b101e564944bd835

data/lib/firespring_dev_commands/coverage/cobertura.rb

@@ -18,17 +18,24 @@ module Dev
         # Remove any previous coverage info
         FileUtils.rm_f(local_filename, verbose: true)
 
+        # Return the needed php commands to generate the cobertura report
         %W(--coverage-cobertura #{container_filename})
       end
 
       # Parse the cobertura file as a hash and check the total coverage against the desired threshold
-      def check
+      def check(application: nil)
+        # If an application has been specified and the file does not exist locally, attempt to copy it back from the docker container
+        if application && !File.exist?(local_filename)
+          container = Dev::Docker::Compose.new.container_by_name(application)
+          Dev::Docker.new.copy_from_container(container, container_filename, local_filename, required: true)
+        end
+
+        # Load the file from disk and parse with ox
         report = Ox.load(File.read(local_filename), mode: :hash)
         attrs, = report[:coverage]
         cov_pct = attrs[:'line-rate'].to_f * 100
-        raise format('Line coverage %.2f%% is less than the threshold %.2f%%', cov_pct, threshold) if cov_pct < threshold
-
-        puts format('Line coverage %.2f%% is above the threshold %.2f%%', cov_pct, threshold)
+        puts format('Line coverage was %.2f%%. Configured threshold was %.2f%%', cov_pct, threshold)
+        raise 'Code coverage not met' if cov_pct < threshold
       end
     end
   end

data/lib/firespring_dev_commands/docker.rb

@@ -138,8 +138,14 @@ 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_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)
@@ -154,6 +160,7 @@ module Dev
     # 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}... "
 
       tar = StringIO.new

data/lib/firespring_dev_commands/php.rb

@@ -101,8 +101,8 @@ module Dev
     end
 
     # Run the check to ensure code coverage meets the desired threshold
-    def check_test_coverage
-      coverage.check
+    def check_test_coverage(application:)
+      coverage.check(application:)
     end
 
     # Build the php fast test command

data/lib/firespring_dev_commands/templates/docker/php/application.rb

@@ -135,7 +135,7 @@ module Dev
                     options = []
                     options << '-T' if Dev::Common.new.running_codebuild?
                     Dev::Docker::Compose.new(services: application, options:).exec(*php.test_command)
-                    php.check_test_coverage
+                    php.check_test_coverage(application:)
                   end
                 end
               end

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.21.pre.alpha.3'.freeze
+    VERSION = '2.1.21.pre.alpha.5'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.1.21.pre.alpha.3
+  version: 2.1.21.pre.alpha.5
 platform: ruby
 authors:
 - Firespring