gitlab-development-kit 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc4cf26603278a9754743fcf00d907067bc2fa85b97fb2b9492ff62e2bee599c
-  data.tar.gz: bc07f637757bb001ad7d4d67edb5aa69ef22886e8a2bcd12d096a3497415c53e
+  metadata.gz: db463a96b5d0f8bca71fcb5ba61e019985403cfde2677fff138b507c355d2da7
+  data.tar.gz: ae4f0852a1e2d19c5999c75815742901dfaf1f397f50e8c58a24974c91cf03a3
 SHA512:
-  metadata.gz: 5814a7b66f3195787d1212a7950b217c6a9a48a86396806c549e9cd49927d51d419047e0faa53cbabf0fba9e4d2e150b24bf62696dd5e9aa11ef2c7e2e6d2300
-  data.tar.gz: 9a62b8c0152a7406b1dc8b5d9c99ff6723be8f7a521ddecd04d07cfcb5adb11b78129bc84e22d214ae5fb344bdfeee745743aa027e010fab761085ece09b49f2
+  metadata.gz: 1372bb27ee7a8461a4c9dfcb0b7083eee84d420fedf94ebe4815290e7ee42b8b3aad9f3fb985b0140fabfe7eabf5f192d6d7f4b12426f999b500161734ef747e
+  data.tar.gz: 291032043e2f088398bbb06b7f44faf88154ef8e9f863877113d6004d9786108c4b8f04b90b26019bd4e153d542651ab80ac35e8579635a62f5de00952b4cd58

data/bin/gdk

@@ -20,14 +20,12 @@ module GDK
 
   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]'
         return false
       end
+
       directory = ARGV.count == 2 ? ARGV[1] : DEFAULT_INIT_DIRECTORY
       if directory.start_with?('-')
         warn <<~INVALID_GDK_DIR_NAME
@@ -36,6 +34,7 @@ module GDK
         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'
@@ -43,41 +42,67 @@ module GDK
         puts 'Usage: gdk trust DIR'
         return false
       end
+
       trust!(ARGV[1])
     else
-      # rubocop:disable Style/GlobalVars
-      $gdk_root = find_root(Dir.pwd)
-      if $gdk_root.nil?
-        warn <<~NOT_A_GDK_DIR
+      if print_version?
+        puts VERSION
 
-          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'.
+        return true
+      end
 
-          gdk init [DIRECTORY] # Default: #{DEFAULT_INIT_DIRECTORY}
+      unless gdk_dir?
+        warn_not_gdk_dir
 
-        NOT_A_GDK_DIR
         return false
       end
 
-      unless trusted?($gdk_root)
-        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}
+      unless trusted?
+        warn_not_trusted_dir
 
-        NOT_A_TRUSTED_GDK_DIR
         return false
       end
 
-      load(File.join($gdk_root, 'lib/gdk.rb'))
-      # rubocop:enable Style/GlobalVars
+      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)
@@ -88,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)

data/lib/gitlab_development_kit.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-development-kit
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Jacob Vosmaer
 - GitLab
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-25 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -39,7 +39,7 @@ homepage: https://gitlab.com/gitlab-org/gitlab-development-kit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -47,7 +47,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.6
+      version: 2.7.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: CLI for GitLab Development Kit
 test_files: []