satops 1.5.2 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5978d7440280bde5f08241d5ca965dafb1f404ba
-  data.tar.gz: b2ed96ea26051aa23623538f8a16a8a3dbfe7524
+  metadata.gz: 17285bbc5eeaf0f510667b9e7b00861b1fe1f4e7
+  data.tar.gz: 6092b9ed2a44eda88bb6636df7cc77a2b45db577
 SHA512:
-  metadata.gz: 80c73d053ef54cf1cf7bfe5a310e82779600d77ec1ee9897b1ca103a39346e8314cb26375f6d72e34d8cb72ec72cae6fa33227a8b8fa02eddb23e26ed8e82e80
-  data.tar.gz: 10fd8a79296984c9c0da6fd2a1909bb388bf2e060d62dde91e6a2487a318c04f7d020feacda994bc1efe59db447de4ffc73f7b794ac5904b2ec5c944715d2e83
+  metadata.gz: a9b7d58b643029dea9bb8a5c446d1a72c882397995f68335c9ed7202dc35b3d89ebe58961fdd64790e05b49611e5d477eebfde3cf62f798eb05b60a453dac632
+  data.tar.gz: 06634295fef298b2385031c89328ed45cc8ff5bfdcd813771684574f11a780ad346fdabb298a4a451590ee2eb6bdf3aa9a90e9370911cecd7d15c25495531783

data/lib/satops/operator.rb

@@ -1178,11 +1178,12 @@ class User
       password=Users.password
       sat.user.create(@login, password, @first_name, @last_name, @email, 0)
     end
+    sat.user.setDetails(@login, {'prefix' => @prefix}) unless @prefix.empty?
     common_update(sat)
   end
 
   def update(sat)
-    @prefix='' unless @prefix
+    @prefix='' unless !@prefix.empty!
     # We ignore password update - Ain't any API for it!
     sat.user.setDetails(@login, {'first_name' => @first_name, 'last_name' => @last_name, 'email' => @email, 'prefix' => @prefix})
     sat.user.listRoles(login).each do |role|
@@ -1194,14 +1195,17 @@ end
 
 class UsersSet < OperationSet
   def delete(list)
-    Users.exclude.each do |exclude|
-      list.delete_if { |u| u == exclude }
-    end
     list.each do |user|
-      @sat.user.delete(user.login)
+      case user.class
+      when Hash
+        @sat.user.delete(user['login']) unless Users.exclude.include?(user['login'])
+      when User
+        @sat.user.delete(user.login) unless Users.exclude.include?(user.login)
+      end
     end
   end
 
+
   def delete_all
     delete(Helpers.filter(@sat.user.listUsers, 'login'))
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: satops
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.7
 platform: ruby
 authors:
 - Gilles Dubreuil
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies: []
 description: Tool to export/import all Red Hat Satellite objects
 email:
@@ -20,11 +20,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/satops
 - lib/satops.rb
 - lib/satops/helpers.rb
-- lib/satops/rhsat.rb
 - lib/satops/operator.rb
-- bin/satops
+- lib/satops/rhsat.rb
 homepage: https://github.com/SatOps/SatOps
 licenses:
 - GNU GPLv3
@@ -35,17 +35,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.12
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Manipulate Red Hat Network Satellite content via its XML/RPC API