firespring_dev_commands 2.1.22 → 2.5.0.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e072ae981046f7bdcd86b078617c9503a5d72ac2b21c2fdfce1c5c51ee8eae5b
-  data.tar.gz: b98bf6d2bb8c8c9598e5a124f9f10ba0c9c94c384e6065a7dafa1a9cefb5aff2
+  metadata.gz: e146e8c9d9c3422dfd7641c6a09ca8c2cdfad6ed430d73aec5808de28ed5d880
+  data.tar.gz: 273923aae5ccce231fc77174ed89cbe0e4f5ad59b52219b04303f983e9966e1d
 SHA512:
-  metadata.gz: 17ded1bd8523d1d695935404d604f66d724c9b032585f4d36d16f30a51485d73154438d8d37c2eb9a38a1a48c1d7e95bd21bb76290f893c9a43f4926b886bdf5
-  data.tar.gz: a971fca800581cd4ee592e9da0605c9f7c3c43702ce22ae7070c81f27ff796553eea5a8ce083d2380421019999d6af768c5df44aa9eaf73affe20d7c54817126
+  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/platform.rb

@@ -8,7 +8,7 @@ module Dev
       # Normalize the ruby platform to return a docker platform architecture format
       def determine_compute_architecture
         case RUBY_PLATFORM
-        when /x86_64|amd64|x64-mingw/
+        when /x86_64|amd64/
           'linux/amd64' # 64-bit Intel/AMD architecture
         when /arm|aarch64/
           'linux/arm64' # ARM architecture

data/lib/firespring_dev_commands/target_process/query.rb

@@ -2,13 +2,12 @@ module Dev
   class TargetProcess
     # Class for writing target process query statements
     class Query
-      attr_accessor :where, :incl, :take, :empty
+      attr_accessor :where, :incl, :take
 
       def initialize
         @where = []
         @incl = []
         @take = 250
-        @empty = false
       end
 
       # Add a new query clause
@@ -34,11 +33,6 @@ 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|
@@ -56,38 +50,22 @@ 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)
-        if team_ids.nil? || team_ids.empty?
-          @empty = true
-          return
-        end
-        self << "(Team.Id in ('#{team_ids.join("', '")}'))"
+        self << "(Team.Id in ('#{team_ids.join("', '")}'))" unless team_ids.nil? || team_ids.empty?
       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)
-        if states.nil? || states.empty?
-          @empty = true
-          return
-        end
-        self << "(EntityState.Name in ('#{states.join("', '")}'))"
+        self << "(EntityState.Name in ('#{states.join("', '")}'))" unless states.nil? || states.empty?
       end
 
       # Add a filter that looks for stories whose state is set to final
@@ -136,11 +114,7 @@ module Dev
 
       # Add a filter that looks for assignable ids which are included in the given array
       def filter_by_entity_ids(entity_ids)
-        if entity_ids.nil? || entity_ids.empty?
-          @empty = true
-          return
-        end
-        self << "(Assignable.Id in ('#{entity_ids.join("', '")}'))"
+        self << "(Assignable.Id in ('#{entity_ids.join("', '")}'))" unless entity_ids.nil? || entity_ids.empty?
       end
 
       # Add a filter that looks for a custom deploy date between the given dates`

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)
@@ -117,8 +117,6 @@ 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/application.rb

@@ -72,7 +72,7 @@ module Dev
               return if exclude.include?(:sh)
 
               desc "Open a shell into a running #{application} container"
-              task sh: %W(init_docker #{application}:up_no_deps _pre_sh_hooks) do
+              task sh: %W(init_docker #{application}:up _pre_sh_hooks) do
                 Dev::Docker::Compose.new(services: [application]).sh
                 Rake::Task[:_post_sh_hooks].execute
               end
@@ -154,7 +154,7 @@ module Dev
               return if exclude.include?(:reload)
 
               desc "Reloads the #{application} container"
-              task reload: %w(init_docker _pre_reload_hooks down up_no_deps) do
+              task reload: %w(init_docker _pre_reload_hooks down up) do
                 Rake::Task[:_post_reload_hooks].execute
               end
             end

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

@@ -7,24 +7,11 @@ module Dev
       module Node
         # Class for default rake tasks associated with a node project
         class Application < Dev::Template::ApplicationInterface
-          attr_reader :node, :start_container_dependencies_on_test
-
-          # Create the templated rake tasks for the node application
-          #
-          # @param application [String] The name of the application
-          # @param container_path [String] The path to the application inside of the container
-          # @param local_path [String] The path to the application on your local system
-          # @param start_container_dependencies_on_test [Boolean] Whether or not to start up container dependencies when running tests
-          # @param exclude [Array<Symbol>] An array of default template tasks to exclude
-          def initialize(
-            application,
-            container_path: nil,
-            local_path: nil,
-            start_container_dependencies_on_test: true,
-            exclude: []
-          )
+          attr_reader :node
+
+          # Allow for custom container path for the application
+          def initialize(application, container_path: nil, local_path: nil, exclude: [])
             @node = Dev::Node.new(container_path:, local_path:)
-            @start_container_dependencies_on_test = start_container_dependencies_on_test
             super(application, exclude:)
           end
 
@@ -72,7 +59,6 @@ module Dev
             application = @name
             node = @node
             exclude = @exclude
-            up_cmd = @start_container_dependencies_on_test ? :up : :up_no_deps
             return if exclude.include?(:test)
 
             DEV_COMMANDS_TOP_LEVEL.instance_eval do
@@ -84,7 +70,7 @@ module Dev
 
                 namespace :node do
                   desc "Run all node tests against the #{application}'s codebase"
-                  task test: %W(init_docker #{up_cmd}) do
+                  task test: %w(init_docker up) do
                     LOG.debug("Running all node tests in the #{application} codebase")
 
                     options = []

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,23 +8,15 @@ module Dev
       module Php
         # Class for default rake tasks associated with a php project
         class Application < Dev::Template::ApplicationInterface
-          attr_reader :php, :start_container_dependencies_on_test
-
-          # Create the templated rake tasks for the php application
-          #
-          # @param application [String] The name of the application
-          # @param container_path [String] The path to the application inside of the container
-          # @param local_path [String] The path to the application on your local system
-          # @param start_container_dependencies_on_test [Boolean] Whether or not to start up container dependencies when running tests
-          def initialize(
-            application,
-            container_path: nil,
-            local_path: nil,
-            start_container_dependencies_on_test: true,
-            exclude: []
-          )
+          attr_reader :php, :siloed_tests
+
+          # Allow for custom container path for the application
+          def initialize(application, container_path: nil, local_path: nil, siloed_tests: nil, exclude: [])
             @php = Dev::Php.new(container_path:, local_path:)
-            @start_container_dependencies_on_test = start_container_dependencies_on_test
+            # TODO: Better name
+            # TODO: Should this apply to all or just tests?
+            @siloed_tests = siloed_tests
+
             super(application, exclude:)
           end
 
@@ -114,8 +107,8 @@ module Dev
           def create_test_task!
             application = @name
             php = @php
+            siloed_tests = @siloed_tests
             exclude = @exclude
-            up_cmd = @start_container_dependencies_on_test ? :up : :up_no_deps
             return if exclude.include?(:test)
 
             DEV_COMMANDS_TOP_LEVEL.instance_eval do
@@ -127,12 +120,16 @@ module Dev
 
                 namespace :php do
                   desc "Run all php tests against the #{application}'s codebase"
-                  task test: %W(init_docker #{up_cmd}) do
+                  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/templates/docker/ruby/application.rb

@@ -7,23 +7,11 @@ module Dev
       module Ruby
         # Class for default rake tasks associated with a ruby project
         class Application < Dev::Template::ApplicationInterface
-          attr_reader :ruby, :start_container_dependencies_on_test
-
-          # Create the templated rake tasks for the ruby application
-          #
-          # @param application [String] The name of the application
-          # @param container_path [String] The path to the application inside of the container
-          # @param local_path [String] The path to the application on your local system
-          # @param start_container_dependencies_on_test [Boolean] Whether or not to start up container dependencies when running tests
-          def initialize(
-            application,
-            container_path: nil,
-            local_path: nil,
-            start_container_dependencies_on_test: true,
-            exclude: []
-          )
+          attr_reader :ruby
+
+          # Allow for custom container path for the application
+          def initialize(application, container_path: nil, local_path: nil, exclude: [])
             @ruby = Dev::Ruby.new(container_path:, local_path:)
-            @start_container_dependencies_on_test = start_container_dependencies_on_test
             super(application, exclude:)
           end
 
@@ -71,7 +59,6 @@ module Dev
             application = @name
             ruby = @ruby
             exclude = @exclude
-            up_cmd = @start_container_dependencies_on_test ? :up : :up_no_deps
             return if exclude.include?(:test)
 
             DEV_COMMANDS_TOP_LEVEL.instance_eval do
@@ -83,7 +70,7 @@ module Dev
 
                 namespace :ruby do
                   desc "Run all ruby tests against the #{application}'s codebase"
-                  task test: %W(init_docker #{up_cmd}) do
+                  task test: %w(init_docker up_no_deps) do
                     LOG.debug("Running all ruby tests in the #{application} codebase")
 
                     options = []

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.22'.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.22
+  version: 2.5.0.pre.alpha.1
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-04 00:00:00.000000000 Z
+date: 2023-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,154 +16,154 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.2
+        version: 7.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.2
+        version: 7.1.1
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.97.0
+        version: 1.83.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.97.0
+        version: 1.83.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-codepipeline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.67.0
+        version: 1.59.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.67.0
+        version: 1.59.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.68.0
+        version: 1.61.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.68.0
+        version: 1.61.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-elasticache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.95.0
+        version: 1.88.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.95.0
+        version: 1.88.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-lambda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.113.0
+        version: 1.101.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.113.0
+        version: 1.101.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-opensearchservice
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.33.0
+        version: 1.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.33.0
+        version: 1.24.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-rds
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.208.0
+        version: 1.183.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.208.0
+        version: 1.183.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.141.0
+        version: 1.127.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.141.0
+        version: 1.127.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ssm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.162.0
+        version: 1.154.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.162.0
+        version: 1.154.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sts
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -249,61 +249,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.3.0
 - !ruby/object:Gem::Dependency
-  name: ox
+  name: libxml-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.14.17
+        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.14.17
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.1.0
+        version: 13.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.1.0
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.1.0
 description: Ruby library for creating/maintaining your development environment
 email: opensource@firespring.com
 executables: []
@@ -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
@@ -403,9 +399,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:

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