ldap_tools 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6460a58ed64997c7d6a574bf144f1eb4001bb2b9
-  data.tar.gz: 582aedaabe2033a5d36ab53b4e3deff54b443524
+  metadata.gz: 87ea99ec2ff3fdf48a25f53868073540168f34fe
+  data.tar.gz: 918dd42c64afeb5ceec56935fc72c34ff57439fa
 SHA512:
-  metadata.gz: e0522e4fc808a6de38d362efc935892bfabd818ff1f85e0f7cdee8852ec4156b863c9d84427ba6881c250174d456eac957b1eaabeb62a8966c1f7fb4ccfaba5a
-  data.tar.gz: df556c80555d45698c2de525bad47a135cbb6dea1013088149f68c9c70a9de016a2423f7a250a85060b460c62c9945abb538b3cb9425d2bcc1243a859fcd7052
+  metadata.gz: 208965f680e094e1afc62ee1a2b5c58f2d5a23e1afe11a1491beadea8dcdb21ab72bbfadefe0a5b763dee16b081bf36a439fd1d48bb0977456a55031bb8a3e14
+  data.tar.gz: b52b0151ad7114e7e36ccab2347b43ac7e340ac784ca2d654ecdb19da64c27632403eb37012fbae006ad7f8045011fbd8ef59ab1cc932f7a5a24670033649bd2

data/lib/tapjoy/ldap/base.rb

@@ -39,20 +39,20 @@ module Tapjoy
       end
 
       # Add objects to LDAP
-      def add(dn, attributes)
-        @conn.add(:dn => dn, :attributes => attributes)
+      def add(distinguished_name, attributes)
+        @conn.add(:dn => distinguished_name, :attributes => attributes)
         return return_result
       end
 
       # Modify objects in LDAP
-      def modify(dn, operations)
-        @conn.modify(:dn => dn, :operations => operations)
+      def modify(distinguished_name, operations)
+        @conn.modify(:dn => distinguished_name, :operations => operations)
         return return_result
       end
 
       # Delete objects from LDAP
-      def delete(dn)
-        @conn.delete(:dn => dn)
+      def delete(distinguished_name)
+        @conn.delete(:dn => distinguished_name)
         return return_result
       end
 

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

@@ -4,7 +4,7 @@ module Tapjoy
       # Add existing user to existing group
       class AddUser
         def add_user
-          puts Tapjoy::LDAP::client.modify(dn, operations)
+          puts Tapjoy::LDAP::client.modify(distinguished_name, operations)
         end
 
         private
@@ -19,8 +19,8 @@ module Tapjoy
           end
         end
 
-        def dn
-          @dn ||= "cn=#{opts[:group]},ou=Group,#{Tapjoy::LDAP::client.basedn}"
+        def distinguished_name
+          @distinguished_name ||= "cn=#{opts[:group]},ou=Group,#{Tapjoy::LDAP::client.basedn}"
         end
 
         def operations

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

@@ -7,7 +7,7 @@ module Tapjoy
           # Check for errors
           Trollop::die :type, "argument must be 'user' or 'service'" unless ['user', 'service'].include?opts[:type]
 
-          puts Tapjoy::LDAP::client.add(dn, ldap_attr)
+          puts Tapjoy::LDAP::client.add(distinguished_name, ldap_attr)
         end
 
         private
@@ -23,8 +23,8 @@ module Tapjoy
           end
         end
 
-        def dn
-          @dn ||= "cn=#{opts[:name]},ou=Group,#{Tapjoy::LDAP::client.basedn}"
+        def distinguished_name
+          @distinguished_name ||= "cn=#{opts[:name]},ou=Group,#{Tapjoy::LDAP::client.basedn}"
         end
 
         def ldap_attr

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

@@ -5,7 +5,7 @@ module Tapjoy
       class Delete
         def delete
           confirm unless opts[:force]
-          puts Tapjoy::LDAP::client.delete(dn)
+          puts Tapjoy::LDAP::client.delete(distinguished_name)
         end
 
         private
@@ -20,16 +20,16 @@ module Tapjoy
           end
         end
 
-        def dn
-          @dn ||= "cn=#{opts[:name]},ou=Group,#{Tapjoy::LDAP::client.basedn}"
+        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[:group]} (yes/no)"
+          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[:group] } aborted")
+            abort("Deletion of #{ opts[:name] } aborted")
           end
         end
       end

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

@@ -5,46 +5,23 @@ module Tapjoy
     module User
       # Create LDAP user
       class Create
-        def opts
-          @opts ||= Trollop::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
-            # TODO: support given names that include a space
-            opt :user, "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
-            opt :type, 'Specfy if this is a user or service account', type: :string, default: 'user'
-          end
-        end
-
-        def uidnumber
-          @uidnumber ||= Tapjoy::LDAP::client.get_max_id('user', opts[:type])
-        end
-
-        def gidnumber
-          @gidnumber ||= Tapjoy::LDAP::Group.lookup_id(opts[:group])
-        end
-
         def create
           # Check for errors
           Trollop::die :user, 'argument count must be two' if opts[:user].size != 2
           Trollop::die :type, "argument must be 'user' or 'service'" unless ['user', 'service'].include?opts[:type]
 
-          puts Tapjoy::LDAP::client.add(dn, ldap_attr)
+          puts Tapjoy::LDAP::client.add(distinguished_name, ldap_attr)
         end
 
         private
         def create_password
           # Super-Salt: bad for blood pressure, good for secure passwords
           # We can get away with this, since we're not planning on using passwords
-          salt = SecureRandom.base64(32)
-          password = SecureRandom.base64(64)
-          password = Digest::SHA1.base64digest(password + salt)
+          @create_password ||= begin
+            salt = SecureRandom.base64(32)
+            password = SecureRandom.base64(64)
+            password = Digest::SHA1.base64digest(password + salt)
+          end
         end
 
         def username
@@ -68,22 +45,47 @@ module Tapjoy
           }
         end
 
-        def dn
-          @dn ||= "uid=#{username},ou=#{ou},#{Tapjoy::LDAP::client.basedn}"
+        def distinguished_name
+          @distinguished_name ||= "uid=#{username},ou=#{organizational_unit},#{Tapjoy::LDAP::client.basedn}"
         end
 
-        def ou
-          @ou ||= begin
+        def organizational_unit
+          @organizational_unit ||= begin
             case opts[:type]
             when 'user'
-              ou = 'People'
+              'People'
             when 'service'
-              ou = Tapjoy::LDAP::client.service_ou
+              Tapjoy::LDAP::client.service_ou
             else
               puts 'Unknown type'
             end
           end
         end
+
+        def uidnumber
+          @uidnumber ||= Tapjoy::LDAP::client.get_max_id('user', opts[:type])
+        end
+
+        def gidnumber
+          @gidnumber ||= Tapjoy::LDAP::Group.lookup_id(opts[:group])
+        end
+
+        def opts
+          @opts ||= Trollop::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
+            # TODO: support given names that include a space
+            opt :user, "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
+            opt :type, 'Specfy if this is a user or service account', type: :string, default: 'user'
+          end
+        end
       end
     end
   end

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

@@ -3,33 +3,49 @@ module Tapjoy
     module User
       # Delete LDAP user
       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 "user delete [options]"
 
-            opt(:user, 'Specify username', :type => :string, :required => true)
-            opt(:force, 'Force delete')
+            opt :user, '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 delete
-          prompt = '>'
-          dn = "uid=#{ opts[:user] },ou=People,#{ Tapjoy::LDAP::client.basedn }"
-          unless opts[:force]
-            puts "Confirm that you want to delete user: #{ opts[:user] }"
-            print prompt
-            confirm = STDIN.gets.chomp().downcase
-            unless confirm.eql?('y') || confirm.eql?('yes')
-              abort("Deletion of #{ opts[:user] } aborted")
-            end
+        def distinguished_name
+          @distinguished_name ||= "uid=#{opts[:user]},ou=#{organizational_unit},#{Tapjoy::LDAP::client.basedn}"
+        end
+
+        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
+        end
 
-          puts Tapjoy::LDAP::client.delete(dn)
+        def organizational_unit
+          @organizational_unit ||= begin
+            case opts[:type]
+            when 'user'
+              'People'
+            when 'service'
+              Tapjoy::LDAP::client.service_ou
+            else
+              puts 'Unknown type'
+            end
+          end
         end
       end
     end
   end
 end
-#       def delete
-#         options = {}

data/lib/tapjoy/ldap/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ldap_tools
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Ali Tayarani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: A set of tools to make managing LDAP users, groups, and keys easier
 email: ali.tayarani@tapjoy.com
 executables: