win32-taskscheduler 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90e586400ec6f09917fb684fb99037a5bd2c332995ecb72c43b37222ce9e2a61
-  data.tar.gz: 7a081a2f498d932400424d87885a89d2f58126366f6d51d6a361d97a215c18c6
+  metadata.gz: 75d6081629e7734ccc70835edb8bcf222111038f4a169bc196348a66dd8e9f9d
+  data.tar.gz: 11722828b8240e0096df6bce84c425ecae0f6018500a83614529e45e717d3fa8
 SHA512:
-  metadata.gz: 4fffce988d9274141c58c5cfce948ac86ff9b03396313f2721ce7bea08c6daf3a118be23418a2b56c7cfa58628db4e7e3943c0fe011b2b7da343007f80c9a7d0
-  data.tar.gz: 7a282afc6a6be4a3cefd6258ee33257221e2d397c327f07329b1972178165c64df0ef89b3c408c951db7375a85a5afea4a0ad63895f3a449036f18b94db13ae4
+  metadata.gz: 59b2f4034e7ae6ed9048b2b99af095e1402907dae5d917445f9cbba00cdbe9e309b2dca7d87254d077a52643093ac07e2672fd2c4276fa54c22d088f8a3a58b3
+  data.tar.gz: 568cae572869dfa9e93abaaf1f8d593e516fdba1388b75ed962b08020a0c7caa8ec5b5a9831c7b915f3113973dbb27a89bcc745e3255a8a0b33fa1d9fa1229cd

data/CHANGELOG.md

@@ -4,28 +4,34 @@ Note: this log contains only changes from win32-taskscheduler release 0.4.0 and
 -- it does not contain the changes from prior releases. To view change history
 prior to release 0.4.0, please visit the [source repository](https://github.com/chef/win32-taskscheduler/commits).
 
-<!-- latest_release unreleased -->
-## Unreleased
+<!-- latest_release 2.0.1 -->
+## [win32-taskscheduler-2.0.1](https://github.com/chef/win32-taskscheduler/tree/win32-taskscheduler-2.0.1) (2018-11-01)
 
 #### Merged Pull Requests
+- Minor Fix for logon_type flag while task registration [#75](https://github.com/chef/win32-taskscheduler/pull/75) ([Nimesh-Msys](https://github.com/Nimesh-Msys))
 - Bump version to 2.0 [#71](https://github.com/chef/win32-taskscheduler/pull/71) ([btm](https://github.com/btm))
 <!-- latest_release -->
 
-<!-- release_rollup since=1.0.12 -->
-### Changes since 1.0.12 release
+<!-- release_rollup since=2.0.0 -->
+### Changes since 2.0.0 release
 
 #### Merged Pull Requests
-- Bump version to 2.0 [#71](https://github.com/chef/win32-taskscheduler/pull/71) ([btm](https://github.com/btm)) <!-- 2.0.0 -->
-- Move helpers under the Win32::TaskScheduler namespace [#70](https://github.com/chef/win32-taskscheduler/pull/70) ([btm](https://github.com/btm)) <!-- 1.0.13 -->
+- Minor Fix for logon_type flag while task registration [#75](https://github.com/chef/win32-taskscheduler/pull/75) ([Nimesh-Msys](https://github.com/Nimesh-Msys)) <!-- 2.0.1 -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [win32-taskscheduler-2.0.0](https://github.com/chef/win32-taskscheduler/tree/win32-taskscheduler-2.0.0) (2018-10-11)
+
+#### Merged Pull Requests
+- Move helpers under the Win32::TaskScheduler namespace [#70](https://github.com/chef/win32-taskscheduler/pull/70) ([btm](https://github.com/btm))
+- Bump version to 2.0 [#71](https://github.com/chef/win32-taskscheduler/pull/71) ([btm](https://github.com/btm))
+<!-- latest_stable_release -->
+
 ## [win32-taskscheduler-1.0.12](https://github.com/chef/win32-taskscheduler/tree/win32-taskscheduler-1.0.12) (2018-10-11)
 
 #### Merged Pull Requests
 - Refactored configure_settings [#67](https://github.com/chef/win32-taskscheduler/pull/67) ([btm](https://github.com/btm))
 - Fixing user registration at Non English version of windows [#69](https://github.com/chef/win32-taskscheduler/pull/69) ([Nimesh-Msys](https://github.com/Nimesh-Msys))
-<!-- latest_stable_release -->
 
 ## [win32-taskscheduler-1.0.10](https://github.com/chef/win32-taskscheduler/tree/win32-taskscheduler-1.0.10) (2018-07-24)
 

data/VERSION

@@ -1,2 +1 @@
-2.0.0
-
+2.0.1

data/lib/win32/taskscheduler.rb

@@ -512,7 +512,7 @@ module Win32
     # trigger variable is a hash of options that define when the scheduled
     # job should run.
     #
-    def new_work_item(task, trigger, userinfo = { user: nil, password: nil })
+    def new_work_item(task, trigger, userinfo = { user: nil, password: nil, interactive: false })
       raise TypeError unless userinfo.is_a?(Hash) && task.is_a?(String) && trigger.is_a?(Hash)
 
       # If user ID is not given, consider it as a 'SYSTEM' user
@@ -609,6 +609,7 @@ module Win32
       act.Path = 'cmd'
 
       @password = userinfo[:password]
+      @interactive = userinfo[:interactive]
 
       register_task_definition(taskDefinition, task, userinfo[:user], userinfo[:password])
 
@@ -1236,6 +1237,7 @@ module Win32
       definition.Principal.LogonType = principals[:logon_type] if principals[:logon_type].to_s != ""
       definition.Principal.GroupId = principals[:group_id] if principals[:group_id].to_s != ""
       definition.Principal.RunLevel = principals[:run_level] if principals[:run_level].to_s != ""
+      @interactive = true if principals[:logon_type] == TASK_LOGON_INTERACTIVE_TOKEN
       register_task_definition(definition)
       principals
     end
@@ -1417,8 +1419,12 @@ module Win32
         TASK_LOGON_SERVICE_ACCOUNT
       elsif group_user?(user_id)
         TASK_LOGON_GROUP
-      elsif !password.to_s.empty? # Password is present
-        TASK_LOGON_PASSWORD
+      elsif !user_id.to_s.empty? && !password.to_s.empty?
+        if @interactive
+          TASK_LOGON_INTERACTIVE_TOKEN
+        else
+          TASK_LOGON_PASSWORD
+        end
       else
         TASK_LOGON_INTERACTIVE_TOKEN
       end
@@ -1435,6 +1441,7 @@ module Win32
     #
     def register_task_definition(definition, path = nil, user_id = nil, password = nil)
       user_id ||= task_user_id(definition)
+      password ||= @password
       path ||= @task.Path
       @task = @root.RegisterTaskDefinition(
         path, # Path (name) of the task

data/lib/win32/taskscheduler/version.rb

@@ -1,6 +1,6 @@
 module Win32
   class TaskScheduler
     # The version of the win32-taskscheduler library
-    VERSION = '2.0.0'.freeze
+    VERSION = '2.0.1'.freeze
   end
 end

data/spec/unit/win32/taskscheduler_spec.rb

@@ -112,6 +112,43 @@ RSpec.describe Win32::TaskScheduler, :windows_only do
     end
   end
 
+  describe '#logon_type' do
+    let(:user_id) { 'User' }
+    context 'With Password' do
+      let(:password) { 'Password' }
+      it 'Returns PASSWORD flag for non-system users' do
+        expect(@ts.send(:logon_type, user_id, password)).to eq(Win32::TaskScheduler::TASK_LOGON_PASSWORD)
+      end
+
+      it 'Returns GROUP flag for group users' do
+        user_id = 'Guests'
+        expect(@ts.send(:logon_type, user_id, password)).to eq(Win32::TaskScheduler::TASK_LOGON_GROUP)
+      end
+
+      it 'Returns SERVICE_ACCOUNT flag for service-account users' do
+        user_id = 'System'
+        expect(@ts.send(:logon_type, user_id, password)).to eq(Win32::TaskScheduler::TASK_LOGON_SERVICE_ACCOUNT)
+      end
+    end
+
+    context 'Without Password' do
+      let(:password) { nil }
+      it 'Returns INTERACTIVE_TOKEN flag for non-system users' do
+        expect(@ts.send(:logon_type, user_id, password)).to eq(Win32::TaskScheduler::TASK_LOGON_INTERACTIVE_TOKEN)
+      end
+
+      it 'Returns GROUP flag for group users' do
+        user_id = 'Guests'
+        expect(@ts.send(:logon_type, user_id, password)).to eq(Win32::TaskScheduler::TASK_LOGON_GROUP)
+      end
+
+      it 'Returns SERVICE_ACCOUNT flag for service-account users' do
+        user_id = 'System'
+        expect(@ts.send(:logon_type, user_id, password)).to eq(Win32::TaskScheduler::TASK_LOGON_SERVICE_ACCOUNT)
+      end
+    end
+  end
+
   private
 
   def load_task_variables

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-taskscheduler
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Park Heesob
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2018-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi