train-pwsh 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dee3811f1e76e743dad03b5fbda0ef38f5ce9f0d0503a2634d109674a4f80c1e
-  data.tar.gz: f3e63fb43c571e462a9a253968daece5d18d8083c21280c3749104a521407d8b
+  metadata.gz: 3ec867288676127f29ea07114e8acbb29e126b7dbc15aba96ca8669fd8818ee8
+  data.tar.gz: f0f08b98e659a6ebae79e6045c928e2bddae9331c5c740ad8b1f4e526841ff1d
 SHA512:
-  metadata.gz: b4a6938760a23e90e50904f7953d39d2706ba7b4b5f6db48f91a1308dea5ce8391c50def5aeed255e9d3eac9eacc28c4b975fc019e187389ac616a302a805486
-  data.tar.gz: 33914e811691e4b1f284b2e33d49515808e0a19925795935485484278f9df90e0607bee8898efcdc1a81d185183325f3b495b395892a72c84da8f121cd28769c
+  metadata.gz: ac445931a17e3a433a4d1b5ccc8901064db19a1763952ca0a339d070c912c70e0c6421f236f97ccc45eee3a4748f92d4725faba4923f24cfe6c1d2d67d3435fe
+  data.tar.gz: '02475499a432dbd135519783e3afe67bcb166459f3dcf51865cec217f3622c1d3ecb75dc7e87d91b9b44c60c69d5c43d5a41e30162f8a514591c9db97f283474'

data/README.md

@@ -1,17 +1,18 @@
 # Train::Pwsh
 
-A train-pwsh connection has 7 fields that are needed for authentication, which are listed below:
-- client_id
-- tenant_id
-- client_secret
-- certificate_path
-- certificate_password
-- organization
-- sharepoint_admin_url
-
-These fields need to be defined in the config file stored at this directory: `~/.inspec/config.json`. Particularly, under the `credentials` key of the json file, create a `pwsh` key with the value being another dictionary. This dictionary should have a key named `pwsh-options` with the value being another dictionary. This dictionary should contain the names of the seven fields above as well as their values. Please refer to this [link](https://origin.inspec.io/docs/reference/config/) for more detailed instructions.
-
-On top of this, environment variables may need to be defined for some of these seven fields if they are to be used elsewhere in the profile as inputs. The README for the profile will specify which ones need to be stored as environment variables. 
+A train-pwsh connection has eight fields that are needed for authentication, which are listed below:
+- client_id (id of client)
+- tenant_id (id of tenant)
+- client_secret (secret key for client)
+- certificate_path (path on machine where authentication certificate is stored)
+- certificate_password (password for certificate)
+- organization (organization domain)
+- sharepoint_admin_url (sharepoint url for admin)
+- pwsh_path (path on machine where the powershell executable is stored)
+
+These fields need to be defined in the config file stored at this directory: `~/.inspec/config.json`. Particularly, under the `credentials` key of the json file, create a `pwsh` key with the value being another dictionary. This dictionary should have a key named `pwsh-options` with the value being another dictionary. This dictionary should contain the names of the eight fields above as well as their values. Please refer to this [link](https://origin.inspec.io/docs/reference/config/) for more detailed instructions.
+
+On top of this, environment variables may need to be defined for some of these eight fields if they are to be used elsewhere in the profile as inputs. The README for the profile will specify which ones need to be stored as environment variables. 
 
 To set an environment variable on Mac, go to the `zschrc` file located at `~/.zschrc` and enter in the following syntax: `export VARIABLE_NAME='insert_value'`
 

data/lib/train-pwsh/connection.rb

@@ -50,8 +50,11 @@ module TrainPlugins
         #Instance variables that store the necessary authentication credentials
         #@pwsh_session_graph_exchange = ::Pwsh::Manager.instance('/opt/homebrew/bin/pwsh', ['-NoLogo'])
         #@pwsh_session_teams_pnp = ::Pwsh::Manager.instance('/opt/homebrew/bin/pwsh', [])
-        @pwsh_session_graph_exchange = @options.delete(:graph_exchange_session)
-        @pwsh_session_teams_pnp = @options.delete(:teams_pnp_session)
+        @pwsh_path = @options.delete(:pwsh_path)
+        #@pwsh_session_graph_exchange = @options.delete(:graph_exchange_session)
+        #@pwsh_session_teams_pnp = @options.delete(:teams_pnp_session)
+        @pwsh_session_graph_exchange = ::Pwsh::Manager.instance("#{@pwsh_path}", ['-NoLogo'])
+        @pwsh_session_teams_pnp = ::Pwsh::Manager.instance("#{@pwsh_path}", [])
         @client_id = @options.delete(:client_id)
         @tenant_id = @options.delete(:tenant_id)
         @client_secret = @options.delete(:client_secret)
@@ -148,6 +151,11 @@ module TrainPlugins
         if result[:stdout].nil?
           result[:stdout] = ""
         end
+        if !result[:stdout].empty? && result[:stdout].match?(/is not recognized|session is not established/i)
+          result[:stderr] = result[:stdout]
+          result[:stdout] = ""
+          result[:exitcode] = -1
+        end
         return CommandResult.new(result[:stdout],result[:stderr],result[:exitcode])
       end
 
@@ -156,6 +164,11 @@ module TrainPlugins
         if result[:stdout].nil?
           result[:stdout] = ""
         end
+        if !result[:stdout].empty? && result[:stdout].match?(/is not recognized|session is not established/i)
+          result[:stderr] = result[:stdout]
+          result[:stdout] = ""
+          result[:exitcode] = -1
+        end
         return CommandResult.new(result[:stdout],result[:stderr],result[:exitcode])
       end
     end

data/lib/train-pwsh/transport.rb

@@ -20,9 +20,6 @@ module TrainPlugins
       #option :certificate_password, required: true, default: proc { ENV['CERTIFICATE_PASSWORD'] } unless ENV['CERTIFICATE_PASSWORD'].empty? 
       #option :organization, required: true, default: proc { ENV['ORGANIZATION'] } unless ENV['ORGANIZATION'].empty? 
       #option :sharepoint_admin_url, required: true, default: proc { ENV['SHAREPOINT_ADMIN_URL'] } unless ENV['SHAREPOINT_ADMIN_URL'].empty? 
-
-      option :graph_exchange_session, required: true, default: proc { ::Pwsh::Manager.instance(ENV['PWSH_PATH'], ['-NoLogo']) }
-      option :teams_pnp_session, required: true, default: proc { ::Pwsh::Manager.instance(ENV['PWSH_PATH'], []) }
       
       # The options passed to this are undocumented and rarely used.
       def connection(_instance_opts = nil)

data/lib/train-pwsh/version.rb

@@ -2,6 +2,6 @@
 
 module Train
   module Pwsh
-    VERSION = "0.1.1"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train-pwsh
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Sujay Kandwal
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-21 00:00:00.000000000 Z
+date: 2024-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train