knife-opc 0.4.4 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f4cf5e1a92fee2ee1e35f580036e8af3e9279d347b6505a435939fc877ab474
-  data.tar.gz: 35066972be85972f7d2f92fd1d1cd9f8cb2ec671b773d22c34d10a4f61384e57
+  metadata.gz: d7af88ddccf9a69fbab41970cfeb23bc0f9fd0f0b04451673933115f887c4d27
+  data.tar.gz: c0ab4f3057dcee7b9a5d10d64de463ebb638f3aecb477be696b6b83a3dd2ab8b
 SHA512:
-  metadata.gz: 818b97758d14e242b40e7b887fbd2ad3388c7e40e647917d7e59b6562edb7e7ba35aa89606abd3007fa505177623985e26d54eb0239e52f358a49fbe3b7a323c
-  data.tar.gz: cd739ebf8b8b3134478274208e40d9c7889079ea474dbc62e1b7459b522d752105ddde0a609e1d159a78a4ed973afc41bc34dc24c321500a35d6dc709be13ca7
+  metadata.gz: 1e4e0abf5f50ff0f8b5eef59551c1e1e2ae341a8e2d4bd31579f77e99c6be410b9257ffd0ff870c5ef4a73e7ef3f6a874c93fa68306c6b1a0dad6dfe89379649
+  data.tar.gz: e220bd8ea974284ac13910b7fe6006d9bfe67a42e2fc87c21031674062b2eb672330c5109fad4303ae8eb7171e1ed4e416766692868941a1f2c90f4d71eef66a

data/lib/chef/knife/opc_user_create.rb

@@ -69,7 +69,7 @@ module Opc
         password: password,
       }
 
-     # Check the file before creating the user so the api is more transactional.
+      # Check the file before creating the user so the api is more transactional.
       if config[:filename]
         file = config[:filename]
         unless File.exist?(file) ? File.writable?(file) : File.writable?(File.dirname(file))

data/lib/chef/knife/opc_user_edit.rb

@@ -44,11 +44,7 @@ module Opc
       end
 
       original_user = root_rest.get("users/#{user_name}")
-      if config[:input]
-        edited_user = JSON.parse(IO.read(config[:input]))
-      else
-        edited_user = edit_data(original_user)
-      end
+      edited_user = get_updated_user(original_user)
       if original_user != edited_user
         result = root_rest.put("users/#{user_name}", edited_user)
         ui.msg("Saved #{user_name}.")
@@ -65,5 +61,34 @@ module Opc
         ui.msg("User unchanged, not saving.")
       end
     end
+
+    private
+
+    # Check the options for ex: input or filename
+    # Read Or Open file to update user information
+    # return updated user
+    def get_updated_user(original_user)
+      if config[:input]
+        edited_user = JSON.parse(IO.read(config[:input]))
+      elsif config[:filename]
+        file = config[:filename]
+        unless File.exist?(file) ? File.writable?(file) : File.writable?(File.dirname(file))
+          ui.fatal "File #{file} is not writable.  Check permissions."
+          exit 1
+        else
+          output = Chef::JSONCompat.to_json_pretty(original_user)
+          File.open(file, "w") do |f|
+            f.sync = true
+            f.puts output
+            f.close
+            raise "Please set EDITOR environment variable. See https://docs.chef.io/knife_setup/ for details." unless system("#{config[:editor]} #{f.path}")
+
+            edited_user = JSON.parse(IO.read(f.path))
+          end
+        end
+      else
+        edited_user = JSON.parse(edit_data(original_user, false))
+      end
+    end
   end
 end

data/lib/knife-opc/version.rb

@@ -1,3 +1,3 @@
 module KnifeOPC
-  VERSION = "0.4.4".freeze
+  VERSION = "0.4.6".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-opc
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.6
 platform: ruby
 authors:
 - Steven Danna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies: []
 description: Knife Tools for Chef Server
 email: steve@chef.io