intello-shipit-cli 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8357db54113d84cd737edb6bf57228fa235df527fba88af7de8eecaa4d0f5d4
-  data.tar.gz: 3716cc73141f21833285e40a3b1b3f28199de3eae8d0133008e5b36e35015d92
+  metadata.gz: 61575736646b080306c67d9a543a9603c748faec5c7b5f7c6b5a2dc0154e099e
+  data.tar.gz: 45a103fd0a48d629a67abfac6a6a4b786f9bf8c9d3221e6eb7a6f1f5c6da4dd7
 SHA512:
-  metadata.gz: 63e909865718db3d151bfdaed972b7f127cd9d905ee42f5a6584849d4d5b706156ba98c795a12acfff063b4375e0762b6c2bd66de31e1e4d9a0564d095f7f8e5
-  data.tar.gz: 27dee93a4f8a9a667eda387f8946509708738f63c7e1cd1c29d4e48bef437a28117829d893c63c6e6a8925289deeaa3e8686df5e15266814a3b24041c768a752
+  metadata.gz: cb8f3664cbe9f66a9559f8822e19aeb0bb7b9468a54df76258ac3f26908c7d42ded6463e50797e4c794eaf651683e362dc3dd65df05e32f8bac0e45e7b068a14
+  data.tar.gz: b370aa66d1908b69e7cf37ff6b220668ef55f91bc48290e9147787500d87cf41a22b70d6791175701ac77f5a2f8b8bbcc2eb0a295049da6b3b8302405708f91e

data/Changelog.md

@@ -4,14 +4,16 @@ All notable changes to this project will be documented in this file.
 
 NOTE: the project follows [Semantic Versioning](http://semver.org/).
 
-## Firmware
+## v1.2.0 - March 9th, 2022
 
-### v1.1.0 - February 7th, 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
+## v1.0.0 - November 25th, 2021
 
 - Inivial version
 

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 = "1.1.0".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
@@ -124,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,6 +22,7 @@ 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"
   spec.add_development_dependency "guard"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: intello-shipit-cli
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Benjamin Thouret
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,6 +52,20 @@ 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