jgrouper 0.6.0 → 0.7.0

data/HISTORY.md

@@ -1,6 +1,17 @@
 JGrouper History
 ================
 
+2014-02-27 v0.7.0
+-----------------
+* Add `bin/jgrouper-add-group-type`
+* Add `JGrouper::Group#add_type()`
+* Add `JGrouper::Group#type?()`
+* Add `JGrouper::GroupType#to_grouper()`
+* Add `JGrouper::GroupType#to_s()`
+* Fix `bin/jgrouper-grant` error messages
+* Fix `bin/jgrouper-revoke` error messages
+
+
 2014-01-10 JGrouper v0.6.0
 -------------------------
 * Add `bin/jgrouper-diff`

data/bin/jgrouper-add-group-type

@@ -0,0 +1,95 @@
+#!/usr/bin/env jruby
+
+require 'jgrouper'
+require 'optparse'
+
+
+class MyApp
+
+  attr_accessor :recurse, :verbose
+
+  def initialize
+    @recurse = false
+    @verbose = false
+    yield self if block_given?
+    self
+  end
+
+  def add_group_type(stem_or_group, group_type)
+    raise 'ERROR: stem-or-group is nil' if stem_or_group.nil?
+    raise 'ERROR: group type is nil'    if group_type.nil?
+
+    type = JGrouper::GroupType.find group_type
+    raise "ERROR: could not find group type: #{group_type}" if type.nil?
+    puts "found group type: #{type.to_s}" if verbose?
+
+    stem = JGrouper::Stem.find stem_or_group
+    return add_group_type_to_stem(stem, type) unless stem.nil?
+
+    group = JGrouper::Group.find stem_or_group
+    return add_group_type_to_group(group, type) unless group.nil?
+
+    raise "ERROR: could not find stem-or-group: #{stem_or_group}"
+  end
+
+  def recurse? ; @recurse ; end
+  def verbose? ; @verbose ; end
+ 
+  
+  private
+
+  def add_group_type_to_group(group, type)
+    return if group.type? type
+    puts "adding group type #{type.name} on group #{group.name}" if verbose?
+    group.add_type type
+  end
+
+  def add_group_type_to_stem(stem, type)
+    unless recurse?
+      warn 'WARNING: cannot add group type on stem without specifying -R'
+      return false
+    end
+
+    stem.groups do |group|
+      next if group.type? type
+      puts "adding group type #{type.name} on group #{group.name}" if verbose?
+      group.add_type type
+    end
+    stem.stems { |child| add_group_type_to_stem child, type }
+
+    true
+  end
+
+end
+
+
+MyApp.new do |app|
+
+  opts = OptionParser.new do |opts|
+    opts.banner = "USAGE: #{ File.basename(__FILE__) } [options] <stem-or-group> <group type>"
+    opts.on('-R', '--[no-]recurse', 'Recursively add group type [DEFAULT: no]') do |recurse|
+      app.recurse = recurse
+    end
+    opts.on_tail('-h', '--help', 'Show help') do
+      puts opts
+      exit
+    end
+    opts.on_tail('-v', '--[no-]verbose', 'Enable verbose mode [DEFAULT: no]') do |verbose|
+      app.verbose = verbose
+    end
+  end.parse!
+
+  # TODO DRY
+  if ENV['GROUPER_HOME']
+    JGrouper.home! ENV['GROUPER_HOME']
+  else
+    warn "ERROR: GROUPER_HOME not set"
+    exit 1
+  end
+
+  app.add_group_type( ARGV.shift, ARGV.shift ) or exit 1
+
+end
+
+# vim: syntax=ruby
+

data/bin/jgrouper-grant

@@ -17,8 +17,8 @@ class MyApp
 
   def grant(stem_or_group, privilege, subject)
     raise 'ERROR: stem-or-group is nil' if stem_or_group.nil?
-    raise 'ERROR: privilege is nil'     if stem_or_group.nil?
-    raise 'ERROR: subject is nil'       if stem_or_group.nil?
+    raise 'ERROR: privilege is nil'     if privilege.nil?
+    raise 'ERROR: subject is nil'       if subject.nil?
 
     priv = JGrouper::Privilege.find privilege
     raise "ERROR: could not find privilege: #{privilege}" if priv.nil?

data/bin/jgrouper-revoke

@@ -17,8 +17,8 @@ class MyApp
 
   def revoke(stem_or_group, privilege, subject)
     raise 'ERROR: stem-or-group is nil' if stem_or_group.nil?
-    raise 'ERROR: privilege is nil'     if stem_or_group.nil?
-    raise 'ERROR: subject is nil'       if stem_or_group.nil?
+    raise 'ERROR: privilege is nil'     if privilege.nil?
+    raise 'ERROR: subject is nil'       if subject.nil?
 
     priv = JGrouper::Privilege.find privilege
     raise "ERROR: could not find privilege: #{privilege}" if priv.nil?

data/lib/jgrouper/group.rb

@@ -33,6 +33,13 @@ module JGrouper # :nodoc:
       group 
     end
 
+    #
+    # Add +JGrouper::GroupType+ to group.
+    #
+    def add_type(type)
+      @obj.addType type.to_grouper, false
+    end
+
     def grant(subject, privilege)
       @obj.grantPriv subject.to_grouper, privilege.to_grouper, false
     end
@@ -98,6 +105,18 @@ module JGrouper # :nodoc:
       %w( name display_name uuid ).collect { |k| "#{k}=#{ self.send(k) }" }.to_csv.chomp
     end
 
+    #
+    # Does group have group type (where type is +String+ or +JGrouper::GroupType+)?
+    #
+    def type?(type)
+      case type.class
+      when String
+        return @obj.hasType JGrouper::GroupType.find(type).to_grouper
+      else
+        return @obj.hasType type.to_grouper
+      end
+    end
+
   end
 end
 

data/lib/jgrouper/group_type.rb

@@ -53,6 +53,11 @@ module JGrouper # :nodoc:
       end
     end
 
+    #
+    # Return Grouper object.
+    #
+    def to_grouper; @obj; end
+
     def to_hash
       {
         kind:         'group_type',
@@ -70,6 +75,11 @@ module JGrouper # :nodoc:
       to_hash.to_json
     end
 
+    def to_s
+      return nil if @obj.nil?
+      %w( name uuid ).collect { |k| "#{k}=#{ self.send(k) }" }.to_csv.chomp
+    end
+
   end
 end
 

data/lib/jgrouper/version.rb

@@ -1,4 +1,4 @@
 module JGrouper
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jgrouper
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashdiff
@@ -111,6 +111,7 @@ description: JRuby wrapper around the Internet2 Grouper API
 email:
 - blair.christensen@gmail.com
 executables:
+- jgrouper-add-group-type
 - jgrouper-audit-archiver
 - jgrouper-diff
 - jgrouper-export
@@ -127,6 +128,7 @@ files:
 - README.rdoc
 - Rakefile
 - TODO.md
+- bin/jgrouper-add-group-type
 - bin/jgrouper-audit-archiver
 - bin/jgrouper-diff
 - bin/jgrouper-export