gitlab-development-kit 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d96b16ee2eaf3d670c9b4a0515111ed19bb2ec6e
-  data.tar.gz: 91aeca28bdfcb29bb5c33ed5ffc322f3c0409ccc
+  metadata.gz: 96053977970c8478e0624219700a6748cd4ef7d2
+  data.tar.gz: 85a3186752629e1870a3e1986cd490cd166cc708
 SHA512:
-  metadata.gz: 19815297dab429e908d6350715d35dbdc8457e24a91e1b9cd0ddb446bb07d9cb235eb19c10d63181a4deb23aa47a9d4ff0db66d8de21ce5de6a1a80cb04b10b6
-  data.tar.gz: 01bbca5392a62f6719818bfcc467646c75ee94ad6904ab33ff172fc2fe1c7de126faf6863190b66ab385ee05fc4b485d31165b33bc92581d32d6461412277522
+  metadata.gz: 2933695c15e0f485e2dd81b847ca5528df70f47a4c2bd0eb72250a1ef3d8c16d2cbfd910958372dabb94ee93b805d2afb63b1671380025f390a729ad852b416c
+  data.tar.gz: 9b5176933fbadf95fad1c64e7b2337d84ec8b9c19a12c01c85fd413e25cfd7af89c3516facb6dc21d788d23dbeeea750ac7539eb0807df662895d9467b83fb03

data/bin/gdk

@@ -1,37 +1,88 @@
 #!/usr/bin/env ruby
-require 'fileutils'
-
-def main
-  case ARGV.first
-  when 'init'
-    if ARGV.count > 2
-      puts "Usage: gdk init [DIR]"
-      return false
+require 'yaml'
+
+# 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'
+
+  def self.launcher_main
+    case ARGV.first
+    when 'init'
+      if ARGV.count > 2
+        puts "Usage: gdk init [DIR]"
+        return false
+      end
+  
+      cmd = %W(git clone https://gitlab.com/gitlab-org/gitlab-development-kit.git)
+      cmd << ARGV[1] if ARGV.count == 2
+      system(*cmd)
+    when 'trust'
+      if ARGV.count != 2
+        puts "Usage: gdk trust DIR"
+        return false
+      end
+      trust!(ARGV[1])
+    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."
+        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
+        return false
+      end
+
+      load(File.join($gdk_root, 'lib/gdk.rb'))
+      GDK::main
     end
+  end
 
-    cmd = %W(git clone -b gdk-cli https://gitlab.com/gitlab-org/gitlab-development-kit.git)
-    cmd << ARGV[1] if ARGV.count == 2
-    system(*cmd)
-  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."
-      return false
+  private
+
+  def self.find_root(current)
+    if File.exist?(File.join(current, 'GDK_ROOT'))
+      File.realpath(current)
+    elsif File.realpath(current) == '/'
+      nil
+    else
+      find_root(File.join(current, '..'))
     end
-    puts "(in #{$gdk_root})"
-    load(File.join($gdk_root, 'lib/gdk.rb'))
-    GDK::main
   end
-end
 
-def find_root(current)
-  if File.exist?(File.join(current, 'GDK_ROOT'))
-    File.realpath(current)
-  elsif File.realpath(current) == '/'
-    nil
-  else
-    find_root(File.join(current, '..'))
+  def self.trusted?(directory)
+    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) }
+    true
+  end
+
+  def self.load_dotfile
+    File.open(DOTFILE, File::RDONLY | File::CREAT) { |f| YAML.load(f) } || {}
   end
 end
 
-exit(main)
+exit(GDK::launcher_main)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-development-kit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jacob Vosmaer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies: []
 description: CLI for GitLab Development Kit.
 email: