gitlab 4.2.0 → 4.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2fd8bd1d12fdceba122d4fd99e3df259c399e629
-  data.tar.gz: dd195a082fc9a572a22ff4074306891ccc9553a1
+SHA256:
+  metadata.gz: 9a9218b2e2622283ff16c91d001d99d9f81e9ee7c6acd285a640553c8c8fd24f
+  data.tar.gz: 7603515dec3c85ea53cbef33acc9131d21605d9eab8f668476c36afa58837b76
 SHA512:
-  metadata.gz: 0edc2245a554decf8c18723979c256e6e7926d67521fa9ffeef11508b3bad1501e31ea3fe7ba91c1e9a5efe98a66149e6be3f2adcb25199c3118e5e6bde9b847
-  data.tar.gz: 12aa581f975cd5bbc7cebe3fb75eef20d1fb87eab9119af485c3a2158779a673cd0c1da74ee4a0d91f05adfe582a35f906e7679f2fd4650f65b5c04167926c28
+  metadata.gz: ec5e891011991391aaa42a86ef3c2506a1541c0c63526c820e1b67bafa17a743d7ce4f00531a074cf982be7b35d2d3a37eeb1ebab8cd619af67680c882dac708
+  data.tar.gz: 7ef86a70f12613923fa0dd59a87164f16cc50d4ebf114fb8bed9756a55b4ddb7363d26c9e3c2f4034c0e32ecda9805bc5577f006cfbb49f6c0d9530e196c7e04

data/CHANGELOG.md

@@ -1,6 +1,8 @@
-## Change Log
+## CHANGELOG
 
-### Unreleased
+### Newer releases
+
+Please see: https://github.com/NARKOZ/gitlab/releases
 
 ### 4.2.0 (13/07/2017)
 - Use `url_encode` in all `Commit` resources (@grodowski)

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2015 Nihad Abbasov <mail@narkoz.me>
+Copyright (c) 2012-2020 Nihad Abbasov <nihad@42na.in>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -1,17 +1,16 @@
 # Gitlab
 
-[![Build Status](https://img.shields.io/travis/NARKOZ/gitlab.svg?style=flat)](https://travis-ci.org/NARKOZ/gitlab)
-[![Code Climate](https://img.shields.io/codeclimate/github/NARKOZ/gitlab.svg?style=flat)](https://codeclimate.com/github/NARKOZ/gitlab)
-[![Inline docs](http://inch-ci.org/github/NARKOZ/gitlab.svg?style=flat)](https://inch-ci.org/github/NARKOZ/gitlab)
-[![Gem version](https://img.shields.io/gem/v/gitlab.svg?style=flat)](https://rubygems.org/gems/gitlab)
-[![License](https://img.shields.io/badge/license-BSD-red.svg?style=flat)](https://github.com/NARKOZ/gitlab/blob/master/LICENSE.txt)
-
-[website](http://narkoz.github.io/gitlab) |
-[documentation](http://rubydoc.info/gems/gitlab/frames) |
+[![Build Status](https://img.shields.io/github/workflow/status/NARKOZ/gitlab/CI/master)](https://github.com/NARKOZ/gitlab/actions?query=workflow%3ARuby)
+[![Inline docs](https://inch-ci.org/github/NARKOZ/gitlab.svg)](https://inch-ci.org/github/NARKOZ/gitlab)
+[![Gem version](https://img.shields.io/gem/v/gitlab.svg)](https://rubygems.org/gems/gitlab)
+[![License](https://img.shields.io/badge/license-BSD-red.svg)](https://github.com/NARKOZ/gitlab/blob/master/LICENSE.txt)
+
+[website](https://narkoz.github.io/gitlab) |
+[documentation](https://www.rubydoc.info/gems/gitlab/frames) |
 [gitlab-live](https://github.com/NARKOZ/gitlab-live)
 
-Gitlab is a Ruby wrapper and CLI for the [GitLab API](https://docs.gitlab.com/ce/api/README.html).
-As of version `4.0.0` this gem will only support Ruby 2.0+ and Gitlab API v4.
+Gitlab is a Ruby wrapper and CLI for the [GitLab API](https://docs.gitlab.com/ce/api/README.html).  
+As of version `4.0.0` this gem only supports GitLab API v4.
 
 ## Installation
 
@@ -28,13 +27,19 @@ gem 'gitlab'
 # gem 'gitlab', github: 'NARKOZ/gitlab'
 ```
 
+Mac OS users can install using Homebrew (may not be the latest version):
+
+```sh
+brew install gitlab-gem
+```
+
 ## Usage
 
 Configuration example:
 
 ```ruby
 Gitlab.configure do |config|
-  config.endpoint       = 'https://example.net/api/v4' # API endpoint URL, default: ENV['GITLAB_API_ENDPOINT']
+  config.endpoint       = 'https://example.net/api/v4' # API endpoint URL, default: ENV['GITLAB_API_ENDPOINT'] and falls back to ENV['CI_API_V4_URL']
   config.private_token  = 'qEsq1pt6HJPaNciie3MG'       # user's private token or OAuth2 access token, default: ENV['GITLAB_API_PRIVATE_TOKEN']
   # Optional
   # config.user_agent   = 'Custom User Agent'          # user agent, default: 'Gitlab Ruby Gem [version]'
@@ -48,8 +53,8 @@ Usage examples:
 
 ```ruby
 # set an API endpoint
-Gitlab.endpoint = 'http://example.net/api/v4'
-# => "http://example.net/api/v4"
+Gitlab.endpoint = 'https://example.net/api/v4'
+# => "https://example.net/api/v4"
 
 # set a user private token
 Gitlab.private_token = 'qEsq1pt6HJPaNciie3MG'
@@ -57,15 +62,23 @@ Gitlab.private_token = 'qEsq1pt6HJPaNciie3MG'
 
 # configure a proxy server
 Gitlab.http_proxy('proxyhost', 8888)
-# proxy server w/ basic auth
+# proxy server with basic auth
 Gitlab.http_proxy('proxyhost', 8888, 'proxyuser', 'strongpasswordhere')
+# set timeout for responses
+ENV['GITLAB_API_HTTPARTY_OPTIONS'] = '{read_timeout: 60}'
 
 # list projects
 Gitlab.projects(per_page: 5)
 # => [#<Gitlab::ObjectifiedHash:0x000000023326e0 @data={"id"=>1, "code"=>"brute", "name"=>"Brute", "description"=>nil, "path"=>"brute", "default_branch"=>nil, "owner"=>#<Gitlab::ObjectifiedHash:0x00000002331600 @data={"id"=>1, "email"=>"john@example.com", "name"=>"John Smith", "blocked"=>false, "created_at"=>"2012-09-17T09:41:56Z"}>, "private"=>true, "issues_enabled"=>true, "merge_requests_enabled"=>true, "wall_enabled"=>true, "wiki_enabled"=>true, "created_at"=>"2012-09-17T09:41:56Z"}>, #<Gitlab::ObjectifiedHash:0x000000023450d8 @data={"id"=>2, "code"=>"mozart", "name"=>"Mozart", "description"=>nil, "path"=>"mozart", "default_branch"=>nil, "owner"=>#<Gitlab::ObjectifiedHash:0x00000002344ca0 @data={"id"=>1, "email"=>"john@example.com", "name"=>"John Smith", "blocked"=>false, "created_at"=>"2012-09-17T09:41:56Z"}>, "private"=>true, "issues_enabled"=>true, "merge_requests_enabled"=>true, "wall_enabled"=>true, "wiki_enabled"=>true, "created_at"=>"2012-09-17T09:41:57Z"}>, #<Gitlab::ObjectifiedHash:0x00000002344958 @data={"id"=>3, "code"=>"gitlab", "name"=>"Gitlab", "description"=>nil, "path"=>"gitlab", "default_branch"=>nil, "owner"=>#<Gitlab::ObjectifiedHash:0x000000023447a0 @data={"id"=>1, "email"=>"john@example.com", "name"=>"John Smith", "blocked"=>false, "created_at"=>"2012-09-17T09:41:56Z"}>, "private"=>true, "issues_enabled"=>true, "merge_requests_enabled"=>true, "wall_enabled"=>true, "wiki_enabled"=>true, "created_at"=>"2012-09-17T09:41:58Z"}>]
 
-# initialize a new client
-g = Gitlab.client(endpoint: 'https://api.example.com', private_token: 'qEsq1pt6HJPaNciie3MG')
+# initialize a new client with custom headers
+g = Gitlab.client(
+  endpoint: 'https://example.com/api/v4',
+  private_token: 'qEsq1pt6HJPaNciie3MG',
+  httparty: {
+    headers: { 'Cookie' => 'gitlab_canary=true' }
+  }
+)
 # => #<Gitlab::Client:0x00000001e62408 @endpoint="https://api.example.com", @private_token="qEsq1pt6HJPaNciie3MG", @user_agent="Gitlab Ruby Gem 2.0.0">
 
 # get a user
@@ -102,14 +115,14 @@ end
 projects.auto_paginate
 ```
 
-For more information, refer to [documentation](http://rubydoc.info/gems/gitlab/frames).
+For more information, refer to [documentation](https://www.rubydoc.info/gems/gitlab/frames).
 
 ## CLI
 
-It is possible to use this gem as a command line interface to gitlab. In order to make that work you need to set a few environment variables:
+It is possible to use this gem as a command line interface to GitLab. In order to make that work you need to set a few environment variables:
 ```sh
 export GITLAB_API_ENDPOINT=https://gitlab.yourcompany.com/api/v4
-export GITLAB_API_PRIVATE_TOKEN=<your private token from /profile/account>
+export GITLAB_API_PRIVATE_TOKEN=<your private token from /profile/account or /profile/personal_access_tokens in newer version>
 # This one is optional and can be used to set any HTTParty option you may need
 # using YAML hash syntax. For example, this is how you would disable SSL
 # verification (useful if using a self-signed cert).
@@ -118,21 +131,21 @@ export GITLAB_API_HTTPARTY_OPTIONS="{verify: false}"
 
 Usage:
 
-When you want to know which CLI commands are supported, take a look at the client [commands implemented in this gem](http://www.rubydoc.info/gems/gitlab/3.4.0/Gitlab/Client). Any of those methods can be called as a command by passing the parameters of the commands as parameters of the CLI.
+When you want to know which CLI commands are supported, take a look at the client [commands implemented in this gem](https://www.rubydoc.info/gems/gitlab/4.5.0/Gitlab/Client). Any of those methods can be called as a command by passing the parameters of the commands as parameters of the CLI.
 
 Usage examples:
 
 ```sh
 # list users
-# see: http://www.rubydoc.info/gems/gitlab/3.4.0/Gitlab/Client/Users#users-instance_method
+# see: https://www.rubydoc.info/gems/gitlab/4.5.0/Gitlab/Client/Users#users-instance_method
 gitlab users
 
 # get current user
-# see: http://www.rubydoc.info/gems/gitlab/3.4.0/Gitlab/Client/Users#user-instance_method
+# see: https://www.rubydoc.info/gems/gitlab/4.5.0/Gitlab/Client/Users#user-instance_method
 gitlab user
 
 # get a user
-# see: http://www.rubydoc.info/gems/gitlab/3.4.0/Gitlab/Client/Users#user-instance_method
+# see: https://www.rubydoc.info/gems/gitlab/4.5.0/Gitlab/Client/Users#user-instance_method
 gitlab user 2
 
 # filter output
@@ -144,7 +157,7 @@ gitlab user --except=email,bio
 gitlab user 2 --json
 
 # passing options hash to a command (use YAML)
-# see: http://www.rubydoc.info/gems/gitlab/3.4.0/Gitlab/Client/MergeRequests#create_merge_request-instance_method
+# see: https://www.rubydoc.info/gems/gitlab/4.5.0/Gitlab/Client/MergeRequests#create_merge_request-instance_method
 gitlab create_merge_request 4 "New merge request" "{source_branch: 'new_branch', target_branch: 'master', assignee_id: 42}"
 
 ```
@@ -171,10 +184,68 @@ gitlab> create_merge_request 4 "New merge request" "{source_branch: 'new_branch'
 ```
 
 Web version is available at https://gitlab-live.herokuapp.com  
-For more information, refer to [website](http://narkoz.github.io/gitlab).
+For more information, refer to [website](https://narkoz.github.io/gitlab).
 
 ## Development
 
+### With a dockerized GitLab instance
+
+```shell
+docker-compose up -d gitlab # Will start the GitLab instance in the background (approx. 3 minutes)
+```
+
+After a while, your GitLab instance will be accessible on http://localhost:3000.
+
+Once you have set your new root password, you can login with the root user.
+
+You can now setup a personal access token here: http://localhost:3000/profile/personal_access_tokens
+
+Once you have your token, set the variables to the correct values in the `docker.env` file.
+
+Then, launch the tool:
+
+```shell
+docker-compose run app
+```
+
+```ruby
+Gitlab.users
+=> [#<Gitlab::ObjectifiedHash:47231290771040 {hash: {"id"=>1, "name"=>"Administrator", "username"=>"root", ...]
+```
+
+To launch the specs:
+
+```shell
+docker-compose run app rake spec
+```
+
+#### Want to use GitLab Enterprise?
+
+Just change the image from `gitlab/gitlab-ce:latest` to `gitlab/gitlab-ee:latest` in the `docker-compose.yml` file.
+
+### With an external GitLab instance
+
+First, set the variables to the correct values in the `docker.env` file.
+
+Then, launch the tool:
+
+```shell
+docker-compose run app
+```
+
+```ruby
+Gitlab.users
+=> [#<Gitlab::ObjectifiedHash:47231290771040 {hash: {"id"=>1, "name"=>"Administrator", "username"=>"root", ...]
+```
+
+To launch the specs,
+
+```shell
+docker-compose run app rake spec
+```
+
+### Without Docker
+
 After checking out the repo, run `bin/setup` to install dependencies. Then, run
 `rake spec` to run the tests. You can also run `bin/console` for an interactive
 prompt that will allow you to experiment.

data/exe/gitlab

@@ -1,6 +1,10 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
+
+# Exit cleanly from an early interrupt
+Signal.trap('INT') { exit 1 }
 
 require 'gitlab/cli'
 

data/lib/gitlab/api.rb

@@ -1,19 +1,24 @@
+# frozen_string_literal: true
+
 module Gitlab
   # @private
   class API < Request
     # @private
     attr_accessor(*Configuration::VALID_OPTIONS_KEYS)
     # @private
-    alias_method :auth_token=, :private_token=
+    alias auth_token= private_token=
 
     # Creates a new API.
     # @raise [Error:MissingCredentials]
-    def initialize(options={})
+    # rubocop:disable Lint/MissingSuper
+    def initialize(options = {})
       options = Gitlab.options.merge(options)
       (Configuration::VALID_OPTIONS_KEYS + [:auth_token]).each do |key|
         send("#{key}=", options[key]) if options[key]
       end
-      set_request_defaults(@sudo)
+      request_defaults(sudo)
+      self.class.headers 'User-Agent' => user_agent
     end
+    # rubocop:enable Lint/MissingSuper
   end
 end

data/lib/gitlab/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'gitlab'
 require 'terminal-table/import'
 require_relative 'cli_helpers'
@@ -6,9 +8,6 @@ require_relative 'shell'
 class Gitlab::CLI
   extend Helpers
 
-  # If set to true, JSON will be rendered as output
-  @render_json = false
-
   # Starts a new CLI session.
   #
   # @example
@@ -17,7 +16,11 @@ class Gitlab::CLI
   #
   # @param [Array] args The command and it's optional arguments.
   def self.start(args)
-    command = args.shift.strip rescue 'help'
+    command = begin
+      args.shift.strip
+    rescue StandardError
+      'help'
+    end
     run(command, args)
   end
 
@@ -30,13 +33,13 @@ class Gitlab::CLI
   # @param [String] cmd The name of a command.
   # @param [Array] args The optional arguments for a command.
   # @return [nil]
-  def self.run(cmd, args=[])
+  def self.run(cmd, args = [])
     case cmd
     when 'help'
       puts help(args.shift) { |out| out.gsub!(/Gitlab\./, 'gitlab ') }
     when 'info'
-      endpoint = Gitlab.endpoint ? Gitlab.endpoint : 'not set'
-      private_token = Gitlab.private_token ? Gitlab.private_token : 'not set'
+      endpoint = Gitlab.endpoint || 'not set'
+      private_token = Gitlab.private_token || 'not set'
       puts "Gitlab endpoint is #{endpoint}"
       puts "Gitlab private token is #{private_token}"
       puts "Ruby Version is #{RUBY_VERSION}"
@@ -52,19 +55,16 @@ class Gitlab::CLI
       end
 
       unless valid_command?(cmd)
-        puts "Unknown command. Run `gitlab help` for a list of available commands."
+        puts 'Unknown command. Run `gitlab help` for a list of available commands.'
+        exit(0) if ENV['CI'] # FIXME: workaround to exit with 0 on passed specs
         exit(1)
       end
 
-      if args.any? && (args.last.start_with?('--only=') || args.last.start_with?('--except='))
-        command_args = args[0..-2]
-      else
-        command_args = args
-      end
+      command_args = args.any? && args.last.start_with?('--only=', '--except=') ? args[0..-2] : args
 
       begin
         command_args.map! { |arg| symbolize_keys(yaml_load(arg)) }
-      rescue => e
+      rescue StandardError => e
         puts e.message
         exit 1
       end
@@ -80,7 +80,7 @@ class Gitlab::CLI
   # Helper method that checks whether we want to get the output as json
   # @return [nil]
   def self.render_output(cmd, args, data)
-    if @json_output
+    if defined?(@json_output) && @json_output
       output_json(cmd, args, data)
     else
       output_table(cmd, args, data)

data/lib/gitlab/cli_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'json'
 require 'base64'
@@ -5,7 +7,7 @@ require 'base64'
 class Gitlab::CLI
   # Defines methods related to CLI output and formatting.
   module Helpers
-    extend self
+    module_function
 
     # Returns actions available to CLI & Shell
     #
@@ -37,22 +39,23 @@ class Gitlab::CLI
     #
     # @return [Array]
     def required_fields(args)
-      if args.any? && args.last.is_a?(String) && args.last.start_with?('--only=')
-        args.last.gsub('--only=', '').split(',')
-      else
-        []
-      end
+      filtered_fields(args, '--only=')
     end
 
     # Returns filtered excluded fields.
     #
     # @return [Array]
     def excluded_fields(args)
-      if args.any? && args.last.is_a?(String) && args.last.start_with?('--except=')
-        args.last.gsub('--except=', '').split(',')
-      else
-        []
-      end
+      filtered_fields(args, '--except=')
+    end
+
+    # Returns fields filtered by a keyword.
+    #
+    # @return [Array]
+    def filtered_fields(args, key)
+      return [] unless args.any? && args.last.is_a?(String) && args.last.start_with?(key)
+
+      args.last.gsub(key, '').split(',')
     end
 
     # Confirms command is valid.
@@ -67,21 +70,22 @@ class Gitlab::CLI
     #
     # @return [String]
     def confirm_command(cmd)
-      if cmd.start_with?('remove_') || cmd.start_with?('delete_')
-        puts "Are you sure? (y/n)"
-        if %w(y yes).include?($stdin.gets.to_s.strip.downcase)
-          puts 'Proceeding..'
-        else
-          puts 'Command aborted.'
-          exit(1)
-        end
+      return unless cmd.start_with?('remove_', 'delete_')
+
+      puts 'Are you sure? (y/n)'
+
+      if %w[y yes].include?($stdin.gets.to_s.strip.downcase)
+        puts 'Proceeding..'
+      else
+        puts 'Command aborted.'
+        exit(1)
       end
     end
 
     # Gets defined help for a specific command/action.
     #
     # @return [String]
-    def help(cmd=nil, &block)
+    def help(cmd = nil, &block)
       if cmd.nil? || Gitlab::Help.help_map.key?(cmd)
         Gitlab::Help.actions_table(cmd)
       else
@@ -89,30 +93,30 @@ class Gitlab::CLI
       end
     end
 
-    # Outputs a nicely formatted table or error msg.
+    # Outputs a nicely formatted table or error message.
     def output_table(cmd, args, data)
       case data
       when Gitlab::ObjectifiedHash, Gitlab::FileResponse
         puts record_table([data], cmd, args)
       when Gitlab::PaginatedResponse
         puts record_table(data, cmd, args)
-      else # probably just an error msg
+      else # probably just an error message
         puts data
       end
     end
 
     def output_json(cmd, args, data)
-      if data.empty?
+      if data.respond_to?(:empty?) && data.empty?
         puts '{}'
       else
         hash_result = case data
-                      when Gitlab::ObjectifiedHash,Gitlab::FileResponse
-                        record_hash([data], cmd, args, true)
+                      when Gitlab::ObjectifiedHash, Gitlab::FileResponse
+                        record_hash([data], cmd, args, single_value: true)
                       when Gitlab::PaginatedResponse
                         record_hash(data, cmd, args)
                       else
                         { cmd: cmd, data: data, args: args }
-        end
+                      end
         puts JSON.pretty_generate(hash_result)
       end
     end
@@ -135,7 +139,7 @@ class Gitlab::CLI
           keys.each do |key|
             case value = hash[key]
             when Hash
-              value = value.has_key?('id') ? value['id'] : 'Hash'
+              value = value.key?('id') ? value['id'] : 'Hash'
             when StringIO
               value = 'File'
             when nil
@@ -158,7 +162,7 @@ class Gitlab::CLI
     # @param  [Array]  args         Options passed to the API call
     # @param  [bool]   single_value If set to true, a single result should be returned
     # @return [Hash]   Result hash
-    def record_hash(data, cmd, args, single_value=false)
+    def record_hash(data, cmd, args, single_value: false)
       if data.empty?
         result = nil
       else
@@ -168,21 +172,21 @@ class Gitlab::CLI
           row = {}
 
           keys.each do |key|
-            case hash[key]
-            when Hash
-              row[key] = 'Hash'
-            when StringIO
-              row[key] = Base64.encode64(hash[key].read)
-            when nil
-              row[key] = nil
-            else
-              row[key] = hash[key]
-            end
+            row[key] = case hash[key]
+                       when Hash
+                         'Hash'
+                       when StringIO
+                         Base64.encode64(hash[key].read)
+                       when nil
+                         nil
+                       else
+                         hash[key]
+                       end
           end
 
           result.push row
         end
-        result = result[0] if single_value && result.count > 0
+        result = result[0] if single_value && result.count.positive?
       end
 
       {
@@ -194,48 +198,46 @@ class Gitlab::CLI
     # Helper function to get rows and keys from data returned from API call
     def get_keys(args, data)
       arr = data.map(&:to_h)
-      keys = arr.first.keys.sort { |x, y| x.to_s <=> y.to_s }
+      keys = arr.first.keys.sort_by(&:to_s)
       keys &= required_fields(args) if required_fields(args).any?
       keys -= excluded_fields(args)
       [arr, keys]
     end
 
     # Helper function to call Gitlab commands with args.
-    def gitlab_helper(cmd, args=[])
-      begin
-        data = args.any? ? Gitlab.send(cmd, *args) : Gitlab.send(cmd)
-      rescue => e
-        puts e.message
-        yield if block_given?
-      end
-
-      data
+    def gitlab_helper(cmd, args = [])
+      args.any? ? Gitlab.send(cmd, *args) : Gitlab.send(cmd)
+    rescue StandardError => e
+      puts e.message
+      yield if block_given?
     end
 
     # Convert a hash (recursively) to use symbol hash keys
     # @return [Hash]
     def symbolize_keys(hash)
       if hash.is_a?(Hash)
-        hash = hash.each_with_object({}) do |(key, value), newhash|
-          begin
-            newhash[key.to_sym] = symbolize_keys(value)
-          rescue NoMethodError
-            raise "error: cannot convert hash key to symbol: #{key}"
-          end
+        hash = hash.each_with_object({}) do |(key, value), new_hash|
+          new_hash[key.to_sym] = symbolize_keys(value)
+        rescue NoMethodError
+          raise "Error: cannot convert hash key to symbol: #{key}"
         end
       end
 
       hash
     end
 
+    # Check if arg is a color in 6-digit hex notation with leading '#' sign
+    def hex_color?(arg)
+      pattern = /\A#\h{6}\Z/
+
+      pattern.match(arg)
+    end
+
     # YAML::load on a single argument
     def yaml_load(arg)
-      begin
-        yaml = YAML.load(arg)
-      rescue Psych::SyntaxError
-        raise "error: Argument is not valid YAML syntax: #{arg}"
-      end
-      yaml
+      hex_color?(arg) ? arg : YAML.safe_load(arg)
+    rescue Psych::SyntaxError
+      raise "Error: Argument is not valid YAML syntax: #{arg}"
     end
   end
 end