gitlab-development-kit 0.2.3 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 048d6a5c0cf12139423fd00a52692f80c4a926d8
-  data.tar.gz: 5ae51adc3c875e66be21f09595a27c9331b0a090
+SHA256:
+  metadata.gz: ad0daa1c74f5e6b1201da5b7348a6acfad5171068d139509ab01bb4a753f5411
+  data.tar.gz: 1179e66732f288d27c83fb874fdfa72887e5c9fc9974b6c66dcbf81092c6a0bd
 SHA512:
-  metadata.gz: d467bd2f6cd63ab87ee6e78ca4b63dc163c0b7d69b6fc4522ec46bdea20b28336f79bb207d36217c8d19f6710526ad20e3030eaf57fdeea41818696024d6c567
-  data.tar.gz: 589794185c7116e427349388a5bb2da0805c06e0b6d2c61215f15cc7d4ee4ac7aab58c177a66f177292d26210c363604080e2d9e2b0fc8400015f0d4564a72a5
+  metadata.gz: 3907a93a3210b2f0978491a918cb5e1baad5c4da279b4b18a344f57f48521c590b43f2eb80197e02bbe25e36f0ae14ed5a5bc6640952519a7fed1b3420a3da92
+  data.tar.gz: cbe49830e3ba32163a9a1a150fb16654c706a03a8b5a49419fe508b3e920a8eb0033e8daa9acb336204f68c3bcacdd33a83a92b5821167f2f4faf129d8565ddc

data/bin/gdk

@@ -1,66 +1,83 @@
 #!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
 require 'yaml'
 
-$:.unshift(File.expand_path('../../lib', __FILE__))
-require 'gitlab-development-kit'
+$LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
+require 'gitlab_development_kit'
 
 # Gitlab Development Kit CLI launcher
 #
 # 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'
   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
-        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?('-')
+        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
-      directory = ARGV.count == 2 ? ARGV[1] : 'gitlab-development-kit' 
-      cmd = %W(git clone https://gitlab.com/gitlab-org/gitlab-development-kit.git #{directory})
+      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
+      # rubocop:disable Style/GlobalVars
       $gdk_root = find_root(Dir.pwd)
       if $gdk_root.nil?
-        puts "Could not find GDK_ROOT in the current directory or any of its parents."
+        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
         return false
       end
-      puts "(in #{$gdk_root})"
-
-      if !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?($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}
+
+        NOT_A_TRUSTED_GDK_DIR
         return false
       end
 
       load(File.join($gdk_root, 'lib/gdk.rb'))
-      GDK::main
+      # rubocop:enable Style/GlobalVars
+      GDK.main
     end
   end
 
-  private
-
   def self.find_root(current)
     if File.exist?(File.join(current, 'GDK_ROOT'))
       File.realpath(current)
@@ -75,30 +92,39 @@ module GDK
     trusted_directories = load_dotfile[TRUSTED_KEY] || []
     !!trusted_directories.include?(File.realpath(directory))
   end
-  
+
   def self.trust!(directory)
     directory = File.realpath(directory)
     config = load_dotfile
     config[TRUSTED_KEY] ||= []
-    config[TRUSTED_KEY] << directory
-    puts "Adding #{directory} to #{TRUSTED_KEY} in #{DOTFILE}"
-    File.open(DOTFILE, 'w') { |f| YAML.dump(config, f) }
+
+    if config[TRUSTED_KEY].include?(directory)
+      puts "#{directory} is already in #{TRUSTED_KEY} in #{DOTFILE}"
+    else
+      config[TRUSTED_KEY] << directory
+      config[TRUSTED_KEY].uniq!
+      puts "Adding #{directory} to #{TRUSTED_KEY} in #{DOTFILE}"
+      File.open(DOTFILE, 'w') { |f| YAML.dump(config, f) }
+    end
+
     true
   end
 
   def self.load_dotfile
-    File.open(DOTFILE, File::RDONLY | File::CREAT) { |f| YAML.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
 
-exit(GDK::launcher_main)
+exit(GDK.launcher_main)

data/lib/gitlab_development_kit.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module GDK
+  GEM_VERSION = '0.2.8'
+end

metadata

@@ -1,47 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-development-kit
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.8
 platform: ruby
 authors:
 - Jacob Vosmaer
-autorequire: 
+- GitLab
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-31 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies: []
 description: CLI for GitLab Development Kit.
 email:
-- jacob@gitlab.com
+- gitlab_rubygems@gitlab.com
 executables:
 - gdk
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/gdk
-- lib/gitlab-development-kit.rb
+- lib/gitlab_development_kit.rb
 homepage: https://gitlab.com/gitlab-org/gitlab-development-kit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: CLI for GitLab Development Kit
 test_files: []

data/lib/gitlab-development-kit.rb

@@ -1,3 +0,0 @@
-module GDK
-  GEM_VERSION = '0.2.3'
-end