gitlab-development-kit 0.2.2 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bc68b7a57d566de10fa8922ad21b17d2981b8295
-  data.tar.gz: 12249b22fd914da80f484c9cd5fc0206fe4dcebc
+SHA256:
+  metadata.gz: bf613de53ce1d786cd089d946aea46954738e639f0866836b6bddc69e8f9d804
+  data.tar.gz: f2f2481311a8e70c8ca803344b0383bfcbd24545f2fb13c7bde6203c79fd579b
 SHA512:
-  metadata.gz: f463abf6d969179a80f1a4da4891eaa68423aeb12fc312307b1eeee848655d8136b50c0a96ea8d13ae097accfb0c74ac3e796c3c5a7756ec6b8d1ddcc81715a0
-  data.tar.gz: f3e11e6e77b2f3b535f5513de60bf465e64c3d3b56bfed0c049ae22bf6a44bdfc81d21c26975c456dfe1342f451778a8dc6f5a87f82ade8ef0c9113a34dde0c2
+  metadata.gz: 508f5077dbb2195433259bb651fe70e42133160399435510b8a5af8bd9d526d802370eb8bab8ecb40b538a185c7911ccc5bf1a3639d9ca9e854741c9cc5dda93
+  data.tar.gz: 4202049aecfdf6512e0dd7ee5140ec803cd8592b2ea32b6e81e29e113d0b81ed6d670eaee005b871564a718ac8028dd8fef69356d311338ad6fc81080ed2f9fd

data/bin/gdk

@@ -1,65 +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] : 'gitlab-development-kit' 
-      cmd = %W(git clone https://gitlab.com/gitlab-org/gitlab-development-kit.git #{directory})
-      system(*cmd) && trust!(directory)
+      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
+      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)
@@ -74,20 +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)
+    File.open("#{directory}/#{ROOT_CHECK_FILE}", 'w') do |f|
+      f.puts File.realpath(directory)
+    end
+    true
+  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.7'
+end

metadata

@@ -1,47 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-development-kit
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.7
 platform: ruby
 authors:
 - Jacob Vosmaer
-autorequire: 
+- GitLab
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-09 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.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.5
-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.2'
-end