gitlab-development-kit 0.2.1 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6318484448973ff064c51e17cb20b07fdfce7822
-  data.tar.gz: 0d5758550994a03e80666d7bc642b100b7d0544e
+SHA256:
+  metadata.gz: 0a7dfe37321d4fec2d19623b010a3556ed485c92042af3370955194058f66b62
+  data.tar.gz: 53db7606b58f3551896416466869cba7be108599c077ab661085e4e25ded97e5
 SHA512:
-  metadata.gz: 7907017ce66ec4b21780acaf5e462f0609cb131411bcaa938b75aa18affe6ec3ddefdfc94d3874b8c5ec07932a32c1b390fb81bbd6706e9b9eebe41fe23f3438
-  data.tar.gz: aeae61c75d457af0da56b3ba2c73cb21506c98b481f457178743b516f2b6597eae0401ef1327a36ac4f2e1a4e0709eb3fc126433921072c9c68ff3c397b9dff8
+  metadata.gz: d0215ec330bc334a8245021fdba947e839a377c5cf5ed9fafb32479ef97f63feceef4d081bec5b3f76b428b5d70dbc7ca9278252f2da679734d328ddcf63bc0c
+  data.tar.gz: 469deab8137ca29da1c6ca4e482ab95c440e74bd76084c0a91c3bf0e6d1efa430869ff561be8c5b8c5ab5e7645d8d2e14f271259311c67a4f8eec94a54a2689f

data/bin/gdk

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 require 'yaml'
 
+$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+require 'gitlab_development_kit'
+
 # Gitlab Development Kit CLI launcher
 #
 # Note to contributors: this script must not change (much) because it is
@@ -9,18 +12,30 @@ require 'yaml'
 
 module GDK
   DOTFILE = File.expand_path('~/.gdk.yml')
-  TRUSTED_KEY = 'trusted_directories'
+  TRUSTED_KEY = 'trusted_directories'.freeze
+  ROOT_CHECK_FILE = '.gdk-install-root'.freeze
+  DEFAULT_INIT_DIRECTORY = File.join(Dir.pwd, 'gitlab-development-kit')
 
   def self.launcher_main
     case ARGV.first
+    when 'version'
+      puts "GitLab Development Kit gem version #{GDK::GEM_VERSION}"
+      true
     when 'init'
-      if ARGV.count > 2
+      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?('-')
+  puts <<-EOS.gsub(/^\s+\|/, '')
+    |The gdk directory cannot start with a dash ('-').  Did you mean:
+    |gdk init #{directory.sub(/^-+/,'')}
+  EOS
+  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"
@@ -30,12 +45,20 @@ module GDK
     else
       $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."
+        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
         return false
       end
-      puts "(in #{$gdk_root})"
+      warn "(in #{$gdk_root})"
 
-      if !trusted?($gdk_root)
+      unless trusted?($gdk_root)
         puts <<-EOS.gsub(/^\s+\|/, '')
           |
           |This GitLab Development Kit root directory is not known to the "gdk"
@@ -48,12 +71,10 @@ module GDK
       end
 
       load(File.join($gdk_root, 'lib/gdk.rb'))
-      GDK::main
+      GDK.main
     end
   end
 
-  private
-
   def self.find_root(current)
     if File.exist?(File.join(current, 'GDK_ROOT'))
       File.realpath(current)
@@ -68,20 +89,37 @@ 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) { |f| YAML.safe_load(f) } || {}
+  end
+
+  def self.remember!(directory)
+    open("#{directory}/#{ROOT_CHECK_FILE}", 'w') do |f|
+      f.puts File.realpath(directory)
+    end
+    true
+  rescue => ex
+    warn ex
+    false
   end
 end
 
-exit(GDK::launcher_main)
+exit(GDK.launcher_main)

data/lib/gitlab_development_kit.rb

@@ -0,0 +1,3 @@
+module GDK
+  GEM_VERSION = '0.2.6'.freeze
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-development-kit
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.6
 platform: ruby
 authors:
 - Jacob Vosmaer
-autorequire: 
+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:
@@ -19,28 +19,28 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/gdk
+- 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: []