hotify 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08ce6906a3be6a5ff236a332d461d3895dcd1017273a21ad42b5b82c252c65c3'
-  data.tar.gz: c6d49d34473f58493e16b2ca071fca490dca6e2653bce630cf6cdd14936b0c2c
+  metadata.gz: 87530c74880b1befe5ee22346c52ea9832dfa0784b1fbd6457f27b9f76428821
+  data.tar.gz: d72bc7a24db4601fdbf932b72f11417fb129a184cf59804c54c59696572f011c
 SHA512:
-  metadata.gz: 3e1e7fea15496bd4ee4b06958ec0646881cca7ea5634753e2a1a9eaff8c490e03f4edcf5955835563197dad546f88cd860f68e6461c9c15f6467d8e624e18b99
-  data.tar.gz: b106e7fe91069e3bba0d2fe2667f3bde32b958a96bcc9c34fcf24cd107cc7fb13b0d67835cb9cf84db8c8559c5ce8f56646addd3f4053ec44c43db31ea8e3f7f
+  metadata.gz: 40a61070bacaa148c9770257df5745a9fd56fa3ddfe12417a56eebcbe813ccd510ce68d5d80b9dfc8095417180d8ab402b0e69a8219aa9ea57e1f912a33fcbc7
+  data.tar.gz: '095275f5c1e02b7fbff2753c1aae5548e4f60b1d898d952dec90640f7f8f3efc68c7d7adcbb3553a435680a7e66a2f9ee8f8d0d61c7d2dc8d34b036895ab1c4e'

data/Gemfile

@@ -13,4 +13,5 @@ group :development do
 end
 
 gem "onelogin"
-gem "thor"
+gem "thor"
+gem "parallel"

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    hotify (0.1.2)
+    hotify (0.1.3)
       onelogin (~> 1.5.0)
+      parallel (~> 1.19.1)
       thor (~> 1.0.1)
 
 GEM
@@ -26,6 +27,7 @@ GEM
     onelogin (1.5.0)
       httparty (>= 0.13.7)
       nokogiri (>= 1.6.3.1)
+    parallel (1.19.1)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -53,6 +55,7 @@ DEPENDENCIES
   dotenv
   hotify!
   onelogin
+  parallel
   pry
   rake (~> 12.0)
   rspec (~> 3.0)

data/hotify.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "dotenv", "~> 2.7.5" 
   spec.add_dependency "onelogin", "~> 1.5.0"
   spec.add_dependency "thor", "~> 1.0.1"
+  spec.add_dependency "parallel", "~> 1.19.1"
 end

data/lib/hotify.rb

@@ -1,5 +1,6 @@
 require "onelogin"
 require "thor"
+require "parallel"
 require "hotify/version"
 require "hotify/cli"
 require "hotify/auth"
@@ -68,12 +69,14 @@ module Hotify
       role_user
     end
 
-    def add_role(user, role)
-      client.assign_role_to_user(user.id, [role.id])
+    def add_role(user_email, role_ids)
+      user = Hotify::Users.find_by(email: user_email)
+      client.assign_role_to_user(user.id, role_ids)
     end
 
-    def leave_role(user, role)
-      client.remove_role_from_user(user.id, [role.id])
+    def leave_role(user_email, role_ids)
+      user = Hotify::Users.find_by(email: user_email)
+      client.remove_role_from_user(user.id, role_ids)
     end
 
     def find_by_name(name)

data/lib/hotify/cli.rb

@@ -28,48 +28,77 @@ module Hotify
 
     private
 
+    def hotify_role
+      @_hotify_role ||= Hotify::Role.new
+    end
+
+    def role_id_names
+      @_role_id_names ||= hotify_role.all_roles.map{ | role | { id: role.id, name: role.name} }
+    end
+
+    def role_id_by(name)
+      role_id_names.each do | role_id_name |
+        return role_id_name[:id] if role_id_name[:name] == name
+      end
+
+      nil
+    end
+
+    def onelogin_role_in_user
+      @_onelogin_role_in_user ||= role_in_user_dump(hotify_role.role_in_user)
+    end
+
     def add_role_by_yaml(hotify_role_users_hash)
-      hotify_role = Hotify::Role.new
-      hotify_role_users_hash.each do | role_name, user_emails |
-        user_emails.each do | user_email |
-          user = Hotify::Users.find_by(email: user_email)
-          onelogin_user_role_names = hotify_role.roles_from(user: user).map{ | user_role | user_role.name }
-          unless onelogin_user_role_names.include?(role_name)
-            add!(user, role_name)
+      users_and_roles_will_add = Hash.new { |h,k| h[k] = [] }
+      hotify_role_users_hash.each do | hotify_role_name, hotify_user_emails |
+        hotify_user_emails.each do | hotify_user_email |
+          unless onelogin_role_in_user[hotify_role_name].include?(hotify_user_email)
+            users_and_roles_will_add[hotify_user_email].push(hotify_role_name)
           end
         end
       end
+
+      add!(users_and_roles_will_add)
     end
 
     def remove_role_by_yaml(hotify_role_users_hash)
-      hotify_role = Hotify::Role.new
-      onelogin_roles = hotify_role.role_in_user
-      onelogin_roles.each do | onelogin_role_name, onelogin_users |
-        onelogin_users.each do | user |
-          unless hotify_role_users_hash[onelogin_role_name].include?(user.email)
-            remove!(user, onelogin_role_name)
+      users_and_roles_will_remove = Hash.new { |h,k| h[k] = [] }
+      hotify_role_users_hash.each do | hotify_role_name, hotify_user_emails |
+        onelogin_role_in_user[hotify_role_name].each do | onelogin_user_email |
+          unless hotify_user_emails.include?(onelogin_user_email)
+            users_and_roles_will_remove[onelogin_user_email].push(hotify_role_name)
           end
         end
       end
+
+      remove!(users_and_roles_will_remove)
     end
 
-    def add!(user, role_name)
-      hotify_role = Hotify::Role.new
-      if options[:dry_run]
-        puts "#{user.email} will add to #{role_name}"
-      else
-        hotify_role.add_role(user, hotify_role.find_by_name(role_name))
-        puts "#{user.email} added to #{role_name}"
+    def add!(users_and_roles_will_add)
+      users_and_roles_will_add.each do |user_email, role_names|
+        if options[:dry_run]
+          puts "#{user_email} will add to:"
+          role_names.each { | role_name | puts role_name }
+        else
+          role_ids = role_names.map{ |role_name| role_id_by(role_name) }
+          hotify_role.add_role(user_email, role_ids)
+          puts "#{user_email} added to:"
+          role_names.each { | role_name | puts role_name }
+        end
       end
     end
 
-    def remove!(user, role_name)
-      hotify_role = Hotify::Role.new
-      if options[:dry_run]
-        puts "#{user.email} will remove by #{role_name}"
-      else
-        hotify_role.leave_role(user, hotify_role.find_by_name(role_name))
-        puts "#{user.email} removed by #{role_name}"
+    def remove!(users_and_roles_will_remove)
+      users_and_roles_will_remove.each do |user_email, role_names|
+        if options[:dry_run]
+          puts "#{user_email} will remove by:"
+          role_names.each { | role_name | puts role_name }
+        else
+          role_ids = role_names.map{ |role_name| role_id_by(role_name) }
+          hotify_role.leave_role(user_email, role_ids)
+          puts "#{user_email} removed by:"
+          role_names.each { | role_name | puts role_name }
+        end
       end
     end
 

data/lib/hotify/version.rb

@@ -1,3 +1,3 @@
 module Hotify
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotify
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - j-o-lantern0422
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.19.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.19.1
 description: Onelogin role manage, example user add, or remove from role command
 email:
 - j.o.lantern0422@gmail.com