jirametrics 2.7.2 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b747372b77be9d3ec514c09b57f479741a47688dd6e634e6823aa9feefe3154e
-  data.tar.gz: df7b9bdc06211d7d2fd89df18af5aa8ab4b780aa58f798c29c45ca8033c1986f
+  metadata.gz: ed5733b75d3ab3091973a5919269c467e6657a1a7699a6e5e4acb4139f9a292b
+  data.tar.gz: 3e750fe3a053fe9d8b5c30099afc42d1c50187c1d749f922d29bd91eb2f60241
 SHA512:
-  metadata.gz: 7f4873e816019b7b2903b7b2a5c905484a6e1ef5d2601f9bb8dd0cec78a306646a4d145a6bb76981a4bd3ce46d884e5e7b8e8e3ccef4f179a2a7067e26b58a43
-  data.tar.gz: 40790878004dd12d1aa362cbe72988a2c6ed13152066b48ab1f38855a74bf89f8aae926d13d3e721990ca568c20f5adbd1c99d0ce5b81aaece19d04701b8eddd
+  metadata.gz: 9f97b93668b57a3f5876979daa14631c1f75f6d6294b49ae58f57b2d60e21b36020c64aef8d7affa59e03796e8c7b3e5480546e3a540372d20c3152764d8a6a0
+  data.tar.gz: ed479b302392340ca02a7f58d4ac0e5f27178ff23fc35956ebeb8659af91454ca8d7e752aacbcad3bef942c49bc24f03dca332760b582b23c782cb5824681651

data/lib/jirametrics/file_system.rb

@@ -6,14 +6,18 @@ class FileSystem
   attr_accessor :logfile, :logfile_name
 
   # Effectively the same as File.read except it forces the encoding to UTF-8
-  def load filename
+  def load filename, supress_deprecation: false
+    if filename.end_with?('.json') && !supress_deprecation
+      deprecated(message: 'call load_json instead', date: '2024-11-13')
+    end
+
     File.read filename, encoding: 'UTF-8'
   end
 
   def load_json filename, fail_on_error: true
     return nil if fail_on_error == false && File.exist?(filename) == false
 
-    JSON.parse load(filename)
+    JSON.parse load(filename, supress_deprecation: true)
   end
 
   def save_json json:, filename:
@@ -43,4 +47,8 @@ class FileSystem
     end
     node
   end
+
+  def foreach root, &block
+    Dir.foreach root, &block
+  end
 end

data/lib/jirametrics/project_config.rb

@@ -63,7 +63,8 @@ class ProjectConfig
   end
 
   def load_settings
-    JSON.parse(file_system.load(File.join(__dir__, 'settings.json')))
+    # This is the wierd exception that we don't ever want mocked out so we skip FileSystem entirely.
+    JSON.parse(File.read(File.join(__dir__, 'settings.json'), encoding: 'UTF-8'))
   end
 
   def guess_project_id
@@ -136,7 +137,7 @@ class ProjectConfig
 
   def load_board board_id:, filename:
     board = Board.new(
-      raw: JSON.parse(file_system.load(filename)), possible_statuses: @possible_statuses
+      raw: file_system.load_json(filename), possible_statuses: @possible_statuses
     )
     board.project_config = self
     @all_boards[board_id] = board
@@ -178,7 +179,7 @@ class ProjectConfig
     # We may not always have this file. Load it if we can.
     return unless File.exist? filename
 
-    statuses = JSON.parse(file_system.load(filename))
+    statuses = file_system.load_json(filename)
       .map { |snippet| Status.new(raw: snippet) }
     statuses
       .find_all { |status| status.global? }
@@ -189,13 +190,22 @@ class ProjectConfig
   end
 
   def load_sprints
-    Dir.foreach(@target_path) do |file|
-      next unless file =~ /#{file_prefix}_board_(\d+)_sprints_\d+/
+    file_system.foreach(@target_path) do |file|
+      next unless file =~ /^#{file_prefix}_board_(\d+)_sprints_\d+.json$/
+
+      file_path = File.join(@target_path, file)
+      board = @all_boards[$1.to_i]
+      unless board
+        @exporter.file_system.log(
+          'Found sprint data but can\'t find a matching board in config. ' \
+            "File: #{file_path}, Boards: #{@all_boards.keys.sort}"
+        )
+        next
+      end
 
-      board_id = $1.to_i
       timezone_offset = exporter.timezone_offset
-      JSON.parse(file_system.load("#{target_path}#{file}"))['values']&.each do |json|
-        @all_boards[board_id].sprints << Sprint.new(raw: json, timezone_offset: timezone_offset)
+      file_system.load_json(file_path)['values']&.each do |json|
+        board.sprints << Sprint.new(raw: json, timezone_offset: timezone_offset)
       end
     end
 
@@ -247,7 +257,7 @@ class ProjectConfig
 
   def load_project_metadata
     filename = File.join @target_path, "#{file_prefix}_meta.json"
-    json = JSON.parse(file_system.load(filename))
+    json = file_system.load_json(filename)
 
     @data_version = json['version'] || 1
 
@@ -380,7 +390,7 @@ class ProjectConfig
     default_board = nil
 
     group_filenames_and_board_ids(path: path).each do |filename, board_ids|
-      content = file_system.load(File.join(path, filename))
+      content = file_system.load_json(File.join(path, filename))
       if board_ids == :unknown
         boards = [(default_board ||= find_default_board)]
       else
@@ -388,7 +398,7 @@ class ProjectConfig
       end
 
       boards.each do |board|
-        issues << Issue.new(raw: JSON.parse(content), timezone_offset: timezone_offset, board: board)
+        issues << Issue.new(raw: content, timezone_offset: timezone_offset, board: board)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jirametrics
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
 platform: ruby
 authors:
 - Mike Bowler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-11 00:00:00.000000000 Z
+date: 2024-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: random-word