icfs 0.2.0 → 0.3.0

data/lib/icfs.rb

@@ -22,7 +22,7 @@ require_relative 'icfs/validate'
 module ICFS
 
   # version: major, minor, patch
-  Version = [0, 2, 0].freeze
+  Version = [0, 3, 0].freeze
 
   # version pre-release
   VersionPre = nil
@@ -233,6 +233,75 @@ module ICFS
   end # def self.time_parse()
 
 
+  ###############################################
+  # Get epoch time as local
+  #
+  # @param tme [Integer] the epoch time
+  # @param cfg [Config] the config
+  #
+  def self.time_local(tme, cfg)
+      Time.at(tme).getlocal(cfg.get('tz')).strftime('%F %T')
+  end # def self.time_local()
+
+
+  ###############################################
+  # Get epoch time as local with weekday
+  #
+  # @param tme [Integer] the epoch time
+  # @param cfg [Config] the config
+  #
+  def self.time_weekday(tme, cfg)
+      Time.at(tme).getlocal(cfg.get('tz')).strftime('%F %T (%a)')
+  end # def self.time_weekday()
+
+
+  ###############################################
+  # Get relative display time from epoch
+  #
+  # @param tme [Integer] the epoch time
+  # @return [String] Relative time string
+  #
+  def self.time_relative(tme)
+    rel = Time.now.to_i - tme
+    abs = rel.abs
+
+    # time periods
+    if abs >= (2*365*24*60*60)
+      num = abs / (365*24*60*60)
+      txt = 'years'
+    elsif abs >= (3*7*24*60*60)
+      num = abs / (7*24*60*60)
+      txt = 'weeks'
+    elsif abs >= (3*24*60*60)
+      num = abs / (24*60*60)
+      txt = 'days'
+    elsif abs >= (3*60*60)
+      num = abs / (60*60)
+      txt = 'hours'
+    elsif abs >= 2*60
+      num = abs / 60
+      txt = 'minutes'
+    else
+      num = 0
+      txt = 'just now'
+    end
+
+    # description
+    desc = '%d %s' % [num, txt]
+
+    # before/after
+    if num == 0
+      final = 'just now'
+    elsif rel < 0
+      final = 'in ' + desc
+    else
+      final = desc + ' ago'
+    end
+
+    return final
+  end # def self.time_relative()
+
+
 ##########################################################################
 # Error
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icfs
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Graham A. Field
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-29 00:00:00.000000000 Z
+date: 2019-07-04 00:00:00.000000000 Z
 dependencies: []
 description: |2-
 
@@ -24,7 +24,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
-- bin/icfs_demo_fcgi.rb
 - data/icfs.css
 - data/icfs.js
 - devel/demo/ssl_gen.rb
@@ -33,11 +32,14 @@ files:
 - devel/icfs
 - devel/icfs-wrk/Dockerfile
 - devel/run/base.rb
+- devel/run/case-backup.rb
+- devel/run/case-restore.rb
 - devel/run/copy-s3.rb
 - devel/run/email.rb
 - devel/run/email_imap.rb
 - devel/run/email_smime.rb
 - devel/run/init-icfs.rb
+- devel/run/init-template.rb
 - devel/run/webrick.rb
 - lib/icfs.rb
 - lib/icfs/api.rb

data/bin/icfs_demo_fcgi.rb

@@ -1,53 +0,0 @@
-#!/usr/bin/env ruby
-#
-# Investigative Case File System
-#
-# Copyright 2019 by Graham A. Field
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 3.
-#
-# This program is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# frozen_string_literal: true
-
-require 'yaml'
-require 'faraday'
-
-require_relative '../lib/icfs'
-require_relative '../lib/icfs/cache_elastic'
-require_relative '../lib/icfs/store_fs'
-require_relative '../lib/icfs/users_fs'
-require_relative '../lib/icfs/web/client'
-require_relative '../lib/icfs/web/auth_ssl'
-require_relative '../lib/icfs/demo/timezone'
-
-# load the config file
-cfg = YAML.load_file(ARGV[0])
-map = {}
-cfg['cache']['map'].each do |key, val|
-  map[key.to_sym] = val
-end
-
-es = Faraday.new(cfg['elastic']['base'])
-cache = ICFS::CacheElastic.new(map, es)
-store = ICFS::StoreFs.new(cfg['store']['dir'])
-users = ICFS::UsersFs.new(cfg['users']['dir'])
-api = ICFS::Api.new([], users, cache, store)
-web = ICFS::Web::Client.new(cfg['web']['css'], cfg['web']['script'])
-
-user_map = {
-  'CN=client 1,OU=Test Client,OU=example,OU=org' => 'user1',
-  'CN=client 2,OU=Test Client,OU=example,OU=org' => 'user2',
-  'CN=client 3,OU=Test Client,OU=example,OU=org' => 'user3'
-}
-
-app = Rack::Builder.new do
-  use(ICFS::Web::AuthSsl, user_map, api)
-  use(ICFS::Demo::Timezone, cfg['web']['tz'])
-  run web
-end
-
-puts 'try to run'
-Rack::Handler::FastCGI.run(app, {Host: '127.0.0.1', Port: 9000} )