firespring_dev_commands 2.1.4.pre.alpha.1 → 2.1.4.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 782f199b829c9205d5d6539b2e6be9d5daed015cf00e4dc4dd8743c53925b967
-  data.tar.gz: 960a71a68186fa19525cb8935ece0deb6ee398c0400913eff2a6cf39b9806635
+  metadata.gz: 7bfc98cc8da862092d77bcb5781f7ea61260c56e4207ed72cc5c2b6812a6fbaf
+  data.tar.gz: 2b1a49276792b8f5d24dbd4e188eb7c89a70d77876625e80edd193d4b06fc9ca
 SHA512:
-  metadata.gz: a662422f7c487bce2824f657c86099508af9185b71bc95168cccd8ba854282d8a0d981c6a1f6adf0b570cfa7ae4b46c05d7f9276ba3fe201c8bee175529badd4
-  data.tar.gz: 0e4872ea27d593ca5e87ff92c044ddcf7e5d284f18d2fe5644ad9d7e380da95468202ee3f4697443464cef1e113587219daaf82ba287e95e18b7c578160c5de9
+  metadata.gz: f20f8b61f93b885fe0d3039abba3d922dce072f64a565472c9ca61eaac69047679de5615e92399ffbe494069fbef2d6469fbd3661edccd0c0e4c6aa65d7a3075
+  data.tar.gz: 26f3c929fe09590e24851b5075fb2d4525f6fe3e67a0940dfc11e4289095a5338fecbe128165ead9b48ed7d27064949e96b55742913712d95d9ca2e2297f93e9

data/lib/firespring_dev_commands/aws/login.rb

@@ -38,6 +38,12 @@ module Dev
 
         region = profileini['region'] || defaultini['region'] || Dev::Aws::DEFAULT_REGION
 
+        # Explicitly set the region to the one we are logging in to. Then exit if we are already logged in.
+        # This is to fix an issue where you are attempting to log in to an account in a different region.
+        # We were seeing issue where it would still be attempting to use the old region until the process exited
+        ENV['AWS_DEFAULT_REGION'] = region
+        return if Dev::Aws::Credentials.new.active?(account)
+
         serial = profileini['mfa_serial_name'] || defaultini['mfa_serial_name']
         serial = "arn:aws:iam::#{Dev::Aws::Account.new.root.id}:mfa/#{serial}" if serial
         serial ||= profileini['mfa_serial'] || defaultini['mfa_serial']

data/lib/firespring_dev_commands/jira/issue.rb

@@ -5,7 +5,7 @@ module Dev
       # Issue subtypes which do not map to a story type
       NON_STORY_TYPES = ['review', 'sub-task', 'code review sub-task', 'pre-deploy sub-task', 'deploy sub-task', 'devops sub-task'].freeze
 
-      attr_accessor :data, :project, :id, :title, :points, :assignee, :resolved_date, :histories, :in_progress_history, :in_review_history, :closed_history
+      attr_accessor :data, :project, :id, :title, :points, :assignee, :resolved_date
 
       def initialize(data)
         @data = data
@@ -15,71 +15,10 @@ module Dev
         @points = calculate_points(data)
         @assignee = Jira::User.lookup(data.assignee&.accountId)
         @resolved_date = data.resolutiondate
-        @histories = Jira::Histories.populate(data)
-        @in_progress_history = nil
-        @in_review_history = nil
-        @closed_history = nil
-      end
-
-      def cycle_time
-        # Calculate the difference and convert to days
-        ((last_closed_history.created - first_in_progress_history.created) / 60 / 60 / 24).round(2)
-      end
-
-      def in_progress_cycle_time
-        # Calculate the difference and convert to days
-        ((first_in_review_history.created - first_in_progress_history.created) / 60 / 60 / 24).round(2)
-      end
-
-      def in_review_cycle_time
-        # Calculate the difference and convert to days
-        ((last_closed_history.created - first_in_review_history.created) / 60 / 60 / 24).round(2)
-      end
-
-      private def first_in_progress_history
-        raise 'you must expand the changelog field to calculate cycle time' if histories.nil?
-
-        # Find the first instance in the histoy where the status moved to "In Progress"
-        @in_progress_history ||= histories.select do |history|
-          history.items.find do |item|
-            item['fieldId'] == 'status' && item['toString'] == 'In Progress'
-          end
-        end.min_by(&:created)
-        raise 'unable to find "In Progress" history entry needed to calculate cycle time' unless @in_progress_history
-
-        @in_progress_history
-      end
-
-      private def first_in_review_history
-        raise 'you must expand the changelog field to calculate cycle time' if histories.nil?
-
-        # Find the first instance in the histoy where the status moved to "In Review"
-        @in_review_history ||= histories.select do |history|
-          history.items.find do |item|
-            item['fieldId'] == 'status' && item['toString'] == 'In Review'
-          end
-        end.min_by(&:created)
-        raise 'unable to find "In Review" history entry needed to calculate cycle time' unless @in_review_history
-
-        @in_review_history
-      end
-
-      private def last_closed_history
-        raise 'you must expand the changelog field to calculate cycle time' if histories.nil?
-
-        # Find the last instance in the histoy where the status moved to "Closed"
-        @closed_history ||= histories.select do |history|
-          history.items.find do |item|
-            item['fieldId'] == 'status' && item['toString'] == 'Closed'
-          end
-        end.max_by(&:created)
-        raise 'unable to find "Closed" history entry needed to calculate cycle time' unless @closed_history
-
-        @closed_history
       end
 
       # Returns the value of the jira points field or 0 if the field is not found
-      private def calculate_points(data)
+      def calculate_points(data)
         return data.send(Dev::Jira.config.points_field_name).to_i if Dev::Jira.config.points_field_name && data.respond_to?(Dev::Jira.config.points_field_name)
 
         0

data/lib/firespring_dev_commands/jira.rb

@@ -9,16 +9,15 @@ module Dev
     # "user_lookup_list" should be an array of Jira::User objects representing the usernames, ids, etc for all jira users
     #    This is a bit clumsy but currently the jira api only returns the user id with issues
     #    and there is no way to query this information from Jira directly.
-    Config = Struct.new(:username, :token, :url, :points_field_name, :expand, :user_lookup_list, :read_timeout, :http_debug) do
+    Config = Struct.new(:username, :token, :url, :points_field_name, :user_lookup_list, :read_timeout, :http_debug) do
       def initialize
         self.username = nil
         self.token = nil
         self.url = nil
         self.points_field_name = nil
-        self.expand = []
         self.user_lookup_list = []
         self.read_timeout = 120
-        self.http_debug = true
+        self.http_debug = false
       end
     end
 
@@ -63,16 +62,15 @@ module Dev
     def issues(jql, &)
       start_at = 0
       max_results = 100
-      expand = self.class.config.expand
 
       # Query Jira and yield all issues it returns
-      issues = @client.Issue.jql(jql, start_at:, max_results:, expand:)
+      issues = @client.Issue.jql(jql, start_at:, max_results:)
       issues.map { |data| Issue.new(data) }.each(&)
 
       # If we returned the max_results then there may be more - add the max results to where we start at and query again
       while issues.length >= max_results
         start_at += max_results
-        issues = @client.Issue.jql(jql, start_at:, max_results:, expand:)
+        issues = @client.Issue.jql(jql, start_at:, max_results:)
         issues.map { |data| Issue.new(data) }.each(&)
       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.4.pre.alpha.1'.freeze
+    VERSION = '2.1.4.pre.alpha.2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.1.4.pre.alpha.1
+  version: 2.1.4.pre.alpha.2
 platform: ruby
 authors:
 - Firespring
@@ -284,8 +284,6 @@ files:
 - lib/firespring_dev_commands/git.rb
 - lib/firespring_dev_commands/git/info.rb
 - lib/firespring_dev_commands/jira.rb
-- lib/firespring_dev_commands/jira/histories.rb
-- lib/firespring_dev_commands/jira/history.rb
 - lib/firespring_dev_commands/jira/issue.rb
 - lib/firespring_dev_commands/jira/project.rb
 - lib/firespring_dev_commands/jira/user.rb

data/lib/firespring_dev_commands/jira/histories.rb

@@ -1,13 +0,0 @@
-require 'pry'
-
-module Dev
-  class Jira
-    class Histories
-      def self.populate(data)
-        return nil unless data.attrs.key?('changelog')
-
-        data.changelog['histories'].map { |it| Jira::History.new(it) }
-      end
-    end
-  end
-end

data/lib/firespring_dev_commands/jira/history.rb

@@ -1,17 +0,0 @@
-require 'date'
-
-module Dev
-  class Jira
-    class History
-      attr_accessor :date, :id, :author, :created, :items
-
-      def initialize(data)
-        @data = data
-        @id = data['id']
-        @author = data['author']
-        @items = data['items']
-        @created = Time.parse(data['created'])
-      end
-    end
-  end
-end