intello-shipit-cli 1.2.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61575736646b080306c67d9a543a9603c748faec5c7b5f7c6b5a2dc0154e099e
-  data.tar.gz: 45a103fd0a48d629a67abfac6a6a4b786f9bf8c9d3221e6eb7a6f1f5c6da4dd7
+  metadata.gz: 445aaf9d82b15a6b4da9145c0853d9ddb929a9a04363358a642fcd690082c1bd
+  data.tar.gz: 55f6b47b6a9a83b4498ea5b991bf538fac822205969fea17e55419fd3a09fd4f
 SHA512:
-  metadata.gz: cb8f3664cbe9f66a9559f8822e19aeb0bb7b9468a54df76258ac3f26908c7d42ded6463e50797e4c794eaf651683e362dc3dd65df05e32f8bac0e45e7b068a14
-  data.tar.gz: b370aa66d1908b69e7cf37ff6b220668ef55f91bc48290e9147787500d87cf41a22b70d6791175701ac77f5a2f8b8bbcc2eb0a295049da6b3b8302405708f91e
+  metadata.gz: '0191c273e1d08a476f326f3b12acc6738a0bda22cb995ee1304b3843088c858e4e9ab337dc72c32243af156948e81c8584032c82c5d07822e6de6faf176f0a7b'
+  data.tar.gz: c7a0c21d7ae9a4c899c197bc569dc454afad068ed80dc4ebe4912613af985542abcb02ff443c418d20d8d544ef2b9f7f2f23405d88e683c249f25ea029adc46c

data/Changelog.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 NOTE: the project follows [Semantic Versioning](http://semver.org/).
 
+## v1.3.1 - August 31st, 2023
+
+- [bug] #5 - Does not like when labels are of form bug1foobar scoped labels
+
+## v1.3.0 - October 12th, 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

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,6 +27,7 @@ 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")

data/lib/shipit/cli/version.rb

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

data/lib/shipit/cli/work.rb

@@ -99,7 +99,7 @@ module Shipit
         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("-")
+        issue["source_branch"] = [issue["labels"].first.gsub(/\s+/, "").gsub(/::/, "-").gsub(/:/, ""), assignee_initials, issue_id, issue_title].compact.join("-")
         issue["first_commit_message"] = first_commit_message
         issue["target_branch"] = target_branch
         issue["merge_request_title"] = mr_title

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: intello-shipit-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Benjamin Thouret
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-09 00:00:00.000000000 Z
+date: 2023-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -250,7 +250,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubyforge_project: 
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Designed to simplify working with Gitlab, its main purpose is to kickstart