gitlab-development-kit 0.2.7 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf613de53ce1d786cd089d946aea46954738e639f0866836b6bddc69e8f9d804
-  data.tar.gz: f2f2481311a8e70c8ca803344b0383bfcbd24545f2fb13c7bde6203c79fd579b
+  metadata.gz: fce4dd74b2f32c9cbf4519336c9b731158cb34c5570d83805fbeff74aab2c209
+  data.tar.gz: 3b86852c3e15145a1c5c4617a05827cb4b9b7159be8c684107e0e85f57a389a2
 SHA512:
-  metadata.gz: 508f5077dbb2195433259bb651fe70e42133160399435510b8a5af8bd9d526d802370eb8bab8ecb40b538a185c7911ccc5bf1a3639d9ca9e854741c9cc5dda93
-  data.tar.gz: 4202049aecfdf6512e0dd7ee5140ec803cd8592b2ea32b6e81e29e113d0b81ed6d670eaee005b871564a718ac8028dd8fef69356d311338ad6fc81080ed2f9fd
+  metadata.gz: 245d0650689fca386f65d623fce71c5a6884b65faddd731daedb622b39fa3e7c2677218be24709bebe7d9e091dc89263fe5f8b0b4fd82e46a1beb8e125bea12a
+  data.tar.gz: 14c63e2ab27736a16e7356f4b39b65f125949447f38cab27f90b99249a340f2ad876293b536d3d12544c6e56a380ebd15668bf8e727ccaea51fdd4a20fc2bfce

data/bin/gdk

@@ -13,21 +13,17 @@ require 'gitlab_development_kit'
 # 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 # rubocop:disable Metrics/CyclomaticComplexity
+  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 || (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
@@ -36,46 +32,49 @@ module GDK
         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'
-        return false
-      end
-      trust!(ARGV[1])
+      system(*cmd) && remember!(directory)
     else
-      # rubocop:disable Style/GlobalVars
-      $gdk_root = find_root(Dir.pwd)
-      if $gdk_root.nil?
-        warn <<~NOT_A_GDK_DIR
+      if print_version?
+        puts VERSION
 
-          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'.
+        return true
+      end
 
-          gdk init [DIRECTORY] # Default: #{DEFAULT_INIT_DIRECTORY}
+      unless gdk_dir?
+        warn_not_gdk_dir
 
-        NOT_A_GDK_DIR
         return false
       end
 
-      unless trusted?($gdk_root)
-        warn <<~NOT_A_TRUSTED_GDK_DIR
+      load(File.join(gdk_root, 'lib/gdk.rb'))
+      GDK.main
+    end
+  end
+
+  def self.warn_not_gdk_dir
+    warn <<~NOT_A_GDK_DIR
 
-          This GitLab Development Kit root directory is not known to the "gdk"
-          command. To mark it as trusted run:
+      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 trust #{$gdk_root}
+      gdk init [DIRECTORY] # Default: #{DEFAULT_INIT_DIRECTORY}
 
-        NOT_A_TRUSTED_GDK_DIR
-        return false
-      end
+    NOT_A_GDK_DIR
+  end
 
-      load(File.join($gdk_root, 'lib/gdk.rb'))
-      # rubocop:enable Style/GlobalVars
-      GDK.main
-    end
+  def self.gdk_root
+    @gdk_root ||= find_root(Dir.pwd)
+  end
+
+  def self.gdk_dir?
+    !gdk_root.nil?
+  end
+
+  def self.print_version?
+    %w[version --version].include?(ARGV.first) && !gdk_dir?
   end
 
   def self.find_root(current)
@@ -88,28 +87,6 @@ module GDK
     end
   end
 
-  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] ||= []
-
-    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) do |f|
       YAML.safe_load(f)

data/lib/gitlab_development_kit.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 module GDK
-  GEM_VERSION = '0.2.7'
+  GEM_VERSION = '0.2.12'
+  VERSION = "GitLab Development Kit #{GEM_VERSION}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-development-kit
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.12
 platform: ruby
 authors:
 - Jacob Vosmaer
@@ -9,8 +9,22 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
-dependencies: []
+date: 2021-04-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
 description: CLI for GitLab Development Kit.
 email:
 - gitlab_rubygems@gitlab.com
@@ -31,16 +45,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.5
+      version: 2.7.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: CLI for GitLab Development Kit