gitlab-development-kit 0.2.12 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fce4dd74b2f32c9cbf4519336c9b731158cb34c5570d83805fbeff74aab2c209
-  data.tar.gz: 3b86852c3e15145a1c5c4617a05827cb4b9b7159be8c684107e0e85f57a389a2
+  metadata.gz: 6ea455a9185d9a48272280448034af98ee051740756dea1ed6545cec557fc957
+  data.tar.gz: 520cd43ae500977adade2d5bcf7d10ee09326c3ac56e8ec7a9b510ef8f0ef94b
 SHA512:
-  metadata.gz: 245d0650689fca386f65d623fce71c5a6884b65faddd731daedb622b39fa3e7c2677218be24709bebe7d9e091dc89263fe5f8b0b4fd82e46a1beb8e125bea12a
-  data.tar.gz: 14c63e2ab27736a16e7356f4b39b65f125949447f38cab27f90b99249a340f2ad876293b536d3d12544c6e56a380ebd15668bf8e727ccaea51fdd4a20fc2bfce
+  metadata.gz: 8c98398310d0c1eeda0d851dfded10ec22745e156b1550d7ad9a888eef399f37eede40f3e2a2f88963f756e2eac27fcc2af078959d27f7d93f43f92bb96c0245
+  data.tar.gz: 27c139a2d76cd03446c11e3c7bf0d071cfc5216ec28bb41d79faeef9e97acbc3b5ecb23a964480948f7fe0bf64622ae273a5683cfc35d344383d3947f0aefe0d

data/bin/gdk

@@ -13,95 +13,132 @@ require 'gitlab_development_kit'
 # installed outside the gitlab-development-kit repository with 'gem
 # install'. Edit lib/gdk.rb to define new commands.
 module GDK
+  # TODO: Touching .gdk-install-root will be redundant shortly.
   ROOT_CHECK_FILE = '.gdk-install-root'
   DEFAULT_INIT_DIRECTORY = File.join(Dir.pwd, 'gitlab-development-kit')
 
-  def self.launcher_main
-    case ARGV.first
-    when 'init'
-      if ARGV.count > 2 || (ARGV.count == 2 && (ARGV[1] == '-help' || ARGV[1] == '--help'))
-        puts 'Usage: gdk init [DIR]'
-        return false
+  module CommandBasic
+    class Main
+      def initialize(args)
+        @args = args
       end
 
-      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
+      def run
+        return GDK::CommandBasic::Version.new.run if gdk_version?
+        return GDK::CommandBasic::Init.new(args[1..]).run if gdk_init?
+
+        if gdk_dir?
+          require(File.join(gdk_root, 'lib/gdk.rb'))
+          GDK.main
+        else
+          warn_not_gdk_dir
+          false
+        end
       end
 
-      cmd = %W[git clone https://gitlab.com/gitlab-org/gitlab-development-kit.git #{directory}]
-      system(*cmd) && remember!(directory)
-    else
-      if print_version?
-        puts VERSION
+      private
 
-        return true
+      attr_reader :args
+
+      def warn_not_gdk_dir
+        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
       end
 
-      unless gdk_dir?
-        warn_not_gdk_dir
+      def gdk_root
+        @gdk_root ||= find_root(Dir.pwd)
+      end
+
+      def gdk_dir?
+        !gdk_root.nil?
+      end
 
-        return false
+      def gdk_version?
+        # If gdk_dir? == true, fall through to allow lib/gdk.rb to handle
+        %w[version --version].include?(args.first) && !gdk_dir?
       end
 
-      load(File.join(gdk_root, 'lib/gdk.rb'))
-      GDK.main
+      def gdk_init?
+        args.first == 'init'
+      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, '..'))
+        end
+      end
     end
-  end
 
-  def self.warn_not_gdk_dir
-    warn <<~NOT_A_GDK_DIR
+    class Version
+      def run
+        puts GDK::VERSION
+        true
+      end
+    end
 
-      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'.
+    class Init
+      def initialize(args)
+        @args = args
+      end
 
-      gdk init [DIRECTORY] # Default: #{DEFAULT_INIT_DIRECTORY}
+      def run
+        warn("INFO: 'gdk init' is deprecated and will be removed in a future update.")
 
-    NOT_A_GDK_DIR
-  end
+        if show_help?
+          puts('Usage: gdk init [DIR]')
 
-  def self.gdk_root
-    @gdk_root ||= find_root(Dir.pwd)
-  end
+          return true
+        end
 
-  def self.gdk_dir?
-    !gdk_root.nil?
-  end
+        directory = new_gdk_directory
+        if new_gdk_directory_invalid?(directory)
+          warn("ERROR: The proposed new GDK directory '#{directory}' is invalid because it begins with a dash.")
 
-  def self.print_version?
-    %w[version --version].include?(ARGV.first) && !gdk_dir?
-  end
+          return false
+        end
 
-  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
-  end
+        if clone_gdk(directory)
+          puts("INFO: Successfully git cloned the GDK into '#{directory}'.")
+          true
+        else
+          warn("ERROR: An error occurred while attempting to git clone the GDK into '#{directory}'.")
+          false
+        end
+      end
 
-  def self.load_dotfile
-    File.open(DOTFILE, File::RDONLY | File::CREAT) do |f|
-      YAML.safe_load(f)
-    end || {}
-  end
+      private
+
+      attr_reader :args
 
-  def self.remember!(directory)
-    File.open("#{directory}/#{ROOT_CHECK_FILE}", 'w') do |f|
-      f.puts File.realpath(directory)
+      def show_help?
+        args.count > 1 || (args & %w[-help --help]).any?
+      end
+
+      def new_gdk_directory_invalid?(directory)
+        directory.start_with?('-')
+      end
+
+      def new_gdk_directory
+        args.count == 1 ? args.first : GDK::DEFAULT_INIT_DIRECTORY
+      end
+
+      def clone_gdk(directory)
+        cmd = "git clone https://gitlab.com/gitlab-org/gitlab-development-kit.git #{directory}"
+        system(*cmd)
+      end
     end
-    true
-  rescue StandardError => e
-    warn e
-    false
   end
 end
 
-exit(GDK.launcher_main)
+exit(GDK::CommandBasic::Main.new(ARGV).run)

data/lib/gitlab_development_kit.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module GDK
-  GEM_VERSION = '0.2.12'
+  GEM_VERSION = '0.2.14'
   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.12
+  version: 0.2.14
 platform: ruby
 authors:
 - Jacob Vosmaer
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-23 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake