intello-shipit-cli 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8357db54113d84cd737edb6bf57228fa235df527fba88af7de8eecaa4d0f5d4
-  data.tar.gz: 3716cc73141f21833285e40a3b1b3f28199de3eae8d0133008e5b36e35015d92
+  metadata.gz: 0c4795dc17a4c6b03dc3446b9f365f5be72f33ca155f54bb621aac3fbc631e7a
+  data.tar.gz: 106c04cf366e83b3b3616e192c866936929bd99d623e75853c91562376d3bd45
 SHA512:
-  metadata.gz: 63e909865718db3d151bfdaed972b7f127cd9d905ee42f5a6584849d4d5b706156ba98c795a12acfff063b4375e0762b6c2bd66de31e1e4d9a0564d095f7f8e5
-  data.tar.gz: 27dee93a4f8a9a667eda387f8946509708738f63c7e1cd1c29d4e48bef437a28117829d893c63c6e6a8925289deeaa3e8686df5e15266814a3b24041c768a752
+  metadata.gz: f04183c2c88b07988dd50b82ba70e3db98ed9b1afb02b684617d7b9e5ae2c4bcaa6f2de04c8d07923e73b6f87e2ccc811a06d4fede245cca0e9ff17daa30f12a
+  data.tar.gz: f2b9437e9d64b0a78bc6afe4c4d885f979630897fc8713d97bcec0cd99b05bc8d0bf186d320d5ba332e3ee1d4203179d662590937a97611a0bd7c57bdc1de3cd

data/Changelog.md

@@ -4,14 +4,20 @@ All notable changes to this project will be documented in this file.
 
 NOTE: the project follows [Semantic Versioning](http://semver.org/).
 
-## Firmware
+## v1.3.0 - October 12th, 2022
 
-### v1.1.0 - February 7th, 2022
+- [enhancement] #8 - Add option to skip CICD when shipping
+
+## 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
+## v1.0.0 - November 25th, 2021
 
 - Inivial version
 

data/exe/shipit

@@ -24,6 +24,7 @@ sort_help :manually
 flag [:c, :config], default_value: File.join(ENV["HOME"], ".shipit.yml"), desc: "Set the saved configuration path"
 flag [:e, :endpoint], desc: "Set the shipit API endpoint"
 flag [:p, :private_token], desc: "Set your private token to access the shipit API"
+flag [:ship_skips_ci], default_value: false, desc: "Skip running the CI/CD after running `shipit work #`"
 
 # Switches
 switch :dry_run, default_value: false, desc: "Dry Run mode, no git or POST/PUT commands are run"

data/lib/shipit/cli/configuration.rb

@@ -8,9 +8,9 @@ module Shipit
     #
     class Configuration
       # List of all the configuration attributes stored for use within the gem
-      ATTRIBUTES = [:endpoint, :private_token, :protected_branches]
+      ATTRIBUTES = [:endpoint, :private_token, :protected_branches, :ship_skips_ci]
 
-      attr_accessor :endpoint, :private_token, :protected_branches
+      attr_accessor :endpoint, :private_token, :protected_branches, :ship_skips_ci
 
       # Apply a configuration hash to a configuration instance
       #

data/lib/shipit/cli/configuration_file.rb

@@ -3,7 +3,7 @@ require "yaml"
 module Shipit
   module Cli
     class ConfigurationFile
-      ATTR_READER = [:endpoint, :private_token, :protected_branches]
+      ATTR_READER = [:endpoint, :private_token, :protected_branches, :ship_skips_ci]
       attr_reader(*ATTR_READER)
 
       def initialize(path, configuration = nil)

data/lib/shipit/cli/git.rb

@@ -9,12 +9,12 @@ module Shipit
         new: {
           desc: "create new branch `branch`",
           commands: [
-            '"#{GIT} push #{origin} #{current_branch}:refs/heads/#{branch} --no-verify #{VERBOSE}"',
+            '"#{GIT} push #{ship_skips_ci}#{origin} #{current_branch}:refs/heads/#{branch} --no-verify #{VERBOSE}"',
             '"#{GIT} fetch #{origin} #{VERBOSE}"',
             '"#{GIT} branch --track #{branch} #{origin}/#{branch} #{VERBOSE}"',
             '"#{GIT} checkout #{branch} #{VERBOSE}"',
             '"#{GIT} commit --allow-empty -m \"#{message}\" #{VERBOSE}"',
-            '"#{GIT} push --no-verify #{VERBOSE}"'
+            '"#{GIT} push #{ship_skips_ci}--no-verify #{VERBOSE}"'
           ]
         }
       }
@@ -27,8 +27,10 @@ module Shipit
           origin = ORIGIN
           message = opt.fetch(:message, "").gsub("`", "'")
           dry_run = opt.fetch(:dry_run, false)
+          ship_skips_ci = "-o ci.skip " if Shipit::Cli.config.ship_skips_ci.to_s.downcase == "true"
           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.3.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.3.0
 platform: ruby
 authors:
 - Benjamin Thouret
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-10-12 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