jgrouper 0.5.0 → 0.6.0

data/HISTORY.md

@@ -1,6 +1,18 @@
 JGrouper History
 ================
 
+2014-01-10 JGrouper v0.6.0
+-------------------------
+* Add `bin/jgrouper-diff`
+* Add `bin/jgrouper-revoke`
+* Add `JGrouper::ExportFileDiff`
+* Add `JGrouper::ExportFileEntry`
+* Add `JGrouper::ExportFileReader`
+* Add `JGrouper::Group.revoke()`
+* Add `JGrouper::Stem.revoke()`
+* Update `JGrouper::Export` and `bin/jgrouper-export` to export to JSON
+
+
 2013-08-15 JGrouper v0.5.0
 --------------------------
 * Add `JGrouper.start_root_session()`

data/bin/jgrouper-diff

@@ -0,0 +1,68 @@
+#!/usr/bin/env jruby
+
+require 'jgrouper/export_file_entry'
+require 'jgrouper/export_file_reader'
+
+require 'optparse'
+
+#
+# TODO Optionally key on attribute other than UUID?
+#
+
+
+opts = OptionParser.new do |opts|
+  opts.banner = "USAGE: #{ File.basename(__FILE__) } [-h]"
+
+  opts.on_tail('-h', '--help', "Show this message") do
+    puts opts
+    exit
+  end
+  opts.on_tail( '-v', '--[no-]verbose', 'Enable verbose mode [DEFAULT: no]' ) do |value|
+    exporter.verbose = value
+  end
+end.parse!
+
+
+JGrouper::ExportFileReader.new(ARGV.shift) do |src|
+  JGrouper::ExportFileReader.new(ARGV.shift) do |dst|
+    loop do
+
+      src.next do |json|
+        entry = JGrouper::ExportFileEntry.new json
+        next if entry.metadata?
+
+        if dst.include?(entry)
+          diff = entry.diff dst[entry]
+          puts diff.to_json if diff.different? # Modified
+          dst.delete(entry)
+        else
+          src << entry
+        end
+      end unless src.done?
+
+      
+      dst.next do |json|
+        entry = JGrouper::ExportFileEntry.new json
+        next if entry.metadata?
+
+        if src.include?( entry )
+          diff = src[entry].diff entry
+          puts diff.to_json if diff.different? # Modified
+          src.delete(entry)
+        else
+          dst << entry
+        end
+      end unless dst.done?
+
+      if dst.done? && src.done?
+        src.each { |_| puts _.diff( JGrouper::ExportFileEntry.new ).to_json } # Delete
+        dst.each { |_| puts JGrouper::ExportFileEntry.new.diff(_).to_json   } # Add
+        break
+      end
+
+    end
+  end
+end
+
+# vim: syntax=ruby
+

data/bin/jgrouper-export

@@ -4,7 +4,6 @@ require 'jgrouper'
 require 'jgrouper/exporter'
 require 'optparse'
 require 'thread'
-require 'yaml'
 
 
 JGrouper::Exporter.new do |exporter|
@@ -44,14 +43,14 @@ JGrouper::Exporter.new do |exporter|
     JGrouper.start_root_session
 
     # TODO GzipWriter?
-    fn = File.join directory, 'jgrouper-export.yaml'
+    fn = File.join directory, 'jgrouper-export.json'
     File.open( fn, 'w' ) do |fh|
       fh.flock File::LOCK_EX
 
       loop do
         while queue.size > 0
           value = queue.pop
-          fh.puts value.to_yaml
+          fh.puts value
         end
         if done && queue.empty?
           break

data/bin/jgrouper-grant

@@ -78,7 +78,7 @@ end
 MyApp.new do |app|
 
   opts = OptionParser.new do |opts|
-    opts.banner = "USAGE: #{ File.basename(__FILE__) } [options] <stem-or-group> <privilege> <subject>"
+    opts.banner = "USAGE: #{ File.basename(__FILE__) } [options] <stem-or-group> <admin|create|optin|optout|read|stem|view> <subject>"
     opts.on('-R', '--[no-]recurse', 'Recursively grant privileges [DEFAULT: no]') do |recurse|
       app.recurse = recurse
     end

data/bin/jgrouper-revoke

@@ -0,0 +1,107 @@
+#!/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 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?
+
+    priv = JGrouper::Privilege.find privilege
+    raise "ERROR: could not find privilege: #{privilege}" if priv.nil?
+    puts "found privilege: #{priv.to_s}" if verbose?
+    subj = JGrouper::Subject.find(subject)
+    raise "ERROR: could not find subject: #{subject}"     if subj.nil?
+    puts "found subject: #{subj.to_s}"   if verbose?
+
+    stem = JGrouper::Stem.find(stem_or_group)
+    return revoke_stem(stem, priv, subj) unless stem.nil?
+
+    group = JGrouper::Group.find(stem_or_group)
+    return revoke_group(group, priv, subj) 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 revoke_group(group, privilege, subject)
+    if privilege.naming?
+      warn 'WARNING: cannot revoke naming privilege on group'
+      return false
+    end
+
+    puts "revoking privilege #{privilege.name} from subject #{subject} on group #{group.name}" if verbose?
+    group.revoke(subject, privilege)
+  end
+
+  def revoke_stem(stem, privilege, subject)
+    if privilege.access?
+      unless recurse?
+        warn 'WARNING: cannot revoke access privilege on stem without specifying -R'
+        return false
+      end
+      stem.groups do |group|
+        puts "revoking privilege #{privilege.name} from subject #{subject} on group #{group.name}" if verbose?
+        group.revoke(subject, privilege)
+      end
+      stem.stems { |child| revoke_stem(child, privilege, subject) }
+      return
+    end 
+
+    puts "revoking privilege #{privilege.name} from subject #{subject} on stem #{stem.name}" if verbose?
+    stem.revoke(subject, privilege)
+    stem.stems { |child| revoke_stem(child, privilege, subject) } if recurse?
+    true
+  end
+
+end
+
+
+MyApp.new do |app|
+
+  opts = OptionParser.new do |opts|
+    opts.banner = "USAGE: #{ File.basename(__FILE__) } [options] <stem-or-group> <admin|create|optin|optout|read|stem|view> <subject>"
+    opts.on('-R', '--[no-]recurse', 'Recursively revoke privileges [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.revoke( ARGV.shift, ARGV.shift, ARGV.shift ) or exit 1
+
+end
+
+# vim: syntax=ruby
+

data/jgrouper.gemspec

@@ -18,7 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'hashdiff'
   spec.add_dependency 'jruby-jars', '>= 1.7.3'
+  spec.add_dependency 'json'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/lib/jgrouper/export_file_diff.rb

@@ -0,0 +1,49 @@
+require 'hashdiff'
+require 'json'
+
+module JGrouper # :nodoc:
+  #
+  # = JGrouper::ExportFileDiff - Difference between two JGrouper::ExportFileEntry objects
+  #
+  # == WARNING
+  #
+  # The output format is unstable and will change in a future release.
+  #
+  # == USAGE
+  #
+  #   require 'jgrouper'
+  #   require 'jgrouper/export_file_diff'
+  #   require 'jgrouper/export_file_entry'
+  #
+  #   diff = JGrouper::ExportFileDiff JGrouper::ExportFileEntry.new(json), JGrouper::ExportFileEntry.new(json)
+  #
+  class ExportFileDiff
+
+    def initialize(src, dst)
+      @dst  = dst
+      @key  = dst.key || src.key
+      @src  = src
+      @diff = HashDiff.diff @src.json, @dst.json
+    end
+
+    def different?
+      !@diff.empty?
+    end
+
+    def to_s
+      { key: @key, diff: @diff }.inspect
+    end
+
+    def to_hash
+      return {} unless different?
+      return { entry: @key, changes: @diff }
+    end
+
+    def to_json
+      to_hash.to_json
+    end
+
+  end
+
+end
+

data/lib/jgrouper/export_file_entry.rb

@@ -0,0 +1,99 @@
+require 'jgrouper/export_file_diff'
+require 'json'
+
+module JGrouper # :nodoc:
+  #
+  # = JGrouper::ExportFileEntry - Entry from JGrouper::Exporter file
+  #
+  # == USAGE
+  #
+  #   require 'jgrouper'
+  #   require 'jgrouper/export_file_entry'
+  #   require 'jgrouper/export_file_reader'
+  #
+  #   JGrouper::ExportFileReader.new(file_name) do |reader|
+  #     reader.next { |json| entry = JGrouper::ExportFileEntry.new json }
+  #   end
+  #
+  class ExportFileEntry
+
+    attr_reader :key, :kind, :json
+
+    def initialize( json = {} )
+      @json = json
+      @kind = @json['kind']
+
+      @key     = nil
+      @name    = nil
+      @stem    = nil
+      @subject = nil
+      @uuid    = nil # Or equivalent ...
+
+      case @kind
+      when 'admins', 'members', 'optins', 'optouts', 'readers', 'viewers', 'updaters'
+        @group   = @json['group']
+        @subject = @json['subject']
+        @key     = [ @kind, @group['uuid'], @subject ]
+      when 'composite'
+        @group = @json['group']
+        @key   = [ @kind, @group['uuid'] ]
+      when 'creators', 'stemmers'
+        @stem    = @json['stem']
+        @subject = @json['subject']
+        @key     = [ @kind, @stem['uuid'], @subject ]
+      when 'field'
+        @name = @json['name']
+        @uuid = @json['uuid']
+        @key  = [ @kind, @uuid ]
+      when 'group'
+        %w( create_subject create_time modify_subject modify_time ).each { |_| @json.delete _ }
+        @name = @json['name']
+        @uuid = @json['uuid']
+        @key  = [ @kind, @uuid ]
+      when 'group_attributes'
+        @group = @json['group']
+        @name  = @json['name']
+        @key   = [ @kind, @group['uuid'], @name ]
+      when 'group_type'
+        @name = @json['name']
+        @uuid = @json['uuid'] 
+        @key  = [ @kind, @uuid ]
+      when 'metadata'
+        @key = @kind
+      when 'source'
+        @name = @json['name']
+        @uuid = @json['id'] # Effectively ...
+        @key  = [ @kind, @uuid ]
+      when 'stem'
+        %w( create_subject create_time modify_subject modify_time ).each { |_| @json.delete _ }
+        @name = @json['name']
+        @uuid = @json['uuid']
+        @key  = [ @kind, @uuid ]
+      else
+        warn "invalid entry type: #{ @kind } - #{ @json.inspect }" unless @json.empty?
+      end
+    end
+
+    def ==(other)
+      self.class == other.class && self.kind == other.kind && self.key == other.key
+    end
+
+    alias eql? ==
+
+    def diff(other)
+      JGrouper::ExportFileDiff.new self, other
+    end
+
+    def hash
+      raise "nil @key - #{ @self.inspect }" if @key.nil?
+      @key.hash
+    end
+
+    def metadata?
+      'metadata' == @kind
+    end
+
+  end
+
+end
+

data/lib/jgrouper/export_file_reader.rb

@@ -0,0 +1,65 @@
+require 'json'
+
+module JGrouper # :nodoc:
+  #
+  # = JGrouper::ExportFileReader - Read output file from JGrouper::Exporter
+  #
+  # == USAGE
+  #
+  #   require 'jgrouper'
+  #   require 'jgrouper/export_file_reader'
+  #
+  #   JGrouper::ExportFileReader.new(file_name) do |reader|
+  #     reader.next { |json| ... }
+  #   end
+  #
+  class ExportFileReader
+    include Enumerable
+
+    def initialize(fn)
+      @done    = false
+      @entries = {}
+      @fn      = fn
+
+      @fh = File.open @fn, 'r'
+      yield self
+      @fh.close
+    end
+
+    def <<(entry)
+      @entries[ entry ] = entry
+    end
+
+    def [](entry)
+      @entries[entry]
+    end
+
+    def delete(entry)
+      @entries.delete(entry)
+    end
+
+    def done?
+      @done
+    end
+
+    def each(&block)
+      @entries.values.each(&block)
+    end
+
+    def include?(entry)
+      @entries.include?(entry)
+    end
+
+    def next
+      return if done?
+      if @fh.eof?
+        @done = true
+        return
+      end
+      yield JSON.parse( @fh.gets )
+    end
+
+  end
+
+end
+

data/lib/jgrouper/exporter.rb

@@ -1,3 +1,4 @@
+require 'json'
 
 module JGrouper # :nodoc:
   #
@@ -8,12 +9,14 @@ module JGrouper # :nodoc:
   #   require 'jgrouper'
   #   require 'jgrouper/exporter'
   #
-  #   JGrouper::Exporter do |exporter|
+  #   JGrouper::Exporter.new do |exporter|
   #     exporter.export 'stem:to:export', lambda { |_| puts _.to_yaml }
   #   end
   #
   class Exporter
 
+    EXPORT_VERSION = 1
+
     attr_writer :verbose
 
     def initialize
@@ -34,8 +37,10 @@ module JGrouper # :nodoc:
       # TODO Multiple readers?
       txt = stem.root? ? 'root stem' : "stem #{stem.name}"
       log "exporting #{txt} ..."
+      export_metadata params[:block]
       if stem.root? # TODO Configurable?
         export_group_types params[:block]
+        export_fields      params[:block]
         export_sources     params[:block]
       end
       export_stem stem, params[:block]
@@ -43,28 +48,120 @@ module JGrouper # :nodoc:
 
     end
 
+    # Export fields
+    def export_fields(p)
+      log 'exporting group fields ...'
+      JGrouper::Field.all.each     { |_| p.call _.to_json }
+      log 'exporting group fields: done'
+    end
+
     # Export group types.
     def export_group_types(p)
       log 'exporting group types ...'
-      p.call JGrouper::GroupType
+      JGrouper::GroupType.all.each { |_| p.call _.to_json }
+      log 'exporting group types: done'
+    end
+
+    # Export metadata
+    def export_metadata(p)
+      log 'exporting metadata ...'
+      p.call( { kind:             'metadata',
+                export_version:   EXPORT_VERSION,
+                jgrouper_version: JGrouper::VERSION,
+                hostname:         ENV['HOSTNAME'],
+                ruby_engine:      RUBY_ENGINE,
+                ruby_platform:    RUBY_PLATFORM,
+                ruby_version:     RUBY_VERSION,
+                start_time:       Time.now.to_datetime.rfc3339
+              }.to_json
+            )
+      log 'exporting metadata: done'
     end
 
     # Export subject sources.
     def export_sources(p)
       log 'exporting subject sources ...'
-      p.call JGrouper::Source
+      JGrouper::Source.all.each { |source| p.call source.to_json }
+      log 'exporting subject sources: done'
     end
 
     # Export stem and childen.
-    def export_stem( stem, p )
-      log "exporting stem #{stem.name} ..."
-      p.call stem
-      stem.groups { |child| p.call child          }
-      stem.stems  { |child| export_stem(child, p) }
+    def export_stem(stem, p)
+      log "exporting stem #{stem.name} ..." # TODO Debug ... unless root?!
+      p.call stem.to_json
+      export_stem_privileges(stem, p)
+      stem.groups { |child| export_group child, p }
+      stem.stems  { |child| export_stem  child, p }
+      log "exporting stem #{stem.name}: done" # TODO Debug ... unless root?!
     end
 
 
     private
+ 
+      def export_group(group, p)
+        p.call group.to_json
+        export_group_attributes group, p
+        export_group_privileges group, p
+        export_group_members    group, p
+      end
+
+      def export_group_attributes(group, p)
+        group.get_attributes_map(false).each do |k, v|
+          p.call( { kind:   'group_attributes',
+                    group:  { name: group.name, uuid: group.uuid },
+                    name:   k,
+                    value:  v.get_value
+                  }.to_json
+                )
+        end
+      end
+
+      def export_group_members(group, p)
+        c = group.get_composite false
+        if c
+          left  = c.get_left_group
+          right = c.get_right_group
+          p.call( { kind: 'composite',
+                    group:  { name: group.name,     uuid: group.uuid },
+                    type:   c.get_type.get_name,
+                    left:   { name: left.get_name,  uuid: left.get_uuid },
+                    right:  { name: right.get_name, uuid: right.get_name } 
+                  }.to_json
+                )
+        else
+          group.get_immediate_members.each do |_|
+            p.call( { kind:     'members',
+                      group:    { name: group.name, uuid: group.uuid },
+                      subject:  JGrouper::Subject.new( _.get_subject ).to_hash
+                    }.to_json
+                  )
+          end
+        end
+      end
+
+      def export_group_privileges(group, p)
+        [ :admins, :optins, :optouts, :readers, :updaters, :viewers ].each do |privilege|
+          group.send(privilege).each do |_|
+            p.call( { kind:     privilege,
+                      group:    { name: group.name, uuid: group.uuid },
+                      subject:  JGrouper::Subject.new(_).to_hash
+                    }.to_json
+                  )
+          end
+        end
+      end
+
+      def export_stem_privileges(stem, p)
+        [ :creators, :stemmers ].each do |privilege|
+          stem.send(privilege).each do |_|
+            p.call( { kind:     privilege,
+                      stem:     { name: stem.name, uuid: stem.uuid },
+                      subject:  JGrouper::Subject.new(_).to_hash
+                    }.to_json
+                  )
+          end
+        end
+      end
 
       # TODO Use Logger...
       # TODO DRY

data/lib/jgrouper/field.rb

@@ -18,6 +18,13 @@ module JGrouper # :nodoc:
       self
     end
 
+    #
+    # Find all fields.
+    #
+    def self.all
+      JFieldFinder.find_all.collect { |_| self.new _ }
+    end
+
     #
     # For passing methods on to Grouper Field object.
     #
@@ -33,20 +40,19 @@ module JGrouper # :nodoc:
 
     def to_hash
       {
-        'kind'      =>  'field',
-        'name'      =>  @obj.get_name,
-        'uuid'      =>  @obj.get_uuid,
-        'nullable'  =>  @obj.get_is_nullable,
-        'required'  =>  @obj.get_required,
-        'privilege' =>  {
-          'read'      =>  @obj.get_read_privilege,
-          'write'     =>  @obj.get_write_privilege
-        }
+        kind:             'field',
+        group_type:       { name: @obj.get_group_type.get_name, uuid: @obj.get_group_type.get_uuid },
+        name:             @obj.get_name,
+        uuid:             @obj.get_uuid,
+        nullable:         @obj.get_is_nullable,
+        required:         @obj.get_required,
+        read_privilege:   @obj.get_read_privilege,
+        write_privilege:  @obj.get_write_privilege
       }
     end
 
-    def to_yaml
-      to_hash.to_yaml
+    def to_json
+      to_hash.to_json
     end
 
   end

data/lib/jgrouper/group.rb

@@ -50,74 +50,47 @@ module JGrouper # :nodoc:
       end
     end
 
-    def to_hash
-      begin
-        mod_subj = JGrouper::Subject.new( @obj.get_modify_subject )
-      rescue edu.internet2.middleware.subject.SubjectNotFoundException
-        mod_subj = nil
-      end
+    def revoke(subject, privilege)
+      @obj.revokePriv subject.to_grouper, privilege.to_grouper, false
+    end
 
-      hash = {
-        'kind'              =>  'group',
-        'uuid'              =>  @obj.get_uuid,
-        'name'              =>  @obj.get_name,
-        'display_name'      =>  @obj.get_display_name,
-        'extension'         =>  @obj.get_extension,
-        'display_extension' =>  @obj.get_display_extension,
-        'description'       =>  @obj.get_description,
-        'parent'            =>  {
-          'name'              =>  @obj.get_parent_stem_name,
-          'uuid'              =>  @obj.get_parent_uuid,
-        },
-        'create'            =>  {
-          'subject'           =>  JGrouper::Subject.new( @obj.get_create_subject ).to_hash,
-          'time'              =>  Time.at( @obj.get_create_time_long / 1000 ).to_datetime.rfc3339
-        }
+    def to_hash
+      h = {
+        kind:               'group',
+        uuid:               @obj.get_uuid,
+        name:               @obj.get_name,
+        display_name:       @obj.get_display_name,
+        extension:          @obj.get_extension,
+        display_extension:  @obj.get_display_extension,
+        create_subject:     JGrouper::Subject.new( @obj.get_create_subject ).to_hash,
+        create_time:        Time.at( @obj.get_create_time_long / 1000 ).to_datetime.rfc3339,
+        parent:             { name: @obj.get_parent_stem.get_name, uuid: @obj.get_parent_stem.get_uuid }
       }
 
-      begin
-        mod_subj = JGrouper::Subject.new( @obj.get_modify_subject )
-        hash['modify'] = {
-          'subject'     =>  mod_subj ? mod_subj.to_hash : nil,
-          'time'        =>  Time.at( @obj.get_modify_time_long / 1000 ).to_datetime.rfc3339
-        }
-      rescue
+      unless @obj.get_alternate_names.empty?
+        h[:alternate_names] = @obj.get_alternate_names.collect(&:to_s)
       end
-
-      # TODO Ugly
-      unless  @obj.get_admins.empty?  &&
-              @obj.get_optins.empty?  &&
-              @obj.get_optouts.empty? &&
-              @obj.get_readers.empty? &&
-              @obj.get_updaters.empty &&
-              @obj.get_viewers.empty?
-        hash['privileges'] = {}
-        hash['privileges']['admin']  = @obj.get_admins.collect   { |_| JGrouper::Subject.new(_).to_hash } unless @obj.get_admins.empty?
-        hash['privileges']['optin']  = @obj.get_optins.collect   { |_| JGrouper::Subject.new(_).to_hash } unless @obj.get_optins.empty?
-        hash['privileges']['optout'] = @obj.get_optouts.collect  { |_| JGrouper::Subject.new(_).to_hash } unless @obj.get_optouts.empty?
-        hash['privileges']['read']   = @obj.get_readers.collect  { |_| JGrouper::Subject.new(_).to_hash } unless @obj.get_readers.empty?
-        hash['privileges']['update'] = @obj.get_updaters.collect { |_| JGrouper::Subject.new(_).to_hash } unless @obj.get_updaters.empty?
-        hash['privileges']['view']   = @obj.get_viewers.collect  { |_| JGrouper::Subject.new(_).to_hash } unless @obj.get_viewers.empty?
+      unless @obj.get_description.empty?
+        h[:description]     = @obj.get_description                                                            
+      end
+      unless @obj.get_removable_types.empty?
+        h[:group_types]     = @obj.get_removable_types.collect { |_| { name: _.get_name, uuid: _.get_uuid } }
+      end
+      if 'role' == @obj.get_type_of_group.to_s
+        h[:role]            = true
       end
 
-      hash['types']           = @obj.get_removable_types.collect { |_| { 'name' => _.get_name, 'uuid' => _.get_uuid } } unless @obj.get_removable_types.empty?
-      hash['attributes']      = @obj.get_attributes_map(false).inject({}) { |h, (k,v)| h[k] = v.get_value ; h }         unless @obj.get_attributes_map(false).empty?
-      hash['alternate_names'] = @obj.get_alternate_names.collect { |_| _ }                                              unless @obj.get_alternate_names.empty?
-
-      hash['role'] = 'role' if 'role' == @obj.get_type_of_group.to_string
-
-      composite = @obj.get_composite(false)
-      if composite
-        hash['composite'] = {
-          'type'  =>  composite.get_type.get_name,
-          'left'  =>  { 'name' => composite.get_left_group.get_name,  'uuid' => composite.get_left_group.get_uuid  },
-          'right' =>  { 'name' => composite.get_right_group.get_name, 'uuid' => composite.get_right_group.get_uuid }
-        }
-      else
-        hash['members'] = @obj.get_immediate_members.collect { |_| JGrouper::Subject.new( _.get_subject ).to_hash } unless @obj.get_immediate_members.empty?
+      begin
+        h[:modify_subject] = JGrouper::Subject.new( @obj.get_modify_subject ).to_hash
+        h[:modify_time]    = Time.at( @obj.get_modify_time_long / 1000 ).to_datetime.rfc3339
+      rescue
       end
 
-      hash
+      h
+    end
+
+    def to_json
+      to_hash.to_json
     end
 
     def to_s
@@ -125,10 +98,6 @@ module JGrouper # :nodoc:
       %w( name display_name uuid ).collect { |k| "#{k}=#{ self.send(k) }" }.to_csv.chomp
     end
 
-    def to_yaml
-      to_hash.to_yaml
-    end
-
   end
 end
 

data/lib/jgrouper/group_type.rb

@@ -54,32 +54,20 @@ module JGrouper # :nodoc:
     end
 
     def to_hash
-      hash = {
-        'kind'        =>  'group_type',
-        'name'        =>  @obj.get_name,
-        'uuid'        =>  @obj.get_uuid,
-        'assignable'  =>  @obj.get_is_assignable,
-        'internal'    =>  @obj.get_is_internal,
-        'create'      =>  {
-          'uuid'        => @obj.get_creator_uuid,
-          'time'        => Time.at( @obj.get_create_time / 1000 ).to_datetime.rfc3339
-        }
-      }
-      unless @obj.get_fields.empty?
-        hash['fields'] = @obj.get_fields.collect { |_| JGrouper::Field.new(_).to_hash }
-      end
-      hash
-    end
-
-    def self.to_yaml
       {
-        'kind'        => 'group_types',
-        'group_types' => all.collect { |_| self.new(_).to_hash } 
-      }.to_yaml
+        kind:         'group_type',
+        name:         @obj.get_name,
+        uuid:         @obj.get_uuid,
+        assignable:   @obj.get_is_assignable,
+        internal:     @obj.get_is_internal,
+        create_time:  Time.at( @obj.get_create_time / 1000 ).to_datetime.rfc3339,
+        create_uuid:  @obj.get_creator_uuid,
+        fields:       @obj.get_fields.collect { |f| { name: f.get_name, uuid: f.get_uuid } }
+      }
     end
 
-    def to_yaml
-      to_hash.to_yaml
+    def to_json
+      to_hash.to_json
     end
 
   end

data/lib/jgrouper/member.rb

@@ -23,7 +23,7 @@ module JGrouper # :nodoc:
     #
     def self.find(uuid)
       begin
-        m = MemberFinder.find_by_uuid JGrouper.start_root_session, uuid, false
+        m = JMemberFinder.find_by_uuid JGrouper.start_root_session, uuid, false
       rescue => e
         warn "JGrouper::Member.find(#{uuid}) => #{e}"
       end

data/lib/jgrouper/source.rb

@@ -40,22 +40,15 @@ module JGrouper # :nodoc:
 
     def to_hash
       {
-        'kind'        =>  'source',
-        'id'          =>  @obj.get_id,
-        'name'        =>  @obj.get_name,
-        'init_params' =>  @obj.get_init_params.inject({}) { |h, (k,v)| h[k] = v ; h }
+        kind:         'source',
+        id:           @obj.get_id,
+        name:         @obj.get_name,
+        init_params:  @obj.get_init_params.each { |k,v| { name: k, value: v }.collect }
       }
     end
 
-    def self.to_yaml
-      {
-        'kind'    => 'sources',
-        'sources' => all.collect { |_| self.new(_).to_hash }
-      }.to_yaml
-    end
-
-    def to_yaml
-      to_hash.to_yaml
+    def to_json
+      to_hash.to_json
     end
 
   end

data/lib/jgrouper/stem.rb

@@ -24,7 +24,7 @@ module JGrouper # :nodoc:
     #
     def self.find(name)
       begin
-        obj = StemFinder.find_by_name JGrouper.start_root_session, name, false
+        obj = JStemFinder.find_by_name JGrouper.start_root_session, name, false
       rescue => e
         warn "JGrouper::Group.find(#{name}) => #{e}"
       end
@@ -62,11 +62,15 @@ module JGrouper # :nodoc:
       end
     end
 
+    def revoke(subject, privilege)
+      @obj.revokePriv subject.to_grouper, privilege.to_grouper, false
+    end
+
     #
     # Find Grouper root stem.  Returns +JGrouper::Stem+ or +nil+.
     #
     def self.root
-      obj = StemFinder.find_root_stem JGrouper.start_root_session
+      obj = JStemFinder.find_root_stem JGrouper.start_root_session
       return nil if obj.nil?
       stem = self.new obj
       yield stem if block_given?
@@ -92,43 +96,34 @@ module JGrouper # :nodoc:
     end
 
     def to_hash
-      hash = {
-        'kind'              =>  'stem',
-        'uuid'              =>  @obj.get_uuid,
-        'name'              =>  @obj.get_name,
-        'display_name'      =>  @obj.get_display_name,
-        'extension'         =>  @obj.get_extension,
-        'display_extension' =>  @obj.get_display_extension
+      h = {
+        kind:               'stem',
+        uuid:               @obj.get_uuid,
+        name:               @obj.get_name,
+        display_name:       @obj.get_display_name,
+        extension:          @obj.get_extension,
+        display_extension:  @obj.get_display_extension,
+        create_subject:     JGrouper::Subject.new( @obj.get_create_subject ).to_hash,
+        create_time:        Time.at( @obj.get_create_time_long / 1000 ).to_datetime.rfc3339
       }
 
-      hash['description'] = @obj.get_description unless @obj.get_description.empty?
-
-      hash['create'] = {
-          'subject'   =>  JGrouper::Subject.new( @obj.get_create_subject ).to_hash,
-          'time'      =>  Time.at( @obj.get_create_time_long / 1000 ).to_datetime.rfc3339
-      }
+      h[:description] = @obj.get_description unless @obj.get_description.empty?
+      unless root?
+        parent = @obj.get_parent_stem
+        h[:parent] = { name: parent.get_name, uuid: parent.get_uuid }
+      end
 
       begin
-        mod_subj = JGrouper::Subject.new( @obj.get_modify_subject )
-        hash['modify'] = {
-          'subject'     =>  mod_subj ? mod_subj.to_hash : nil,
-          'time'        =>  Time.at( @obj.get_modify_time_long / 1000 ).to_datetime.rfc3339
-        }
+        h[:modify_subject] = JGrouper::Subject.new( @obj.get_modify_subject ).to_hash
+        h[:modify_time]    = Time.at( @obj.get_modify_time_long / 1000 ).to_datetime.rfc3339
       rescue
       end
 
-      unless @obj.get_creators.empty? && @obj.get_stemmers.empty?
-        hash['privileges'] = {}
-        hash['privileges']['create'] = @obj.get_creators.collect { |_| JGrouper::Subject.new(_).to_hash } unless @obj.get_creators.empty?
-        hash['privileges']['stem']   = @obj.get_stemmers.collect { |_| JGrouper::Subject.new(_).to_hash } unless @obj.get_stemmers.empty?
-      end
-
-      hash['stems']  = @obj.child_stems.collect  { |_| { 'name' => _.get_name, 'uuid' => _.get_uuid } } unless @obj.child_stems.empty?
-      hash['groups'] = @obj.child_groups.collect { |_| { 'name' => _.get_name, 'uuid' => _.get_uuid } } unless @obj.child_groups.empty?
-
-      hash['parent'] = { 'name' => @obj.get_parent_stem.get_name, 'uuid' => @obj.get_parent_uuid } unless root?
+      h
+    end
 
-      hash
+    def to_json
+      to_hash.to_json
     end
 
     def to_s
@@ -136,10 +131,6 @@ module JGrouper # :nodoc:
       %w( name display_name uuid ).collect { |k| "#{k}=#{ self.send(k) }" }.to_csv.chomp
     end
 
-    def to_yaml
-      to_hash.to_yaml
-    end
-
   end
 end
 

data/lib/jgrouper/subject.rb

@@ -23,7 +23,7 @@ module JGrouper # :nodoc:
     #
     def self.find(id_or_identifier)
       begin
-        subj = SubjectFinder.find_by_id_or_identifier id_or_identifier, false
+        subj = JSubjectFinder.find_by_id_or_identifier id_or_identifier, false
       rescue => e
         warn "JGrouper::Subject.find(#{id_or_identifier}) => #{e}"
       end
@@ -50,22 +50,22 @@ module JGrouper # :nodoc:
 
     def to_hash
       {
-        'kind'    => 'subject',
-        'id'      => @obj.get_id,
-        'source'  => @obj.get_source_id,
-        'type'    => @obj.get_type_name
+        kind:   'subject',
+        id:     @obj.get_id,
+        source: @obj.get_source_id,
+        type:   @obj.get_type_name
       }
     end
 
+    def to_json
+      to_hash.to_json
+    end
+
     def to_s
       return nil if @obj.nil?
       %w( id type_name source_id name ).collect { |k| "#{k}=#{ self.send(k) }" }.to_csv.chomp
     end
 
-    def to_yaml
-      to_hash.to_yaml
-    end
-
   end
 end
 

data/lib/jgrouper/version.rb

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

data/lib/jgrouper.rb

@@ -10,6 +10,7 @@ require 'jgrouper/stem'
 require 'jgrouper/subject'
 require 'jgrouper/version'
 
+
 #
 # = JGrouper - JRuby wrapper around the Internet2 Grouper API
 # 
@@ -161,20 +162,18 @@ module JGrouper
     $CLASSPATH << File.join( path, 'conf' )
     $CLASSPATH << File.join( path, 'dist', 'lib', 'grouper.jar' )
 
-    %w( edu.internet2.middleware.subject.SubjectNotFoundException
-        edu.internet2.middleware.grouper.GrouperSession
-        edu.internet2.middleware.grouper.MemberFinder
-        edu.internet2.middleware.grouper.StemFinder
-        edu.internet2.middleware.grouper.SubjectFinder
-      ).each { |klass| java_import klass }
-
-    # TODO Do this for everything?
     %w( 
         edu.internet2.middleware.grouper.Field
+        edu.internet2.middleware.grouper.FieldFinder
         edu.internet2.middleware.grouper.GroupFinder
+        edu.internet2.middleware.grouper.GrouperSession
         edu.internet2.middleware.grouper.GroupTypeFinder
+        edu.internet2.middleware.grouper.MemberFinder
         edu.internet2.middleware.grouper.privs.Privilege
         edu.internet2.middleware.subject.provider.SourceManager
+        edu.internet2.middleware.grouper.StemFinder
+        edu.internet2.middleware.grouper.SubjectFinder
+        edu.internet2.middleware.subject.SubjectNotFoundException
       ).each do |klass|
         java_import klass do |pkg, cls| "J#{cls}"; end
       end
@@ -183,7 +182,7 @@ module JGrouper
   # TODO Block method?
   def self.start_root_session
     # TODO Block method?
-    GrouperSession.start_root_session
+    JGrouperSession.start_root_session
   end
 
 end

metadata

@@ -1,87 +1,121 @@
 --- !ruby/object:Gem::Specification
 name: jgrouper
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.6.0
+  prerelease:
 platform: ruby
 authors:
 - blair christensen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jruby-jars
-  requirement: !ruby/object:Gem::Requirement
+  name: hashdiff
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.7.3
-  type: :runtime
+        version: '0'
+    none: false
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: jruby-jars
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.3
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.3
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: json
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
   requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: bundler
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rdoc-readme
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.2
+    none: false
+  prerelease: false
+  type: :development
 description: JRuby wrapper around the Internet2 Grouper API
 email:
 - blair.christensen@gmail.com
 executables:
 - jgrouper-audit-archiver
+- jgrouper-diff
 - jgrouper-export
 - jgrouper-grant
+- jgrouper-revoke
 extensions: []
 extra_rdoc_files: []
 files:
@@ -94,11 +128,16 @@ files:
 - Rakefile
 - TODO.md
 - bin/jgrouper-audit-archiver
+- bin/jgrouper-diff
 - bin/jgrouper-export
 - bin/jgrouper-grant
+- bin/jgrouper-revoke
 - jgrouper.gemspec
 - lib/jgrouper.rb
 - lib/jgrouper/audit_archiver.rb
+- lib/jgrouper/export_file_diff.rb
+- lib/jgrouper/export_file_entry.rb
+- lib/jgrouper/export_file_reader.rb
 - lib/jgrouper/exporter.rb
 - lib/jgrouper/field.rb
 - lib/jgrouper/group.rb
@@ -112,26 +151,26 @@ files:
 homepage: https://github.com/blairc/jgrouper/
 licenses:
 - MIT
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: JRuby wrapper around the Internet2 Grouper API
 test_files: []