gitlab-development-kit 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c08724cade5596b519cec789c57fd78a3768eb6
-  data.tar.gz: 789b3739455ef0bb09656a197a26fd47699d2432
+  metadata.gz: ff26cd3455867518a1a5643f5281284d9cfe147e
+  data.tar.gz: 9b8cacd504980b0fbbff5319cac052ca824301d0
 SHA512:
-  metadata.gz: 3455fc72970248142aa5f22dd79ad70fb3a1ef42a5d355824e51a3b42f5e1ef930f3f1cb572859f2279091a79e711d9782992f310ec768cd316983a4d3f1eb8c
-  data.tar.gz: 96d32477fa3318284c1c861968c8da11d4c4d542789ebac88cd323d1c7ed9a8339d825c8d1fcb676b36694bf0b53544e081abd4ebf33e6e9c4ddd53703e3287f
+  metadata.gz: ab29297020e74599b09f296668f90df91b731032ecc8b631b165697f1fac45b49fe4bed091811eb21c431c3005b2038c0f5d864aa50d4f36b62cb175da2fdcbb
+  data.tar.gz: 61059b81659b30929b50f0ba63223bbdec36cc1cdb80ca1e7b629eb16a324de4d6bdd7ccc7dae0e8db395e10e58bc75eaeaa7d7be75f8a228344f82c819ca54f

data/bin/gdk

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 require 'yaml'
 
-$:.unshift(File.expand_path('../../lib', __FILE__))
-require 'gitlab-development-kit'
+$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+require 'gitlab_development_kit'
 
 # Gitlab Development Kit CLI launcher
 #
@@ -12,8 +12,8 @@ require 'gitlab-development-kit'
 
 module GDK
   DOTFILE = File.expand_path('~/.gdk.yml')
-  TRUSTED_KEY = 'trusted_directories'
-  ROOT_CHECK_FILE = '.gdk-install-root'
+  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
@@ -22,12 +22,19 @@ module GDK
       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] : DEFAULT_INIT_DIRECTORY
-      cmd = %W(git clone https://gitlab.com/gitlab-org/gitlab-development-kit.git #{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
@@ -49,9 +56,9 @@ module GDK
         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"
@@ -64,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)
@@ -84,19 +89,26 @@ 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)
@@ -110,4 +122,4 @@ module GDK
   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.5'.freeze
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-development-kit
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Jacob Vosmaer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies: []
 description: CLI for GitLab Development Kit.
 email:
@@ -19,7 +19,7 @@ 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
@@ -40,7 +40,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: CLI for GitLab Development Kit

data/lib/gitlab-development-kit.rb

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