intello-shipit-cli 0.6.0.rc6 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9969d36e43da8f23a4fa822901567e7dc95128327be6e5c988cecd16fef6b8a8
-  data.tar.gz: 6acd1abd01f8773e22a86cdfddccd8af523110ef2c323f88765f491b5469efd0
+  metadata.gz: 61575736646b080306c67d9a543a9603c748faec5c7b5f7c6b5a2dc0154e099e
+  data.tar.gz: 45a103fd0a48d629a67abfac6a6a4b786f9bf8c9d3221e6eb7a6f1f5c6da4dd7
 SHA512:
-  metadata.gz: 68fc8e0405f45201a6320da1f566f86938035acc4e25fac5bc531842f7560d24e4ed2ca35291eaf907e3dcada170d8f26c5972d2c57e308f0d04d2bbb0ecbfb5
-  data.tar.gz: fa131c0fadf6f491c8e6803ce4e7c4628ac1dabf51f2c633d4c2a4536b305775971c60bd83574a6fcc78fb8206f03f7831a3d7a2d01458037ac21bc28ede3e68
+  metadata.gz: cb8f3664cbe9f66a9559f8822e19aeb0bb7b9468a54df76258ac3f26908c7d42ded6463e50797e4c794eaf651683e362dc3dd65df05e32f8bac0e45e7b068a14
+  data.tar.gz: b370aa66d1908b69e7cf37ff6b220668ef55f91bc48290e9147787500d87cf41a22b70d6791175701ac77f5a2f8b8bbcc2eb0a295049da6b3b8302405708f91e

data/Changelog.md

@@ -0,0 +1,19 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+NOTE: the project follows [Semantic Versioning](http://semver.org/).
+
+## v1.2.0 - March 9th, 2022
+
+- [bug] #3 - Support when project is located in sub folder
+
+## v1.1.0 - February 7th, 2022
+
+- [enhancement] #5 - Run shipit from a Docker environement for nonLinux environement
+- [task] #1 - Support gitlab.com new Draft status
+
+## v1.0.0 - November 25th, 2021
+
+- Inivial version
+

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright Intello Technologies Inc, 2016-2019.
+Copyright Intello Technologies Inc, 2016-2020.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

data/README.md

@@ -12,29 +12,64 @@ Designed to simplify collaboration with Git and Gitlab, its main purpose is to k
 
 ## Requirements
 
-- Ruby 2.5+
+- Git
 - A `gitlab` personal access token (`https://{{ YOUR_GITLAB_HOST  }}/profile/personal_access_tokens`)
 - Issues must have a label and a milestone
 
 `intello-shipit-cli` works as well on gitlab.com as on a privately hosted instance of Gitlab
 
+### Linux / macOS
+
+- Ruby 2.5+
+
+### Windows
+
+- Docker
+
+A .shipit.yml file must exist in `C:\Users\[my_user]\.shipit.yml` or to a path specified by `-c [path_to_file]`
+SSH keys should be present in `C:\Users\[my_user]\.ssh`
+
+Here is an example of the format of the file :
+
+```yaml
+---
+endpoint:            endpoint
+private_token:       private_token
+```
+
+As an example, the [endpoint for gitlab.com](https://docs.gitlab.com/ee/api/#current-status) is `https://gitlab.intello.com/api/v4`.
+
 ## Install/Update
 
+### Linux / macOS
+
 ```bash
 gem install intello-shipit-cli
 ```
 
 > NOTE: If you use a ruby manager, the gem has to be installed each time you want to use it in a new ruby context.
 
-### PROTIP
+#### PROTIP
 
 If you use rbenv as your ruby manager, and want to easily install/update `intello-shipit-cli` across all your rubies:
 
 1. Install [rbenv-each](https://github.com/rbenv/rbenv-each)
 1. Run `rbenv each gem install intello-shipit-cli`
 
+### Windows
+
+Move `shipit-windows.bat` to a folder present in your environment %PATH%.
+shipit-windows.bat needs to be run from a gitlab project.
+
+#### Known issues
+
+- Virtualization may not be enabled on certain AMD processors.
+- From our experience, You may need to update to Windows build 2004 and re-install Docker or Docker Desktop to fix the above mentionned issue.
+
 ## Setup
 
+### Linux
+
 You must first setup `intello-shipit-cli` by running:
 
 ```bash
@@ -48,6 +83,12 @@ This will interactivly ask you for:
 
 The setup will create a file in your user root folder called `.shipit.yml` with this information.
 
+### Windows
+
+You must manually set up your `.shipit.yml` file in your home directory : `C:\Users\[your_user]\.shipit.yml`
+Setup will be performed when you first run `shipit-windows.bat`.
+First time use may take a few minutes to configure its Docker environment.
+
 ### PROTIP
 
 If you have multiple Gitlab servers or account you can manually create configuration YAML files and use the `-c` option of `intello-shipit-cli` to select the proper configuration.
@@ -138,7 +179,7 @@ You can write tests using `rspec v3+` syntax in the `spec` folder. To run the te
 
 ## License
 
-Copyright Intello Technologies Inc, 2016-2019. Licensed under the [MIT license](/LICENSE?raw=true).
+Copyright Intello Technologies Inc, 2016-2020. Licensed under the [MIT license](/LICENSE?raw=true).
 
 ## About Intello Technologies Inc.
 

data/lib/shipit/cli/git.rb

@@ -29,6 +29,7 @@ module Shipit
           dry_run = opt.fetch(:dry_run, false)
           grepped_protected_branches = Array(Shipit::Cli.config.protected_branches)
             .push("master")
+            .push("main")
             .push("develop")
             .push(get_current_branch)
             .uniq.map{ |b| "| grep -v #{b} " }.join

data/lib/shipit/cli/version.rb

@@ -1,5 +1,5 @@
 module Shipit
   module Cli
-    VERSION = "0.6.0.rc6".freeze
+    VERSION = "1.2.0".freeze
   end
 end

data/lib/shipit/cli/work.rb

@@ -1,4 +1,5 @@
 require "active_support/all"
+require "git_clone_url"
 
 module Shipit
   module Cli
@@ -63,7 +64,10 @@ module Shipit
       end
 
       def create_merge_request(issue)
-        return if dry_run?
+        if dry_run?
+          puts "    - Merge request name: #{issue["merge_request_title"]}"
+          return
+        end
         opts = issue.slice("source_branch", "target_branch", "assignee_id", "labels", "milestone_id", "remove_source_branch")
         client.create_merge_request(project_path,
                                     issue["merge_request_title"],
@@ -92,7 +96,7 @@ module Shipit
         assignee_id = assignee["id"]
         issue_title = sane_title.parameterize[0..20]
         first_commit_message = "[#{labels}] Fixes ##{issue_id} - #{sane_title}"
-        mr_title = "[WIP] [#{labels}] ##{issue_id} - #{sane_title}"
+        mr_title = "Draft: [#{labels}] ##{issue_id} - #{sane_title}"
 
         # 2. Add to issue properties
         issue["source_branch"] = [issue["labels"].first.gsub(/\s+/, ""), assignee_initials, issue_id, issue_title].compact.join("-")
@@ -121,18 +125,23 @@ module Shipit
 
       # @return [String]
       def project_name
-        @project_name ||= project_git_url.split("/").last.gsub(".git", "")
+        @project_name ||= project_path_array.last.gsub(".git", "")
       end
 
       # @return [String]
       def project_namespace
-        @project_namespace ||= project_git_url.split(":").last.split("/").first
+        @project_namespace ||= project_path_array.first(project_path_array.size - 1)
       end
 
       # @return [String]
       def project_path
         @project_path ||= [project_namespace, project_name].join("/")
       end
+
+      # @return [Array]
+      def project_path_array
+        @project_path_array ||= GitCloneUrl.parse(project_git_url).path.split("/").reject(&:blank?)
+      end
     end
   end
 end

data/shipit-cli.gemspec

@@ -22,8 +22,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport"
   spec.add_dependency "gli", "~> 2.13"
   spec.add_dependency "gitlab", "~> 4.3.0"
+  spec.add_dependency "git_clone_url", "~> 2.0.0"
 
-  spec.add_development_dependency "bundler", "~> 2.0.1"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-ctags-bundler"
   spec.add_development_dependency "guard-rspec"

data/shipit-windows.bat

@@ -0,0 +1,60 @@
+@echo off
+
+docker info > NUL 2>&1
+
+REM Checks if docker is running or not
+if errorlevel 1 (
+    echo Please install or start Docker
+    exit /b 1
+)
+
+REM If a -c flag is passed as the first argument
+IF [%1] == [-c] (
+    
+    REM If the file doesn't exist, stop here
+    IF [%2] NEQ [] (
+        IF NOT EXIST "%2" (
+            echo %2 - File does not exist
+            exit /b 1
+        )
+    )
+
+    REM Otherwise copy the config file to WORKDIR of container
+    xcopy /y %2 . > NUL 2>&1
+)
+
+REM Create temp dockerfile
+(
+    echo FROM ruby:2.5
+    echo RUN gem install intello-shipit-cli
+    echo WORKDIR /usr/src/project
+) > %TEMP%\Dockerfile
+
+REM Check if Ruby container already is installed locally
+docker inspect --type=image ruby:2.5 > NUL 2>&1
+
+IF errorlevel 1 (
+    ECHO Please wait while we perform a first-time setup for shipit on your Windows environment. This can take several minutes.
+)
+
+REM Build Container
+docker build -t "shipit-docker" -f %TEMP%\Dockerfile . > NUL 2>&1
+
+REM Depending on is -c was passed, use the right arg number to run container
+IF [%1] == [-c] (
+    docker run -v %CD%:/usr/src/project ^
+    -v %HOMEDRIVE%%HOMEPATH%"\authorized_keys":/root/.ssh/authorized_keys ^
+    -v %HOMEDRIVE%%HOMEPATH%"\.gitconfig":/root/.gitconfig ^
+    -v %HOMEDRIVE%%HOMEPATH%"\.ssh":/root/ssh_temp/ ^
+    --rm shipit-docker:latest /bin/bash -c "cp -f /root/ssh_temp/* /root/.ssh/ ; chmod 0600 /root/.ssh/* ; shipit -c .shipit.yml %3 %4"
+    del .shipit.yml
+) else (
+    docker run -v %CD%:/usr/src/project ^
+    -v %HOMEDRIVE%%HOMEPATH%"\authorized_keys":/root/.ssh/authorized_keys ^
+    -v %HOMEDRIVE%%HOMEPATH%"\.gitconfig":/root/.gitconfig ^
+    -v %HOMEDRIVE%%HOMEPATH%"\.ssh":/root/ssh_temp/ ^
+    -v %HOMEDRIVE%%HOMEPATH%"\.shipit.yml":/root/.shipit.yml ^
+    --rm shipit-docker:latest /bin/bash -c "cp -f /root/ssh_temp/* /root/.ssh/ ; chmod 0600 /root/.ssh/* ; shipit -c /root/.shipit.yml %1 %2"
+)
+
+del %TEMP%\Dockerfile

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: intello-shipit-cli
 version: !ruby/object:Gem::Version
-  version: 0.6.0.rc6
+  version: 1.2.0
 platform: ruby
 authors:
 - Benjamin Thouret
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-16 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,20 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.3.0
+- !ruby/object:Gem::Dependency
+  name: git_clone_url
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +207,7 @@ files:
 - ".rubocop.yml"
 - ".ruby-style.yml"
 - ".ruby-version"
+- Changelog.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -215,6 +230,7 @@ files:
 - script/release
 - script/test
 - shipit-cli.gemspec
+- shipit-windows.bat
 homepage: https://gitlab.com/intello/shipit-cli
 licenses:
 - MIT
@@ -230,12 +246,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Designed to simplify working with Gitlab, its main purpose is to kickstart