ldap_tools 0.9.2 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea0fa0ebe1c98580e3e623f810c1b036c5002ff9
-  data.tar.gz: 6e56df2eb8f7caed546bfec945cb070c162d2b99
+  metadata.gz: a013f47e3c9fccb1ff3aafeee6ed84d8c0677c86
+  data.tar.gz: 1db37492ec187835d08b88462140ac9d930c590f
 SHA512:
-  metadata.gz: 98bb0f41e0ec6df27863a2d4917a28e6d24cd7d4bc7c7966e9375decf4c1b4e7c9760c9d6431127b10238593f96581a454727129329530c26f402da980fca62d
-  data.tar.gz: 3108815f8a5ec38c43917a7b0111f255aeb83c068d42e30dace52d59a40126586fd81edcd9a36716520f3515e1360b2acaf784db7581d9eb2921c59846444343
+  metadata.gz: db759742e4443fbec435dc701377ad505746ce92426255583f7e393079dd9d37ec7084087daabecb969bf2bf64c3c1c3d276c8271bca7a5651a9fa9bc93e4e0a
+  data.tar.gz: 016170fd1a601da4e120be647c9051377a052ebd24c7b38ae6b691864f07412ea608dd8ec84a76cd8c014be36c00669fe3d88db3f9ef6690adfa749eeb43589b

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
+          Optimist.options do
             usage 'user [SUB_COMMAND] [options]'
             synopsis "\nThis object is used for auditing LDAP permissions\nAvailable subcommands are: #{SUB_COMMANDS}"
 

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

@@ -12,7 +12,7 @@ module Tapjoy
           private
 
           def opts
-            @opts ||= Trollop.options do
+            @opts ||= Optimist.options do
               # Set help message
               usage 'group add_user [options]'
               synopsis "\nThis command is for adding existing users to existing groups"

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

@@ -6,13 +6,13 @@ module Tapjoy
         class Create
           def create
             # Check for errors
-            Trollop.die :type, "argument must be 'user' or 'service'" unless ['user', 'service'].include?(opts[:type])
+            Optimist.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
+            @opts ||= Optimist.options do
               # Set help message
               usage 'group create [options]'
               synopsis "\nThis command is for creating new LDAP groups"

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

@@ -12,7 +12,7 @@ module Tapjoy
           private
 
           def opts
-            @opts ||= Trollop.options do
+            @opts ||= Optimist.options do
               # Set help message
               usage 'group delete [options]'
               synopsis "\nThis command is for deleting LDAP groups"

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

@@ -13,7 +13,7 @@ module Tapjoy
           private
 
           def opts
-            @opts ||= Trollop.options do
+            @opts ||= Optimist.options do
               # Set help message
               usage 'group remove_user [options]'
               synopsis "\nThis command is for removing existing users from existing groups"

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

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

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

@@ -8,22 +8,22 @@ module Tapjoy
           # Make the API call to create an LDAP user
           def create
             verify_arguments
-            fname, lname = opts[:user]
+            fname, lname = opts[:name]
             puts Tapjoy::LDAP::API::User.create(fname, lname,
               opts[:type], opts[:group])
           end
 
           private
           def opts
-            @opts ||= Trollop.options do
+            @opts ||= Optimist.options do
               # Set help message
               usage 'user create [options]'
               synopsis "\nThis command is for creating new LDAP users"
 
-              # Username is two arguments
-              # Trollop will accept more, but we will only parse two later
+              # Name is two arguments
+              # Optimist will accept more, but we will only parse two later
               # TODO: support given names that include a space
-              opt :user, "Specify user's first and last name", type: :strings, required: true
+              opt :name, "Specify user's first and last name", type: :strings, required: true
 
               # Groupname is a single string, for primary group setting
               opt :group, 'Specify name of primary group', type: :string, required: true
@@ -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])
+            Optimist.die :name, 'argument count must be two' if opts[:name].size != 2
+            Optimist.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

@@ -9,30 +9,30 @@ module Tapjoy
           def delete
             verify_arguments
             confirm unless opts[:force]
-            puts Tapjoy::LDAP::API::User.destroy(opts[:user], opts[:type])
+            puts Tapjoy::LDAP::API::User.destroy(opts[:username], opts[:type])
           end
 
           private
           def opts
-            @opts ||= Trollop.options do
+            @opts ||= Optimist.options do
               # Set help message
               usage "user delete [options]"
 
-              opt :user, 'Specify username', type: :string, required: true
+              opt :username, 'Specify username', type: :string, required: true
               opt :force, 'Force delete'
               opt :type, 'Specfy if this is a user or service account', type: :string, default: 'user'
             end
           end
 
           def confirm
-            puts "Confirm that you want to delete user: #{opts[:user]} (yes/no)"
+            puts "Confirm that you want to delete user: #{opts[:username]} (yes/no)"
             print '>'
             confirm = STDIN.gets.chomp.downcase
-            abort("Deletion of #{opts[:user]} aborted") unless confirm.start_with?('y')
+            abort("Deletion of #{opts[:username]} 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])
+            Optimist.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

@@ -7,7 +7,7 @@ module Tapjoy
         class Show
           # Make the API call to show an LDAP user
           def show
-            Tapjoy::LDAP::API::User.show(opts[:user]).each do |entry|
+            Tapjoy::LDAP::API::User.show(opts[:username]).each do |entry|
               puts "DN: #{entry.dn}"
               entry.each do |attribute, values|
                 puts "   #{attribute}:"
@@ -20,11 +20,11 @@ module Tapjoy
 
           private
           def opts
-            @opts ||= Trollop.options do
+            @opts ||= Optimist.options do
               # Set help message
               usage "user show [options]"
 
-              opt :user, 'Specify username', type: :string, required: true
+              opt :username, 'Specify username', type: :string, required: true
             end
           end
         end

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
+            Optimist.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

@@ -7,7 +7,7 @@ module Tapjoy
       class << self
         def commands
           subcommand = %w(user group key audit)
-          Trollop.options do
+          Optimist.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."

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

@@ -15,12 +15,12 @@ module Tapjoy
 
         private
         def opts
-          @opts ||= Trollop.options do
+          @opts ||= Optimist.options do
               # Set help message
               usage 'key add [options]'
               synopsis "\nThis command is for adding user keys to a given user's profile"
 
-              opt :user, 'Specify username to add key to', type: :string,
+              opt :username, 'Specify username to add key to', type: :string,
                 required: true
               opt :filename, 'File to load keys from', type: :string
           end
@@ -31,10 +31,10 @@ module Tapjoy
         end
 
         def filter_users
-          filter = Net::LDAP::Filter.eq('uid', opts[:user])
+          filter = Net::LDAP::Filter.eq('uid', opts[:username])
           results = Tapjoy::LDAP.client.search(attributes = ['*'], filter = filter)
 
-          Tapjoy::LDAP::Key.verify_user(opts[:user], results)
+          Tapjoy::LDAP::Key.verify_user(opts[:username], results)
 
           results
         end

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

@@ -15,7 +15,7 @@ module Tapjoy
 
         private
         def opts
-          @opts ||= Trollop.options do
+          @opts ||= Optimist.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

@@ -6,7 +6,7 @@ module Tapjoy
         # Remove key from LDAP
         def remove
           keys  # Get keys first
-          Tapjoy::LDAP::Key.verify_user(opts[:user], results)
+          Tapjoy::LDAP::Key.verify_user(opts[:username], results)
 
           confirm unless opts[:force]
           Tapjoy::LDAP.client.replace_attribute(
@@ -15,12 +15,12 @@ module Tapjoy
 
         private
         def opts
-          @opts ||= Trollop.options do
+          @opts ||= Optimist.options do
             # Set help message
             usage 'key remove [options]'
             synopsis "\nThis command is for removing a user's SSH key(s)"
 
-            opt :user, 'Specify username to delete key from', type: :string,
+            opt :username, 'Specify username to delete key from', type: :string,
                 required: true
             opt :filename, 'File to load key deletion list from', type: :string
             opt :force, 'Force delete', short: '-F'
@@ -32,7 +32,7 @@ module Tapjoy
         end
 
         def filter
-          @filter ||= Net::LDAP::Filter.eq('uid', opts[:user])
+          @filter ||= Net::LDAP::Filter.eq('uid', opts[:username])
         end
 
         def results
@@ -69,7 +69,7 @@ module Tapjoy
           print "\t #{ keep_keys }\n\n"
           puts "Delete these keys:\n\n"
           print "\t #{ delete_keys }\n\n"
-          puts "Ignore these keys (not found in LDAP for #{ opts[:user]}):\n\n"
+          puts "Ignore these keys (not found in LDAP for #{ opts[:username]}):\n\n"
           print "\t #{ keys_not_found }\n\n"
           get_confirmation
         end

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

@@ -4,20 +4,20 @@ module Tapjoy
       # Show all of a user's keys
       class Show
         def show
-          username = opts[:user]
+          username = opts[:username]
           keys = Tapjoy::LDAP::Key.get_keys_from_ldap[username]
-          puts "No keys found for #{opts[:user]}" if keys.nil?
+          puts "No keys found for #{opts[:username]}" if keys.nil?
           puts keys
         end
 
         private
         def opts
-          @opts ||= Trollop.options do
+          @opts ||= Optimist.options do
               # Set help message
               usage 'key show [options]'
               synopsis "\nThis command is for showing a specific user's SSH keys"
 
-              opt :user, 'Specify username', type: :string, required: true
+              opt :username, 'Specify username', type: :string, required: true
           end
         end
 

data/lib/tapjoy/ldap/key.rb

@@ -1,3 +1,4 @@
+require 'json'
 require_relative 'key/add'
 require_relative 'key/remove'
 require_relative 'key/show'
@@ -11,7 +12,7 @@ module Tapjoy
         SUB_COMMANDS = %w(add remove install list show)
 
         def commands
-          Trollop.options do
+          Optimist.options do
             usage 'key [SUB_COMMAND] [options]'
             synopsis "\nThis object is used for user key management\nAvailable subcommands are: #{SUB_COMMANDS}"
 
@@ -44,7 +45,7 @@ module Tapjoy
         end
 
         def list
-          Tapjoy::LDAP::Key.get_keys_from_ldap
+          puts JSON.pretty_generate(Tapjoy::LDAP::Key.get_keys_from_ldap)
         end
 
         def show
@@ -53,12 +54,11 @@ module Tapjoy
         end
 
         def get_keys_from_ldap
-
           key_results = {}
           filter = Net::LDAP::Filter.eq('sshPublicKey', '*')
           attributes = %w(uid sshPublicKey)
           results = Tapjoy::LDAP.client.search(attributes, filter)
-          results.each {|result| key_results[result.uid[0]] = result.sshPublicKey}
+          results.each {|result| key_results[result.uid[0]] = result.sshpublickey}
           key_results
         end
 

data/lib/tapjoy/ldap/version.rb

@@ -2,7 +2,7 @@ module Tapjoy
   module LDAP
     module Version
       MAJOR = 0
-      MINOR = 9
+      MINOR = 11
       PATCH = 2
     end
 

data/lib/tapjoy/ldap.rb

@@ -1,8 +1,7 @@
 require 'net/ldap'
 require 'yaml'
-require 'trollop'
+require 'optimist'
 require 'memoist'
-require 'pry'
 require_relative 'ldap/cli'
 require_relative 'ldap/base'
 require_relative 'ldap/key'
@@ -25,7 +24,7 @@ module Tapjoy
 
     class InvalidArgument < ArgumentError
       def initialize
-        Trollop.educate
+        Optimist.educate
       end
     end
   end

metadata

@@ -1,29 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: ldap_tools
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.11.2
 platform: ruby
 authors:
+- Tapjoy
 - Ali Tayarani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-13 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: net-ldap
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +67,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +208,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: A set of tools to make managing LDAP users, groups, and keys easier
-email: ali.tayarani@tapjoy.com
+email: dev@tapjoy.com
 executables:
 - ldaptools
 extensions: []
@@ -273,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Tapjoy LDAP Tools