geordi 7.0.2 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8c141d6bb76920354f1a772f6d7a3f88f4ee41fc11766ae40c9bc664ae3d914
-  data.tar.gz: e1d000833fb2d445b164529da4051fc25c846b7b0a5c12a0469a3fe745e6c2da
+  metadata.gz: 5269b4048b40bb81c2d1d89400cbbdabc080107cce0befca2722dbad3451f4b2
+  data.tar.gz: 2f48fae5fb0849795b994ef3c3c58fcb255024da72e4879f65f5867529a7145a
 SHA512:
-  metadata.gz: d9f630cfa71810205a6db1b23c304c13e14b7ad3380fb71539940e1c0af6802f74b13c6461f673e3aaa456a89dfc2a3b74fda29a865c605d4c5e4ce8890c1cfb
-  data.tar.gz: dab2ddb18a29a96872478cd896951608ffdf2baa37c604e6124522810241fb5ecee69f9c2cafdde791992914d02fa926e195556592a5e82e067f37eadd7797f3
+  metadata.gz: 18ac47bd9c3fb39c3a916f2ece300b931c0af9c466068cbbae5a98bf4db1655063f74096c967e4337d29a96c87202653f3b88a200b5d8e0b2cd8985acf4c41de
+  data.tar.gz: 02cfbe20e95b29cf90d65760d39587fe43bebf0c7886364816bd16f71d705110f4b3b7af4f98c1873332b08308040bb7e1d4bc897079b8d0469ffa8c1c24e433

data/CHANGELOG.md

@@ -3,6 +3,7 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+
 ## Unreleased
 
 ### Compatible changes
@@ -10,16 +11,24 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ### Breaking changes
 
 
+## 8.0.0 2021-11-08
+
+### Breaking changes
+* `geordi branch` now checks out new branches from the current branch instead of master. To check out from master, use `geordi branch -m`.
+
+
 ## 7.0.2 2021-10-06
 
 ### Compatible changes
 * fix `YAML.safe_load` for `psych` >= 4
 
+
 ## 7.0.1 2021-08-13
 
 ### Compatible changes
 * Fix missing `thor` dependency
 
+
 ## 7.0.0 2021-08-25
 
 ### Breaking changes

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (7.0.2)
+    geordi (8.0.0)
       thor (~> 1)
 
 GEM
@@ -165,4 +165,4 @@ DEPENDENCIES
   tracker_api
 
 BUNDLED WITH
-   2.2.26
+   2.2.27

data/README.md

@@ -33,6 +33,9 @@ Example: `geordi branch`
 On the first execution we ask for your Pivotal Tracker API token. It will be
 stored in `~/.config/geordi/global.yml`.
 
+**Options**
+- `-m, [--from-master], [--no-from-master]`: Branch from master instead of the current branch
+
 
 ### `geordi capistrano COMMAND`
 Run a capistrano command on all deploy targets.

data/lib/geordi/commands/branch.rb

@@ -6,7 +6,9 @@ On the first execution we ask for your Pivotal Tracker API token. It will be
 stored in `~/.config/geordi/global.yml`.
 LONGDESC
 
+option :from_master, aliases: '-m', type: :boolean, desc: 'Branch from master instead of the current branch'
+
 def branch
   require 'geordi/gitpt'
-  Gitpt.new.run_branch
+  Gitpt.new.run_branch(from_master: options.from_master)
 end

data/lib/geordi/gitpt.rb

@@ -26,7 +26,7 @@ module Geordi
       end
     end
 
-    def run_branch
+    def run_branch(from_master: false)
       story = choose_story || Interaction.fail('No story selected.')
 
       normalized_story_name = normalize_string(story.name)
@@ -50,7 +50,7 @@ module Geordi
       if branch_name.present?
         checkout_branch branch_name, new_branch: false
       else
-        checkout_branch new_branch_name, new_branch: true
+        checkout_branch new_branch_name, new_branch: true, from_master: from_master
       end
     end
 
@@ -139,9 +139,9 @@ module Geordi
       HighLine::BOLD + string + HighLine::RESET
     end
 
-    def checkout_branch(name, new_branch: false)
+    def checkout_branch(name, new_branch: false, from_master: false)
       if new_branch
-        Util.run! ['git', 'checkout', 'master']
+        Util.run! ['git', 'checkout', 'master'] if from_master
         Util.run! ['git', 'checkout', '-b', name]
       else
         Util.run! ['git', 'checkout', name]

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '7.0.2'.freeze
+  VERSION = '8.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 8.0.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-06 00:00:00.000000000 Z
+date: 2021-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.2.30
 signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails