ldap_tools 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c580acd38fa44077ad2175af8c7525b25c22dfcd
-  data.tar.gz: 9002e5285f2eb0964a53e587b757cbf60492392c
+  metadata.gz: fb5a40099b907acf70a59b0b522fdc27b6bf07de
+  data.tar.gz: 31070ab008f94eb5251247a43429edac810afc87
 SHA512:
-  metadata.gz: 372a3e9e8013fe642ddbcfbceb1f1dead4a0e68874f7b968e6957bca2709697ad0fc7d303a6730cdde21216b536a596c5f17ccd83983e49712d1b664f75fad12
-  data.tar.gz: d3662bc277bd26599a19dba670f96c261c55ddf617b93196f68762836c75ed4e190162e54088a1d810b2aa138bf00ddf997cc90e6e7fdf6cba3b8a697e1a746a
+  metadata.gz: d1bd83b23b788f86d3b13bd5bb337de356b697685b700e98bd058a6dc8de71aa48180544321aaa31457167994565b4b01ce69e13c9c06e52ea8043e9890f12ac
+  data.tar.gz: 6e39d5db0f86fa1faf48679f8d444141a1e1a5fdd68e6ae682b0522d264b60c839f7a3dd82aeb103959eed8ec6ab4f5bb14e5db318e06f40791653d82cd3de37

data/lib/tapjoy/ldap/api/group.rb

@@ -0,0 +1,75 @@
+require 'memoist'
+module Tapjoy::LDAP::API
+  # API methods for managing LDAP Groups
+  module Group
+    class << self
+      extend Memoist
+      def create(group_name, group_type)
+        Tapjoy::LDAP.client.add(
+          distinguished_name(group_name),
+          ldap_attr(group_name, group_type)
+        )
+      end
+
+      def destroy(group_name)
+        Tapjoy::LDAP.client.delete(distinguished_name(group_name))
+      end
+
+      def update(group_name, username, operation)
+        Tapjoy::LDAP.client.modify(
+          distinguished_name(group_name),
+          [[operation, :memberUid, username]]
+        )
+      end
+
+      def index
+        Tapjoy::LDAP.client.search('*', group_object_class_filter)
+      end
+
+      # Lookup GID for the given group
+      def lookup_id(groupname)
+        gidnumber = []
+
+        cn_filter = Net::LDAP::Filter.eq('cn', groupname)
+        filter    = Net::LDAP::Filter.join(
+          group_object_class_filter, cn_filter)
+
+        results = Tapjoy::LDAP.client.search(['gidNumber'], filter)
+
+        # Make sure we return one, and only one group
+        if results.size < 1
+          abort('Group not found')
+        elsif results.size > 1
+          abort('Multiple groups found. Please narrow your search.')
+        end
+
+        results.each { |result| gidnumber = result.gidnumber }
+        return gidnumber[0]
+      end
+
+      private
+
+      def group_object_class_filter
+        Net::LDAP::Filter.eq('objectClass', 'posixGroup')
+      end
+      memoize :group_object_class_filter
+
+      def distinguished_name(group_name)
+        %W(
+          cn=#{group_name}
+          ou=Group
+          #{Tapjoy::LDAP.client.basedn}).join(',')
+      end
+      memoize :distinguished_name
+
+      def ldap_attr(group_name, group_type)
+        {
+          cn:          group_name,
+          objectclass: %w(top posixGroup),
+          gidnumber:   Tapjoy::LDAP.client.get_max_id('group', group_type)
+        }
+      end
+      memoize :ldap_attr
+    end
+  end
+end

data/lib/tapjoy/ldap/api/user.rb

@@ -9,24 +9,24 @@ module Tapjoy
             # Properly capitalize names
             fname, lname = [fname, lname].map(&:capitalize)
 
-            Tapjoy::LDAP::client.add(
+            Tapjoy::LDAP.client.add(
               distinguished_name(fname, lname, type),
               ldap_attr(fname, lname, type, group)
             )
           end
 
           def destroy(username, type)
-            Tapjoy::LDAP::client.delete(
+            Tapjoy::LDAP.client.delete(
               distinguished_name(*name_of_user(username), type)
             )
           end
 
           def index
-            Tapjoy::LDAP::client.search('*', filter(uid: '*'))
+            Tapjoy::LDAP.client.search('*', filter(uid: '*'))
           end
 
           def show(username)
-            Tapjoy::LDAP::client.search('*', filter(uid: username))
+            Tapjoy::LDAP.client.search('*', filter(uid: username))
           end
 
           private
@@ -52,7 +52,7 @@ module Tapjoy
             %W(
               uid=#{username(fname, lname)}
               ou=#{organizational_unit(type)}
-              #{Tapjoy::LDAP::client.basedn}).join(',')
+              #{Tapjoy::LDAP.client.basedn}).join(',')
           end
           memoize :distinguished_name
 
@@ -61,7 +61,7 @@ module Tapjoy
             when 'user'
               'People'
             when 'service'
-              Tapjoy::LDAP::client.service_ou
+              Tapjoy::LDAP.client.service_ou
             else
               puts 'Unknown type'
             end
@@ -89,12 +89,12 @@ module Tapjoy
           memoize :ldap_attr
 
           def uidnumber(type)
-            Tapjoy::LDAP::client.get_max_id('user', type)
+            Tapjoy::LDAP.client.get_max_id('user', type)
           end
           memoize :uidnumber
 
           def gidnumber(group)
-            Tapjoy::LDAP::Group.lookup_id(group)
+            Tapjoy::LDAP::API::Group.lookup_id(group)
           end
           memoize :gidnumber
 

data/lib/tapjoy/ldap/audit/by_user.rb

@@ -32,7 +32,7 @@ module Tapjoy
         end
 
         def results
-          @results ||= Tapjoy::LDAP::client.search(attributes, filter)
+          @results ||= Tapjoy::LDAP.client.search(attributes, filter)
         end
 
         def group_results

data/lib/tapjoy/ldap/audit.rb

@@ -7,7 +7,7 @@ module Tapjoy
         SUB_COMMANDS = %w(by_user by_group raw)
 
         def commands
-          Trollop::options do
+          Trollop.options do
             usage 'user [SUB_COMMAND] [options]'
             synopsis "\nThis object is used for auditing LDAP permissions\nAvailable subcommands are: #{SUB_COMMANDS}"
 
@@ -35,7 +35,7 @@ module Tapjoy
         end
 
         def raw
-          puts Tapjoy::LDAP::client.search.inspect
+          puts Tapjoy::LDAP.client.search.inspect
         end
 
         # Get hash of groups with list of members of each group
@@ -43,7 +43,7 @@ module Tapjoy
           filter = Net::LDAP::Filter.eq('objectclass', 'posixGroup')
           attributes = %w(cn memberUid)
 
-          results = Tapjoy::LDAP::client.search(attributes, filter)
+          results = Tapjoy::LDAP.client.search(attributes, filter)
         end
 
 

data/lib/tapjoy/ldap/base.rb

@@ -26,9 +26,9 @@ module Tapjoy
                  filter = Net::LDAP::Filter.eq('objectclass','*'))
         @entries = []
         if @conn
-          @conn.search :base => @basedn,
-                       :filter => filter,
-                       :attributes => attributes do |entry|
+          @conn.search base: @basedn,
+                       filter: filter,
+                       attributes: attributes do |entry|
             @entries.push(entry)
           end
         else
@@ -40,7 +40,7 @@ module Tapjoy
 
       # Add objects to LDAP
       def add(distinguished_name, attributes)
-        @conn.add(:dn => distinguished_name, :attributes => attributes)
+        @conn.add(dn: distinguished_name, attributes: attributes)
         return return_result
       end
 
@@ -141,16 +141,12 @@ module Tapjoy
       def ldap_connect(host, ldap_password_file)
         port = @ldap_info['port']
         auth = {
-          :method   => :simple,
-          :username => @ldap_info['rootdn'],
-          :password => File.read(ldap_password_file).chomp
+          method:   :simple,
+          username: @ldap_info['rootdn'],
+          password: File.read(ldap_password_file).chomp
         }
 
-        ldap = Net::LDAP.new :host => host,
-                             :port => port,
-                             :base => @basedn,
-                             :auth => auth
-        return ldap
+        Net::LDAP.new(host: host, port: port, base: @base, auth: auth)
       end
 
       # Find valid LDAP host

data/lib/tapjoy/ldap/cli/group/add_user.rb

@@ -0,0 +1,28 @@
+module Tapjoy
+  module LDAP
+    module CLI
+      module Group
+        # Add existing user to existing group
+        class AddUser
+          def add_user
+            puts Tapjoy::LDAP::API::Group.update(
+              opts[:group], opts[:username], :add)
+          end
+
+          private
+
+          def opts
+            @opts ||= Trollop.options do
+              # Set help message
+              usage 'group add_user [options]'
+              synopsis "\nThis command is for adding existing users to existing groups"
+
+              opt(:group, 'Specify group', type: :string, required: true)
+              opt(:username, 'Specify username', type: :string, required: true)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tapjoy/ldap/cli/group/create.rb

@@ -0,0 +1,28 @@
+module Tapjoy
+  module LDAP
+    module CLI
+      module Group
+        # Create LDAP group
+        class Create
+          def create
+            # Check for errors
+            Trollop.die :type, "argument must be 'user' or 'service'" unless ['user', 'service'].include?(opts[:type])
+
+            puts Tapjoy::LDAP::API::Group.create(opts[:name], opts[:type])
+          end
+
+          private def opts
+            @opts ||= Trollop.options do
+              # Set help message
+              usage 'group create [options]'
+              synopsis "\nThis command is for creating new LDAP groups"
+
+              opt :name, 'Specify group to create', type: :string, required: true
+              opt :type, 'Specfy if this is a user or service group', type: :string, default: 'user'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tapjoy/ldap/cli/group/delete.rb

@@ -0,0 +1,35 @@
+module Tapjoy
+  module LDAP
+    module CLI
+      module Group
+        # Delete LDAP group
+        class Delete
+          def delete
+            confirm unless opts[:force]
+            puts Tapjoy::LDAP::API::Group.destroy(opts[:name])
+          end
+
+          private
+
+          def opts
+            @opts ||= Trollop.options do
+              # Set help message
+              usage 'group delete [options]'
+              synopsis "\nThis command is for deleting LDAP groups"
+
+              opt :name, 'Specify group', type: :string, required: true
+              opt :force, 'Force delete'
+            end
+          end
+
+          def confirm
+            puts "Confirm that you want to delete group #{opts[:name]} (yes/no)"
+            print '>'
+            confirm = STDIN.gets.chomp.downcase
+            abort("Deletion of #{opts[:name]} aborted") unless confirm.start_with?('y')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tapjoy/ldap/cli/group/index.rb

@@ -0,0 +1,18 @@
+module Tapjoy
+  module LDAP
+    module CLI
+      module Group
+        # Manipulates data to a format usable
+        # by the API structure for group display
+        class Index
+          # Make the API call to show an LDAP user
+          def index
+            Tapjoy::LDAP::API::Group.index.each do |entry|
+              puts "#{entry.cn.first}:\t#{entry.gidnumber.first}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tapjoy/ldap/cli/group/remove_user.rb

@@ -0,0 +1,36 @@
+module Tapjoy
+  module LDAP
+    module CLI
+      module Group
+        # Remove existing user to existing group
+        class RemoveUser
+          def remove_user
+            confirm unless opts[:force]
+            puts Tapjoy::LDAP::API::Group.update(
+              opts[:group], opts[:username], :delete)
+          end
+
+          private
+
+          def opts
+            @opts ||= Trollop.options do
+              # Set help message
+              usage 'group remove_user [options]'
+              synopsis "\nThis command is for removing existing users from existing groups"
+
+              opt(:group, 'Specify group', type: :string, required: true)
+              opt(:username, 'Specify username', type: :string, required: true)
+            end
+          end
+
+          def confirm
+            puts "Confirm that you want to remove user #{opts[:username]} from group #{opts[:group]} (yes/no)"
+            print '>'
+            confirm = STDIN.gets.chomp.downcase
+            abort("Deletion of #{opts[:name]} aborted") unless confirm.start_with?('y')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tapjoy/ldap/cli/group.rb

@@ -0,0 +1,65 @@
+require_relative 'group/create'
+require_relative 'group/delete'
+require_relative 'group/add_user'
+require_relative 'group/remove_user'
+require_relative 'group/index'
+require_relative '../api/group'
+
+module Tapjoy
+  module LDAP
+    module CLI
+      # Entry point for all group subcommands
+      module Group
+        class << self
+
+          SUB_COMMANDS = %w(create delete add_user remove_user)
+
+          def commands
+            Trollop.options do
+              usage 'group [SUB_COMMAND] [options]'
+              synopsis "\nThis object is used for group management\nAvailable subcommands are: #{SUB_COMMANDS}"
+
+              stop_on SUB_COMMANDS
+            end
+
+            cmd = ARGV.shift
+
+            case cmd
+            when 'create', 'delete', 'add_user', 'remove_user', 'index'
+              send(cmd) # call method with respective name
+            else
+              raise Tapjoy::LDAP::InvalidArgument
+            end
+          end
+
+          # Create Group
+          def create
+            group = Tapjoy::LDAP::CLI::Group::Create.new
+            group.create
+          end
+
+          # Delete group
+          def delete
+            group = Tapjoy::LDAP::CLI::Group::Delete.new
+            group.delete
+          end
+
+          def add_user
+            group = Tapjoy::LDAP::CLI::Group::AddUser.new
+            group.add_user
+          end
+
+          def remove_user
+            group = Tapjoy::LDAP::CLI::Group::RemoveUser.new
+            group.remove_user
+          end
+
+          def index
+            group = Tapjoy::LDAP::CLI::Group::Index.new
+            group.index
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tapjoy/ldap/cli/user/create.rb

@@ -15,7 +15,7 @@ module Tapjoy
 
           private
           def opts
-            @opts ||= Trollop::options do
+            @opts ||= Trollop.options do
               # Set help message
               usage 'user create [options]'
               synopsis "\nThis command is for creating new LDAP users"
@@ -32,8 +32,8 @@ module Tapjoy
           end
 
           def verify_arguments
-            Trollop::die :user, 'argument count must be two' if opts[:user].size != 2
-            Trollop::die :type, "argument must be 'user' or 'service'" unless %w(user service).include?opts[:type]
+            Trollop.die :user, 'argument count must be two' if opts[:user].size != 2
+            Trollop.die :type, "argument must be 'user' or 'service'" unless %w(user service).include?(opts[:type])
           end
         end
       end

data/lib/tapjoy/ldap/cli/user/delete.rb

@@ -14,7 +14,7 @@ module Tapjoy
 
           private
           def opts
-            @opts ||= Trollop::options do
+            @opts ||= Trollop.options do
               # Set help message
               usage "user delete [options]"
 
@@ -27,14 +27,12 @@ module Tapjoy
           def confirm
             puts "Confirm that you want to delete user: #{opts[:user]} (yes/no)"
             print '>'
-            confirm = STDIN.gets.chomp().downcase
-            unless confirm.eql?('y') || confirm.eql?('yes')
-              abort("Deletion of #{ opts[:user] } aborted")
-            end
+            confirm = STDIN.gets.chomp.downcase
+            abort("Deletion of #{opts[:user]} aborted") unless confirm.start_with?('y')
           end
 
           def verify_arguments
-            Trollop::die :type, "argument must be 'user' or 'service'" unless %w(user service).include?opts[:type]
+            Trollop.die :type, "argument must be 'user' or 'service'" unless %w(user service).include?(opts[:type])
           end
         end
       end

data/lib/tapjoy/ldap/cli/user/show.rb

@@ -20,7 +20,7 @@ module Tapjoy
 
           private
           def opts
-            @opts ||= Trollop::options do
+            @opts ||= Trollop.options do
               # Set help message
               usage "user show [options]"
 

data/lib/tapjoy/ldap/cli/user.rb

@@ -11,7 +11,7 @@ module Tapjoy
           SUB_COMMANDS = %w(create delete index show)
 
           def commands
-            Trollop::options do
+            Trollop.options do
               usage 'user [SUB_COMMAND] [options]'
               synopsis "\nThis object is used for user management\nAvailable subcommands are: #{SUB_COMMANDS}"
 

data/lib/tapjoy/ldap/cli.rb

@@ -1,4 +1,5 @@
 require_relative 'cli/user'
+require_relative 'cli/group'
 
 module Tapjoy
   module LDAP
@@ -6,7 +7,7 @@ module Tapjoy
       class << self
         def commands
           subcommand = %w(user group key audit)
-          Trollop::options do
+          Trollop.options do
             usage '[SUB_COMMAND] [options]'
             synopsis "\nTool to manage LDAP resources.\nAvailable subcommands are: #{subcommand}"
             version "#{File.basename($PROGRAM_NAME)} #{Tapjoy::LDAP::VERSION} \u00A9 2015 Tapjoy, Inc."
@@ -18,7 +19,7 @@ module Tapjoy
           when 'user'
             Tapjoy::LDAP::CLI::User.commands
           when 'group'
-            Tapjoy::LDAP::Group.commands
+            Tapjoy::LDAP::CLI::Group.commands
           when 'key'
             Tapjoy::LDAP::Key.commands
           when 'audit'

data/lib/tapjoy/ldap/key/add.rb

@@ -8,14 +8,14 @@ module Tapjoy
           filter_users.each  do |result|
             confirm_ldap_schema(result)
             keys.each do |key|
-              puts Tapjoy::LDAP::client.add_attribute(result.dn, :sshPublicKey, key)
+              puts Tapjoy::LDAP.client.add_attribute(result.dn, :sshPublicKey, key)
             end
           end
         end
 
         private
         def opts
-          @opts ||= Trollop::options do
+          @opts ||= Trollop.options do
               # Set help message
               usage 'key add [options]'
               synopsis "\nThis command is for adding user keys to a given user's profile"
@@ -32,7 +32,7 @@ module Tapjoy
 
         def filter_users
           filter = Net::LDAP::Filter.eq('uid', opts[:user])
-          results = Tapjoy::LDAP::client.search(attributes = ['*'], filter = filter)
+          results = Tapjoy::LDAP.client.search(attributes = ['*'], filter = filter)
 
           Tapjoy::LDAP::Key.verify_user(opts[:user], results)
 

data/lib/tapjoy/ldap/key/install.rb

@@ -15,7 +15,7 @@ module Tapjoy
 
         private
         def opts
-          @opts ||= Trollop::options do
+          @opts ||= Trollop.options do
               # Set help message
               usage 'key install'
               synopsis "\nThis command is for adding keys to the appropriate authorized_keys file"

data/lib/tapjoy/ldap/key/remove.rb

@@ -9,13 +9,13 @@ module Tapjoy
           Tapjoy::LDAP::Key.verify_user(opts[:user], results)
 
           confirm unless opts[:force]
-          Tapjoy::LDAP::client.replace_attribute(
+          Tapjoy::LDAP.client.replace_attribute(
             @user_dn, :sshPublicKey, keep_keys)
         end
 
         private
         def opts
-          @opts ||= Trollop::options do
+          @opts ||= Trollop.options do
             # Set help message
             usage 'key remove [options]'
             synopsis "\nThis command is for removing a user's SSH key(s)"
@@ -36,7 +36,7 @@ module Tapjoy
         end
 
         def results
-          @results ||= Tapjoy::LDAP::client.search(['sshPublicKey'], filter)
+          @results ||= Tapjoy::LDAP.client.search(['sshPublicKey'], filter)
         end
 
         def current_keys
@@ -74,17 +74,10 @@ module Tapjoy
           get_confirmation
         end
 
-        def fd
-          @fd ||= IO.sysopen('/dev/tty', 'w+')
-        end
-
         def get_confirmation
           print '>'
-          confirm = gets.chomp
-          # IO.open(fd, 'w+')  { |io| confirm = io.gets.chomp }
-          unless confirm.eql?('y') || confirm.eql?('yes')
-            abort("Deletion of #{ opts[:user] } aborted")
-          end
+          confirm = STDIN.gets.chomp.downcase
+          abort('Deletion of key aborted') unless confirm.start_with?('y')
         end
       end
     end

data/lib/tapjoy/ldap/key/show.rb

@@ -12,7 +12,7 @@ module Tapjoy
 
         private
         def opts
-          @opts ||= Trollop::options do
+          @opts ||= Trollop.options do
               # Set help message
               usage 'key show [options]'
               synopsis "\nThis command is for showing a specific user's SSH keys"

data/lib/tapjoy/ldap/key.rb

@@ -11,7 +11,7 @@ module Tapjoy
         SUB_COMMANDS = %w(add remove install list show)
 
         def commands
-          Trollop::options do
+          Trollop.options do
             usage 'key [SUB_COMMAND] [options]'
             synopsis "\nThis object is used for user key management\nAvailable subcommands are: #{SUB_COMMANDS}"
 
@@ -57,7 +57,7 @@ module Tapjoy
           key_results = {}
           filter = Net::LDAP::Filter.eq('sshPublicKey', '*')
           attributes = %w(uid sshPublicKey)
-          results = Tapjoy::LDAP::client.search(attributes, filter)
+          results = Tapjoy::LDAP.client.search(attributes, filter)
           results.each {|result| key_results[result.uid[0]] = result.sshPublicKey}
           key_results
         end

data/lib/tapjoy/ldap/version.rb

@@ -3,7 +3,7 @@ module Tapjoy
     module Version
       MAJOR = 0
       MINOR = 8
-      PATCH = 0
+      PATCH = 1
     end
 
     VERSION = [Version::MAJOR, Version::MINOR, Version::PATCH].join('.')

data/lib/tapjoy/ldap.rb

@@ -1,23 +1,29 @@
 require 'net/ldap'
 require 'yaml'
 require 'trollop'
+require 'memoist'
 require_relative 'ldap/cli'
 require_relative 'ldap/base'
-require_relative 'ldap/group'
 require_relative 'ldap/key'
 require_relative 'ldap/audit'
 require_relative 'ldap/version'
 
+
 module Tapjoy
   module LDAP
+    class << self
+      attr_reader :client
+      extend Memoist
 
-    def self.client
-      @@client ||= Tapjoy::LDAP::Base.new
+      def client
+        Tapjoy::LDAP::Base.new
+      end
+      memoize :client
     end
 
     class InvalidArgument < ArgumentError
       def initialize
-        Trollop::educate
+        Trollop.educate
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ldap_tools
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Ali Tayarani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -178,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: codacy-coverage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: A set of tools to make managing LDAP users, groups, and keys easier
 email: ali.tayarani@tapjoy.com
 executables:
@@ -187,21 +201,23 @@ extra_rdoc_files: []
 files:
 - bin/ldaptools
 - lib/tapjoy/ldap.rb
+- lib/tapjoy/ldap/api/group.rb
 - lib/tapjoy/ldap/api/user.rb
 - lib/tapjoy/ldap/audit.rb
 - lib/tapjoy/ldap/audit/by_group.rb
 - lib/tapjoy/ldap/audit/by_user.rb
 - lib/tapjoy/ldap/base.rb
 - lib/tapjoy/ldap/cli.rb
+- lib/tapjoy/ldap/cli/group.rb
+- lib/tapjoy/ldap/cli/group/add_user.rb
+- lib/tapjoy/ldap/cli/group/create.rb
+- lib/tapjoy/ldap/cli/group/delete.rb
+- lib/tapjoy/ldap/cli/group/index.rb
+- lib/tapjoy/ldap/cli/group/remove_user.rb
 - lib/tapjoy/ldap/cli/user.rb
 - lib/tapjoy/ldap/cli/user/create.rb
 - lib/tapjoy/ldap/cli/user/delete.rb
 - lib/tapjoy/ldap/cli/user/show.rb
-- lib/tapjoy/ldap/group.rb
-- lib/tapjoy/ldap/group/add_user.rb
-- lib/tapjoy/ldap/group/create.rb
-- lib/tapjoy/ldap/group/delete.rb
-- lib/tapjoy/ldap/group/remove_user.rb
 - lib/tapjoy/ldap/key.rb
 - lib/tapjoy/ldap/key/add.rb
 - lib/tapjoy/ldap/key/install.rb

data/lib/tapjoy/ldap/group/add_user.rb

@@ -1,34 +0,0 @@
-module Tapjoy
-  module LDAP
-    module Group
-      # Add existing user to existing group
-      class AddUser
-        def add_user
-          puts Tapjoy::LDAP::client.modify(distinguished_name, operations)
-        end
-
-        private
-        def opts
-          @opts ||= Trollop::options do
-            # Set help message
-            usage 'group add_user [options]'
-            synopsis "\nThis command is for adding existing users to existing groups"
-
-            opt(:group, 'Specify group', :type => :string, :required => true)
-            opt(:username, 'Specify username', :type => :string, :required => true)
-          end
-        end
-
-        def distinguished_name
-          @distinguished_name ||= "cn=#{opts[:group]},ou=Group,#{Tapjoy::LDAP::client.basedn}"
-        end
-
-        def operations
-          # Format is LDAP operation, attribute modified, value modified
-          # i.e, add the username to the memberuid attribute for the specified group
-          @operations ||= [[:add, :memberUid, opts[:username]]]
-        end
-      end
-    end
-  end
-end

data/lib/tapjoy/ldap/group/create.rb

@@ -1,40 +0,0 @@
-module Tapjoy
-  module LDAP
-    module Group
-      # Create LDAP group
-      class Create
-        def create
-          # Check for errors
-          Trollop::die :type, "argument must be 'user' or 'service'" unless ['user', 'service'].include?opts[:type]
-
-          puts Tapjoy::LDAP::client.add(distinguished_name, ldap_attr)
-        end
-
-        private
-
-        def opts
-          @opts ||= Trollop::options do
-            # Set help message
-            usage 'group create [options]'
-            synopsis "\nThis command is for creating new LDAP groups"
-
-            opt :name, 'Specify group to create', type: :string, required: true
-            opt :type, 'Specfy if this is a user or service group', type: :string, default: 'user'
-          end
-        end
-
-        def distinguished_name
-          @distinguished_name ||= "cn=#{opts[:name]},ou=Group,#{Tapjoy::LDAP::client.basedn}"
-        end
-
-        def ldap_attr
-          @ldap_attr ||= {
-            :cn          => opts[:name],
-            :objectclass => %w(top posixGroup),
-            :gidnumber   => Tapjoy::LDAP::client.get_max_id('group', opts[:type])
-          }
-        end
-      end
-    end
-  end
-end

data/lib/tapjoy/ldap/group/delete.rb

@@ -1,38 +0,0 @@
-module Tapjoy
-  module LDAP
-    module Group
-      # Delete LDAP group
-      class Delete
-        def delete
-          confirm unless opts[:force]
-          puts Tapjoy::LDAP::client.delete(distinguished_name)
-        end
-
-        private
-        def opts
-          @opts ||= Trollop::options do
-            # Set help message
-            usage 'group delete [options]'
-            synopsis "\nThis command is for deleting LDAP groups"
-
-            opt :name, 'Specify group', type: :string, required: true
-            opt :force, 'Force delete'
-          end
-        end
-
-        def distinguished_name
-          @distinguished_name ||= "cn=#{opts[:name]},ou=Group,#{Tapjoy::LDAP::client.basedn}"
-        end
-
-        def confirm
-          puts "Confirm that you want to delete group #{opts[:name]} (yes/no)"
-          print '>'
-          confirm = STDIN.gets.chomp().downcase
-          unless confirm.eql?('y') || confirm.eql?('yes')
-            abort("Deletion of #{ opts[:name] } aborted")
-          end
-        end
-      end
-    end
-  end
-end

data/lib/tapjoy/ldap/group/remove_user.rb

@@ -1,44 +0,0 @@
-module Tapjoy
-  module LDAP
-    module Group
-      # Remove existing user to existing group
-      class RemoveUser
-        def remove_user
-          confirm unless opts[:force]
-          puts Tapjoy::LDAP::client.modify(distinguished_name, operations)
-        end
-
-        private
-        def opts
-          @opts ||= Trollop::options do
-            # Set help message
-            usage 'group remove_user [options]'
-            synopsis "\nThis command is for removing existing users from existing groups"
-
-            opt(:group, 'Specify group', :type => :string, :required => true)
-            opt(:username, 'Specify username', :type => :string, :required => true)
-          end
-        end
-
-        def distinguished_name
-          @distinguished_name ||= "cn=#{opts[:group]},ou=Group,#{Tapjoy::LDAP::client.basedn}"
-        end
-
-        def operations
-          # Format is LDAP operation, attribute modified, value modified
-          # i.e, remove the username to the memberuid attribute for the specified group
-          @operations ||= [[:delete, :memberUid, opts[:username]]]
-        end
-
-        def confirm
-          puts "Confirm that you want to remove user #{opts[:username]} from group #{opts[:group]} (yes/no)"
-          print '>'
-          confirm = STDIN.gets.chomp().downcase
-          unless confirm.eql?('y') || confirm.eql?('yes')
-            abort("Deletion of #{ opts[:name] } aborted")
-          end
-        end
-      end
-    end
-  end
-end

data/lib/tapjoy/ldap/group.rb

@@ -1,77 +0,0 @@
-require_relative 'group/create'
-require_relative 'group/delete'
-require_relative 'group/add_user'
-require_relative 'group/remove_user'
-
-module Tapjoy
-  module LDAP
-    # Entry point for all group subcommands
-    module Group
-      class << self
-
-        SUB_COMMANDS = %w(create delete add_user remove_user)
-
-        def commands
-          Trollop::options do
-            usage 'group [SUB_COMMAND] [options]'
-            synopsis "\nThis object is used for group management\nAvailable subcommands are: #{SUB_COMMANDS}"
-
-            stop_on SUB_COMMANDS
-          end
-
-          cmd = ARGV.shift
-
-          case cmd
-          when 'create', 'delete', 'add_user', 'remove_user'
-            send(cmd) # call method with respective name
-          else
-            raise Tapjoy::LDAP::InvalidArgument
-          end
-        end
-
-        # Lookup GID for the given group
-        def lookup_id(groupname)
-          gidnumber = []
-
-          oc_filter = Net::LDAP::Filter.eq('objectclass', 'posixGroup')
-          cn_filter = Net::LDAP::Filter.eq('cn', groupname)
-          filter    = Net::LDAP::Filter.join(oc_filter, cn_filter)
-
-          results = Tapjoy::LDAP::client.search(['gidNumber'], filter)
-
-          # Make sure we return one, and only one group
-          if results.size < 1
-            abort('Group not found')
-          elsif results.size > 1
-            abort('Multiple groups found. Please narrow your search.')
-          end
-
-          results.each { |result| gidnumber = result.gidnumber }
-          return gidnumber[0]
-        end
-
-        # Create Group
-        def create
-          group = Tapjoy::LDAP::Group::Create.new
-          group.create
-        end
-
-        # Delete group
-        def delete
-          group = Tapjoy::LDAP::Group::Delete.new
-          group.delete
-        end
-
-        def add_user
-          group = Tapjoy::LDAP::Group::AddUser.new
-          group.add_user
-        end
-
-        def remove_user
-          group = Tapjoy::LDAP::Group::RemoveUser.new
-          group.remove_user
-        end
-      end
-    end
-  end
-end