firespring_dev_commands 2.1.5.pre.alpha.4 → 2.1.6.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b0ed9fd9f98ba8519047e26cdd8a2c9f9d17a36ab4fc7a5892a314443205e6d
-  data.tar.gz: 8522ba7b6923d0098453ac9f38b37d42d13685a046ae1e4ccf81928af87ce8cf
+  metadata.gz: 17a02c0b5521ca1da3efb1b8374529732d7dde86060a9864f1d75be1ba070f6f
+  data.tar.gz: 9264d32211c1d1da7726215e8bf2c4f5df187f915ed9c38c29cdf336675b7e8b
 SHA512:
-  metadata.gz: f86272afe09c769bf177cdd2707d0fdd6f550386aa2884f6f5705c9a5055b42f3298cc0fba75a0c05e9f15f76bf9ecda26e839034364e99f6432bea76c43455e
-  data.tar.gz: 39a5fe0b5822deedde861270278346376bbf1c855e1945fa48dcc0d9ad0f5585bc9e609dac6c7d649519a2dc438bfb4597e399b6a81296c43f1019c74b000217
+  metadata.gz: 436338662d1889eec74a3c5fac8ca50427fa0f58ec2a6a256f7689015217bc8738618e26b14260d3648e650d93bfa4ce64d9fc49ec974204815fb49d2ec09a6b
+  data.tar.gz: 30158eb11227b227d711011bd77db61b1dc8bac6a8fda0760a89e21b8d60434a3f443162499313312d285ccf8c3cac751a5ad106f80c1bfa0e9139d973662028

data/lib/firespring_dev_commands/common.rb

@@ -41,7 +41,7 @@ module Dev
     # If the user answers 'y' then the block is executed.
     # If the user answers 'n' then the block is skipped.
     def with_confirmation(message, default = 'y', color_message: true)
-      message = "\n  #{message}? "
+      message = "\n  #{message}" << '? '.light_green
       message = message.light_green if color_message
       print message
       print '('.light_green << 'y'.light_yellow << '/'.light_green << 'n'.light_yellow << ') '.light_green

data/lib/firespring_dev_commands/git.rb

@@ -203,7 +203,7 @@ module Dev
 
     # Checks out the given branch in the given repo
     # Defaults to the current directory
-    def checkout(branch, dir: default_project_dir)
+    def checkout(branch, dir: default_project_dir, raise_errors: false)
       raise 'branch is required' if branch.to_s.strip.empty?
       return unless File.exist?(dir)
 
@@ -224,12 +224,14 @@ module Dev
       indent g.pull('origin', actual_branch)
       true
     rescue ::Git::GitExecuteError => e
+      raise e if raise_errors
+
       print_errors(e.message)
       false
     end
 
     # Create the given branch in the given repo
-    def create_branch(branch, dir: default_project_dir)
+    def create_branch(branch, dir: default_project_dir, raise_errors: false)
       raise 'branch is required' if branch.to_s.strip.empty?
       raise "refusing to create protected branch '#{branch}'" if %w(master develop).any?(branch.to_s.strip)
       return unless File.exist?(dir)
@@ -240,7 +242,7 @@ module Dev
       g = ::Git.open(dir)
       g.fetch('origin', prune: true)
 
-      puts "Fetching the latest changes for base branch #{staging_branch}"
+      puts "Fetching the latest changes for base branch \"#{staging_branch}\""
       g.checkout(staging_branch)
       g.pull('origin', staging_branch)
 
@@ -251,6 +253,19 @@ module Dev
       g.config("branch.#{branch}.merge", "refs/heads/#{branch}")
       puts
     rescue ::Git::GitExecuteError => e
+      raise e if raise_errors
+
+      print_errors(e.message)
+      false
+    end
+
+    def add(*paths, dir: default_project_dir, raise_errors: false)
+      g = ::Git.open(dir)
+      indent g.add(paths)
+      true
+    rescue ::Git::GitExecuteError => e
+      raise e if raise_errors
+
       print_errors(e.message)
       false
     end
@@ -277,7 +292,7 @@ module Dev
     end
 
     # Merge the given branch into the given repo
-    def merge(branch, dir: default_project_dir)
+    def merge(branch, dir: default_project_dir, raise_errors: false)
       raise 'branch is required' if branch.to_s.strip.empty?
       return unless File.exist?(dir)
 
@@ -296,6 +311,8 @@ module Dev
       indent g.merge(branch)
       true
     rescue ::Git::GitExecuteError => e
+      raise e if raise_errors
+
       print_errors(e.message)
       false
     end
@@ -320,7 +337,7 @@ module Dev
     end
 
     # Pull the given repo
-    def pull(dir: default_project_dir)
+    def pull(dir: default_project_dir, raise_errors: false)
       return unless File.exist?(dir)
 
       g = ::Git.open(dir)
@@ -331,6 +348,8 @@ module Dev
       indent g.pull('origin', branch)
       true
     rescue ::Git::GitExecuteError => e
+      raise e if raise_errors
+
       print_errors(e.message)
       false
     end
@@ -355,7 +374,7 @@ module Dev
     end
 
     # Push the given repo
-    def push(dir: default_project_dir)
+    def push(dir: default_project_dir, raise_errors: false)
       return unless File.exist?(dir)
 
       g = ::Git.open(dir)
@@ -366,6 +385,8 @@ module Dev
       indent g.push('origin', branch)
       true
     rescue ::Git::GitExecuteError => e
+      raise e if raise_errors
+
       print_errors(e.message)
       false
     end
@@ -378,7 +399,7 @@ module Dev
     # Clones the repo_name into the dir
     # Optionally specify a repo_org
     # Optionally specify a branch to check out (defaults to the repository default branch)
-    def clone_repo(dir:, repo_name:, repo_org: 'firespring', branch: nil)
+    def clone_repo(dir:, repo_name:, repo_org: 'firespring', branch: nil, depth: nil)
       if Dir.exist?("#{dir}/.git")
         puts "#{dir} already cloned".light_green
         return
@@ -390,6 +411,7 @@ module Dev
 
       opts = {}
       opts[:branch] = branch unless branch.to_s.strip.empty?
+      opts[:depth] = depth unless depth.to_s.strip.empty?
       g = ::Git.clone(ssh_repo_url(repo_name, repo_org), dir, opts)
       g.fetch('origin', prune: true)
     end

data/lib/firespring_dev_commands/jira/issue.rb

@@ -3,9 +3,9 @@ module Dev
     # Contains information and methods representing a Jira issue
     class Issue
       # Issue subtypes which do not map to a story type
-      NON_STORY_TYPES = ['epic', 'review', 'sub-task', 'code review sub-task', 'pre-deploy sub-task', 'deploy sub-task', 'devops sub-task'].freeze
+      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 - last_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 - last_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 last_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['fromString'] == 'Open' && item['toString'] == 'In Progress'
-          end
-        end.max_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.5.pre.alpha.4'.freeze
+    VERSION = '2.1.6.pre.alpha.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.1.5.pre.alpha.4
+  version: 2.1.6.pre.alpha.2
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-31 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -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,11 +0,0 @@
-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