ds_utils 0.2.0 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 9de4789693aaa6ea36decbd2e50aad3713904a53
4
- data.tar.gz: 4d68be39c99d23a0a9cf4221fba083802cf460f4
3
+ metadata.gz: 08abacb6e1be776053ca3b8e8434c1898d9c5219
4
+ data.tar.gz: 007aad441b3fb9506c28b46d85b6cf2ce4f2f8e4
5
5
  SHA512:
6
- metadata.gz: 005efdc72d1f1f2e3067b4f4fd2533049ebc4108cc94142a284d49eb24d66507079e9b61fc27ee840930bd4402a0c167da564ba419f357c7365d5f97521e6bb9
7
- data.tar.gz: 3916699b5ab407af97f6819ab47953a0ab440a675859a0059f8235dbb6ab2f59a9578e675045706f576feb72217b77868243721cd64cc58d0b1bc57eda74448d
6
+ metadata.gz: ca067fb8c4b661707158e6dac603f79fa3a0240a79605b8c33944349d340f2d947b3f6cce3a98e6262c905f55c2733ac395fabfbf35bf966f57a8bd97ce4a94e
7
+ data.tar.gz: 59721658252790bfc0ed05762d9c40d8f2d6518e42fb94bf358fb2e1151e424ad1dbd84ee4b858f633e5e40e0366b63425d020392443cf53f45b58ae504e0aee
@@ -1,3 +1,3 @@
1
1
  module DsUtils
2
- VERSION = "0.2.0"
2
+ VERSION = "0.3.0"
3
3
  end
data/lib/ds_utils.rb CHANGED
@@ -1,16 +1,16 @@
1
1
  require "ds_utils/version"
2
-
2
+ require 'byebug'
3
3
  module DsUtils
4
4
  # Move tiles from subdirectories of topdir to topdir
5
- def self.flatten(thisdir,allowed_extensions_arr=[])
5
+ def self.flatten(thisdir)
6
6
  @do_listing = []
7
7
  @undo_listing = []
8
8
  @move_files = []
9
9
 
10
- flatten_recurse(thisdir,allowed_extensions_arr)
11
-
12
- @subdirectories = @move_files.map{|f| File.dirname(f)}.uniq
13
-
10
+ dir_contents = Dir["#{thisdir}/**/*"]
11
+ @move_files = dir_contents.reject{|item| File.directory?(item)}
12
+ @subdirectories = dir_contents.select{|item| File.directory?(item)}
13
+
14
14
  create_do_file
15
15
  create_undo_file
16
16
 
@@ -23,25 +23,6 @@ module DsUtils
23
23
  end
24
24
 
25
25
 
26
- def self.flatten_recurse(thisdir,allowed_extensions_arr=[])
27
- Dir.foreach(thisdir) do |filename|
28
- abspath = File.join(thisdir,filename)
29
- if (!filename.eql?(".") and !filename.eql?("..") and (allowed_extensions_arr.empty? || allowed_extensions_arr.include?(File.extname(filename))))
30
- # If the listed file is a directory, then flatten it and move contents up to this directory
31
- if File.directory?(abspath)
32
- #full_file_path = File.join(File.absolute_path(thisdir),filename)
33
- self.flatten_recurse(abspath,allowed_extensions_arr)
34
- #rename_and_move_contents(abspath,File.absolute_path(thisdir),allowed_extensions_arr)
35
- else
36
- @move_files << abspath
37
- end
38
- else
39
- puts "skipped: #{abspath}"
40
- end
41
- end
42
- end
43
-
44
-
45
26
  def self.create_do_file
46
27
  @do_file = "flatten_directory_#{timestamp}.rb"
47
28
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ds_utils
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jen Dobson
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-04-20 00:00:00.000000000 Z
11
+ date: 2017-04-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler