yus 1.0.2 → 1.0.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzBiN2NhYjE5MzU5YzAxZDZmZDk1MzI4OTE0YmIwYmUxOWQ5ZmNlOQ==
-  data.tar.gz: !binary |-
-    YjNiNThjNmY0ZjYxZWE2YTg1MzkyYThmYmQ1YzczYzBjYTg1MjQ0OQ==
+SHA1:
+  metadata.gz: 38cfb069f12865442210784253c0249d165821e0
+  data.tar.gz: 6eecec578892f50ba778fec5d7f696114466b48d
 SHA512:
-  metadata.gz: !binary |-
-    MzhlMzYxYzUyYzY2NzAyYjg1MWZjMzNiYmNhODQ2MWQyZThkYjBkZDdkNDgx
-    OWMzOTM0MjFiOTY3YjkxMzA4MzIwNzExNWIwMWFiNjk5OWE0NjJjZmI4MGU5
-    MmU0M2M1NDk2YzYxYzliOWY4YmIyZTBjYTJhYTBlYjVmNWQyMGE=
-  data.tar.gz: !binary |-
-    YTFmODdiNjkwNzcyZjViYTc1NjQzMmZhYjQyNDAyNTE0NjgyYTFjMThjNzdk
-    YThkYmJlZjQxZDBmOTQ2ZGMwZTRmZDQyY2ViMmIxYjhlOTYwMzk2YmQ5ODM5
-    MzMzM2QyNzA1MGZiOWQyMDk1YjZiYmE3YmVmYjFjNTI2ZDM0NDQ=
+  metadata.gz: 1ebc69681b04a40e6cffe913d0bd2b66077e8e7897fe423b98d768ca6880e476987f1f5429e5fc3bda06f84907a97e119278a4c669182c1871568a13723f02d0
+  data.tar.gz: 1eb5017b1700d163eca13caab60510a34fb1900044f7474e9e0e4c5c5791062a0ed9c3b3eabf6684474e2d063ed2f2091eb83ef0558c0c06ad14c945e3658409

data/.gitignore

@@ -0,0 +1,3 @@
+.bundle/
+vendor/
+pkg/

data/.ruby-version

@@ -0,0 +1 @@
+2.3.1

data/.travis.yml

@@ -0,0 +1,22 @@
+language: ruby
+before_install:
+  - gem install bundler
+
+bundler_args: --without debugger
+
+script:
+  - bundle exec rake test
+
+notifications:
+  email:
+  - ngiger@ywesee.com
+rvm:
+  - ruby-head
+  - 2.3.0
+  - 2.2.3
+  - 2.1.7
+  - 1.8.7
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: 1.8.7

data/0001-Added-support-for-running-yus-via-docker.patch

@@ -0,0 +1,172 @@
+From 2fc902ee538f96ff9f87920b63bd1a1bb7d2f9f5 Mon Sep 17 00:00:00 2001
+From: Niklaus Giger <ngiger@ywesee.com>
+Date: Wed, 23 Dec 2015 10:45:48 +0100
+Subject: [PATCH] Added support for running yus via docker
+
+Signed-off-by: Niklaus Giger <ngiger@ywesee.com>
+---
+ .gitignore         |  2 ++
+ .travis.yml        |  2 +-
+ Dockerfile         | 10 ++++++++++
+ Gemfile            |  1 -
+ bin/yusd           |  3 ++-
+ docker-compose.yml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
+ test/yus_demo.yml  | 17 +++++++++++++++++
+ 7 files changed, 81 insertions(+), 3 deletions(-)
+ create mode 100644 Dockerfile
+ create mode 100644 docker-compose.yml
+ create mode 100644 test/yus_demo.yml
+
+diff --git a/.gitignore b/.gitignore
+index 97709c1..fa3d1eb 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -1,3 +1,5 @@
+ .bundle/
+ vendor/
+ pkg/
++coverage
++.ruby-version
+diff --git a/.travis.yml b/.travis.yml
+index 3641b02..e71a651 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -5,7 +5,7 @@ before_install:
+ bundler_args: --without debugger
+ 
+ script:
+-  - rake test
++  - bundle exec rake test
+ 
+ notifications:
+   email:
+diff --git a/Dockerfile b/Dockerfile
+new file mode 100644
+index 0000000..c8108ea
+--- /dev/null
++++ b/Dockerfile
+@@ -0,0 +1,10 @@
++FROM ruby:2.2.4-onbuild
++CMD ["bundle", "exec", "bin/yusd"]
++
++# RUN apt-get update &&  apt-get -y install postgresql-client-9.4
++
++# The names for pgTest => db_host, yus_data => db_name must be in sync between
++# docker-compose.yml, test/yus_demo.yml and Dockerfile
++COPY 'test/yus_demo.yml' '/etc/yus/yus.yml'
++COPY 'bin/yusd' '/usr/src/app/bin/yusd'
++
+diff --git a/Gemfile b/Gemfile
+index 08dd1ab..3ec57ca 100644
+--- a/Gemfile
++++ b/Gemfile
+@@ -1,7 +1,6 @@
+ source "http://rubygems.org"
+ 
+ gem 'needle'
+-#gem 'pg', '0.9.0'
+ gem 'pg'
+ # we have some important patches here!!
+ gem 'dbi', '0.4.5', :git => 'https://github.com/zdavatz/ruby-dbi'
+diff --git a/bin/yusd b/bin/yusd
+index ce4e6dd..c7c15d7 100755
+--- a/bin/yusd
++++ b/bin/yusd
+@@ -18,6 +18,7 @@ default_config_files = [
+ defaults = {
+   'cleaning_interval' =>  300,
+   'config'			      => default_config_files,
++  'db_host'           => 'localhost',
+   'db_name'           => 'yus',
+   'db_user'           => 'yus',
+   'db_auth'           => 'yus',
+@@ -48,7 +49,7 @@ when 'odba'
+   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}",
++  ODBA.storage.dbi = ODBA::ConnectionPool.new("DBI:Pg:#{config.db_name}:#{config.db_host}",
+                                              config.db_user, config.db_auth)
+   ODBA.cache.setup
+   persistence = Yus::Persistence::Odba.new
+diff --git a/docker-compose.yml b/docker-compose.yml
+new file mode 100644
+index 0000000..5ba3196
+--- /dev/null
++++ b/docker-compose.yml
+@@ -0,0 +1,49 @@
++# Copyright (c) 2015 by Niklaus Giger ngiger@ywesee.com
++#
++# This file is part of oddb-docker.
++#
++# oddb-docker is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# oddb-docker is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with oddb-docker.  If not, see <http://www.gnu.org/licenses/>.
++#
++# # This is a setup for running tests
++# Security is not really a concern!
++#
++
++YusData:
++  image: postgres:9.4
++  entrypoint: /bin/bash
++
++# The names for pgTest => db_host, yus_data => db_name must be in sync between
++# docker-compose.yml, test/yus_demo.yml and Dockerfile
++pgTest:
++  image: postgres:9.4
++  volumes_from:
++    - YusData
++  environment:
++    POSTGRES_USER: yus
++    POSTGRES_PASSWORD: yus
++    POSTGRES_DB: yus_data
++yustest:
++  build: .
++  volumes:
++    - /home/docker-data-containers/yus-test:/var/yus_home
++  ports:
++  # by defaul yus run on port 9997, could by overriden by /etc/yus/yus.ml or $HOME/.yus/yus.yml
++    - "9997:9997"
++  links:
++    - pgTest
++  environment:
++    PGHOST: pgTest
++    PGUSER: yus
++    PGPASSWORD: yus
++    PGDATABASE: yus_data
+diff --git a/test/yus_demo.yml b/test/yus_demo.yml
+new file mode 100644
+index 0000000..cf90f6c
+--- /dev/null
++++ b/test/yus_demo.yml
+@@ -0,0 +1,17 @@
++---
++# This is a demo setup for running yus inside a docker
++#root_name: zdavatz@ywesee.com
++#root_pass: 0fdcf7ceb36d7b6057c144e676133c8f0aff1490cc0e7f5470f6ae503d3b8878
++root_name: ngiger@ywesee.com
++#root_pass: 0fdcf7ceb36d7b6057c144e676133c8f0aff1490cc0e7f5470f6ae503d3b8878
++# root_pass for 1234
++root_pass: 03ac674216f3e15c761ee1a5e255f067953623c8b388b4459e13f978d7c846f4
++log_level: DEBUG
++ssl_key: /etc/yus/data/yus.key
++ssl_cert: /etc/yus/data/yus.crt
++session_timeout: 3600
++
++# The names for pgTest => db_host, yus_data => db_name must be in sync between
++# docker-compose.yml, test/yus_demo.yml and Dockerfile
++db_host: pgTest
++db_name: yus_data
+-- 
+2.1.4
+

data/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Specify gem's dependencies in yus.gemspec
+gemspec
+
+

data/Gemfile.lock

@@ -0,0 +1,84 @@
+PATH
+  remote: .
+  specs:
+    yus (1.0.4)
+      deprecated (= 2.0.1)
+      highline
+      needle
+      odba
+      pg (= 0.17.0)
+      rclconf
+      ydbd-pg (>= 0.5.1)
+      ydbi (>= 0.5.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    byebug (9.0.5)
+    coderay (1.1.1)
+    deprecated (2.0.1)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    flexmock (1.3.3)
+    highline (1.7.8)
+    json (2.0.1)
+    method_source (0.8.2)
+    minitest (5.9.0)
+    needle (1.3.0)
+    odba (1.1.2)
+      ydbd-pg (>= 0.5.1)
+      ydbi (>= 0.5.1)
+    pg (0.17.0)
+    power_assert (0.3.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.4.0)
+      byebug (~> 9.0)
+      pry (~> 0.10)
+    rake (11.2.2)
+    rclconf (1.0.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.1)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    slop (3.6.0)
+    test-unit (3.2.0)
+      power_assert
+    ydbd-pg (0.5.3)
+      pg
+      ydbi (>= 0.5.0)
+    ydbi (0.5.3)
+      deprecated (= 2.0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  flexmock (~> 1.3.0)
+  minitest
+  pry-byebug
+  rake
+  rspec
+  simplecov
+  test-unit
+  yus!
+
+BUNDLED WITH
+   1.12.5

data/History.txt

@@ -1,3 +1,14 @@
+=== 1.0.4 / 11.07.2016
+
+* Added yus_migrate_to_utf_8
+* Cleanup yus/helpers and bin/yus* to use always module name Yus (not YUS)
+* Fixed an error preventing yusd to run under Ruby 2.3.1
+
+=== 1.0.3 / 23.05.2016
+
+* Make it run under Ruby >= 2.1
+* Replaced hoe by bundler/gem_tasks
+
 === 1.0.2 / 01.10.2014
 
 * Added bin/yus_dump to dump yus-database into data/yus_dump.yml

data/Manifest.txt

@@ -0,0 +1,25 @@
+Guide.txt
+History.txt
+LICENSE
+README.txt
+bin/yus_add_user
+bin/yus_delete_user
+bin/yus_grant
+bin/yus_passwd
+bin/yus_show
+bin/yusd
+data/yus.crt
+data/yus.key
+install.rb
+lib/yus/entity.rb
+lib/yus/persistence/odba.rb
+lib/yus/persistence/og.rb
+lib/yus/privilege.rb
+lib/yus/server.rb
+lib/yus/session.rb
+sha256.rb
+test/suite.rb
+test/test_entity.rb
+test/test_privilege.rb
+test/test_server.rb
+test/test_session.rb

data/Rakefile

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+# 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'
+task :gem => :build do
+  Rake::Task[:build].invoke
+end
+
+desc 'test using minittest via test/suite.rb'
+task :test do |t|
+  $LOAD_PATH << File.dirname(__FILE__)
+  require 'test/suite'
+end
+
+
+task :spec => :clean
+
+require 'rake/clean'
+CLEAN.include FileList['pkg/*.gem']

data/bin/yus_add_user

@@ -8,18 +8,10 @@ require 'drb/ssl'
 require 'password'
 require 'rclconf'
 require 'yus/session'
+require 'yus/helpers'
 require 'getoptlong'
 
-opts = []
-GetoptLong.new(
-  ['--config', '-c', GetoptLong::OPTIONAL_ARGUMENT],
-  ['--root_name', '-r', GetoptLong::OPTIONAL_ARGUMENT],
-  ['--server_url', '-u', GetoptLong::OPTIONAL_ARGUMENT],
-  ['--yus_dir', '-d', GetoptLong::OPTIONAL_ARGUMENT]
-).each { |pair|
-  opts.push(pair.join('=')[2..-1])
-}
-
+opts = Yus.default_opts
 name, action, item = ARGV
 
 unless(name)
@@ -29,37 +21,9 @@ Usage: yus_add_user <username> [<action> [<item>]]
   exit
 end
 
-default_dir = File.join(ENV['HOME'], '.yus')
-default_config_files = [
-  File.join(default_dir, 'yus.yml'),
-  '/etc/yus/yus.yml',
-]
-defaults = {
-  'config'			      => default_config_files,
-  'root_name'         => 'admin',
-  'server_url'        => 'drbssl://localhost:9997',
-  'yus_dir'           => default_dir,
-}
-
-config = RCLConf::RCLConf.new(opts, defaults)
-config.load(config.config)
-
-server = DRb::DRbObject.new(nil, config.server_url)
-server.ping
-
-session = nil
-begin
-  pass = Password.get("Password for #{config.root_name}: ")
-  session = server.login(config.root_name, pass.to_s, 'commandline')
-rescue Yus::YusError => e
-  puts e.message
-  retry
-end
-
-cont = nil
-callcc { |cont| }
-pass1 = Password.get("New Password for #{name}: ")
-pass2 = Password.get("Repeat Password for #{name}: ")
+session = Yus.session(opts)
+pass1 = Yus.get_password("New Password for #{name}: ")
+pass2 = Yus.get_password("Repeat Password for #{name}: ")
 
 if(pass1 != pass2)
   puts "Passwords did not match"