advance 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 582ef1d9786e2aef4fcd5fc7fbabb925772fe2c774d7daf3f7290f36b3ec10bb
-  data.tar.gz: b575f4c854d4118520aa50328ef8c328f45827ba07d581d98de114735015bce3
+  metadata.gz: d598fdb8c38b12f9946058d06f4904f8c4e279c5973d7173061869ebeb8e4db8
+  data.tar.gz: b37c176948435b13ee2a494e5e0973fd14d5660e3bbe1da3c419b5a7328286b5
 SHA512:
-  metadata.gz: 1492a2d26dc7d1764f6a138e4d53a7d83c3626e70f4dea030d889a412fb074de8713559e20c9d35dfeeeb1a952ecb62968a2f4349fc095916a42bb50557a2d05
-  data.tar.gz: 188de35c95e64ed1c340f4c5e463a4a50d07c7c6f95ac0dc8dbae2f100e9e9c9f1975c580bd3f02a330001f27f9c5b0b758bededb1e47b5550dbf89c73946da0
+  metadata.gz: 991cbfc6556e45618971ab059c8bb8a23a106abf73d86f3f1409d47ce03920b7b5ab67287bbb43a920f6443bafe0e18e71c3890b381e89e8da9c2bd828f0cbb0
+  data.tar.gz: 3054fb61cf64fe18e12e203fd97ebc49cc54d846e2ad28a46269128041c9e4e4785cac92d5560acdc102a0450460df8dd2b5b944b3756a7ab3b0fc315371a758

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    advance (0.3.2)
+    advance (0.3.3)
       team_effort
 
 GEM

data/bin/csv_split_on_change_nh.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-require 'csv'
+require "csv"
+require_relative "../lib/path_for_new_file"
 
 def columns_changed?(previous_row, row, change_columns)
   changed = false
@@ -17,11 +18,14 @@ change_columns = ARGV[0].split(/,/).map(&:to_i)
 input_file = ARGV[1]
 
 previous_row = output_csv = nil
+file_path_generator = FilePathGenerator.new()
+
 CSV.foreach(input_file) do |row|
   if previous_row.nil? || (previous_row && columns_changed?(previous_row, row, change_columns))
     output_csv.close if output_csv
     output_file_name = file_name_from_changed_columns(row, change_columns)
-    output_csv = CSV.open(output_file_name, "w")
+    path = file_path_generator.path_for_new_file(output_file_name)
+    output_csv = CSV.open(path, "w")
   end
   output_csv << row
   previous_row = row

data/lib/advance/version.rb

@@ -1,3 +1,3 @@
 module Advance
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/path_for_new_file.rb

@@ -0,0 +1,50 @@
+class FilePathGenerator
+  def initialize(max_entries_per_dir = 10_000)
+    @max_entries_per_dir = max_entries_per_dir
+    @entry_counts = [0]
+    @dir_mask = "%0#{max_entries_per_dir.to_s.length}d"
+  end
+
+  def path_for_new_file(file_name)
+    increment_dir_counter
+    return file_name if @entry_counts.size == 1
+
+    dir_paths = @entry_counts[1..-1].reverse.map{|n| @dir_mask % [n - 1] }
+    dir_path = File.join(".", *dir_paths)
+    FileUtils.mkdir_p(dir_path)
+    File.join(dir_path, file_name)
+  end
+
+  def increment_dir_counter(dir_depth = 0)
+    if dir_depth > (@entry_counts.size - 1)
+      @entry_counts << 2
+      indent_dirs
+      return
+    end
+
+    @entry_counts[dir_depth] += 1
+
+    if @entry_counts[dir_depth] > @max_entries_per_dir
+      @entry_counts[dir_depth] = 1
+      increment_dir_counter(dir_depth + 1)
+    end
+  end
+
+
+  def indent_dirs
+    tmp_dir_name = "tmp_#{@entry_counts.size}"
+    FileUtils.mkdir tmp_dir_name
+    Dir.entries(".").each do |existing_dir|
+      next if existing_dir =~ %r(\.\.?)
+      next if existing_dir == tmp_dir_name
+      FileUtils.mv existing_dir, tmp_dir_name
+    end
+    new_dir_name = @dir_mask % [0]
+    FileUtils.mv tmp_dir_name, new_dir_name
+  end
+
+  def to_s
+    "[ #{@entry_counts.join(',')} ]"
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: advance
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - janemacfarlane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-27 00:00:00.000000000 Z
+date: 2019-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: team_effort
@@ -104,6 +104,7 @@ files:
 - bin/split_csv.rb
 - lib/advance.rb
 - lib/advance/version.rb
+- lib/path_for_new_file.rb
 homepage: https://github.com/doctorjane/advance
 licenses:
 - MIT