firespring_dev_commands 2.1.21.pre.alpha.9 → 2.1.22.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4189e443ce57ccf4e992178ad2dd0de137017a8d78f6d63a4e4f7b55f76fe61b
-  data.tar.gz: ab87b579efff5fe40edfad306c6088504b176b61f4d0997e8ab8804f65a61177
+  metadata.gz: 7846bf81995b28016a6f50953c105e3e6ffd5254f840c5d1932d5809d74ec5db
+  data.tar.gz: 398648a97d3b46270bfec9e5d9f954c743bef815f37e8bf2bcae97461e4619aa
 SHA512:
-  metadata.gz: 329dc4520ff98700950aef5c5b67920e8f8b520d6f8eba693150526e7144c962b55c31924e0d956b108fe8914777d4d21daf14c20393bb3f61902c19dd92a315
-  data.tar.gz: 873fcd5623d4e007cd2018285656caa029fdbf9dc34714b64df4223a10cb118b95919bbc428176ee7d68b29da6aea130163881a5480cd0fe2db7a033795af8ae
+  metadata.gz: 3feaa407786cb229b54e028f24e3771163ccfd615468a749f830e8a03f79fc0c45178762fff603902df216837ad95a128937e89fff56ffd6238cdd898c0465f1
+  data.tar.gz: ce23794f53be4086d5df5edbcaa2ce99ed506ef098b550d8b68a19a81b11b82549b41c60d4a3d42d59de9c13ad610c95e743df612147381dcc67075e474e1804

data/lib/firespring_dev_commands/docker.rb

@@ -138,14 +138,8 @@ 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)
@@ -160,7 +154,6 @@ 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

@@ -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,13 +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
     end
 
     # The base npm command that is the starting point for all subsequent commands
@@ -95,16 +93,10 @@ module Dev
     def test_command
       test = []
       test << './vendor/bin/phpunit'
-      test.concat(coverage.php_options) if coverage
       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 = []

data/lib/firespring_dev_commands/target_process/query.rb

@@ -2,12 +2,13 @@ module Dev
   class TargetProcess
     # Class for writing target process query statements
     class Query
-      attr_accessor :where, :incl, :take
+      attr_accessor :where, :incl, :take, :empty
 
       def initialize
         @where = []
         @incl = []
         @take = 250
+        @empty = false
       end
 
       # Add a new query clause
@@ -33,6 +34,11 @@ module Dev
         end
       end
 
+      # Check if any of the "in" statements were empty. If so then we don't want to actually run the query
+      def empty?
+        @empty == true
+      end
+
       # Generate the string representation for this query
       def generate
         {}.tap do |clause|
@@ -50,22 +56,38 @@ module Dev
       # TODO: Do these need moved to their associated entities?
       # Add a filter that looks for stories whose id is contained in the list of ids given
       def filter_by_user_story_ids(user_story_ids)
+        if user_story_ids.nil? || user_story_ids.empty?
+          @empty = true
+          return
+        end
         self << "(Id in ('#{user_story_ids.join("', '")}'))"
       end
 
       # Add a filter that looks for stories whose team id is contained in the list of ids given
       def filter_by_team_ids(team_ids)
-        self << "(Team.Id in ('#{team_ids.join("', '")}'))" unless team_ids.nil? || team_ids.empty?
+        if team_ids.nil? || team_ids.empty?
+          @empty = true
+          return
+        end
+        self << "(Team.Id in ('#{team_ids.join("', '")}'))"
       end
 
       # Add a filter that looks for stories whose project id is contained in the list of ids given
       def filter_by_project(projects)
+        if projects.nil? || projects.empty?
+          @empty = true
+          return
+        end
         self << "(Project.Name in ('#{projects.join("', '")}'))"
       end
 
       # Add a filter that looks for stories whose state is contained in the list of states given
       def filter_by_states(states)
-        self << "(EntityState.Name in ('#{states.join("', '")}'))" unless states.nil? || states.empty?
+        if states.nil? || states.empty?
+          @empty = true
+          return
+        end
+        self << "(EntityState.Name in ('#{states.join("', '")}'))"
       end
 
       # Add a filter that looks for stories whose state is set to final
@@ -114,7 +136,11 @@ module Dev
 
       # Add a filter that looks for assignable ids which are included in the given array
       def filter_by_entity_ids(entity_ids)
-        self << "(Assignable.Id in ('#{entity_ids.join("', '")}'))" unless entity_ids.nil? || entity_ids.empty?
+        if entity_ids.nil? || entity_ids.empty?
+          @empty = true
+          return
+        end
+        self << "(Assignable.Id in ('#{entity_ids.join("', '")}'))"
       end
 
       # Add a filter that looks for a custom deploy date between the given dates`

data/lib/firespring_dev_commands/target_process.rb

@@ -117,6 +117,8 @@ module Dev
     # Call the given block (if present) with each piece of data
     # Return all pieces of data
     def get(path, query, &)
+      return [] if query.empty?
+
       query_string = query.generate
       url = "/api/v1/#{path}"
       url << "?#{URI.encode_www_form(query_string)}" unless query_string.empty?

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

@@ -20,12 +20,10 @@ module Dev
             container_path: nil,
             local_path: nil,
             start_container_dependencies_on_test: true,
-            coverage: nil,
             exclude: []
           )
-            @php = Dev::Php.new(container_path:, local_path:, coverage:)
+            @php = Dev::Php.new(container_path:, local_path:)
             @start_container_dependencies_on_test = start_container_dependencies_on_test
-
             super(application, exclude:)
           end
 
@@ -135,7 +133,6 @@ 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(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.9'.freeze
+    VERSION = '2.1.22.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.21.pre.alpha.9
+  version: 2.1.22.pre.alpha.1
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-02 00:00:00.000000000 Z
+date: 2024-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -333,9 +333,6 @@ files:
 - lib/firespring_dev_commands/bloom_growth/user.rb
 - lib/firespring_dev_commands/boolean.rb
 - lib/firespring_dev_commands/common.rb
-- lib/firespring_dev_commands/coverage/base.rb
-- lib/firespring_dev_commands/coverage/cobertura.rb
-- lib/firespring_dev_commands/coverage/none.rb
 - lib/firespring_dev_commands/daterange.rb
 - lib/firespring_dev_commands/docker.rb
 - lib/firespring_dev_commands/docker/compose.rb

data/lib/firespring_dev_commands/coverage/base.rb

@@ -1,13 +0,0 @@
-module Dev
-  module Coverage
-    class Base
-      def php_options
-        raise 'not implemented'
-      end
-
-      def check(*)
-        raise 'not implemented'
-      end
-    end
-  end
-end

data/lib/firespring_dev_commands/coverage/cobertura.rb

@@ -1,86 +0,0 @@
-module Dev
-  # Module containing different classes for interfacing with coverage files
-  module Coverage
-    # Class for checking code coverage using cobertura
-    class Cobertura < Base
-      attr_reader :local_filename, :container_filename, :filename, :threshold, :exclude
-
-      def initialize(filename: File.join('coverage', 'cobertura.xml'), threshold: nil, container_path: nil, local_path: nil, exclude: nil)
-        super()
-
-        @filename = filename
-        @local_filename = File.join(local_path || '.', @filename)
-        @container_filename = File.join(container_path || '.', @filename)
-        @threshold = threshold
-        @exclude = (exclude || []).map do |it|
-          next it if it.is_a?(Regex)
-
-          Regex.new(it)
-        end
-      end
-
-      # Remove any previous versions of the local file that will be output
-      # return the phpunit options needed to regenerate the cobertura xml file
-      def php_options
-        # 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 and check the lines missed against the desired threshold
-      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
-
-        report = Ox.load(File.read(local_filename))
-        total_missed = report.coverage.locate('packages/package').sum { |package| parse_package_missed(package) }
-        puts "Lines missing coverage was #{total_missed}"
-        puts "Configured threshold was #{threshold}" if threshold
-        raise 'Code coverage not met' if threshold && total_missed > threshold
-      end
-
-      # Go through the package and add up all of the lines that were missed
-      # Ignore if the file was in the exlude list
-      private def parse_package_missed(package)
-        filename =  package.attributes[:name]
-        return if exclude.any? { |it| it.match(filename) }
-
-        missed = 0
-        lines_processed = Set.new
-        package.locate('classes/class/lines/line').each do |line|
-          # Don't count lines multiple times
-          line_number = line.attributes[:number]
-          next if lines_processed.include?(line_number)
-
-          lines_processed << line_number
-          missed += 1 unless line.attributes[:hits].to_i.positive?
-        end
-        total = lines_processed.length
-
-        sanity_check_coverage_against_cobertura_values(package, missed, total)
-        missed
-      end
-
-      # Calculate the coverage percent based off the numbers we got and compare to the
-      # value cobertura reported. This is meant as a sanity check that we are reading the data correctly
-      # TODO: This should be removed after the above logic has been vetted
-      private def sanity_check_coverage_against_cobertura_values(package, missed, total)
-        line_rate = package.attributes[:'line-rate']
-        cobertura_reported_coverage = line_rate.to_f
-        cobertura_reported_precision = line_rate.split('.').last.length
-
-        file_coverage = 0.0
-        file_coverage = ((total - missed).to_f / total).round(cobertura_reported_precision) if total.positive?
-        return if file_coverage == cobertura_reported_coverage
-
-        filename = package.attributes[:name]
-        puts "WARNINNG: #{filename} coverage (#{file_coverage}) differed from what cobertura reported (#{cobertura_reported_coverage})"
-      end
-    end
-  end
-end

data/lib/firespring_dev_commands/coverage/none.rb

@@ -1,17 +0,0 @@
-module Dev
-  module Coverage
-    class None < Base
-      def initialize(*)
-        super()
-      end
-
-      def php_options
-        []
-      end
-
-      def check(*)
-        puts 'Coverage not configured'
-      end
-    end
-  end
-end