cotcube-helpers 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d08ed5fa831283b0934d2ce7f86f9da0f1be5430d0d3164ee503b0aa7bac74f
-  data.tar.gz: ac59b5558432299e6906c8a93b4ddab8b7a57a7cac4b2c11239a8f41a8c05f4e
+  metadata.gz: 569d3d98802f31608b3525e0b0692a19a67b65a05036f7b9c04cd4d8985017d3
+  data.tar.gz: ad92e036d65e317ab94f179020b4d131ebb085e8ff87395f17ac5c65b0ec02a2
 SHA512:
-  metadata.gz: 8b3ce7871cbc2068523994caa155a2291512c0cce8c72398f51de275e56c6e1a75a94402327118f27ae0376ccbf70b148be3fb17d0f66326e019d21a639ae485
-  data.tar.gz: e17fe32e700a3441e5e54a4b521c0c3d20acedbfb45606cd8f3da6edb5041a7cbcab522729da6d9d0e784f739730972af1ad1210b5542e06cd879f70587d7b1e
+  metadata.gz: ca30750b5450a285efc24f7d8498919b329fddc848e8eaee24990632701e529ab967aaf4c94d6718858f921297674adaaee36025a2fce2664d11e370e0003a86
+  data.tar.gz: 7b85764c5630f909f87c0987e662b6801e20e22de850945342dddc839a67c7636abe284463f4e5fba1c952aec80e51dce25f24a1795e9c9a6cdb96e8b29907e6

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.2.4 (January 13, 2022)
+  - minor changes to init and bin/uncommitted
+  - datetime_ext: added #seconds_until_next_minute
+  - hash: added #deep_dup and #reduce_group; array: added #deep_dup
+  - bin/gitlog: pretty formatted git log
+  - string_ext: escape_regex escapes characters that otherwise have functional meanings in a regex
+  - array_ext: elem_raises? checks for each elem if raises with block, return raising elems or false
+  - Merge branch 'main' of github.com:donkeybridge/cotcube-helpers into main
+  - merging conflict
+
 ## 0.2.3 (December 30, 2021)
   - merging conflict
   - added bare josch_ and order_client s

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/bin/gitlog

@@ -0,0 +1,4 @@
+#!/bin/sh
+GIT=`which git`
+${GIT} log --graph --pretty=format:'%N%h   %<(100)%s (%cr)  %d%n%b' --abbrev-commit | egrep '\\|/|\w+' | sed 's/^|/           /'
+

data/bin/uncommitted

@@ -0,0 +1,28 @@
+#!/bin/bash
+ROOT=${1:-$HOME/GEMS}
+
+
+check_dir () {
+  CYAN="\033[1;36m"
+  RESET="\033[0m"
+  VGREP="grep --color=always -v"
+  dir=$1
+  if [ -d "${dir}/.git" ]; then
+    echo -e ${CYAN}${dir}${RESET}
+    pushd ${dir} 2>&1 >/dev/null
+    git status  2>&1 | $VGREP 'no changes added to commit' |\
+                  $VGREP '^$' |\
+                  $VGREP 'to include in what will' |\
+                  $VGREP '(use "git ' |\
+                  $VGREP 'On branch main' |\
+                  $VGREP 'On branch master' |\
+                  $VGREP 'nothing to commit' |\
+                  $VGREP 'Your branch is up to date'
+    popd 2>&1 >/dev/null
+  fi
+}
+
+
+export -f check_dir
+
+find $ROOT -type d -maxdepth 1 2>/dev/null | xargs -n 1 bash -c  'check_dir "$1"' _

data/lib/cotcube-helpers/array_ext.rb

@@ -64,38 +64,63 @@ class Array
   def select_within(ranges:, attr: nil, &block)
     unless attr.nil? || first[attr]
       raise ArgumentError,
-            "At least first element of Array '#{first}' does not contain attr '#{attr}'!"
-  end
-  raise ArgumentError, 'Ranges should be an Array or, more precisely, respond_to :map' unless ranges.respond_to? :map
-  raise ArgumentError, 'Each range in :ranges should respond to .include!' unless ranges.map do |x|
-    x.respond_to? :include?
-  end.reduce(:&)
-
-  select do |el|
-    value = attr.nil? ? el : el[attr]
-    ranges.map do |range|
-      range.include?(block.nil? ? value : block.call(value))
-    end.reduce(:|)
+        "At least first element of Array '#{first}' does not contain attr '#{attr}'!"
+    end
+    raise ArgumentError, 'Ranges should be an Array or, more precisely, respond_to :map' unless ranges.respond_to? :map
+    raise ArgumentError, 'Each range in :ranges should respond to .include!' unless ranges.map do |x|
+      x.respond_to? :include?
+    end.reduce(:&)
+
+    select do |el|
+      value = attr.nil? ? el : el[attr]
+      ranges.map do |range|
+        range.include?(block.nil? ? value : block.call(value))
+      end.reduce(:|)
+    end
   end
-end
 
-def select_right_by(inclusive: false, exclusive: false, initial: [], &block)
-  # unless range.is_a? Range and
-  #       (range.begin.nil? or range.begin.is_a?(Integer)) and
-  #       (range.end.nil? or range.end.is_a?(Integer))
-  #  raise ArgumentError, ":range, if given, must be a range of ( nil|Integer..nil|Integer), got '#{range}'"
-  # end
+  def select_right_by(inclusive: false, exclusive: false, initial: [], &block)
+    # unless range.is_a? Range and
+    #       (range.begin.nil? or range.begin.is_a?(Integer)) and
+    #       (range.end.nil? or range.end.is_a?(Integer))
+    #  raise ArgumentError, ":range, if given, must be a range of ( nil|Integer..nil|Integer), got '#{range}'"
+    # end
+
+    raise ArgumentError, 'No block given.' unless block.is_a? Proc
+
+    inclusive = true unless exclusive
+    if inclusive && exclusive
+      raise ArgumentError,
+        "Either :inclusive or :exclusive must remain falsey, got '#{inclusive}' and '#{exclusive}'"
+    end
+
+    index = find_index { |obj| block.call(obj) }
 
-  raise ArgumentError, 'No block given.' unless block.is_a? Proc
+    self[((inclusive ? index : index + 1)..)]
+  end
 
-  inclusive = true unless exclusive
-  if inclusive && exclusive
-    raise ArgumentError,
-      "Either :inclusive or :exclusive must remain falsey, got '#{inclusive}' and '#{exclusive}'"
+  def elem_raises?(&block)
+    raise ArgumentError, "Must provide a block." unless block_given?
+    raise ArgumentError, "Block must have arity of 1." unless block.arity == 1
+    map do |elem|
+      begin
+        block.call(elem)
+        false
+      rescue
+        elem
+      end
+    end.reject{|z| z.is_a? FalseClass }.tap{|z| z.empty? ? (return false) : (return z)}
   end
 
-  index = find_index { |obj| block.call(obj) }
+  def deep_dup
+    map do |el|
+      case el
+      when Hash, Array
+        el.deep_dup
+      else
+        el.dup
+      end
+    end
+  end
 
-  self[((inclusive ? index : index + 1)..)]
-end
 end

data/lib/cotcube-helpers/datetime_ext.rb

@@ -12,6 +12,14 @@ class DateTime
   end
 
   alias to_sssm to_seconds_since_sunday_morning
+
+  def seconds_until_next_minute(offset: 60)
+    offset = offset % 60
+    offset = 60 if offset.zero?
+    seconds = (self + offset - (self.to_f % 60).round(3) - self).to_f
+    seconds + (seconds.negative? ? 60 : 0)
+  end
+
 end
 
 class Date
@@ -21,12 +29,12 @@ class Date
     form = '%Y %W %w'
     build_range = lambda {|w|
       begin
-        ( DateTime.strptime("#{year} #{w} 1", form).to_date..
-          DateTime.strptime("#{year} #{w} 0", form).to_date)
+	( DateTime.strptime("#{year} #{w} 1", form).to_date..
+	 DateTime.strptime("#{year} #{w} 0", form).to_date)
       rescue
-        # beyond Dec 31st #strptime must be called with cw:0 to keep it working
-        ( DateTime.strptime("#{year} #{w} 1", form).to_date..
-          DateTime.strptime("#{year+1} 0  0", form).to_date)
+	# beyond Dec 31st #strptime must be called with cw:0 to keep it working
+	( DateTime.strptime("#{year} #{w} 1", form).to_date..
+	 DateTime.strptime("#{year+1} 0  0", form).to_date)
       end
     }
     case week

data/lib/cotcube-helpers/hash_ext.rb

@@ -14,4 +14,30 @@ class Hash
     end
     self
   end
+
+  # a group_hash was created from an array by running group_by
+  # to reduce a group_hash, the given block is applied to each array of the hash
+  # if its not an array value, the block will auto-yield nil
+  def reduce_group(&block)
+    raise ArgumentError, 'No block given' unless block_given?
+    map do |key,value|
+      case value
+      when Array
+        [key, (block.call(value) rescue nil) ]
+      else
+        [key, nil]
+      end
+    end.to_h
+  end
+
+  def deep_dup
+    map do |k,v|
+      case v
+      when Hash, Array
+        [k, v.deep_dup]
+      else
+        [k, v.dup]
+      end
+    end.to_h
+  end
 end

data/lib/cotcube-helpers/init.rb

@@ -22,9 +22,10 @@ module Cotcube
     def init(config_file_name: nil, 
              gem_name: nil,
              debug: false)
-      gem_name ||= self.ancestors.first.to_s
-      config_file_name = "#{gem_name.downcase.split('::').last}.yml"
-      config_file = config_path + "/#{config_file_name}"
+      gem_name        ||= self.ancestors.first.to_s
+      name              = gem_name.split('::').last.downcase
+      config_file_name  = "#{name}.yml"
+      config_file       = config_path + "/#{config_file_name}"
 
       if File.exist?(config_file)
         require 'yaml'
@@ -34,7 +35,8 @@ module Cotcube
       end
 
       defaults = { 
-        data_path: '/var/cotcube/' + name.split('::').last.downcase,
+        data_path: '/var/cotcube/' + name,
+        pid_file:  "/var/run/cotcube/#{name}.pid"
       }
 
       config = defaults.merge(config)

data/lib/cotcube-helpers/string_ext.rb

@@ -10,5 +10,9 @@ class String
     false
   end
 
+  def escape_regex
+    chars.map{|z| %w[ . | ( ) [ ] { } \ ^ $ + * ? ].include?(z) ? "\\#{z}" : z }.join
+  end
+
   alias is_valid_json? valid_json?
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cotcube-helpers
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Benjamin L. Tischendorf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-30 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -93,6 +93,8 @@ files:
 - LICENSE.txt
 - README.md
 - VERSION
+- bin/gitlog
+- bin/uncommitted
 - cotcube-helpers.gemspec
 - lib/cotcube-helpers.rb
 - lib/cotcube-helpers/array_ext.rb