posix-fileutils 0.1.15 → 0.1.16

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWI5OWRjY2Q5N2IxZDczYTFkN2U1OTJmNDc1NTQ0ZDI4MjIyOWQyZQ==
+    ZmU2NzhiMzYyN2Y4Zjg5MTI2ZDdhODI3YzJhODU4YTkzYTlmYzc4NA==
   data.tar.gz: !binary |-
-    NmY5ODMzNTIyODM0MTc4ZDAwZmUwY2Q1MWEwNDA0ZjI3MWZhYzg5Ng==
+    ZmM1MWFiMWZjZmI2MTkwMjQzYThmYzc2ZGQxOTFhOWViNDRlNGY1Yg==
 SHA512:
   metadata.gz: !binary |-
-    MjkyMjY1Y2Q0MWNhOTRlNjJhYjk2ZjUyNjM2NDJkMjZlZDJjNDFlNjRiMmEy
-    Yjg5NTU5OTI2NzM0MThjNWZjYjZiODhjYzk5MGUwN2FiYzM5Mzg2MTJjMTBi
-    MjNmZTIzM2UzN2ZiOTM1YTA5YTBjNTYxNjJiZDY3ZmI1OTQ1Mjc=
+    ZmU4ODU5NzYwMzE4MzI0MWY2N2VmMDRkZmRlMGZjZmYxNjM1YTc4YTA4MjQ1
+    ZmM4NjMyZjQ0OWU4NjY1MzRlMmZlMTdiZTBkYzYwM2E1Y2UzM2MzMzgxZTI1
+    NmJlNWYwNTAxNzliMGRiOWRiODE1YjVhNmE1MGEyYzFlMjliNTE=
   data.tar.gz: !binary |-
-    Njc0MzkwY2M1ZWZhYWE1OWM3MzdiM2ZkMDc2YTdjMTc3OTA4YTAzZTdlNDFi
-    ZjVlNTFhNTdjMzFlYWU5ZDI4MzlhOTRlZmFiMGIwOTY1ZjEwNDZjNjM0NmUz
-    N2IyZmE1MGY0NjdmM2RkMmU1N2IwMTZlOTIyZTM4MmYwN2MzYzk=
+    YzdlMGViNGJlZDBiMGI3OWM4ZGFhZDA3OGZmNjhjZWU5ODAyZGUyMDBjYWRl
+    ZDFiZDAzODQ4Yjk4NjQ4YzAzYWRiNmE1NjM2YjljMmJmMGQ2ZjNmODlkMTFk
+    OWM2MzQ3OTEwNjc5YjI4NTUyNDg5ZGI1MTAwODBjYTk4NmMyODI=

data/lib/posix-fileutils/fileutils.rb

@@ -130,8 +130,10 @@ module Fs
   end
 
   def self.parse_list_args list, *opts
+    opts = opts.to_set
+
     if list.a?
-      return [[],[]] if list.count == 0
+      return [[],[].to_set] if list.count == 0
 
       list.map! do |elem| Pathname.new elem.to_s unless elem.kind_of? Pathname end
 
@@ -177,7 +179,7 @@ module Fs
     Kernel.system "rm #{opts.to_s}#{list.to_s}"
   end
 
-  def self.mkdir list, *opts
+  def self.mkdir list, *opts, &block
     opts = opts.to_set
 
     list, opts = parse_list_args list, *opts
@@ -192,7 +194,34 @@ module Fs
       end
     end
 
-    Kernel.system "mkdir #{opts.to_s}#{list.to_s}"
+    res = Kernel.system "mkdir #{opts.to_s}#{list.to_s}"
+    
+    return res if res != true
+
+    raise ArgumentError, 'Only in case single directory creating passing block is permitted' if list.a? && block
+
+    if block
+      err = nil
+
+      cwd = Fs.pwd
+      old_defopts = @defopts.clone
+      Fs.cd list, *(opts&@popts[:mkdir])
+
+      @defopts += opts
+
+      begin
+        yield
+      rescue => e
+        err = e
+      end
+      
+      Fs.cd Pathname.new(list).absolute? ? cwd : cwd.relative_path_from(self.pwd), *(opts&@popts[:mkdir])
+      @defopts = old_defopts
+
+      raise err if e
+    end
+
+    true
   end
 
   def self.touch list, *opts
@@ -208,7 +237,7 @@ module Fs
     res
   end
 
-  def self.cd list, *opts
+  def self.cd list, *opts, &block
     opts = opts.to_set
 
     list, opts = parse_list_args list, *opts
@@ -218,8 +247,28 @@ module Fs
 
     return false unless list.directory?
 
+    cwd = self.pwd
+    old_defopts = @defopts.clone
+
+    @defopts += opts
+
     FileUtils.cd list.to_s, opts.include?(:v) ? {:verbose => true} : {:verbose => false}
 
+    if block
+      err = nil
+
+      begin
+        yield
+      rescue => e
+        err = e
+      end
+
+      self.cd Pathname.new(list).absolute? ? cwd : cwd.relative_path_from(self.pwd), *opts
+      @defopts = old_defopts
+
+      raise err if err
+    end
+
     true
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: posix-fileutils
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - A. Levenkov