metanorma-iso 1.0.6 → 1.0.7

data/lib/asciidoctor/iso/base.rb

@@ -5,6 +5,7 @@ require "pathname"
 require "open-uri"
 require "pp"
 require "isodoc"
+require "fileutils"
 
 module Asciidoctor
   module ISO
@@ -28,11 +29,11 @@ module Asciidoctor
         unless node.attr("nodoc") || !node.attr("docfile")
           File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
           html_converter_alt(node).convert(@filename + ".xml")
-          system "mv #{@filename}.html #{@filename}_alt.html"
+          FileUtils.mv "#{@filename}.html", "#{@filename}_alt.html"
           html_converter(node).convert(@filename + ".xml")
           doc_converter(node).convert(@filename + ".xml")
         end
-        @files_to_delete.each { |f| system "rm #{f}" }
+        @files_to_delete.each { |f| FileUtils.rm f }
         ret
       end
 

data/lib/asciidoctor/iso/biblio.rng

@@ -259,6 +259,9 @@
   </define>
   <define name="uri">
     <element name="uri">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <data type="anyURI"/>
     </element>
   </define>
@@ -444,6 +447,9 @@
         <ref name="BibItemType"/>
       </attribute>
     </optional>
+    <optional>
+      <ref name="fetched"/>
+    </optional>
     <choice>
       <oneOrMore>
         <ref name="btitle"/>
@@ -523,6 +529,11 @@
       <ref name="FormattedString"/>
     </element>
   </define>
+  <define name="fetched">
+    <element name="fetched">
+      <data type="dateTime"/>
+    </element>
+  </define>
   <define name="validity">
     <element name="validity">
       <optional>
@@ -599,6 +610,7 @@
           <value>issued</value>
           <value>transmitted</value>
           <value>copied</value>
+          <value>unchanged</value>
         </choice>
       </attribute>
       <choice>

data/lib/asciidoctor/iso/isostandard.rng

@@ -69,6 +69,9 @@
           <ref name="BibItemType"/>
         </attribute>
       </optional>
+      <optional>
+        <ref name="fetched"/>
+      </optional>
       <choice>
         <oneOrMore>
           <ref name="btitle"/>
@@ -788,13 +791,15 @@
   </define>
   <define name="editorialgroup">
     <element name="editorialgroup">
-      <ref name="technical-committee"/>
-      <optional>
+      <oneOrMore>
+        <ref name="technical-committee"/>
+      </oneOrMore>
+      <zeroOrMore>
         <ref name="subcommittee"/>
-      </optional>
-      <optional>
+      </zeroOrMore>
+      <zeroOrMore>
         <ref name="workgroup"/>
-      </optional>
+      </zeroOrMore>
       <optional>
         <ref name="secretariat"/>
       </optional>

data/lib/asciidoctor/iso/validate.rb

@@ -146,9 +146,11 @@ module Asciidoctor
 
       def locality_erefs_validate(root)
         root.xpath("//eref[locality]").each do |t|
-          unless /^IEV$|:[ ]?(\d+{4}|--)$/.match t["citeas"]
-            warn "ISO: undated reference #{t['citeas']} should not contain "\
-              "specific elements"
+          if /^(ISO|IEC)/.match t["citeas"]
+            unless /^:[ ]?(\d+{4}|--)$/.match t["citeas"]
+              warn "ISO: undated reference #{t['citeas']} should not contain "\
+                "specific elements"
+            end
           end
         end
       end

data/lib/asciidoctor/iso/validate_section.rb

@@ -178,7 +178,7 @@ module Asciidoctor
         "//references[title = 'Normative References']/bibitem".freeze
 
       def asset_title_style(root)
-        root.xpath("//figure[image][not(title)]").each do |node|
+        root.xpath("//figure[image][not(name)]").each do |node|
           style_warning(node, "Figure should have title", nil)
         end
         root.xpath("//table[not(name)]").each do |node|

data/lib/isodoc/iso/html/isodoc.scss

@@ -658,7 +658,7 @@ div.example {
   margin-left:70.9pt;
   text-indent:-70.9pt;
 }
-p.example, li.example, div.example, td.example, td.example p
+p.example, li.example, div.example, td.example
 	{	margin:0in;
 	margin-bottom:.0001pt;
 	mso-pagination:none;

data/lib/isodoc/iso/html/style-human.scss

@@ -408,14 +408,14 @@ p.Terms {
 ul li {
     list-style: none;
   }
-  
-  ul > li > p:before {
-    content: "—";
-    display: inline-block;
-    width: 1em;
-    margin-left: -1.5em;
-    margin-right: 0.5em;
-  }
+
+ul > li > p:first-child:before {
+  content: "—";
+  display: inline-block;
+  width: 1em;
+  margin-left: -1.5em;
+  margin-right: 0.5em;
+}
 
   li p {
       /* display: inline-block; */

data/lib/isodoc/iso/html/style-iso.scss

@@ -251,13 +251,13 @@ h2 p {
     list-style: none;
   }
   
-  ul > li > p:before {
-    content: "—";
-    display: inline-block;
-    width: 1em;
-    margin-left: -1.5em;
-    margin-right: 0.5em;
-  }
+ul > li > p:first-child:before {
+  content: "—";
+  display: inline-block;
+  width: 1em;
+  margin-left: -1.5em;
+  margin-right: 0.5em;
+}
 
   li p {
       /* display: inline-block; */

data/lib/isodoc/iso/html/wordstyle.scss

@@ -108,6 +108,72 @@ p.MsoBlockText, li.MsoBlockText, div.MsoBlockText
 	mso-themecolor:accent1;
 	mso-ansi-language:EN-AU;
 	font-style:italic;}
+p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
+	{mso-style-priority:34;
+	mso-style-unhide:no;
+	mso-style-qformat:yes;
+	margin-top:0cm;
+	margin-right:0cm;
+	margin-bottom:0cm;
+	/* do not put in margin-left, it is specific to list level */
+	margin-bottom:.0001pt;
+	mso-add-space:auto;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphCxSpFirst
+	{mso-style-priority:34;
+	mso-style-unhide:no;
+	mso-style-qformat:yes;
+	mso-style-type:export-only;
+	margin-top:0cm;
+	margin-right:0cm;
+	margin-bottom:0cm;
+	/* do not put in margin-left, it is specific to list level */
+	margin-bottom:.0001pt;
+	mso-add-space:auto;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagraphCxSpMiddle
+	{mso-style-priority:34;
+	mso-style-unhide:no;
+	mso-style-qformat:yes;
+	mso-style-type:export-only;
+	margin-top:0cm;
+	margin-right:0cm;
+	margin-bottom:0cm;
+	/* do not put in margin-left, it is specific to list level */
+	margin-bottom:.0001pt;
+	mso-add-space:auto;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxSpLast
+	{mso-style-priority:34;
+	mso-style-unhide:no;
+	mso-style-qformat:yes;
+	mso-style-type:export-only;
+	margin-top:0cm;
+	margin-right:0cm;
+	margin-bottom:0cm;
+	/* do not put in margin-left, it is specific to list level */
+	margin-bottom:12.0pt;
+	mso-add-space:auto;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+div.figure 
+        {text-align: center;}
+
 h1
 	{mso-style-priority:1;
 	mso-style-unhide:no;
@@ -181,6 +247,7 @@ h1.Annex
         mso-hyphenate:none;
         tab-stops:27.0pt 35.0pt;
         font-size:12.0pt;
+        font-weight:bold;
         mso-bidi-font-size:11.0pt;
         font-family:$headerfont;
         mso-fareast-font-family:$headerfont;

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.0.6".freeze
+    VERSION = "1.0.7".freeze
   end
 end

data/spec/asciidoctor-iso/base_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require "fileutils"
 
 RSpec.describe Asciidoctor::ISO do
   it "has a version number" do
@@ -6,7 +7,8 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "generates output for the Rice document" do
-    system "cd spec/examples; rm -f rice.xml; rm -f rice.doc; rm -f rice.html; rm -f rice_alt.html; asciidoctor --trace -b iso -r 'metanorma-iso' rice.adoc; cd ../.."
+    FileUtils.rm_f %w(spec/examples/rice.xml spec/examples/rice.doc spec/examples/rice.html spec/examples/rice_alt.html)
+    system "cd spec/examples; asciidoctor --trace -b iso -r 'metanorma-iso' rice.adoc; cd ../.."
     expect(File.exist?("spec/examples/rice.xml")).to be true
     expect(File.exist?("spec/examples/rice.doc")).to be true
     expect(File.exist?("spec/examples/rice.html")).to be true
@@ -24,7 +26,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "converts a blank document" do
-    system "rm -f test.doc"
+    FileUtils.rm_f "test.doc"
     expect(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)).to be_equivalent_to <<~"OUTPUT"
       = Document title
       Author
@@ -60,6 +62,15 @@ RSpec.describe Asciidoctor::ISO do
       :workgroup: WG
       :workgroup-number: 3
       :workgroup-type: C
+      :technical-committee_2: TC1
+      :technical-committee-number_2: 11
+      :technical-committee-type_2: A1
+      :subcommittee_2: SC1
+      :subcommittee-number_2: 21
+      :subcommittee-type_2: B1
+      :workgroup_2: WG1
+      :workgroup-number_2: 31
+      :workgroup-type_2: C1
       :secretariat: SECRETARIAT
       :copyright-year: 2001
       :docstage: 10
@@ -122,8 +133,11 @@ RSpec.describe Asciidoctor::ISO do
          </copyright>
          <editorialgroup>
            <technical-committee number="1" type="A">TC</technical-committee>
+           <technical-committee number="11" type="A1">TC1</technical-committee>
            <subcommittee number="2" type="B">SC</subcommittee>
+           <subcommittee number="21" type="B1">SC1</subcommittee>
            <workgroup number="3" type="C">WG</workgroup>
+           <workgroup number="31" type="C1">WG1</workgroup>
            <secretariat>SECRETARIAT</secretariat>
          </editorialgroup>
          <ics>
@@ -257,7 +271,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "reads scripts into blank HTML document" do
-    system "rm -f test.html"
+    FileUtils.rm_f "test.html"
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
       = Document title
       Author
@@ -269,7 +283,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "uses default fonts" do
-    system "rm -f test.html"
+    FileUtils.rm_f "test.html"
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
       = Document title
       Author
@@ -283,7 +297,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "uses default fonts for alt doc" do
-    system "rm -f test_alt.html"
+    FileUtils.rm_f "test_alt.html"
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
       = Document title
       Author
@@ -297,7 +311,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "uses Chinese fonts" do
-    system "rm -f test.html"
+    FileUtils.rm_f "test.html"
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
       = Document title
       Author
@@ -312,7 +326,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "uses specified fonts" do
-    system "rm -f test.html"
+    FileUtils.rm_f "test.html"
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
       = Document title
       Author
@@ -330,8 +344,8 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "strips MS-specific CSS" do
-    system "rm -f test.html"
-    system "rm -f test.doc"
+    FileUtils.rm_f "test.html"
+    FileUtils.rm_f "test.doc"
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
       = Document title
       Author

data/spec/asciidoctor-iso/isobib_cache_spec.rb

@@ -1,5 +1,6 @@
 require "spec_helper"
 require "isobib"
+require "fileutils"
 
 RSpec.describe Asciidoctor::ISO do
 
@@ -44,10 +45,10 @@ EOS
 EOS
 
   it "does not activate biblio caches if isobib disabled" do
-    system "mv ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
-    system "mv ~/.iev.pstore ~/.iev.pstore1"
-    system "rm -f test.relaton.pstore"
-    system "rm -f test.iev.pstore"
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore"), File.expand_path("~/.relaton-bib.pstore1"), force: true
+    FileUtils.mv File.expand_path("~/.iev.pstore"), File.expand_path("~/.iev.pstore1"), force: true
+    FileUtils.rm_f "test.relaton.pstore"
+    FileUtils.rm_f "test.iev.pstore"
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
       #{ASCIIDOC_BLANK_HDR}
       [bibliography]
@@ -60,17 +61,17 @@ EOS
     expect(File.exist?("test.relaton.pstore")).to be false
     expect(File.exist?("test.iev.pstore")).to be false
 
-    system "rm ~/.relaton-bib.pstore"
-    system "rm ~/.iev.pstore"
-    system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
-    system "mv ~/.iev.pstore1 ~/.iev.pstore"
+    FileUtils.rm_f File.expand_path("~/.relaton-bib.pstore")
+    FileUtils.rm_f File.expand_path("~/.iev.pstore")
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton-bib.pstore"), force: true
+    FileUtils.mv File.expand_path("~/.iev.pstore1"), File.expand_path("~/.iev.pstore"), force: true
   end
 
   it "does not activate biblio caches if isobib caching disabled" do
-    system "mv ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
-    system "mv ~/.iev.pstore ~/.iev.pstore1"
-    system "rm -f test.relaton.pstore"
-    system "rm -f test.iev.pstore"
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore"), File.expand_path("~/.relaton-bib.pstore1"), force: true
+    FileUtils.mv File.expand_path("~/.iev.pstore"), File.expand_path("~/.iev.pstore1"), force: true
+    FileUtils.rm_f "test.relaton.pstore"
+    FileUtils.rm_f "test.iev.pstore"
     mock_isobib_get_123
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
       #{ISOBIB_BLANK_HDR}
@@ -84,18 +85,18 @@ EOS
     expect(File.exist?("test.relaton.pstore")).to be false
     expect(File.exist?("test.iev.pstore")).to be false
 
-    system "rm ~/.relaton-bib.pstore"
-    system "rm ~/.iev.pstore"
-    system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
-    system "mv ~/.iev.pstore1 ~/.iev.pstore"
+    FileUtils.rm_f File.expand_path("~/.relaton-bib.pstore")
+    FileUtils.rm_f File.expand_path("~/.iev.pstore")
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton-bib.pstore"), force: true
+    FileUtils.mv File.expand_path("~/.iev.pstore1"), File.expand_path("~/.iev.pstore"), force: true
   end
 
   it "flushes biblio caches" do
-    system "cp ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
-    system "cp ~/.iev.pstore ~/.iev.pstore1"
+    FileUtils.cp File.expand_path("~/.relaton-bib.pstore"), File.expand_path("~/.relaton-bib.pstore1")
+    FileUtils.cp File.expand_path("~/.iev.pstore"), File.expand_path("~/.iev.pstore1")
 
     File.open("#{Dir.home}/.relaton-bib.pstore", "w") { |f| f.write "XXX" }
-    system "rm ~/.iev.pstore"
+    FileUtils.rm_f File.expand_path("~/.iev.pstore")
 
     mock_isobib_get_123
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
@@ -113,15 +114,15 @@ EOS
     expect(entry["fetched"].to_s).to eq(Date.today.to_s)
     expect(entry["bib"].to_xml).to be_equivalent_to(ISOBIB_123_DATED)
 
-    system "rm ~/.relaton-bib.pstore"
-    system "rm ~/.iev.pstore"
-    system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
-    system "mv ~/.iev.pstore1 ~/.iev.pstore"
+    FileUtils.rm_f File.expand_path("~/.relaton-bib.pstore")
+    FileUtils.rm_f File.expand_path("~/.iev.pstore")
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton-bib.pstore"), force: true
+    FileUtils.mv File.expand_path("~/.iev.pstore1"), File.expand_path("~/.iev.pstore"), force: true
   end
 
   it "activates global cache" do
-    system "mv ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
-    system "rm -f test.relaton.pstore"
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore"), File.expand_path("~/.relaton-bib.pstore1"), force: true
+    FileUtils.rm_f "test.relaton.pstore"
     mock_isobib_get_123
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
       #{CACHED_ISOBIB_BLANK_HDR}
@@ -137,13 +138,13 @@ EOS
     entry = db.load_entry("ISO(ISO 123:2001)")
     expect(entry).to_not be nil
 
-    system "rm ~/.relaton-bib.pstore"
-    system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
+    FileUtils.rm_f File.expand_path("~/.relaton-bib.pstore")
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton-bib.pstore"), force: true
   end
 
   it "activates local cache" do
-    system "mv ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
-    system "rm -f test.relaton.pstore"
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore"), File.expand_path("~/.relaton-bib.pstore1"), force: true
+    FileUtils.rm_f "test.relaton.pstore"
     mock_isobib_get_123
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
       #{LOCAL_CACHED_ISOBIB_BLANK_HDR}
@@ -163,13 +164,12 @@ EOS
     entry = db.load_entry("ISO(ISO 123:2001)")
     expect(entry).to_not be nil
 
-    system "rm ~/.relaton-bib.pstore"
-    system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
+    FileUtils.rm_f File.expand_path("~/.relaton-bib.pstore")
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton-bib.pstore"), force: true
   end
 
-
   it "fetches uncached references" do
-    system "mv ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore"), File.expand_path("~/.relaton-bib.pstore1"), force: true
     db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
     db.save_entry("ISO(ISO 123:2001)",
         {
@@ -196,12 +196,12 @@ EOS
     expect(entry["fetched"].to_s).to eq(Date.today.to_s)
     expect(entry["bib"].to_xml).to be_equivalent_to(ISOBIB_124_DATED)
 
-    system "rm ~/.relaton-bib.pstore"
-    system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
+    FileUtils.rm_f File.expand_path("~/.relaton-bib.pstore")
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton-bib.pstore"), force: true
   end
 
   it "expires stale undated references" do
-    system "mv ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore"), File.expand_path("~/.relaton-bib.pstore1"), force: true
 
         db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
         db.save_entry("ISO 123",
@@ -225,12 +225,12 @@ EOS
             expect(entry["fetched"].to_s).to eq(Date.today.to_s)
     expect(entry["bib"].to_xml).to be_equivalent_to(ISOBIB_123_UNDATED)
 
-    system "rm ~/.relaton-bib.pstore"
-    system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
+    FileUtils.rm_f File.expand_path("~/.relaton-bib.pstore")
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton-bib.pstore"), force: true
   end
 
   it "does not expire stale dated references" do
-    system "mv ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore"), File.expand_path("~/.relaton-bib.pstore1"), force: true
 
             db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
             db.save_entry("ISO(ISO 123:2001)",
@@ -252,13 +252,13 @@ EOS
             expect(entry["fetched"].to_s).to eq((Date.today - 90).to_s)
     expect(entry["bib"].to_xml).to be_equivalent_to(ISO_123_SHORT)
 
-    system "rm ~/.relaton-bib.pstore"
-    system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
+    FileUtils.rm_f File.expand_path("~/.relaton-bib.pstore")
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton-bib.pstore"), force: true
   end
 
   it "prioritises local over global cache values" do
-    system "mv ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
-    system "rm test.relaton.pstore"
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore"), File.expand_path("~/.relaton-bib.pstore1"), force: true
+    FileUtils.rm_f "test.relaton.pstore"
 
     db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
     db.save_entry("ISO(ISO 123:2001)",
@@ -311,8 +311,8 @@ EOS
     expect(localdb.load_entry("ISO(ISO 123:2001)")["bib"].to_xml).to be_equivalent_to(ISO_123_SHORT)
     expect(localdb.load_entry("ISO(ISO 124)")["bib"].to_xml).to be_equivalent_to(ISO_124_SHORT_ALT)
 
-    system "rm ~/.relaton-bib.pstore"
-    system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
+    FileUtils.rm_f File.expand_path("~/.relaton-bib.pstore")
+    FileUtils.mv File.expand_path("~/.relaton-bib.pstore1"), File.expand_path("~/.relaton-bib.pstore"), force: true
   end
 
 private