firespring_dev_commands 2.1.16.pre.alpha.2 → 2.5.0.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f810b97efdfffe33d29fc32b31c63e59e988e4c7b11e82d68a4cd6e85262a7b0
-  data.tar.gz: 965832c284d5276501f658c5a0d7d70c6a4b4f88ef84c834011bc4b6bdb1cd6f
+  metadata.gz: e146e8c9d9c3422dfd7641c6a09ca8c2cdfad6ed430d73aec5808de28ed5d880
+  data.tar.gz: 273923aae5ccce231fc77174ed89cbe0e4f5ad59b52219b04303f983e9966e1d
 SHA512:
-  metadata.gz: ea9ffaa8921ed4c75f1e0c3c9262167fa45faa382d0d9074c22d4aa6a4318856dc380a7f23f5ce2b09e5a20197af193e587f102ded1bc09447c81c6a87aac092
-  data.tar.gz: ad5e684614fb9bcadba6a6a975712bf1a6ccd4d27687cb3e1288fd8efc34bea5cb1285c4da47b12f7a72f1eb283bb71f0e6bbae604ae071bb7d3d0eadbac9b69
+  metadata.gz: 67223e6ba12a10f798d7fee6b1cab844da41cd3dc65a449330e8c8bd0ef86180cc297889b7365b7b68f5ca8054919e9881693707ecfde02e539d0a7e22c6af51
+  data.tar.gz: ada0e13a3f2d8022687a2542503bad6bc847bf32fc17604116d17e06ed46ee7efa18aea35635c31a26c07f5ccdd6a3c5083235edaafd77684528bc487c17f3c7

data/lib/firespring_dev_commands/audit/report.rb

@@ -3,12 +3,11 @@ module Dev
   class Audit
     # The class containing standardized information about an audit report
     class Report
-      attr_accessor :items, :min_severity, :error_on_unknown, :ignorelist, :filtered_items
+      attr_accessor :items, :min_severity, :ignorelist, :filtered_items
 
       def initialize(
         items,
         min_severity: ENV.fetch('MIN_SEVERITY', nil),
-        error_on_unknown: ENV.fetch('ERROR_ON_UNKNOWN', nil),
         ignorelist: ENV['IGNORELIST'].to_s.split(/\s*,\s*/)
       )
         # Items should be an array of Item objects
@@ -16,18 +15,12 @@ module Dev
         raise 'items must all be report items' unless @items.all?(Dev::Audit::Report::Item)
 
         @min_severity = min_severity || Level::HIGH
-        @error_on_unknown = error_on_unknown
         @ignorelist = Array(ignorelist).compact
       end
 
       # Get all severities greater than or equal to the minimum severity
       def desired_severities
-        max_severity = if error_on_unknown.to_s.strip == 'true'
-                         -1
-                       else
-                         -2
-                       end
-        LEVELS.slice(LEVELS.find_index(min_severity)..max_severity)
+        LEVELS.slice(LEVELS.find_index(min_severity)..-1)
       end
 
       # Run the filters against the report items and filter out any which should be excluded

data/lib/firespring_dev_commands/node.rb

@@ -96,7 +96,7 @@ module Dev
       test
     end
 
-    # Build the node test command
+    # Build the node test (with coverage) command
     def test_coverage_command
       test = base_command
       test << 'run' << 'test:coverage'

data/lib/firespring_dev_commands/php.rb

@@ -58,12 +58,9 @@ module Dev
     end
 
     # Build the command to fix any security vulnerabilities that were found
-    # def audit_fix_command
-    #  audit_fix = base_command
-    #  audit_fix << 'audit' << 'fix'
-    #  audit_fix.concat(Dev::Common.new.tokenize(ENV['OPTS'].to_s))
-    #  audit_fix
-    # end
+    def audit_fix_command
+      raise 'not implemented'
+    end
 
     # Build the php install command
     def install_command
@@ -76,7 +73,7 @@ module Dev
     # Build the php lint command
     def lint_command
       lint = base_command
-      lint << 'lint'
+      lint << 'run' << 'lint'
       lint.concat(Dev::Common.new.tokenize(ENV['OPTS'].to_s))
       lint
     end
@@ -84,7 +81,7 @@ module Dev
     # Build the php lint fix command
     def lint_fix_command
       lint_fix = base_command
-      lint_fix << 'lint-fix'
+      lint_fix << 'run' << 'lint-fix'
       lint_fix.concat(Dev::Common.new.tokenize(ENV['OPTS'].to_s))
       lint_fix
     end
@@ -92,18 +89,14 @@ module Dev
     # Build the php test command
     def test_command
       test = []
-      test << './vendor/bin/phpunit'
+      lint_fix << 'run' << 'test'
       test.concat(Dev::Common.new.tokenize(ENV['OPTS'].to_s))
       test
     end
 
-    # Build the php fast test command
-    def test_fast_command(processes = 4)
-      test = []
-      test << './vendor/bin/paratest'
-      test.concat(Dev::Common.new.tokenize(ENV['OPTS'].to_s))
-      test << "-p#{processes}" << '--runner=WrapperRunner'
-      test
+    # Build the php test (with coverage) command
+    def test_coverage_command
+      raise 'not implemented'
     end
   end
 end

data/lib/firespring_dev_commands/target_process.rb

@@ -15,7 +15,7 @@ module Dev
     # The text of the url variable key
     TP_URL = 'TP_URL'.freeze
 
-    # Config object for setting top level target process config options
+    # Config object for setting top level jira config options
     Config = Struct.new(:username, :password, :url, :http_debug) do
       def initialize
         Dotenv.load(CONFIG_FILE) if File.exist?(CONFIG_FILE)

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

@@ -1,4 +1,5 @@
 require_relative '../../base_interface'
+require 'securerandom'
 
 module Dev
   module Template
@@ -7,11 +8,15 @@ module Dev
       module Php
         # Class for default rake tasks associated with a php project
         class Application < Dev::Template::ApplicationInterface
-          attr_reader :php
+          attr_reader :php, :siloed_tests
 
           # Allow for custom container path for the application
-          def initialize(application, container_path: nil, local_path: nil, exclude: [])
+          def initialize(application, container_path: nil, local_path: nil, siloed_tests: nil, exclude: [])
             @php = Dev::Php.new(container_path:, local_path:)
+            # TODO: Better name
+            # TODO: Should this apply to all or just tests?
+            @siloed_tests = siloed_tests
+
             super(application, exclude:)
           end
 
@@ -102,6 +107,7 @@ module Dev
           def create_test_task!
             application = @name
             php = @php
+            siloed_tests = @siloed_tests
             exclude = @exclude
             return if exclude.include?(:test)
 
@@ -117,9 +123,13 @@ module Dev
                   task test: %w(init_docker up) do
                     LOG.debug("Running all php tests in the #{application} codebase")
 
+                    project_name = nil
+                    project_name = SecureRandom.hex if siloed_tests
+
                     options = []
                     options << '-T' if Dev::Common.new.running_codebuild?
-                    Dev::Docker::Compose.new(services: application, options:).exec(*php.test_command)
+                    Dev::Docker::Compose.new(project_name:, services: application, options:).exec(*php.test_command)
+                    # TODO: Add clean if we are siloed
                   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.16.pre.alpha.2'.freeze
+    VERSION = '2.5.0.pre.alpha.1'.freeze
   end
 end

data/lib/firespring_dev_commands.rb

@@ -11,7 +11,7 @@ DEV_COMMANDS_TOP_LEVEL = self
 
 # Load all gems referenced in the Gemfile
 require 'bundler'
-Bundler.require(:default)
+Bundler.require
 
 # Add libdir to the default ruby path
 libdir = File.realpath(File.dirname(__FILE__))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.1.16.pre.alpha.2
+  version: 2.5.0.pre.alpha.1
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-04 00:00:00.000000000 Z
+date: 2023-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -327,10 +327,6 @@ files:
 - lib/firespring_dev_commands/aws/parameter.rb
 - lib/firespring_dev_commands/aws/profile.rb
 - lib/firespring_dev_commands/aws/s3.rb
-- lib/firespring_dev_commands/bloom_growth.rb
-- lib/firespring_dev_commands/bloom_growth/rock.rb
-- lib/firespring_dev_commands/bloom_growth/seat.rb
-- lib/firespring_dev_commands/bloom_growth/user.rb
 - lib/firespring_dev_commands/boolean.rb
 - lib/firespring_dev_commands/common.rb
 - lib/firespring_dev_commands/daterange.rb

data/lib/firespring_dev_commands/bloom_growth/rock.rb

@@ -1,34 +0,0 @@
-module Dev
-  class BloomGrowth
-    # Class containing rock information
-    class Rock
-      attr_accessor :data, :id, :type, :name, :owner, :complete, :completion_id, :created, :due
-      attr_reader :state
-
-      def initialize(data)
-        @data = data
-        @id = data['Id']
-        @type = data['Type']
-        @name = data['Name'].to_s.strip
-        @owner = User.new(data['Owner']) if data['Owner']
-        @complete = data['Complete']
-        @completion_id = data['Completion']
-        @created = Time.parse(data['CreateTime']) if data['CreateTime']
-        @due = Time.parse(data['DueDate']) if data['DueDate']
-        @archived = data['Archived']
-      end
-
-      # Convert the completion_id bloom growth gives us into a text version
-      def state
-        case completion_id
-        when 0
-          'Off Track'
-        when 1
-          'On Track'
-        when 2
-          'Complete'
-        end
-      end
-    end
-  end
-end

data/lib/firespring_dev_commands/bloom_growth/seat.rb

@@ -1,16 +0,0 @@
-module Dev
-  class BloomGrowth
-    # Class containing seat information
-    class Seat
-      attr_accessor :data, :id, :type, :name
-
-      def initialize(data)
-        @data = data
-        position = data.dig('Group', 'Position')
-        @id = position&.fetch('Id')
-        @type = position&.fetch('Type')
-        @name = position&.fetch('Name').to_s.strip
-      end
-    end
-  end
-end

data/lib/firespring_dev_commands/bloom_growth/user.rb

@@ -1,43 +0,0 @@
-module Dev
-  class BloomGrowth
-    # Class containing user information
-    class User
-      attr_accessor :data, :id, :type, :name, :rocks, :direct_reports, :seats
-
-      def initialize(data)
-        @data = data
-        @id = data['Id']
-        @type = data['Type']
-        @name = data['Name'].to_s.strip
-        @rocks = nil
-        @direct_reports = nil
-        @seats = nil
-      end
-
-      def rocks
-        @rocks ||= [].tap do |ary|
-          Dev::BloomGrowth.new.get("/api/v1/rocks/user/#{id}") do |data|
-            ary << Rock.new(data)
-          end
-        end
-      end
-
-      def direct_reports
-        @direct_reports ||= [].tap do |ary|
-          Dev::BloomGrowth.new.get("/api/v1/users/#{id}/directreports") do |data|
-            ary << User.new(data)
-          end
-        end
-      end
-
-      def seats
-        @seats ||= [].tap do |ary|
-          Dev::BloomGrowth.new.get("/api/v1/users/#{id}/seats") do |data|
-            ary << Seat.new(data)
-            puts ary.last.inspect
-          end
-        end
-      end
-    end
-  end
-end

data/lib/firespring_dev_commands/bloom_growth.rb

@@ -1,132 +0,0 @@
-require 'net/http'
-
-module Dev
-  # Class for interacting with the Bloom Growth api
-  class BloomGrowth
-    # The config file to try to load credentials from
-    CONFIG_FILE = "#{Dir.home}/.env.bloom".freeze
-
-    # The text of the username variable key
-    BLOOM_USERNAME = 'BLOOM_USERNAME'.freeze
-
-    # The text of the password variable key
-    BLOOM_PASSWORD = 'BLOOM_PASSWORD'.freeze
-
-    # The text of the token variable key
-    BLOOM_TOKEN = 'BLOOM_TOKEN'.freeze
-
-    # The text of the url variable key
-    BLOOM_URL = 'BLOOM_URL'.freeze
-
-    # Config object for setting top level bloom growth config options
-    Config = Struct.new(:username, :password, :url, :http_debug) do
-      def initialize
-        Dotenv.load(CONFIG_FILE) if File.exist?(CONFIG_FILE)
-
-        self.username = ENV.fetch(BLOOM_USERNAME, nil)
-        self.password = ENV.fetch(BLOOM_PASSWORD, nil)
-        self.url = ENV.fetch(BLOOM_URL, 'https://app.bloomgrowth.com')
-        self.http_debug = false
-      end
-    end
-
-    class << self
-      # Instantiates a new top level config object if one hasn't already been created
-      # Yields that config object to any given block
-      # Returns the resulting config object
-      def config
-        @config ||= Config.new
-        yield(@config) if block_given?
-        @config
-      end
-
-      # Alias the config method to configure for a slightly clearer access syntax
-      alias_method :configure, :config
-    end
-
-    attr_accessor :username, :password, :url, :token, :client, :default_headers
-
-    # Initialize a new target process client using the given inputs
-    def initialize(username: self.class.config.username, password: self.class.config.password, url: self.class.config.url)
-      raise 'username is required' if username.to_s.strip.empty?
-      raise 'password is required' if password.to_s.strip.empty?
-      raise 'url is required' if url.to_s.strip.empty?
-
-      @username = username
-      @password = password
-      @url = url
-      uri = URI.parse(@url)
-      @client = Net::HTTP.new(uri.host, uri.port)
-      @client.use_ssl = true
-      @client.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      @client.set_debug_output(LOG) if self.class.config.http_debug
-      @default_headers = {
-        'authorization' => "Bearer #{token}",
-        'content-type' => 'application/json',
-        'accept' => 'application/json'
-      }
-    end
-
-    # Method for getting a bearer token for the bloom growth api. There are a couple of possible logic paths
-    #   - If a token has already been defined, use it
-    #   - If a token is found in the ENV, use it
-    #   - Otherwise, use the username and passowrd that has been configured to request a new token from bloom
-    def token
-      @token ||= ENV.fetch(BLOOM_TOKEN, nil)
-
-      unless @token
-        response = post(
-          '/Token',
-          {
-            grant_type: 'password',
-            userName: username,
-            password:
-          },
-          headers: {
-            'content-type' => 'application/json',
-            'accept' => 'application/json'
-          }
-        )
-        # TODO: Should we look at https://github.com/DannyBen/lightly for caching the token?
-        @token = ENV[BLOOM_TOKEN] = response['access_token']
-        LOG.info("Retrieved BloomGrowth token. Expires on #{Time.now + response['expires_in']}")
-      end
-
-      @token
-    end
-
-    # Return all user objects visible to the logged in user
-    def visible_users(&)
-      [].tap do |ary|
-        get('/api/v1/users/mineviewable') do |user_data|
-          ary << User.new(user_data)
-        end
-        ary.each(&)
-      end
-    end
-
-    # Perform a get request to the given path using the given query
-    # Call the given block (if present) with each piece of data
-    # Return all pieces of data
-    def get(path, query_string: nil, headers: default_headers, &)
-      url = path
-      url << "?#{URI.encode_www_form(query_string)}" unless query_string.to_s.strip.empty?
-
-      response = client.request_get(url, headers)
-      raise "Error querying #{url} [#{query_string}]: #{response.inspect}" unless response.response.is_a?(Net::HTTPSuccess)
-
-      JSON.parse(response.body).each(&)
-      nil
-    end
-
-    # Perform a post request to the given path using the gien data
-    # Return the parsed json body
-    def post(path, data, headers: default_headers)
-      data = data.to_json unless data.is_a?(String)
-      response = client.request_post(path, data, headers)
-      raise "Error querying #{url}/#{path}: #{response.inspect}" unless response.response.is_a?(Net::HTTPSuccess)
-
-      JSON.parse(response.body)
-    end
-  end
-end