Test/muthuja/rubydistros

.expeditor/config.yml

@@ -2,9 +2,9 @@
 ---
 # Slack channel in Chef Software slack to send notifications about build failures, etc
 slack:
-  notify_channel: sustaining-notify
-  notify_channel: chef-notify
-
+  notify_channel:
+    - sustaining-notify
+    - chef-notify
 # This publish is triggered by the `built_in:publish_rubygems` artifact_action.
 rubygems:
   - win32-taskscheduler

.expeditor/scripts/install_ruby.ps1

@@ -0,0 +1,18 @@
+param(
+    [Parameter(Mandatory = $true)]
+    [string]$RubyVersion
+)
+
+$ErrorActionPreference = "Stop"
+
+Write-Output "--- Downloading and installing Ruby"
+$installerUrl = "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-$RubyVersion-1/rubyinstaller-devkit-$RubyVersion-1-x64.exe"
+$installerPath = "$env:TEMP\rubyinstaller.exe"
+
+Write-Output "Downloading Ruby $RubyVersion from $installerUrl"
+Invoke-WebRequest -Uri $installerUrl -OutFile $installerPath
+if (-not $?) { throw "Could not download ruby with devkit from https://github.com/oneclick/rubyinstaller2" }
+
+Write-Output "Running Ruby installer..."
+Start-Process -FilePath $installerPath -ArgumentList "/verysilent","/tasks=modpath", "/currentuser" -Wait
+if (-not $?) { throw "Failed to install Ruby." }

.expeditor/scripts/run_windows_tests.ps1

@@ -0,0 +1,31 @@
+# Stop script execution when a non-terminating error occurs
+$ErrorActionPreference = "Stop"
+
+# Find the latest Ruby install directory
+$RubyDir = Get-ChildItem -Directory "C:\Ruby*" | Sort-Object LastWriteTime -Descending | Select-Object -First 1
+if ($RubyDir) {
+    $RubyBin = "$($RubyDir.FullName)\bin"
+    Write-Output "Ruby installed at $RubyBin"
+} else {
+    throw "Could not find Ruby installation directory."
+}
+$env:PATH = "$env:PATH;$RubyBin"
+
+Write-Output "--- Installed Ruby version"
+ruby --version
+
+Write-Output "--- Bundle install"
+
+bundle config --local path vendor/bundle
+bundle install --jobs=7 --retry=3
+if (-not $?) { throw "bundle install failed" }
+
+Write-Output "--- Running Cookstyle"
+gem install cookstyle
+cookstyle --chefstyle -c .rubocop.yml
+if (-not $?) { throw "Cookstyle failed." }
+
+Write-Output "--- Bundle Execute"
+
+bundle exec rake
+if (-not $?) { throw "Rake task failed." }

.expeditor/verify.pipeline.yml

@@ -0,0 +1,36 @@
+---
+expeditor:
+  defaults:
+    buildkite:
+      retry:
+        automatic:
+          limit: 1
+      timeout_in_minutes: 90
+
+steps:
+  - label: run-specs-ruby-3.1
+    command:
+      #- .expeditor/scripts/install_ruby.ps1 -RubyVersion "3.1.6"
+      - .expeditor/scripts/run_windows_tests.ps1
+    expeditor:
+      executor:
+        docker:
+          host_os: windows
+          shell: [ "powershell", "-Command" ]
+          image: rubydistros/windows-2019:3.1
+          environment:
+            - BUILDKITE
+
+
+  - label: run-specs-ruby-3.4
+    command:
+      #- .expeditor/scripts/install_ruby.ps1 -RubyVersion "3.4.3"
+      - .expeditor/scripts/run_windows_tests.ps1
+    expeditor:
+      executor:
+        docker:
+          host_os: windows
+          shell: [ "powershell", "-Command" ]
+          image: rubydistros/windows-2019:3.4
+          environment:
+            - BUILDKITE

.gitignore

@@ -1 +1,3 @@
 Gemfile.lock
+vendor
+.bundle

Gemfile

@@ -3,7 +3,6 @@ source "https://rubygems.org"
 gemspec
 
 group :development do
-  gem "chefstyle"
   gem "rake"
   gem "rspec", "~> 3.0"
 end
@@ -12,6 +11,10 @@ group :ci do
   gem "rspec_junit_formatter"
 end
 
+group :style do
+  gem "cookstyle", "~> 8.1"
+end
+
 group :docs do
   gem "github-markup"
   gem "redcarpet"

Rakefile

@@ -25,6 +25,16 @@ task :example do
   ruby "-Iib examples/taskscheduler_example.rb"
 end
 
+desc "Check the code for linting/styling errors"
+task :style do
+  require "rubocop/rake_task"
+
+  system("bundle exec cookstyle --chefstyle -c .rubocop.yml")
+rescue LoadError => e
+  puts "rubocop/cookstyle gem is not installed. Run `bundle install` first to make sure all dependencies are installed."
+  puts e.message
+end
+
 begin
   require "rspec/core/rake_task"
 
@@ -38,17 +48,6 @@ rescue LoadError
   end
 end
 
-begin
-  require "chefstyle"
-  require "rubocop/rake_task"
-  desc "Run Chefstyle tests"
-  RuboCop::RakeTask.new(:style) do |task|
-    task.options += ["--display-cop-names", "--no-color"]
-  end
-rescue LoadError
-  puts "chefstyle gem is not installed. bundle install first to make sure all dependencies are installed."
-end
-
 begin
   require "yard"
   YARD::Rake::YardocTask.new(:docs)

cspell.json

@@ -1348,6 +1348,7 @@
     "TERMSRV",
     "testswapfile",
     "testswapfiledir",
+    "testtask",
     "texteditor",
     "THRDS",
     "THREADID",
@@ -1532,6 +1533,7 @@
     "XEEDS",
     "XFORM",
     "XMLHTTP",
+    "Yardoc",
     "yieldparam",
     "zabbix",
     "zanetti",

lib/win32/taskscheduler.rb

@@ -182,7 +182,7 @@ def enum
 
       array = []
 
-      taskCollection.each do |registeredTask|
+      taskCollection.each do |registeredTask| # rubocop:disable Style/MapIntoArray
         array << registeredTask.Name
       end
 

lib/win32/taskscheduler/helper.rb

@@ -12,7 +12,7 @@ module Helper
       ffi_lib :kernel32, :advapi32
 
       attach_function :FormatMessage, :FormatMessageA,
-                      %i{ulong pointer ulong ulong pointer ulong pointer}, :ulong
+        %i{ulong pointer ulong ulong pointer ulong pointer}, :ulong
 
       attach_function :ConvertStringSidToSidW, %i{pointer pointer}, :bool
       attach_function :LookupAccountSidW, %i{pointer pointer pointer pointer pointer pointer pointer}, :bool

lib/win32/taskscheduler/time_calc_helper.rb

@@ -127,6 +127,8 @@ def extra_days(days_count, month_count, year_count, init_month, init_year)
       #   time_details("PT3S") #=> {sec: 3}
       #
       def time_details(time_str)
+        raise TypeError unless time_str.is_a?(String) || time_str.nil?
+
         tm_detail = {}
         if time_str.to_s != ""
           # time_str will be like "PxxYxxMxxDTxxHxxMxxS"
@@ -157,7 +159,7 @@ def time_details(time_str)
       #   dt_tm_string_to_hash("10year3month", {}) #=> {:year=>"10", :month=>"3"}
       #
       def dt_tm_string_to_hash(str, tm_detail)
-        str.split(/(\d+)/)[1..-1].each_slice(2).each_with_object(tm_detail) { |i, h| h[i.last.to_sym] = i.first; }
+        str.split(/(\d+)/)[1..-1].each_slice(2).with_object(tm_detail) { |i, h| h[i.last.to_sym] = i.first }
       end
     end
   end

spec/functional/win32/taskscheduler_spec.rb

@@ -53,7 +53,7 @@
         expect(no_of_tasks).to eq(0)
       end
 
-      it "Raises error when path separators(\\\) are absent" do
+      it "Raises error when path separators(\\) are absent" do
         invalid_path = "Foo"
         expect { ts.new(@task, @trigger, invalid_path) }.to raise_error(ArgumentError)
         expect(no_of_tasks).to eq(0)
@@ -670,7 +670,7 @@
 
   describe "#trigger_string" do
     before { create_task }
-    it "Returns a string that describes the current trigger at "\
+    it "Returns a string that describes the current trigger at " \
        "the specified index for the active task" do
          expect(@ts.trigger_string(0)).to be_a(String)
        end
@@ -842,7 +842,7 @@
   describe "#trigger" do
     before { create_task }
 
-    it "Returns a hash that describes the trigger "\
+    it "Returns a hash that describes the trigger " \
        "at the given index for the current task" do
          trigger = @ts.trigger(0)
          expect(trigger).to be_a(Hash)

win32-taskscheduler.gemspec

@@ -8,7 +8,6 @@ Gem::Specification.new do |spec|
   spec.email      = "djberg96@gmail.com"
   spec.homepage   = "https://github.com/chef/win32-taskscheduler"
   spec.summary    = "A library for the Windows task scheduler"
-  spec.test_files = Dir["test/*, spec/**/*"]
   spec.files      = Dir["lib/**/*"]
 
   spec.add_dependency("ffi")