jit 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aa9a39f5359292f9749f7103c29f3a6eadf1dfc1
-  data.tar.gz: 061d790a80ac6f7307a749527c4683f95c28b7d3
+SHA256:
+  metadata.gz: 3456259298664412f5d90d68ba0a102320bd6b59a9ace12b3817b76cdd553a89
+  data.tar.gz: 57d5cec5ebd3150ccc5abd83a458d60ed59cc1065b0a0dc8a6fd4df40153ea53
 SHA512:
-  metadata.gz: 47ae83e85a0b9f76e57d61dd76acca5402665b98ffd44f085ada67a2c49d9ae69ed81d43059d3d8aca824ccb084714b55f629b1af51992256ddce1eeeac3701e
-  data.tar.gz: 6207ab63be2d26bb76d97451b98212c7f1e37c014cc200698643bb7921139dc80cddc890211d40cd0480399b78db2bc7b5cecb09ccb24a818e99ad90b424923d
+  metadata.gz: bca4b9acaec9bc125b22adbcfe0179794a0f2f27e196c70be266cb1081296bda1a18c740e274cb17fa1f676499cd1d2bdd4187cfa751f8a380ffabdc7d529a50
+  data.tar.gz: 074d431d5f9a5b1b66e1fcb72223aa92a457fdd08be43d6f3361b7ecf2c3184fb1b3c13dd0437960b0763e604a673fb7114aaff140a613c0574808113f57fb89

data/lib/config.rb

@@ -1,10 +1,10 @@
 require_relative "./lockfile"
 
 class Config
-  SECTION_LINE  = /^\s*\[([a-z0-9-]+)( "(.+)")?\]\s*($|#|;)/i
-  VARIABLE_LINE = /^\s*([a-z][a-z0-9-]*)\s*=\s*(.*?)\s*($|#|;)/i
-  BLANK_LINE    = /^\s*($|#|;)/
-  INTEGER       = /^-?[1-9][0-9]*$/
+  SECTION_LINE  = /\A\s*\[([a-z0-9-]+)( "(.+)")?\]\s*(\Z|#|;)/i
+  VARIABLE_LINE = /\A\s*([a-z][a-z0-9-]*)\s*=\s*(.*?)\s*(\Z|#|;)/im
+  BLANK_LINE    = /\A\s*(\Z|#|;)/
+  INTEGER       = /\A-?[1-9][0-9]*\Z/
 
   VALID_SECTION  = /^[a-z0-9-]+$/i
   VALID_VARIABLE = /^[a-z][a-z0-9-]*$/i
@@ -207,7 +207,7 @@ class Config
 
     File.open(@path, File::RDONLY) do |file|
       until file.eof?
-        line    = parse_line(section, file.readline)
+        line    = parse_line(section, read_line(file))
         section = line.section
 
         lines_for(section).push(line)
@@ -216,6 +216,15 @@ class Config
   rescue Errno::ENOENT
   end
 
+  def read_line(file)
+    buffer = ""
+
+    loop do
+      buffer.concat(file.readline)
+      return buffer unless buffer.end_with?("\\\n")
+    end
+  end
+
   def parse_line(section, line)
     if match = SECTION_LINE.match(line)
       section = Section.new([match[1], match[3]].compact)
@@ -236,7 +245,8 @@ class Config
     when "yes", "on", "true"  then true
     when "no", "off", "false" then false
     when INTEGER              then value.to_i
-    else                           value
+    else
+      value.gsub(/\\\n/, "")
     end
   end
 end

data/lib/index.rb

@@ -92,8 +92,8 @@ class Index
   end
 
   def remove(pathname)
-    @parents[pathname.to_s].each { |child| remove_entry(child) }
     remove_entry(pathname)
+    remove_children(pathname.to_s)
     @changed = true
   end
 
@@ -146,9 +146,7 @@ class Index
 
   def discard_conflicts(entry)
     entry.parent_directories.each { |parent| remove_entry(parent) }
-
-    set = @parents.fetch(entry.path, [])
-    set.each { |child| remove_entry(child) }
+    remove_children(entry.path)
   end
 
   def remove_entry(pathname)
@@ -169,6 +167,13 @@ class Index
     end
   end
 
+  def remove_children(path)
+    return unless @parents.has_key?(path)
+
+    children = @parents[path].clone
+    children.each { |child| remove_entry(child) }
+  end
+
   def store_entry(entry)
     @keys.add(entry.key)
     @entries[entry.key] = entry

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jit
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - James Coglan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2020-04-10 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: jcoglan@gmail.com
@@ -130,8 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: The information manager from London