phtools 0.2.4 → 0.3.0.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2b4a9e0f8e817daa66178993aa0d7338cc4640f
-  data.tar.gz: d5ebce5d0aa61183a4e018ae04c2d59b20673980
+  metadata.gz: b2ba039340b6db82d48a60d8f61bc675ad8c7f55
+  data.tar.gz: c68da1cc277fffea7af2746ec5c0a35301f7f03b
 SHA512:
-  metadata.gz: bb219b0a0dca4df74ce3ac11af40ce59893076a6c8c0c353d14e4951c97233aad4da2f50fb0cde74c26042aca13dc14fccc4ce60fad66c1d03ea2f1cf39960c6
-  data.tar.gz: 702e6dd55560a82cc537589a830c610f17c90be5f03ff4c2c6347b364f8f0ca31af867e9722bf63332da4b90fdb959d13031c657586857625bcf8b3bc5659684
+  metadata.gz: 9417503eb41d424de70de88973b4f43c50778948bf2b41c6601b8a1e383ebbccd3a3e38b72b571abfc19d0f01cc3e4041efd1a82c5932a873759b279ca451739
+  data.tar.gz: 1de101093f41bf5e058226a79fe21610a099ad53dc842880854c13fe714092f90bae814ea5879b91427752c32185a8d6294d531df1991aeae5a01c426d8dd8ee

data/.rspec

@@ -1,2 +1,2 @@
---format Fuubar
---color
+--format documentation
+--color

data/Guardfile

@@ -1,10 +1,11 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-# notification :terminal_notifier, app_name: "ftools"
-notification :tmux, display_message: false
+notification :terminal_notifier, app_name: "phtools"
+# notification :terminal_title
+# notification :tmux, display_message: false
 
-guard 'cucumber' do
+guard 'cucumber', notification: true do
   watch(%r{^features/.+\.feature$})
   watch(%r{^features/support/.+$}) { 'features' }
   watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/{m[1]}.feature")][0] || 'features' }

data/History.md

@@ -0,0 +1,6 @@
+# RELEASED
+
+## [v0.3.0-alpha](https://github.com/andrewbiz/phtools/compare/v0.3.0-alpha...v0.2.4)
+
+* Improved phtools - now it supports DIRs and FILEMASKs parameters
+* Added aruba (cucumber) tests for phls

data/exe/phls

@@ -11,17 +11,20 @@ module PhTools
 ***************************************************
 phtools - *Keep Your Photos In Order* (c) ANB
 ***************************************************
-#{tool_name} scans given directories and
-generates list of files to standard output.
+#{tool_name} scans given directories and generates list of files to standard output.
 In short it acts like a smart 'ls' command (or 'dir' in Windows).
-It is a good starting point for all other phtools to be used with pipes.
-phtools friendly files: #{file_type * ','}
+Set DIRs to be scanned as a parameters. If no DIRs are set - current dir (.)
+will be scanned. Set FILEMASKs as a parameters - and only files matching the
+masks will be processed. If no FILEMASK is set *.* will be used by-default.
+To avoid unnessesary mask extraction by OS - put it in ''.
+Note, #{tool_name} works only with phtools-friendly file types: #{file_type * ','}
+#{tool_name} is a starting point for all other phtools to be connected via pipes.
 
-Example: #{tool_name} -r abc |ftclname => recursively scans 'abc' dir and
-sends all found phtools friendly files to ftclname command.
+Example: #{tool_name} abc '*aaa*' | phrename -a anb => scans 'abc' folder and
+sends all found phtools friendly files filtered with *aaa* to phrename command.
 
 Usage:
-  #{tool_name} [-D] [-r] [DIR_OR_FILE...]
+  #{tool_name} [-D] [-r] [DIR_OR_FILEMASK...]
   #{tool_name} -h | --help
   #{tool_name} -v | --version
 

data/lib/phls.rb

@@ -12,11 +12,16 @@ module PhTools
     end
 
     def run!
-      @options_cli['DIR_OR_FILE'] = ['.'] if @options_cli['DIR_OR_FILE'].empty?
-      @options_cli['DIR_OR_FILE'].each do |item|
-        if File.exist?(item)
-          File.directory?(item) ? output_dir(item) : output_file(item)
-        end
+      dirs_to_scan = []
+      filemasks = []
+      @options_cli['DIR_OR_FILEMASK'].each do |item|
+        File.directory?(item) ? dirs_to_scan << item : filemasks << item
+      end
+      dirs_to_scan = ['.'] if dirs_to_scan.empty?
+      filemasks = ['*.*'] if filemasks.empty?
+      dirs_to_scan.each do |dir|
+        fmask = File.join(dir, @options_cli['--recursive'] ? '**' : '', "{#{filemasks * ','}}")
+        Dir.glob(fmask, File::FNM_CASEFOLD).each { |f| output_file(f) if File.file?(f) }
       end
 
     rescue SignalException
@@ -29,17 +34,9 @@ module PhTools
 
     private
 
-    def output_dir(item)
-      fmask = File.join(item, @options_cli['--recursive'] ? '**' : '',
-                        "{#{@file_type.map { |i| "*.#{i}" } * ','}}")
-      files_to_process = Dir.glob(fmask, File::FNM_CASEFOLD |
-                                  File::FNM_DOTMATCH)
-      files_to_process.each { |f| output_file(f) }
-    end
-
     def output_file(file)
-      @os.output(File.join(File.dirname(file), File.basename(file))) if
-          @file_type.include?(File.extname(file).slice(1..-1).downcase)
+      ftype = File.extname(file).empty? ? '' : File.extname(file).slice(1..-1).downcase
+      @os.output(File.join(File.dirname(file), File.basename(file))) if @file_type.include?(ftype)
     end
   end
 end

data/lib/phtools/version.rb

@@ -1,4 +1,4 @@
 
 module PhTools
-  VERSION = '0.2.4'
+  VERSION = '0.3.0-alpha'
 end

data/lib/phtools.rb

@@ -24,7 +24,7 @@ Please run phtools in a terminal via CLI commands:
     phclname\t(#{Phclname::about}),
     phevent\t(#{Phevent::about}),
     phfixdate\t(#{Phfixdate::about}),
-    phfixmd\t(#{Phfixfmd::about}),
+    phfixfmd\t(#{Phfixfmd::about}),
     phls\t(#{Phls::about}),
     phmtags\t(#{Phmtags::about}),
     phrename \t(#{Phrename::about}),

data/phtools.gemspec

@@ -28,12 +28,15 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 2.9'
-  spec.add_development_dependency 'rspec-its', '~> 1.0'
-  spec.add_development_dependency 'cucumber', '~> 1.3'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec-its'
+  spec.add_development_dependency 'cucumber', '~> 2.0'
   spec.add_development_dependency 'aruba', '~> 0.14'
   spec.add_development_dependency 'fuubar'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-rspec'
+  spec.add_development_dependency 'guard-cucumber'
   spec.add_development_dependency 'pry'
 
   if RbConfig::CONFIG['target_os'] =~ /darwin/i

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phtools
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0.pre.alpha
 platform: ruby
 authors:
 - Andrew Bizyaev
@@ -44,42 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  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: guard-rspec
+  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: guard-cucumber
+  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: pry
   requirement: !ruby/object:Gem::Requirement
@@ -221,6 +263,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - Guardfile
+- History.md
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -267,9 +310,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - ExifTool by Phil Harvey (http://www.sno.phy.queensu.ca/~phil/exiftool/)
 rubyforge_project: