puppet-ci-testing 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 928347f53049919abab4494bef43d7181e015b598b6bbae4688e42070ed498b8
-  data.tar.gz: 379237a85a0ae3c4ef5549c109e84ee69b39df18b5574af3bd04077676d854b8
+  metadata.gz: '09db4de24d2d8e1e8bb604cd574bf11b5a05ca169ac8e48d65cba8854947602d'
+  data.tar.gz: 6b325a5203b582736e39df99aba994dc72bc966d3353c2fa20b24c2dd8b7d768
 SHA512:
-  metadata.gz: 3fc973af4473990e3397fad7ec2d0af3230244a2ecd578b5d3260866cd74740b9951f8fac35d97505ef84789b8bf608d9274c2ced1293a54a364083a162193f3
-  data.tar.gz: 862541f3915b9e0ea356af25abf8442af5342d77b1c9b3c722764bf40e38ee83baf04f12b839934fa1513f4f6b48f25ed5adefa7bc4897928b50a28b06b5c68f
+  metadata.gz: 83565908b56c3f01487079742f790304d274fa700fa16a60941cfb7f87be76f392cddf07f6801ad811426031fa98b0b40e5541e96f1be4dcebed65ffec0347eb
+  data.tar.gz: bea9c2bfe42f523f6537fecd99f19832eaa7e27222ed19251328a2e7fd5826cf75019881e96d39fa24f34557544bbc9ddbbc1ccc7caac13cdb5d8d386c3012c0

data/bin/check_file_syntax

@@ -113,11 +113,11 @@ else
       tc = test_suite.create_testcase('File syntax', path)
       case status
       when :passed
-        tc.passed(output: output)
+        tc.pass(output: output)
       when :failed
-        tc.failed(type: 'syntax_error', output: '', error: output)
+        tc.fail(type: 'syntax_error', output: '', error: output)
       when :skipped
-        tc.skipped
+        tc.skip
       end
     end
   end

data/lib/check_file_syntax.rb

@@ -29,8 +29,7 @@ end
 
 module CheckFileSyntax
 
-  ALL_CHECKS = [:puppet, :ruby, :python, :perl, :bash, :erb, :yaml, :json,
-                :gitlab_ci]
+  ALL_CHECKS = [:puppet, :ruby, :python, :perl, :bash, :erb, :yaml, :json]
 
   module_function
   def type_of_file(path, interpreter, extensions)
@@ -178,35 +177,42 @@ module CheckFileSyntax
     elsif gitlab_ci_file? path
       ci_content = YAML.load_file(path)
 
-      token_file = ENV['CI_LINT_TOKEN'] || "#{Dir.home}/.gitlab-tokens"
-      if File.readable?(token_file)
-        tokens = YAML.load_file(token_file)
-        # Any token should work
-        priv_token = tokens.values()[0]
-
-        begin
-          uri = URI.parse('https://gitlab.com/api/v4/ci/lint')
-          http = Net::HTTP.new(uri.host, uri.port)
-          http.use_ssl = true
-          #Net::HTTP.enable_debug!
-          request = Net::HTTP::Post.new(uri.path, {
-                      'Content-Type' => 'application/json',
-                      'Accept' => 'application/json',
-                      'PRIVATE-TOKEN' => 'ShgK6TXXENFtKA5RWC8U'
-                    })
-          request.body = {content: ci_content.to_json}.to_json
-          response = http.request(request)
-        rescue => e
-          puts "Exception: #{e}"
-        end
-        results = JSON.parse(response.body)
-        case results['status']
-        when 'valid'
-          status = :passed
-        when 'invalid'
-          status = :failed
+      if ENV.has_key?('CI_LINT_TOKEN')
+        priv_token = ENV['CI_LINT_TOKEN']
+      else
+        token_file = "#{Dir.home}/.gitlab-tokens"
+        if File.readable?(token_file)
+          tokens = YAML.load_file(token_file)
+          # Any token should work
+          priv_token = tokens.values()[0]
         end
       end
+
+      begin
+        uri = URI.parse('https://gitlab.com/api/v4/ci/lint')
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        Net::HTTP.enable_debug!
+        request = Net::HTTP::Post.new(uri.path, {
+                    'Content-Type' => 'application/json',
+                    'Accept' => 'application/json',
+                    'PRIVATE-TOKEN' => priv_token
+                  })
+        request.body = {content: ci_content.to_json}.to_json
+        response = http.request(request)
+        puts response
+      rescue => e
+        puts "Exception: #{e}"
+      end
+      results = JSON.parse(response.body)
+      case results['status']
+      when 'valid'
+        status = :passed
+      when 'invalid'
+        status = :failed
+        errors = results['errors']
+      end
+
     elsif json_file? path
       begin
         JSON.parse(File.read(path))

data/lib/simple_junit.rb

@@ -90,7 +90,7 @@ EOTS
       @output = nil
     end
 
-    def passed(output:nil, error:nil)
+    def pass(output:nil, error:nil)
       @status = :passed
       unless output.nil?
         @output = output
@@ -104,7 +104,7 @@ EOTS
       @status == :passed
     end
 
-    def failed(type:nil, output:nil, error:nil)
+    def fail(type:nil, output:nil, error:nil)
       @status = :failed
       @error_type = type || 'unspecified'
       unless output.nil?

data/spec/simple_junit_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 require 'simple_junit'
 
 describe 'SimpleJUnit' do
-  describe 'TestSuiteCollection' do 
+  describe 'TestSuiteCollection' do
     it 'creates an empty test suite collection' do
       tc = SimpleJUnit::TestSuiteCollection.instance
       expect(tc.testsuites).to eq []
       tc.reset
     end
-    
+
     it 'creates two test suite collections' do
       tc = SimpleJUnit::TestSuiteCollection.instance
       tc.create_testsuite('foo')
@@ -16,14 +16,14 @@ describe 'SimpleJUnit' do
       expect(tc.testsuites.count).to eq 2
       tc.reset
     end
-    
+
     it 'generates valid JUnit XML output' do
       tc = SimpleJUnit::TestSuiteCollection.instance
       xml = tc.to_s.gsub(/\n\s*/, "")
       expect(xml).to match /<\?xml version="1.0" encoding="UTF-8"\?><testsuites><\/testsuites>/
       tc.reset
     end
-    
+
     it 'generates valid JUnit XML output with test suites' do
       tc = SimpleJUnit::TestSuiteCollection.instance
       tc.create_testsuite('foo')
@@ -35,104 +35,104 @@ describe 'SimpleJUnit' do
       tc.reset
     end
   end
-  
-  
+
+
   describe 'TestSuite' do
     it 'generates valid XML' do
       name = random_string(5)
       ts = SimpleJUnit::TestSuite.new(name)
       t1 = random_string(3)
-      ts.create_testcase(t1).passed
+      ts.create_testcase(t1).pass
       t2 = random_string(3)
-      ts.create_testcase(t2).failed
+      ts.create_testcase(t2).fail
       t3 = random_string(3)
-      ts.create_testcase(t3).failed
+      ts.create_testcase(t3).fail
       t4 = random_string(3)
-      ts.create_testcase(t4).passed
+      ts.create_testcase(t4).pass
       t5 = random_string(3)
       ts.create_testcase(t5).skip
       xml = ts.to_s.gsub(/\n\s*/, "")
       expect(xml).to match /<testsuite name="#{name}" errors="0" tests="5" failures="2" time="0" timestamp="[^"]+"><properties\/><testcase classname="#{t1}" time=""><\/testcase><testcase classname="#{t2}" time=""><failure message="unspecified"><\/failure><\/testcase><testcase classname="#{t3}" time=""><failure message="unspecified"><\/failure><\/testcase><testcase classname="#{t4}" time=""><\/testcase><testcase classname="#{t5}" time=""><skipped\/><\/testcase><\/testsuite>/
     end
-    
+
   end
-  
-  
+
+
   describe 'TestCase' do
-    it 'passed() sets internal state correctly' do
+    it 'pass() sets internal state correctly' do
       t = SimpleJUnit::TestCase.new('foo')
       output = random_string(30)
       error = random_string(20)
-      t.passed(output: output, error: error)
+      t.pass(output: output, error: error)
       expect(t.status).to eq :passed
       expect(t.output).to eq output
       expect(t.errors).to eq error
     end
-    
+
     it 'passed? test correct' do
       t = SimpleJUnit::TestCase.new('foo')
       expect(t.passed?).to eq false
-      t.passed
+      t.pass
       expect(t.passed?).to eq true
-      t.failed
+      t.fail
       expect(t.passed?).to eq false
       t.skip
       expect(t.passed?).to eq false
     end
-    
-    it 'failed() sets internal state correctly with error type' do
+
+    it 'fail() sets internal state correctly with error type' do
       t = SimpleJUnit::TestCase.new('foo')
       output = random_string(30)
       error = random_string(20)
-      t.failed(type:'bar', output:output, error:error)
+      t.fail(type:'bar', output:output, error:error)
       expect(t.status).to eq :failed
       expect(t.output).to eq output
       expect(t.errors).to eq error
     end
-    
-    it 'failed() sets internal state correctly without error type' do
+
+    it 'fail() sets internal state correctly without error type' do
       t = SimpleJUnit::TestCase.new('foo')
       output = random_string(30)
       error = random_string(20)
-      t.failed(:output => output, :error => error)
+      t.fail(:output => output, :error => error)
       expect(t.status).to eq :failed
       expect(t.output).to eq output
       expect(t.errors).to eq error
     end
-    
+
     it 'failed? test correct' do
       t = SimpleJUnit::TestCase.new('foo')
       expect(t.failed?).to eq false
-      t.failed
+      t.fail
       expect(t.failed?).to eq true
-      t.passed
+      t.pass
       expect(t.failed?).to eq false
       t.skip
       expect(t.passed?).to eq false
     end
-    
+
     it 'pending? test correct' do
       t = SimpleJUnit::TestCase.new('foo')
       expect(t.pending?).to eq true
-      t.failed
+      t.fail
       expect(t.pending?).to eq false
-      t.passed
+      t.pass
       expect(t.pending?).to eq false
       t.skip
       expect(t.pending?).to eq false
     end
-    
+
     it 'skipped? test correct' do
       t = SimpleJUnit::TestCase.new('foo')
       expect(t.skipped?).to eq false
-      t.failed
+      t.fail
       expect(t.skipped?).to eq false
-      t.passed
+      t.pass
       expect(t.skipped?).to eq false
       t.skip
       expect(t.skipped?).to eq true
     end
-    
+
     it 'duration is calculated correctly' do
       t = SimpleJUnit::TestCase.new('foo')
       t.start
@@ -140,18 +140,17 @@ describe 'SimpleJUnit' do
       t.finish
       expect(t.duration.to_i).to eq 2
     end
-    
+
     it 'generates correct XML' do
       name = random_string(5)
       type = random_string(7)
       output = random_string(13)
       error = random_string(11)
       t = SimpleJUnit::TestCase.new(name)
-      t.passed(output: output, error: error)
+      t.pass(output: output, error: error)
       xml = t.to_s.gsub(/\n\s*/, '')
       expect(xml).to match /<testcase classname="#{name}" time=""><system-out>#{output}<\/system-out><system-err>#{error}<\/system-err><\/testcase>/
     end
   end
 end
 
-    

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-ci-testing
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Gerard Hickey
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet