dir_processor 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65259145f8b0affef4fa03d46cebefea990e68b2
-  data.tar.gz: 5ec868f3127ddfdc3dbeba1a0de9455c64ae9180
+  metadata.gz: 2a1ba8e96fb0e3e65cefc5ad96d82f63de75f465
+  data.tar.gz: 27118b88368131720966b7b612e4461a15eaeb45
 SHA512:
-  metadata.gz: c07d98f934c0aa5fd0ebec217602693ca19ad64c61ea3cf1850af0c6d6ab8709ef92de5ffed845eef2d0443eb71479c2449fc107723a772333d39186d9acb1c4
-  data.tar.gz: 4449acf430474b788b85c0fd2b2bf2d7d5cd9133f8e06e3394539bb7924357afe85c9248a29b605f594770d4452324b317f60c98aecd5e8a13c2b7bbadfeab51
+  metadata.gz: 9e57ab852ded737a40e7478376d9fe3647ba17ea3ec83af05d0230e91783c42ecfb8102415d2486d5cf49c2ba773d380705fe187fd3791cc50ddfab0b94f90a7
+  data.tar.gz: affd001b0e212c03865455aa843cb3b140f144cd25b85900744474e7ffcf19281e7d06de15236f15b873268487564e3a2e8949e6948dd79f2ab06148e9802dd9

data/dir_processor.gemspec

@@ -22,5 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
 
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "pry"
   spec.add_runtime_dependency "def_dsl"
 end

data/lib/dir_processor/version.rb

@@ -1,3 +1,3 @@
 module DirProcessor
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/dir_processor.rb

@@ -1,10 +1,53 @@
 require "dir_processor/version"
 require 'def_dsl'
+# require 'pathname'
 
 def DirProcessor &block
   DirProcessor.new &block
 end
 
+# my try to dry
+module FeedMethod
+  def feed dir
+    return unless accept? dir
+
+    # Copy/Paste:
+    crap = proc { |x| x == '.' || x == '..' }
+
+    Dir.chdir dir do
+      this_dir = dir
+      dir = '.'
+
+    all = Dir.entries(dir).reject(&crap).group_by { |x| is_dir?(x) ? :dirs : :files } #long_name
+    all_files = all[:files]
+    all_dirs = all[:dirs]
+
+    so2(:first).each do |processor|
+      processor.feed this_dir
+    end
+    so2(:file).each do |processor|
+      (all[:files] || []).each { |file| processor.feed file } # long_name(dir,file) }
+    end
+    so2(:dir).each do |processor|
+      # require 'pry'; binding.pry
+      (all[:dirs] || []).each do |f|
+        processor.feed f #long_name(dir,f)
+      end
+    end
+
+    end
+  end
+
+  private
+  def long_name dir,file
+    File.join(dir,file).sub /^\.\//, ''
+  end   
+  def is_dir? file
+    raise "file disappeared or did'nt exist..." unless File.exist? file
+    File.directory? file
+  end
+end
+
 module DirProcessor
   def new &block
     DirProcessor.new &block
@@ -56,30 +99,7 @@ module DirProcessor
         def feed dir; @block.call dir end
       end
 
-      def feed dir
-        return unless accept? dir
-
-        # Copy/Paste:
-        crap = proc { |x| x == '.' || x == '..' }
-        all = Dir.entries(dir).reject(&crap).group_by { |x| File.directory?(x) ? :dirs : :files }
-        all_files = all[:files]
-        all_dirs = all[:dirs]
-
-        so2(:first).each do |processor|
-          processor.feed dir
-        end
-        so2(:file).each do |processor|
-          (all[:files] || []).each { |file| processor.feed long_name(dir,file) }
-        end
-        so2(:dir).each do |processor|
-          (all[:dirs] || []).each { |f| processor.feed long_name(dir,f) }
-        end
-      end
-
-      private
-      def long_name dir,file
-        File.join(dir,file).sub /^\.\//, ''
-      end      
+      include FeedMethod     
     end
     extend DefDSL
     def_dsl ADir, AFile
@@ -93,28 +113,30 @@ module DirProcessor
       instance_eval &block #yield
     end
 
-
-      def feed dir
-        # return unless accept? dir
-
-        # Copy/Paste:
-        crap = proc { |x| x == '.' || x == '..' }
-        all = Dir.entries(dir).reject(&crap).group_by { |x| File.directory?(x) ? :dirs : :files }
-        all_files = all[:files]
-        all_dirs = all[:dirs]
-
-        so2(:file).each do |processor|
-          (all[:files] || []).each { |file| processor.feed long_name(dir,file) }
-        end
-        so2(:dir).each do |processor|
-          (all[:dirs] || []).each { |f| processor.feed long_name(dir,f) }
-        end
-      end
-
-      private
-      def long_name dir,file
-        File.join(dir,file).sub /^\.\//, ''
-      end  
+    include FeedMethod
+    def accept?(*); true end
+
+      # def feed dir
+      #   # return unless accept? dir
+
+      #   # Copy/Paste:
+      #   crap = proc { |x| x == '.' || x == '..' }
+      #   all = Dir.entries(dir).reject(&crap).group_by { |x| File.directory?(x) ? :dirs : :files }
+      #   all_files = all[:files]
+      #   all_dirs = all[:dirs]
+
+      #   so2(:file).each do |processor|
+      #     (all[:files] || []).each { |file| processor.feed long_name(dir,file) }
+      #   end
+      #   so2(:dir).each do |processor|
+      #     (all[:dirs] || []).each { |f| processor.feed long_name(dir,f) }
+      #   end
+      # end
+
+      # private
+      # def long_name dir,file
+      #   File.join(dir,file).sub /^\.\//, ''
+      # end  
       
     # def feed dir
     #   # @so = @dir.feed(dir).send(:so)

data/spec/example_spec.rb

@@ -1,5 +1,5 @@
 # do we need variant for lazy stuff??? (to get rid of dir~first do)
-#
+# one_dir / dir '', 1..2 do
 # (...)
 # so1,so2: returns just last and array
 # file,files: yields one by one and all as array
@@ -23,7 +23,7 @@ describe 'DirProcessor method' do
   end
 
   it 'is configured by block' do
-    DirProcessor(){}.send(:so).should_not == DirProcessor(){ dir('.'){} }.send(:so)
+    DirProcessor(){}.send(:so).should_not == DirProcessor(){ dir('*'){} }.send(:so)
   end
 
   example 'main' do
@@ -34,7 +34,9 @@ describe 'DirProcessor method' do
       end
       dir 'mp3s' do
         first do |dir|
-          Dir.exist?(dir).should == true
+          # already chdir-ed in the dir
+          File.basename(File.expand_path('.')).should == dir
+          # Dir.exist?(dir).should == true
           (data[:dirs] ||= []) << dir
         end
 
@@ -45,28 +47,31 @@ describe 'DirProcessor method' do
       end
       dir 'empty' do
         first do |dir|
-          Dir.exist?(dir).should == true
+          # already chdir-ed in the dir
+          File.basename(File.expand_path('.')).should == dir
+          # Dir.exist?(dir).should == true
           (data[:dirs] ||= []) << dir
         end
       end
     end
 
     temp_dir do
-      mkfile 'about.png'
-      mkfile 'any.other'
+      mkfile '1/about.png'
+      mkfile '1/any.other'
 
-      mkfile 'mp3s/one.mp3'
-      mkfile 'mp3s/two.mp3'
-      mkfile 'mp3s/three.mp3'
+      mkfile '1/mp3s/one.mp3'
+      mkfile '1/mp3s/two.mp3'
+      mkfile '1/mp3s/three.mp3'
 
-      Dir.mkdir 'empty'
-
-      this.feed '.'
+      mkdir '1/empty'
+      
+      this.feed '1'
     end
 
     data.keys.should =~ [:about, :dirs, :mp3s]
     data[:about].should == 'about.png'
-    data[:mp3s].should =~ %w[ mp3s/one.mp3  mp3s/two.mp3  mp3s/three.mp3 ]
+    # data[:mp3s].should =~ %w[ mp3s/one.mp3  mp3s/two.mp3  mp3s/three.mp3 ]
+    data[:mp3s].should =~ %w[ one.mp3  two.mp3  three.mp3 ]
     data[:dirs].should =~ %w[ empty mp3s ]
   end
 
@@ -74,21 +79,24 @@ describe 'DirProcessor method' do
     data = {}
 
     this = DirProcessor do
-      dir 'empty' do
+      dir '*' do
         first do |dir|
-          Dir.exist?(dir).should == true
+          # already chdir-ed in the dir
+          File.basename(File.expand_path('.')).should == dir
+          # Dir.exist?(dir).should == true
           (data[:dirs] ||= []) << dir
         end
       end
     end
 
     temp_dir do
-      Dir.mkdir 'empty'
-      this.feed '.'
+      mkdir '1/empty'
+      Dir.exist?('1/empty').should == true
+      this.feed '1'
     end
 
-    data.keys.should =~ [:dirs]
-    data[:dirs].should =~ %w[ empty ]    
+    data.keys.should == [:dirs]
+    data[:dirs].should == %w[ empty ]    
   end
 
 end

data/spec/support/file_utils.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 
 # runs block in temp dir, purge it after all
 def temp_dir temp='tmp/trash'
+  FileUtils.rm_rf temp
   FileUtils.mkpath temp
   Dir.chdir(temp) { yield }
   FileUtils.rm_rf temp
@@ -9,6 +10,10 @@ end
 
 # mkpath + touch
 def mkfile file
-  FileUtils.mkpath File.split(file)[0]
+  mkdir File.split(file)[0]
   FileUtils.touch file
+end
+
+def mkdir dir
+  FileUtils.mkpath dir
 end

data/spec/support/spec_helper.rb

@@ -17,3 +17,5 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 end
+
+F = :focus

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dir_processor
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Alexander K
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: def_dsl
   requirement: !ruby/object:Gem::Requirement