gitlab-development-kit 0.2.6 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a7dfe37321d4fec2d19623b010a3556ed485c92042af3370955194058f66b62
-  data.tar.gz: 53db7606b58f3551896416466869cba7be108599c077ab661085e4e25ded97e5
+  metadata.gz: db463a96b5d0f8bca71fcb5ba61e019985403cfde2677fff138b507c355d2da7
+  data.tar.gz: ae4f0852a1e2d19c5999c75815742901dfaf1f397f50e8c58a24974c91cf03a3
 SHA512:
-  metadata.gz: d0215ec330bc334a8245021fdba947e839a377c5cf5ed9fafb32479ef97f63feceef4d081bec5b3f76b428b5d70dbc7ca9278252f2da679734d328ddcf63bc0c
-  data.tar.gz: 469deab8137ca29da1c6ca4e482ab95c440e74bd76084c0a91c3bf0e6d1efa430869ff561be8c5b8c5ab5e7645d8d2e14f271259311c67a4f8eec94a54a2689f
+  metadata.gz: 1372bb27ee7a8461a4c9dfcb0b7083eee84d420fedf94ebe4815290e7ee42b8b3aad9f3fb985b0140fabfe7eabf5f192d6d7f4b12426f999b500161734ef747e
+  data.tar.gz: 291032043e2f088398bbb06b7f44faf88154ef8e9f863877113d6004d9786108c4b8f04b90b26019bd4e153d542651ab80ac35e8579635a62f5de00952b4cd58

data/bin/gdk

@@ -1,7 +1,10 @@
 #!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
 require 'yaml'
 
-$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+$LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
 require 'gitlab_development_kit'
 
 # Gitlab Development Kit CLI launcher
@@ -9,72 +12,97 @@ require 'gitlab_development_kit'
 # Note to contributors: this script must not change (much) because it is
 # installed outside the gitlab-development-kit repository with 'gem
 # install'. Edit lib/gdk.rb to define new commands.
-
 module GDK
   DOTFILE = File.expand_path('~/.gdk.yml')
-  TRUSTED_KEY = 'trusted_directories'.freeze
-  ROOT_CHECK_FILE = '.gdk-install-root'.freeze
+  TRUSTED_KEY = 'trusted_directories'
+  ROOT_CHECK_FILE = '.gdk-install-root'
   DEFAULT_INIT_DIRECTORY = File.join(Dir.pwd, 'gitlab-development-kit')
 
-  def self.launcher_main
+  def self.launcher_main # rubocop:disable Metrics/CyclomaticComplexity
     case ARGV.first
-    when 'version'
-      puts "GitLab Development Kit gem version #{GDK::GEM_VERSION}"
-      true
     when 'init'
-      if ARGV.count > 2 || (ARGV.count == 2 && (ARGV[1] == "-help" || ARGV[1] == "--help"))
-        puts "Usage: gdk init [DIR]"
+      if ARGV.count > 2 || (ARGV.count == 2 && (ARGV[1] == '-help' || ARGV[1] == '--help'))
+        puts 'Usage: gdk init [DIR]'
         return false
       end
+
       directory = ARGV.count == 2 ? ARGV[1] : DEFAULT_INIT_DIRECTORY
       if directory.start_with?('-')
-  puts <<-EOS.gsub(/^\s+\|/, '')
-    |The gdk directory cannot start with a dash ('-').  Did you mean:
-    |gdk init #{directory.sub(/^-+/,'')}
-  EOS
-  return false
+        warn <<~INVALID_GDK_DIR_NAME
+          The gdk directory cannot start with a dash ('-').  Did you mean:
+          gdk init #{directory.sub(/^-+/, '')}
+        INVALID_GDK_DIR_NAME
+        return false
       end
+
       cmd = %W[git clone https://gitlab.com/gitlab-org/gitlab-development-kit.git #{directory}]
       system(*cmd) && trust!(directory) && remember!(directory)
     when 'trust'
       if ARGV.count != 2
-        puts "Usage: gdk trust DIR"
+        puts 'Usage: gdk trust DIR'
         return false
       end
+
       trust!(ARGV[1])
     else
-      $gdk_root = find_root(Dir.pwd)
-      if $gdk_root.nil?
-        puts <<-EOS.gsub(/^\s+\|/, '')
-          |
-          |The current working directory is not inside a gitlab-development-kit
-          |installation. Use 'cd' to go to your gitlab-development-kit or create
-          |a new one with 'gdk init'.
-          |
-          |gdk init [DIRECTORY] # Default: #{DEFAULT_INIT_DIRECTORY}
-          |
-        EOS
+      if print_version?
+        puts VERSION
+
+        return true
+      end
+
+      unless gdk_dir?
+        warn_not_gdk_dir
+
         return false
       end
-      warn "(in #{$gdk_root})"
-
-      unless trusted?($gdk_root)
-        puts <<-EOS.gsub(/^\s+\|/, '')
-          |
-          |This GitLab Development Kit root directory is not known to the "gdk"
-          |command. To mark it as trusted run:
-          |
-          |gdk trust #{$gdk_root}
-          |
-        EOS
+
+      unless trusted?
+        warn_not_trusted_dir
+
         return false
       end
 
-      load(File.join($gdk_root, 'lib/gdk.rb'))
+      load(File.join(gdk_root, 'lib/gdk.rb'))
       GDK.main
     end
   end
 
+  def self.warn_not_gdk_dir
+    warn <<~NOT_A_GDK_DIR
+
+      The current working directory is not inside a gitlab-development-kit
+      installation. Use 'cd' to go to your gitlab-development-kit or create
+      a new one with 'gdk init'.
+
+      gdk init [DIRECTORY] # Default: #{DEFAULT_INIT_DIRECTORY}
+
+    NOT_A_GDK_DIR
+  end
+
+  def self.warn_not_trusted_dir
+    warn <<~NOT_A_TRUSTED_GDK_DIR
+
+      This GitLab Development Kit root directory is not known to the "gdk"
+      command. To mark it as trusted run:
+
+      gdk trust #{gdk_root}
+
+    NOT_A_TRUSTED_GDK_DIR
+  end
+
+  def self.gdk_root
+    @gdk_root ||= find_root(Dir.pwd)
+  end
+
+  def self.gdk_dir?
+    !gdk_root.nil?
+  end
+
+  def self.print_version?
+    %w[version --version].include?(ARGV.first) && !gdk_dir?
+  end
+
   def self.find_root(current)
     if File.exist?(File.join(current, 'GDK_ROOT'))
       File.realpath(current)
@@ -85,9 +113,9 @@ module GDK
     end
   end
 
-  def self.trusted?(directory)
+  def self.trusted?
     trusted_directories = load_dotfile[TRUSTED_KEY] || []
-    !!trusted_directories.include?(File.realpath(directory))
+    !!trusted_directories.include?(File.realpath(gdk_root))
   end
 
   def self.trust!(directory)
@@ -108,16 +136,18 @@ module GDK
   end
 
   def self.load_dotfile
-    File.open(DOTFILE, File::RDONLY | File::CREAT) { |f| YAML.safe_load(f) } || {}
+    File.open(DOTFILE, File::RDONLY | File::CREAT) do |f|
+      YAML.safe_load(f)
+    end || {}
   end
 
   def self.remember!(directory)
-    open("#{directory}/#{ROOT_CHECK_FILE}", 'w') do |f|
+    File.open("#{directory}/#{ROOT_CHECK_FILE}", 'w') do |f|
       f.puts File.realpath(directory)
     end
     true
-  rescue => ex
-    warn ex
+  rescue StandardError => e
+    warn e
     false
   end
 end

data/lib/gitlab_development_kit.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
 module GDK
-  GEM_VERSION = '0.2.6'.freeze
+  GEM_VERSION = '0.2.11'
+  VERSION = "GitLab Development Kit #{GEM_VERSION}"
 end

metadata

@@ -1,18 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-development-kit
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.11
 platform: ruby
 authors:
 - Jacob Vosmaer
+- GitLab
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
-dependencies: []
+date: 2021-04-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
 description: CLI for GitLab Development Kit.
 email:
-- jacob@gitlab.com
+- gitlab_rubygems@gitlab.com
 executables:
 - gdk
 extensions: []
@@ -30,16 +45,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.5
+      version: 2.7.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: CLI for GitLab Development Kit