gitlab-ci-lint 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24fcfec55b5259161aeb0a2b3167926a88c7ca2aca39a873a1e21d3e8d87d1eb
-  data.tar.gz: 56a27e432e97d86d1cc2edadfdfd4cf99bd909f8dde5abbef00c74e106dacef4
+  metadata.gz: 0ef5eb902372d22fc7c7976e8e09f5582e2f98fdec2415adf82d1b4b12fd6f73
+  data.tar.gz: e4380981cff13d8c9481155f18baa12d45d0f6e67a6c1e84a3d0fc4d5ff65aca
 SHA512:
-  metadata.gz: 3625bb8779241a6033c5d68e916e26e57198363f1523ace6ae4e8b0199bda80a51aeef7343d8c6537fa5e2b1ae9bb802686c9a7510e6a7f01f7440b3e70c6bc8
-  data.tar.gz: f88d6a552745daf26081caa0173218f0f2c13c140a52d6af1888e688310e9acddea933b7cf3aae87365c26c5f89ed1a027d362d52d04c860ddb349b579a27001
+  metadata.gz: d282caeea425a3b2bc0159b905d232d3f88ffc5a1287ab985a80384f328b444bd61137bcd71eeb5c2d758a9cf887b91b4227ff90b23794841eda41b4aa9d7b62
+  data.tar.gz: 43384ddb7c10def3f4fd4ef9b3ff1e1da5eeb73929ad3ee6e55ae7cfa02806b7f7174c5a36cb3cc2c5d535d1e2bcd9cb2b625a12a268565a24e0b5c6df183b0e

data/lib/gitlab/ci/lint.rb

@@ -1,43 +1,53 @@
-require "gitlab/ci/lint/yml"
-require "gitlab/ci/lint/log"
-require "gitlab/ci/lint/system"
-require "gitlab/ci/lint/actions"
-
-module Gitlab
-  module Ci
-    module Lint
-      def self.validate values, configuration, options
-        system = GitLab::CI::Lint::System.new
-        actions = GitLab::CI::Lint::Actions.new
-
-        system.file_exist?(values, "Error: You must specify the values.yml file")
-
-        values = File.absolute_path(values)
-
-        system.file_is_readable?(values, "Error: Could not find file at '#{values}'")
-
-        yml_reader = GitLab::CI::Lint::YMLReader.new(values)
-        content = yml_reader.get_content
-
-        gitlab = content["gitlab"]
-
-        logger = GitLab::CI::Lint::Log.instance
-
-        gitlab_endpoint = options["endpoint"] ?
-            options["endpoint"] : ((!gitlab["endpoint"].to_s.empty? && !gitlab["endpoint"].nil?) ?
-            gitlab["endpoint"] : configuration.gitlab_endpoint)
-
-        gitlab_ci_file = options["file"] ?
-            options["file"] : ((!gitlab["file"].to_s.empty? && !gitlab["file"].nil?) ?
-            gitlab["file"] : configuration.gitlab_ci_file)
-
-        logger.info("Starting GitLab CI YML Validation...")
-
-        actions.validate_gitlab_ci_yml(gitlab_endpoint, gitlab_ci_file)
-
-        return 0
-      end
-
-    end
-  end
-end
+require "gitlab/ci/lint/yml"
+require "gitlab/ci/lint/log"
+require "gitlab/ci/lint/system"
+require "gitlab/ci/lint/actions"
+
+module Gitlab
+  module Ci
+    module Lint
+      def self.validate values, configuration, options
+        system = GitLab::CI::Lint::System.new
+        actions = GitLab::CI::Lint::Actions.new
+
+        system.file_exist?(values, "Error: You must specify the values.yml file")
+
+        values = File.absolute_path(values)
+
+        system.file_is_readable?(values, "Error: Could not find file at '#{values}'")
+
+        yml_reader = GitLab::CI::Lint::YMLReader.new(values)
+        content = yml_reader.get_content
+
+        gitlab = content["gitlab"]
+
+        logger = GitLab::CI::Lint::Log.instance
+
+        gitlab_endpoint = options["endpoint"] ?
+            options["endpoint"] : ((!gitlab["endpoint"].to_s.empty? && !gitlab["endpoint"].nil?) ?
+            gitlab["endpoint"] : configuration.gitlab_endpoint)
+
+        gitlab_token = options["token"] ?
+            options["token"] : ((!gitlab["token"].to_s.empty? && !gitlab["token"].nil?) ?
+            gitlab["token"] : configuration.gitlab_token)
+
+        timeout = options["timeout"] ?
+            options["timeout"] : ((!gitlab["timeout"].to_s.empty? && !gitlab["timeout"].nil?) ?
+            gitlab["timeout"] : configuration.timeout)
+
+        gitlab_ci_file = options["file"] ?
+            options["file"] : ((!gitlab["file"].to_s.empty? && !gitlab["file"].nil?) ?
+            gitlab["file"] : configuration.gitlab_ci_file)
+
+        logger.info("Starting GitLab CI YML Validation...")
+
+        headers = gitlab_token ? { "Content-Type" => "application/json", "Private-Token" => gitlab_token } : { "Content-Type" => "application/json"}
+
+        actions.validate_gitlab_ci_yml(gitlab_endpoint, gitlab_ci_file, headers, timeout)
+
+        return 0
+      end
+
+    end
+  end
+end

data/lib/gitlab/ci/lint/actions.rb

@@ -1,20 +1,21 @@
-require "gitlab/ci/lint/client"
-require "gitlab/ci/lint/serializer"
-
-module GitLab
-  module CI
-    module Lint
-      class Actions < GitLab::CI::Lint::Client
-        def validate_gitlab_ci_yml url, content
-          result = post(url, content)
-          message = GitLab::CI::Lint::Serializer.new(result)
-          if result["status"] == "valid"
-            message.success()
-          else
-            message.failure()
-          end
-        end
-      end
-    end
-  end
-end
+require "gitlab/ci/lint/client"
+require "gitlab/ci/lint/serializer"
+
+module GitLab
+  module CI
+    module Lint
+      class Actions < GitLab::CI::Lint::Client
+
+        def validate_gitlab_ci_yml url, content, headers, timeout
+          result = post(url, headers, timeout, content)
+          message = GitLab::CI::Lint::Serializer.new(result)
+          if result["status"] == "valid"
+            message.success()
+          else
+            message.failure()
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/ci/lint/arguments.rb

@@ -23,13 +23,13 @@ module GitLab
             opts.on("-e", "--endpoint", "GitLab Endpoint") { |value| @options[:endpoint] = value }
             opts.on("-t", "--token", "GitLab Token") { |value| @options[:token] = value }
             opts.on("-f", "--file", "GitLab CI File") { |value| @options[:file] = value }
-            opts.on("-d", "--directory", "GitLab CI Directory") { |value| @options[:file] = value }
-            opts.on("-T", "--timeout", "Request Timeout") { |value| @options[:file] = value }
-            opts.on("-n", "--no-color", "Color Usage") { |value| @options[:file] = value }
+            opts.on("-d", "--directory", "GitLab CI Directory") { |value| @options[:directory] = value }
+            opts.on("-T", "--timeout", "Request Timeout") { |value| @options[:timeout] = value }
+            opts.on("-n", "--no-color", "Color Usage") { |value| @options[:nocolor] = value }
             opts.on("-v", "--values", "Values File") { |value| @options[:values] = value }
             opts.on("-l", "--log", "Log File") { |value| @options[:log] = value }
             opts.on("--verbose", "If set, print verbose output") { |value| @options[:verbose] = true }
-            opts.on("--version", "Show GitLab CI Lint Version") { |value| @options[:help] = version() }
+            opts.on("--version", "Show GitLab CI Lint Version") { |value| @options[:version] = version() }
           end.parse!
           return @options
         end

data/lib/gitlab/ci/lint/client.rb

@@ -8,15 +8,11 @@ module GitLab
       class Client
         include HTTParty
 
-        def initialize
-          @headers = { "Content-Type" => "application/json", "Private-Token" => "uNNACNQdxg1iSnieM2nG" }
-        end
-
-        def post url, content
+        def post url, content, headers={ "Content-Type" => "application/json"}, timeout=10
           begin
             if content = GitLab::CI::Lint::YMLReader.new(content).get_json_content()
               body = { content: content }.to_json
-              request = self.class.post(url, :body => body, :headers => @headers)
+              request = self.class.post(url, :body => body, :headers => headers, :timeout => timeout)
               if request.code == 200
                 puts "\nSuccessful request!"
                 return JSON.parse(request.body)

data/lib/gitlab/ci/lint/configuration.rb

@@ -1,28 +1,30 @@
-module GitLab
-  module CI
-    module Lint
-      class Configuration
-        attr_reader :gitlab_endpoint, :gitlab_token, :gitlab_ci_file,
-                    :values, :log_file
-        def initialize
-          @gitlab_endpoint = ENV["GITLAB_ENDPOINT"]
-          @gitlab_token = ENV["GITLAB_TOKEN"]
-          @gitlab_ci_file = ENV["GITLAB_CI_FILE"]
-          @values = ENV["VALUES"]
-          @log_file = ENV["LOG_FILE"]
-        end
-
-        def variables
-          return {
-            "gitlab_endpoint" => @gitlab_endpoint,
-            "gitlab_token" => @gitlab_token,
-            "gitlab_ci_file" => @gitlab_ci_file,
-            "values" => @values,
-            "log_file" => @log_file
-          }
-        end
-
-      end
-    end
-  end
-end
+module GitLab
+  module CI
+    module Lint
+      class Configuration
+        attr_reader :gitlab_endpoint, :gitlab_token, :gitlab_ci_file,
+                    :timeout, :values, :log_file
+        def initialize
+          @gitlab_endpoint = ENV["GITLAB_ENDPOINT"]
+          @gitlab_token = ENV["GITLAB_TOKEN"]
+          @gitlab_ci_file = ENV["GITLAB_CI_FILE"]
+          @timeout = ENV["TIMEOUT"]
+          @values = ENV["VALUES"]
+          @log_file = ENV["LOG_FILE"]
+        end
+
+        def variables
+          return {
+            "gitlab_endpoint" => @gitlab_endpoint,
+            "gitlab_token" => @gitlab_token,
+            "gitlab_ci_file" => @gitlab_ci_file,
+            "timeout" => @timeout,
+            "values" => @values,
+            "log_file" => @log_file
+          }
+        end
+
+      end
+    end
+  end
+end

data/lib/gitlab/ci/lint/version.rb

@@ -1,7 +1,7 @@
 module Gitlab
   module Ci
     module Lint
-      VERSION = "0.1.4".freeze
+      VERSION = "0.1.5".freeze
     end
   end
 end

data/values.yml

@@ -1,10 +1,11 @@
-# =============================================================================
-# VALUES DEFINITION
-# =============================================================================
-
----
-gitlab:
-  endpoint: "https://gitlab.com/api/v4/ci/lint"
-  file: ".gitlab-ci.yml"
-log:
-  file: "file.log"
+# =============================================================================
+# VALUES DEFINITION
+# =============================================================================
+
+---
+gitlab:
+  endpoint: "https://gitlab.com/api/v4/ci/lint"
+  timeout: 10
+  file: ".gitlab-ci.yml"
+log:
+  file: "file.log"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-ci-lint
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Lucca Pessoa da Silva Matos