yus 1.0.2 → 1.0.4

data/lib/yus/server.rb

@@ -5,8 +5,7 @@ require 'drb'
 require 'yus/entity'
 require 'yus/session'
 require 'needle'
-
-VERSION = '1.0.2'
+require 'yus/version'
 
 module Yus
   class Server

data/lib/yus/session.rb

@@ -6,6 +6,7 @@ require 'thread'
 require 'yus/entity'
 require 'pp'
 require 'yaml'
+require 'fileutils'
 
 begin 
   require 'encoding/character/utf-8'
@@ -35,7 +36,7 @@ module Yus
     end
     def dump_to_yaml(yaml_name=nil)
       yaml_name ||= File.expand_path(File.join(__FILE__, '..', '..', '..', 'data', 'yus_dump.yml'))
-      FileUtils.makedirs(File.dirname(yaml_name))
+      ::FileUtils.makedirs(File.dirname(yaml_name))
       if entities.is_a?(Hash) # when running unit tests, where MockPersistence uses a Hash
         File.open(yaml_name, 'w') { |f| YAML.dump(@needle.persistence, f) }
       else

data/lib/yus/version.rb

@@ -0,0 +1,3 @@
+module Yus
+  VERSION = '1.0.4'
+end

data/readme.md

@@ -0,0 +1,27 @@
+# yus
+
+* https://github.com/zdavatz/yus
+
+## DESCRIPTION:
+
+ywesee user server. Works with the ywesee webframework and all the ywesee
+software packages.
+
+## FEATURES/PROBLEMS:
+
+* Only runs on Ruby 1.8 or ruby >= 2.1.0
+
+## INSTALL:
+
+* sudo gem install yus
+
+## DEVELOPERS:
+
+* Masaomi Hatakeyama
+* Zeno Davatz
+* Hannes Wyss (upto Version 1.0)
+* Niklaus Giger (ported to Ruby 2.3.0)
+
+## LICENSE:
+
+* GPLv2

data/second.env

@@ -0,0 +1 @@
+DUMMY_VAR=DUMMY_VAR_from_second.env

data/yus.gemspec

@@ -0,0 +1,45 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'yus/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "yus"
+  spec.version       = Yus::VERSION
+  spec.summary     = "ywesee user server"
+  spec.description = ". Works with the ywesee webframework and all the ywesee software packages."
+  spec.author      = 'Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger'
+  spec.email       = 'yasaka@ywesee.com,  zdavatz@ywesee.com, ngiger@ywesee.com'
+  spec.platform    = Gem::Platform::RUBY
+  spec.license     = "GPLv3"
+  spec.homepage  = "https://github.com/zdavatz/yus/"
+
+#  if RUBY_VERSION.to_f > 2.0
+#    spec.metadata['allowed_push_host'] = 'RubyGems.org'
+#  end
+
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "needle"
+  # Ruby 1.8.7 cannot install pg 0.18.4
+  spec.add_dependency "pg", '0.17.0'
+  spec.add_dependency "ydbi", '>= 0.5.1'
+  spec.add_dependency 'rclconf'
+  spec.add_dependency 'odba'
+
+  spec.add_runtime_dependency "ydbd-pg", '>= 0.5.1'
+  spec.add_runtime_dependency 'highline'
+  spec.add_dependency 'deprecated', '2.0.1'
+  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

data/yus_migrate_to_utf_8

@@ -0,0 +1,214 @@
+#!/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

metadata

@@ -1,115 +1,310 @@
 --- !ruby/object:Gem::Specification
 name: yus
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
-- Yasuhiro Asaka, Zeno R.R. Davatz
+- Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: needle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+- !ruby/object:Gem::Dependency
+  name: ydbi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: rclconf
+  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
+    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.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: highline
+  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: deprecated
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  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: minitest
+  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: pry-byebug
+  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: bundler
+  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: flexmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: hoe
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        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
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
-description: ! 'ywesee user server. Works with the ywesee webframework and all the
-  ywesee
-
-  software packages.'
-email:
-- yasaka@ywesee.com,  zdavatz@ywesee.com
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ". Works with the ywesee webframework and all the ywesee software packages."
+email: yasaka@ywesee.com,  zdavatz@ywesee.com, ngiger@ywesee.com
 executables:
 - yus_add_user
 - yus_delete_user
+- yus_dump
 - yus_grant
 - yus_passwd
 - yus_show
 - yusd
 extensions: []
-extra_rdoc_files:
-- Guide.txt
-- History.txt
-- README.txt
+extra_rdoc_files: []
 files:
-- .gemtest
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
+- 0001-Added-support-for-running-yus-via-docker.patch
+- Gemfile
+- Gemfile.lock
 - Guide.txt
 - History.txt
 - LICENSE
-- README.txt
+- Manifest.txt
+- Rakefile
 - bin/yus_add_user
 - bin/yus_delete_user
+- bin/yus_dump
 - bin/yus_grant
 - bin/yus_passwd
 - bin/yus_show
 - bin/yusd
 - data/yus.crt
 - data/yus.key
+- data/yus_dump.yml
 - install.rb
+- lib/data/yus_dump.yml
 - lib/yus/entity.rb
+- lib/yus/helpers.rb
 - lib/yus/persistence/odba.rb
 - lib/yus/persistence/og.rb
 - lib/yus/privilege.rb
 - lib/yus/server.rb
 - lib/yus/session.rb
+- lib/yus/version.rb
+- readme.md
+- second.env
 - sha256.rb
-- test/suite.rb
-- test/test_entity.rb
-- test/test_privilege.rb
-- test/test_server.rb
-- test/test_session.rb
-homepage: http://scm.ywesee.com/?p=yus/.git;a=summary
-licenses: []
+- yus.gemspec
+- yus_migrate_to_utf_8
+homepage: https://github.com/zdavatz/yus/
+licenses:
+- GPLv3
 metadata: {}
 post_install_message: 
-rdoc_options:
-- --main
-- README.txt
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: yus
-rubygems_version: 2.3.0
+rubyforge_project: 
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ywesee user server
-test_files:
-- test/test_entity.rb
-- test/test_privilege.rb
-- test/test_server.rb
-- test/test_session.rb
+test_files: []