dir-to-xml 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67285bd12d04cbdcb410beec66b61b67f4af7a73
-  data.tar.gz: 018b47d9893f558ee6087dfd24f1f769c8700c1f
+  metadata.gz: d902a0b07e4b77dc9d9ad7122a4e84186a6e5c09
+  data.tar.gz: b9271f1ca9b93c64da56180ec9e018609f1b204f
 SHA512:
-  metadata.gz: f544cd8687ad522eff3da13cd0f0624dc234bd2fd47b0a212b121a7e710206dfa1420093cc188150d6f35f3d04131a46b297602ca4ed200327ed2c5fa31ce619
-  data.tar.gz: e91b07753b2f31e912b3b5a384a6863848bf02058bd3c5aac4b6e8e43a67f419599cc81ec9fc817ccfb51cf1ca3bea9a6e0efcaa3dde7f60e42b18848417a9dd
+  metadata.gz: b6e2869f2e12fc0570535f20986f41aba36f5cb918e3afe8bc72914c273bf82186d81c917503fcb55bfb7c952b6d5b1682d07b7b2bb65aa635f710ced38ed874
+  data.tar.gz: 1660b3c78c97d666228f28013ed2e10b168a20daf774b5ff5e2597d9c2194592d83493c049a26adf2e96fcd815bd803d8923fd6660346941e148e33e59ca5769

data/lib/dir-to-xml.rb

@@ -8,18 +8,17 @@ require 'dynarex'
 class DirToXML
 
 
-  def initialize(path= '.', recursive: false)
+  def initialize(path= '.', recursive: false, index: 'dir.xml')
     
     super()
     
-    @path = path
+    @path, @index, @recursive = path, index, recursive
     
-    old_path = Dir.pwd
     raise "Directory not found." unless File.exists? path
-    Dir.chdir  path
 
-    a = Dir.glob("*").sort
-    a.delete 'dir.xml'
+    a = Dir.glob(File.join(path, "*")).map{|x| File.basename(x) }.sort
+    
+    a.delete index
     
     a2 = a.inject([]) do |r, x|
 
@@ -34,17 +33,12 @@ class DirToXML
 
     end    
 
-    command = File.exists?('dir.xml') ? :refresh : :dxify
+    command = File.exists?(index) ? :refresh : :dxify
     
     @dx  = self.method(command).call a2
-
-    Dir.chdir old_path 
-
-    @h = @dx.to_h
-    @object = @h
     
-    @path = path
-    @recursive = recursive
+    @h = @dx.to_h
+    @object = @h    
 
   end
   
@@ -66,9 +60,8 @@ class DirToXML
     end
     
     a = sort_by :mtime
-    a2 = a.reject {|x| x[:name] == 'dir.xml'}    
     
-    lm =  a2[-1]
+    lm =  a[-1]
     
     if @recursive and lm[:type] == 'directory' then
       return [lm, DirToXML.new(File.join(@path,  lm[:name])).last_modified]
@@ -78,7 +71,7 @@ class DirToXML
   end
   
   def save()
-    @dx.save File.join(@path, 'dir.xml')
+    @dx.save File.join(@path, @index)
   end
   
   def select_by_ext(ext)
@@ -123,7 +116,7 @@ class DirToXML
     dx.file_path = Dir.pwd
 
     dx.import a
-    dx.save 'dir.xml'
+    dx.save @index
     
     return dx
 
@@ -131,7 +124,7 @@ class DirToXML
 
   def refresh(cur_files)
 
-    dx = Dynarex.new 'dir.xml'
+    dx = Dynarex.new @index
 
     prev_files = dx.to_a
             

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dir-to-xml
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   iqgRYucyTfq3VLTy6wrGN2HJj8unXh4JIFjyEvR3yvcCYl6IaHxuDfgoDfBI6MeQ
   Em7HctRLQorltw==
   -----END CERTIFICATE-----
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex