yus 1.0.2 → 1.0.4

data/bin/yus_delete_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,31 +21,5 @@ Usage: yus_delete_user <username>
   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
-
+session = Yus.session(opts)
 session.delete_entity(name)

data/bin/yus_dump

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+$: << File.expand_path('../lib', File.dirname(__FILE__))
+
+require 'rubygems' if RUBY_VERSION.match('1.8.6')
+require 'drb'
+require 'drb/ssl'
+require 'password'
+require 'rclconf'
+require 'yus/session'
+require 'yus/helpers'
+require 'getoptlong'
+
+opts = Yus.default_opts
+filename = ARGV.first
+
+session = Yus.session(opts)
+session.dump_to_yaml(filename)
+

data/bin/yus_grant

@@ -8,6 +8,7 @@ require 'drb/ssl'
 require 'password'
 require 'rclconf'
 require 'yus/session'
+require 'yus/helpers'
 require 'getoptlong'
 
 opts = []
@@ -20,13 +21,13 @@ GetoptLong.new(
   ['--yus_dir', '-d', GetoptLong::REQUIRED_ARGUMENT],
   ['--revoke', '-R', GetoptLong::NO_ARGUMENT]
 ).each { |key, value|
-	case key
-	when '--revoke'
-		command = :revoke
+  case key
+  when '--revoke'
+    command = :revoke
     date = 'from'
-	else
-		opts.push([key, value].join('=')[2..-1])
-	end
+  else
+    opts.push("#{key}=#{value}")
+  end
 }
 
 name, action, item, expires = ARGV
@@ -38,18 +39,6 @@ Usage: yus_grant <username> <action> [<item> [<expiry_time>]]
   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,
-}
-
 time = nil
 if expires
   if match = /(\d{1,2})\.(\d{1,2})\.(\d{4})/.match(expires.to_s)
@@ -61,20 +50,7 @@ expiry_date must be in the Format: mm.dd.YYYY
   end
 end
 
-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
+session = Yus.session(opts)
 
 session.send(command, name, action, item, time)
 puts sprintf("%sed permission to %s %s for %s %s %s", 

data/bin/yus_passwd

@@ -5,21 +5,12 @@ $: << File.expand_path('../lib', File.dirname(__FILE__))
 require 'rubygems' if RUBY_VERSION.match('1.8.6')
 require 'drb'
 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 = ARGV.first
 
 unless(name)
@@ -29,37 +20,10 @@ Usage: yus_passwd <username>
   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
+session = Yus.session(opts)
 
-cont = nil
-callcc { |cont| }
-pass1 = Password.get("New Password for #{name}: ")
-pass2 = Password.get("Repeat Password for #{name}: ")
+pass1 = Yus.get_password("New Password for #{name}: ")
+pass2 = Yus.get_password("Repeat Password for #{name}: ")
 
 if(pass1 != pass2)
   puts "Passwords did not match"

data/bin/yus_show

@@ -8,6 +8,7 @@ require 'drb/ssl'
 require 'password'
 require 'rclconf'
 require 'yus/session'
+require 'yus/helpers'
 require 'getoptlong'
 
 opts = []
@@ -19,14 +20,13 @@ GetoptLong.new(
   ['--yus_dir', '-d', GetoptLong::REQUIRED_ARGUMENT],
   ['--recursive', '-R', GetoptLong::NO_ARGUMENT]
 ).each { |key, value|
-	case key
-	when '--recursive'
-		recursive = true
-	else
-		opts.push([key, value].join('=')[2..-1])
-	end
+  case key
+  when '--recursive'
+    recursive = true
+  else
+    opts.push("#{key}=#{value}")
+  end
 }
-
 name = ARGV.first
 
 unless(name)
@@ -36,31 +36,5 @@ Usage: yus_show <username>
   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
-
+session = Yus.session(opts)
 puts session.show(name, recursive)

data/bin/yusd

@@ -9,6 +9,7 @@ require 'drb'
 require 'drb/ssl'
 require 'drb/timeridconv'
 require 'digest/sha2'
+require 'odba/18_19_loading_compatibility'
 
 default_dir = File.join(ENV['HOME'], '.yus')
 default_config_files = [
@@ -91,8 +92,7 @@ begin
   url.untaint
   DRb.start_service(url, server, drbconf)
   $SAFE = 1
-	logger.info('start') { 
-		sprintf("starting yus-server on %s", url) }
+	logger.info('start') { sprintf("starting yus-server on %s", url) }
   DRb.thread.join
 rescue Exception => error
 	logger.error('fatal') { error }

data/data/yus_dump.yml

@@ -0,0 +1,42 @@
+--- !ruby/object:MockPersistence
+entities:
+  entity_name: !ruby/object:Yus::Entity
+    name: entity_name
+    valid_until: entity_pass
+    valid_from: 2016-05-23 17:41:00.786953476 +02:00
+    affiliations:
+    - &1 !ruby/object:Yus::Entity
+      name: a_yus_group
+      valid_until: entity_pass
+      valid_from: 2016-05-23 17:41:00.787118766 +02:00
+      affiliations: []
+      privileges:
+        set_password: !ruby/object:Yus::Privilege
+          items:
+            a_yus_group: :never
+      preferences: {}
+      last_logins: {}
+      tokens: {}
+    privileges:
+      set_password: !ruby/object:Yus::Privilege
+        items:
+          entity_name: :never
+      action: !ruby/object:Yus::Privilege
+        items:
+          key: :never
+    preferences: {}
+    last_logins: {}
+    tokens: {}
+  second_name: !ruby/object:Yus::Entity
+    name: second_name
+    valid_until: entity_pass
+    valid_from: 2016-05-23 17:41:00.787038968 +02:00
+    affiliations: []
+    privileges:
+      set_password: !ruby/object:Yus::Privilege
+        items:
+          second_name: :never
+    preferences: {}
+    last_logins: {}
+    tokens: {}
+  a_yus_group: *1

data/lib/data/yus_dump.yml

@@ -0,0 +1,42 @@
+--- !ruby/object:MockPersistence
+entities:
+  entity_name: !ruby/object:Yus::Entity
+    name: entity_name
+    valid_until: entity_pass
+    valid_from: 2014-10-01 13:16:27.677438587 +02:00
+    affiliations:
+    - &1 !ruby/object:Yus::Entity
+      name: a_yus_group
+      valid_until: entity_pass
+      valid_from: 2014-10-01 13:16:27.677673350 +02:00
+      affiliations: []
+      privileges:
+        set_password: !ruby/object:Yus::Privilege
+          items:
+            a_yus_group: :never
+      preferences: {}
+      last_logins: {}
+      tokens: {}
+    privileges:
+      set_password: !ruby/object:Yus::Privilege
+        items:
+          entity_name: :never
+      action: !ruby/object:Yus::Privilege
+        items:
+          key: :never
+    preferences: {}
+    last_logins: {}
+    tokens: {}
+  second_name: !ruby/object:Yus::Entity
+    name: second_name
+    valid_until: entity_pass
+    valid_from: 2014-10-01 13:16:27.677558840 +02:00
+    affiliations: []
+    privileges:
+      set_password: !ruby/object:Yus::Privilege
+        items:
+          second_name: :never
+    preferences: {}
+    last_logins: {}
+    tokens: {}
+  a_yus_group: *1

data/lib/yus/helpers.rb

@@ -0,0 +1,74 @@
+#!/usr/bin/env ruby
+# AutoInvoicer -- ydim -- 13.01.2006 -- hwyss@ywesee.com
+
+require 'rclconf'
+require 'getoptlong'
+require 'highline/import'
+
+module Yus
+  def self.default_opts
+    opts = []
+    GetoptLong.new(
+      ['--help', '-h', GetoptLong::NO_ARGUMENT],
+      ['--config', '-c', GetoptLong::OPTIONAL_ARGUMENT],
+      ['--root_name', '-r', GetoptLong::OPTIONAL_ARGUMENT],
+      ['--server_url', '-u', GetoptLong::OPTIONAL_ARGUMENT],
+      ['--yus_dir', '-d', GetoptLong::OPTIONAL_ARGUMENT]
+    ).each { |key, pair|
+      opts.push("#{key}=#{pair}")
+    }
+    opts
+  end
+
+  def self.session(opts = self.default_opts)
+    if /--help=/.match(opts[0])
+            puts <<-EOF
+#{File.basename(__FILE__)} ...
+
+-h, --help:
+   show help
+
+-c -config
+   config directory of yus.yml
+
+-r --root_name
+   Root name to use for reading yus
+
+-s --config
+   path to YAML-config of Yus
+      EOF
+      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_config_files,
+    }
+
+    opts.each{|opt|opt.sub!(/^--/, '') } # Remove leading '--' from the GetOptLong
+    config = RCLConf::RCLConf.new(opts, defaults)
+    config.load(config.config)
+
+    server = DRb::DRbObject.new(nil, config.server_url)
+    server.ping
+
+    session = nil
+    begin
+      pass = Yus.get_password("Password for #{config.root_name}: ")
+      session = server.login(config.root_name, pass.to_s, 'commandline')
+    rescue Yus::YusError => e
+      puts e.message
+      retry
+    end
+    return session
+  end
+  def self.get_password(prompt='Password: ')
+    ask(prompt) { |q| q.echo = false}
+  end
+end