yus 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58525f574ac756f75145de86797f797080aefad5e3a256b6b641bc7fbfacbe00
-  data.tar.gz: bd2c67d98ae8cd0444129c6bfe7e26fc7d23fd00c6ebe87aca9762453606c05c
+  metadata.gz: 9a4e9d36a220ba81011adc1a2f07d20f4fca9c9b2d12bfc9cc344ea0c0e4829e
+  data.tar.gz: f09165485ece1c0e4d2d3650cf95c4cfc462d8bf91f91ace56ca6dfa0eedb12e
 SHA512:
-  metadata.gz: cdae72138101be68834d1f14f49ea9d412f78c67005214c12e9dd4abf741d4ac569710be7d588ff49d2c17fb7b9a84f85e427eb1caf86064431991d11302ba26
-  data.tar.gz: 5c7a3c14112eaa229a1e023b41ed2ef4c2b40b93d2e97ff12999457428dfcb98bf88566e3134fd487c5a85c42ee83c0967a5c64b4fe7302d369bc5bef1e7fdc5
+  metadata.gz: 4328617716343bbae7c629c0458e6b8b2c537ec8523c7c00a58564b400fb9a931c5957cd3175a2835bbfd79d79db1c56e33ada38d401b95e624a2c5e113d43f0
+  data.tar.gz: 3edb6452809dea43af0d07111bbd7f2a9840041b73eb940b9cac1a393a773507202f39a1542b08877eb7ccf49dabebaba5e2c520b217ff4390171534e47f5410

data/.envrc

@@ -0,0 +1,3 @@
+source_url "https://raw.githubusercontent.com/cachix/devenv/d1f7b48e35e6dee421cfd0f51481d17f77586997/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0="
+
+use devenv

data/.github/workflows/ruby.yml

@@ -0,0 +1,32 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+  # see https://github.com/ruby/setup-ruby
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        ruby: ['3.0', 3.1, 3.2, 3.3, 3.4, 'head']
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests via rake test
+      run: bundle exec rake test

data/.gitignore

@@ -1,3 +1,13 @@
 .bundle/
 vendor/
 pkg/
+
+# Devenv
+.devenv*
+devenv.local.nix
+
+# direnv
+.direnv
+
+# pre-commit
+.pre-commit-config.yaml

data/Gemfile.lock

@@ -1,77 +1,66 @@
 PATH
   remote: .
   specs:
-    yus (1.0.6)
+    yus (1.0.7)
       deprecated (= 2.0.1)
       highline
+      logger
       needle
       odba (>= 1.1.6)
       rclconf
+      ydbd-pg
+      ydbi
 
 GEM
   remote: https://rubygems.org/
   specs:
-    byebug (11.1.3)
-    coderay (1.1.3)
+    bigdecimal (3.1.9)
     deprecated (2.0.1)
-    diff-lcs (1.3)
-    docile (1.3.2)
+    docile (1.4.1)
+    drb (2.2.1)
     flexmock (1.3.3)
-    highline (2.0.3)
-    method_source (1.0.0)
-    minitest (5.14.1)
+    highline (3.1.2)
+      reline
+    io-console (0.8.0)
+    logger (1.6.4)
+    minitest (5.25.4)
     needle (1.3.0)
-    odba (1.1.6)
-      ydbd-pg (>= 0.5.6)
-      ydbi (>= 0.5.6)
-    pg (1.2.3)
-    power_assert (1.2.0)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
-    rake (13.0.1)
+    odba (1.1.8)
+    pg (1.5.9)
+    power_assert (2.0.5)
+    rake (13.2.1)
     rclconf (1.0.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    simplecov (0.18.5)
+    reline (0.6.0)
+      io-console (~> 0.5)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
-    test-unit (3.3.6)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.13.1)
+    simplecov_json_formatter (0.1.4)
+    test-unit (3.6.7)
       power_assert
-    ydbd-pg (0.5.6)
+    ydbd-pg (0.6.0)
       pg
-      ydbi (= 0.5.6)
-    ydbi (0.5.6)
+      ydbi (= 0.6.0)
+    ydbi (0.6.0)
+      bigdecimal
       deprecated (= 2.0.1)
+      pg (>= 1.0.0)
 
 PLATFORMS
   ruby
+  x86_64-linux
 
 DEPENDENCIES
   bundler
+  drb
   flexmock (~> 1.3.0)
   minitest
-  pry-byebug
   rake
-  rspec
   simplecov
   test-unit
   yus!
 
 BUNDLED WITH
-   2.1.4
+   2.5.22

data/History.txt

@@ -1,3 +1,12 @@
+=== 1.0.7 / 08.01.2025
+
+* Added devenv environment for Ruby 3.4 (see https://devenv.sh/)
+* Fixed Rakefile
+* Added minimal Ruby version 3.0 in gemspec
+* (#8) Force yus.yml to be found in /etc/yus
+* changelog_uri to gemspec
+* Fix spelling for default cleaner_interval in bin/yusd
+
 === 1.0.6 / 17.06.2020
 
 * Update for Ruby 2.7.1, remove obsolete calls to untaint/SAFE

data/Rakefile

@@ -2,10 +2,8 @@
 # encoding: utf-8
 
 require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
 require 'rake/testtask'
 
-RSpec::Core::RakeTask.new(:spec)
 
 # dependencies are now declared in bbmb.gemspec
 desc 'Offer a gem task like hoe'
@@ -19,8 +17,5 @@ task :test do |t|
   require 'test/suite'
 end
 
-
-task :spec => :clean
-
 require 'rake/clean'
 CLEAN.include FileList['pkg/*.gem']

data/bin/yusd

@@ -11,13 +11,12 @@ require 'drb/timeridconv'
 require 'digest/sha2'
 require 'odba/18_19_loading_compatibility'
 
-default_dir = File.join(ENV['HOME'], '.yus')
+default_dir = File.join('/etc', 'yus')
 default_config_files = [
   File.join(default_dir, 'yus.yml'),
-  '/etc/yus/yus.yml',
 ]
 defaults = {
-  'cleaning_interval' =>  300,
+  'cleaner_interval' =>  300,
   'config'			      => default_config_files,
   'db_name'           => 'yus',
   'db_user'           => 'yus',

data/data/yus_dump.yml

@@ -3,12 +3,12 @@ entities:
   entity_name: !ruby/object:Yus::Entity
     name: entity_name
     valid_until: entity_pass
-    valid_from: 2020-06-17 09:42:09.633800037 +02:00
+    valid_from: 2025-01-08 17:06:06.725487367 +01:00
     affiliations:
     - &1 !ruby/object:Yus::Entity
       name: a_yus_group
       valid_until: entity_pass
-      valid_from: 2020-06-17 09:42:09.634001115 +02:00
+      valid_from: 2025-01-08 17:06:06.725511873 +01:00
       affiliations: []
       privileges:
         set_password: !ruby/object:Yus::Privilege
@@ -30,7 +30,7 @@ entities:
   second_name: !ruby/object:Yus::Entity
     name: second_name
     valid_until: entity_pass
-    valid_from: 2020-06-17 09:42:09.633903583 +02:00
+    valid_from: 2025-01-08 17:06:06.725501017 +01:00
     affiliations: []
     privileges:
       set_password: !ruby/object:Yus::Privilege

data/devenv.lock

@@ -0,0 +1,168 @@
+{
+  "nodes": {
+    "devenv": {
+      "locked": {
+        "dir": "src/modules",
+        "lastModified": 1736273305,
+        "owner": "cachix",
+        "repo": "devenv",
+        "rev": "cc48e044747cef4e4f69897e20a100adf5b716a3",
+        "type": "github"
+      },
+      "original": {
+        "dir": "src/modules",
+        "owner": "cachix",
+        "repo": "devenv",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733328505,
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733328505,
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1736200483,
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-ruby": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1735192621,
+        "owner": "bobvanderlinden",
+        "repo": "nixpkgs-ruby",
+        "rev": "602c528c8228f231f912c6d117703a1700464202",
+        "type": "github"
+      },
+      "original": {
+        "owner": "bobvanderlinden",
+        "repo": "nixpkgs-ruby",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1735882644,
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "devenv": "devenv",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-ruby": "nixpkgs-ruby",
+        "pre-commit-hooks": "pre-commit-hooks"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

data/devenv.nix

@@ -0,0 +1,50 @@
+# Please look at the file [oddb.org/devenv.README.md](https://github.com/zdavatz/oddb.org/blob/ruby-3.2/devenv.README.md)
+{ pkgs, ... }:
+
+{
+  env.GREET = "devenv";
+  packages = [ pkgs.git pkgs.libyaml ]; #  after I added pkgs.openssl here, I could no longer call devenup because of a glibc mismatch
+  # therefore I ${pkgs.openssl}/bin/openssl in the enterShell
+
+  enterShell = ''
+    echo This is the devenv shell for oddb2xml
+    git --version
+    ruby --version
+    psql --version
+    OLD_YUS_CRT=`git status --porcelain data;`
+    if [[ -z $OLD_YUS_CRT ]]; then
+      echo Must replace old yus certificat from 2006
+      cd data
+      pwd
+      ${pkgs.openssl}/bin/openssl req -nodes -new -x509 -key yus.key -out yus.crt -subj "/C=CH/ST=Zurich/L=Zurich/O=ywesee GmbH/OU=IT Department CI/CN=ywesee.com"
+    else
+      echo Found changed data/yus.key
+    fi
+    bundle install
+  '';
+
+  languages.ruby.enable = true;
+  languages.ruby.version = "3.4";
+  services.postgres = {
+    enable = true;
+    package = pkgs.postgresql_16;
+    listen_addresses = "0.0.0.0";
+    port = 5435;
+
+    initialDatabases = [
+      { name = "yus"; }
+    ];
+
+    initdbArgs =
+      [
+        "--locale=C"
+        "--encoding=UTF8"
+      ];
+
+    initialScript = ''
+      create role yus superuser login password null;
+      \connect yus;
+      \i ../22:20-postgresql_database-yus-backup
+    '';
+  };
+}

data/devenv.yaml

@@ -0,0 +1,8 @@
+inputs:
+  nixpkgs:
+    url: github:NixOS/nixpkgs/nixos-24.11
+  nixpkgs-ruby:
+    url: github:bobvanderlinden/nixpkgs-ruby
+    inputs:
+      nixpkgs:
+        follows: nixpkgs

data/lib/yus/helpers.rb

@@ -39,10 +39,9 @@ module Yus
       EOF
       exit
     end
-    default_dir = File.join(ENV['HOME'], '.yus')
+    default_dir = '/etc/yus'
     default_config_files = [
       File.join(default_dir, 'yus.yml'),
-      '/etc/yus/yus.yml',
     ]
      defaults = {
       'config'            => default_config_files,

data/lib/yus/version.rb

@@ -1,3 +1,3 @@
 module Yus
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

data/readme.md

@@ -2,20 +2,22 @@
 
 * https://github.com/zdavatz/yus
 
-## DESCRIPTION:
+## Description:
 
 ywesee user server. Works with the ywesee webframework and all the ywesee
 software packages.
 
-## FEATURES/PROBLEMS:
+## Features/Problems:
 
 * Only runs on Ruby >= 2.1.0
+* runs fine with Ruby 3.1.1
 
-## INSTALL:
+## Install:
 
-* sudo gem install yus
+* `sudo gem install yus`
+* `bundle install --without development`
 
-## DEVELOPERS:
+## Developers:
 
 * Masaomi Hatakeyama
 * Zeno Davatz

data/yus.gemspec

@@ -13,6 +13,8 @@ Gem::Specification.new do |spec|
   spec.platform    = Gem::Platform::RUBY
   spec.license     = "GPLv3"
   spec.homepage  = "https://github.com/zdavatz/yus/"
+  spec.metadata["changelog_uri"] = spec.homepage + "/blob/master/History.txt"
+  spec.required_ruby_version = '>= 3.0'
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org' if RUBY_VERSION.to_f > 2.0
 
@@ -21,19 +23,19 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "needle"
+  spec.add_dependency "ydbi"
+  spec.add_dependency "ydbd-pg"
   spec.add_dependency 'rclconf'
+  spec.add_dependency 'logger'
   spec.add_dependency 'odba', '>= 1.1.6'
 
   spec.add_runtime_dependency 'highline'
   spec.add_dependency 'deprecated', '2.0.1'
+  spec.add_development_dependency "drb"
   spec.add_development_dependency "test-unit"
   spec.add_development_dependency "minitest"
-  if RUBY_VERSION.to_f > 2.0
-    spec.add_development_dependency "pry-byebug"
-  end
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "flexmock", '~>1.3.0'
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
   spec.add_development_dependency "simplecov"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: yus
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: needle
@@ -24,6 +23,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ydbi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ydbd-pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rclconf
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +65,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: odba
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +122,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.1
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: drb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +136,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +150,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -164,20 +205,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: 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: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -205,9 +232,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".envrc"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".ruby-version"
-- ".travis.yml"
 - 0001-Added-support-for-running-yus-via-docker.patch
 - Gemfile
 - Gemfile.lock
@@ -226,6 +253,9 @@ files:
 - data/yus.crt
 - data/yus.key
 - data/yus_dump.yml
+- devenv.lock
+- devenv.nix
+- devenv.yaml
 - install.rb
 - lib/data/yus_dump.yml
 - lib/yus/entity.rb
@@ -240,13 +270,12 @@ files:
 - second.env
 - sha256.rb
 - yus.gemspec
-- yus_migrate_to_utf_8
 homepage: https://github.com/zdavatz/yus/
 licenses:
 - GPLv3
 metadata:
+  changelog_uri: https://github.com/zdavatz/yus//blob/master/History.txt
   allowed_push_host: https://rubygems.org
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -254,15 +283,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: ywesee user server
 test_files: []

data/.ruby-version

@@ -1 +0,0 @@
-2.5.0

data/.travis.yml

@@ -1,20 +0,0 @@
-language: ruby
-before_install:
-  - gem install bundler
-
-bundler_args: --without debugger
-
-script:
-  - bundle exec rake test
-
-notifications:
-  email:
-  - ngiger@ywesee.com
-rvm:
-  - 2.7.1
-  - 2.5.0
-  - ruby-head
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head

data/yus_migrate_to_utf_8

@@ -1,214 +0,0 @@
-#!/usr/bin/env ruby
-#encoding: ASCII-8BIT
-require 'fileutils'
-require 'syck'
-
-here = File.expand_path(File.join(File.dirname(File.dirname(__FILE__)), 'lib'))
-$: << here
-require 'logger'
-require 'needle'
-require 'odba/id_server'
-require 'rrba/server'
-require 'yus/entity'
-require 'yus/privilege'
-require 'odba/connection_pool'
-require 'odba/drbwrapper'
-require 'odba/storage'
-require 'rclconf'
-require 'odba/18_19_loading_compatibility'
-
-module Yus
-  attr_reader :config
-
-  def self.load_config
-    default_dir = File.join(ENV['HOME'], '.yus')
-    default_config_files = [
-      File.join(default_dir, 'yus.yml'),
-      '/etc/yus/yus.yml',
-    ]
-    defaults = {
-      'cleaning_interval' =>  300,
-      'config'            => default_config_files,
-      'db_name'           => 'yus',
-      'db_user'           => 'yus',
-      'db_auth'           => 'yus',
-      'db_backend'        => :psql,
-      'digest'            => Digest::SHA256,
-      'log_file'          => STDERR,
-      'log_level'         => 'INFO',
-      'persistence'       => 'odba',
-      'root_name'         => 'admin',
-      'root_pass'         => nil,
-      'server_url'        => 'drbssl://localhost:9997',
-      'session_timeout'   => 300,
-      'ssl_key'           => File.expand_path('../data/yus.key',
-                                              File.dirname(__FILE__)),
-      'ssl_cert'          => File.expand_path('../data/yus.crt',
-                                              File.dirname(__FILE__)),
-      'token_lifetime'    => 30,
-      'yus_dir'           => default_dir,
-    }
-
-    @config = RCLConf::RCLConf.new(ARGV, defaults)
-    @config.load(@config.config)
-
-    require File.join('yus', 'persistence', @config.persistence)
-  end
-
-  class Server
-    # http://stackoverflow.com/questions/2982677/ruby-1-9-invalid-byte-sequence-in-utf-8
-    # https://robots.thoughtbot.com/fight-back-utf-8-invalid-byte-sequences
-    def sanitize_utf8(string)
-      return nil if string.nil?
-      # return string.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
-      return string if string.valid_encoding?
-      if string.force_encoding(Encoding::ISO_8859_1).valid_encoding?
-        string.force_encoding(Encoding::ISO_8859_1).clone.encode(Encoding::UTF_8)
-      else
-        string.chars.select { |c| c.valid_encoding? }.join
-      end
-    end
-    def _migrate_to_utf8 queue, table, opts={}
-      while obj = queue.shift do
-        if obj.is_a?(Numeric)
-          begin
-            obj = ODBA.cache.fetch obj
-          rescue ODBA::OdbaError
-            return
-          end
-        else
-          obj = obj.odba_instance
-        end
-        puts " #{__LINE__}: Migrating #{obj.class} #{obj.to_s}" if $VERBOSE
-        return unless obj
-        _migrate_obj_to_utf8 obj, queue, table, opts
-        obj.odba_store unless obj.odba_unsaved?
-      end
-    end
-    def _migrate_obj_to_utf8 obj, queue, table, opts={}
-      obj.instance_variables.each do |name|
-        child = obj.instance_variable_get name
-        if child.respond_to?(:odba_unsaved?) && !child.odba_unsaved? \
-          && obj.respond_to?(:odba_serializables) \
-          && obj.odba_serializables.include?(name)
-          child.instance_variable_set '@odba_persistent', nil
-        end
-        child = _migrate_child_to_utf8 child, queue, table, opts
-        obj.instance_variable_set name, child
-      end
-      if obj.is_a?(Array)
-        obj.collect! do |child|
-          _migrate_child_to_utf8 child, queue, table, opts
-        end
-      end
-      if obj.is_a?(Hash)
-        obj.dup.each do |key, child|
-          obj.store key, _migrate_child_to_utf8(child, queue, table, opts)
-        end
-      end
-      obj
-    end
-    def _migrate_child_to_utf8 child, queue, table, opts={}
-      @serialized ||= {}
-      case child
-      when ODBA::Persistable, ODBA::Stub
-        if child = child.odba_instance
-          if child.odba_unsaved?
-            _migrate_to_utf8 [child], table, opts
-          elsif opts[:all]
-            odba_id = child.odba_id
-            unless table[odba_id]
-              table.store odba_id, true
-              queue.push odba_id
-            end
-          end
-        end
-      when String
-        old = child.encoding
-        orig = child.clone
-        if ( child.encoding != Encoding::UTF_8 && child.force_encoding(Encoding::ISO_8859_1).valid_encoding? ) ||
-           ( child.encoding == Encoding::UTF_8 && !child.valid_encoding? )
-          child = child.force_encoding(Encoding::UTF_8)
-          puts "force_encoding from ISO_8859_1 #{old}. Now #{child}" unless child.to_i > 0
-        end
-        case child.encoding.to_s
-        when /ASCII-8BIT|US-ASCII/
-          # nothing todo
-        when /UTF-8/
-          puts "UTF-8: for #{child.to_s}" if $VERBOSE
-          child = sanitize_utf8(child)
-        when /ISO-8859-1/i
-          child = sanitize_utf8(child)
-          # child = child.force_encoding('UTF-8')
-          puts "force_encoding from #{old}. is now #{child}"
-        else
-          puts "Unhandeled encoding #{child.encoding}"
-        # child = child.force_encoding
-        end
-      when
-        Yus::Entity,
-        Yus::Privilege
-        child = _migrate_obj_to_utf8 child, queue, table, opts
-      when Float, Fixnum, TrueClass, FalseClass, NilClass,
-        Symbol, Time, Date, DateTime
-        # do nothing
-      else
-        @ignored ||= {}
-        unless @ignored[child.class]
-          @ignored.store child.class, true
-          warn "ignoring #{child.class}"
-        end
-      end
-      child
-    rescue SystemStackError
-      puts child.class
-      raise
-    end
-  end
-  class Entity
-    include ODBA::Persistable
-    class << self
-      alias :all :odba_extent
-    end
-  end
-  class Privilege
-    include ODBA::Persistable
-    class << self
-      alias :all :odba_extent
-    end
-  end
-  def self.migrate_to_uf_8
-    self.load_config
-    @logger = Logger.new("/tmp/#{File.basename(__FILE__)}.log")
-    @logger.level = Logger::DEBUG
-    @logger.info  "#{Time.now}: Calling  #{File.basename(__FILE__)}"
-
-    puts "storage #{@config.db_name} name #{@config.db_user} auth #{@config.db_auth} pass #{@config.db_pass} storage is #{@config.persistence}"
-    require 'odba/connection_pool'
-    require 'odba/drbwrapper'
-    DRb.install_id_conv ODBA::DRbIdConv.new
-    ODBA.storage.dbi = ODBA::ConnectionPool.new("DBI:Pg:#{@config.db_name}", @config.db_user, @config.db_auth)
-    ODBA.cache.setup
-    @persistence = Yus::Persistence::Odba.new
-    ODBA.cache.setup
-
-    DRb.install_id_conv ODBA::DRbIdConv.new
-    @server = Yus::Server.new(@persistence, @config, @logger)
-    @server.extend(DRbUndumped)
-    {
-      :entitites => Yus::Entity.odba_extent,
-      :privileges => Yus::Privilege.odba_extent,
-      }.each do |name, to_migrate|
-      msg = "#{Time.now}: Start migrating #{to_migrate.size} #{name}"
-      @logger.info msg
-      puts msg
-      @server._migrate_to_utf8(to_migrate, {})
-    end
-    puts "#{Time.now}: Finished #{File.basename(__FILE__)}"
-  rescue Exception => error
-    @logger.error('fatal') { error } if @logger
-    raise
-  end
-end
-
-Yus.migrate_to_uf_8