git-story-workflow 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91b2ba9f8da9a74b7b786c3632db0fe24789b40fa64d1a7fb9a503f614bc5ac9
-  data.tar.gz: 40ebc08064474eb912a726028c3384e1e1e4d8e68a266a99196866211764ca3a
+  metadata.gz: f051c084b13ff9adfe54646e03a41df9866a182298fc77a507cd5535c936ff82
+  data.tar.gz: a522c43ff824e0ed757d5a3a7a7c602696e84c62d1f1f3d60974f726716f7def
 SHA512:
-  metadata.gz: c8d2592d20eda25b45776b9ae13ca8a070495e6f2db31ac4c6d9246b99088b53c00c4b596b4962d47defa9ab31fe9f299798eceabc54850613bcb2bcf70bf4f8
-  data.tar.gz: d24cb416fe27e201a7b981ff7c2b262909d58443dc58b4864c86b4a964b317a0447d47079e5dec1da023fc948ff47289b6af958d440b71b65bb782b2d24ccb9d
+  metadata.gz: fda7276dd59d69a127858d43d011e07906ef3f6054f988b6f038f2772823f2af06f9118fa699a3fe2f357810fde36de0f56a4d42c0ce09816656627cea3b8dbf
+  data.tar.gz: '05822b553b342f8c7ae211e461c07c3591f160a26508a0f568bac71c08c9d6cfbfc54ce5d4edcd46d95556b4df7eaa7cca24073ac1912c71fb371e7d19b4db62'

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.6.0

data/git-story-workflow.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: git-story-workflow 0.5.3 ruby lib
+# stub: git-story-workflow 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "git-story-workflow".freeze
-  s.version = "0.5.3"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2018-09-03"
+  s.date = "2018-11-06"
   s.description = "Gem abstracting a git workflow\u2026".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["git-story".freeze]
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://flori.github.com/git-story-workflow".freeze
   s.licenses = ["Apache-2.0".freeze]
   s.rdoc_options = ["--title".freeze, "Git-story-workflow".freeze, "--main".freeze, "README.md".freeze]
-  s.rubygems_version = "2.7.6".freeze
+  s.rubygems_version = "2.7.7".freeze
   s.summary = "Gem abstracting a git workflow".freeze
   s.test_files = ["spec/git/story/app_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 

data/lib/git/story/app.rb

@@ -29,7 +29,8 @@ class Git::Story::App
   end
 
   def initialize(argv = ARGV.dup, debug: ENV['DEBUG'].to_i == 1)
-    @argv    = argv
+    @rest_argv = (sep = argv.index('--')) ? argv.slice!(sep..-1).tap(&:shift) : []
+    @argv      = argv
     @opts    = go 'n:', @argv
     @command = @argv.shift&.to_sym
     @debug   = debug
@@ -38,7 +39,11 @@ class Git::Story::App
   def run
     Git::Story::Setup.perform
     if command_of(@command)
-      puts __send__(@command, *@argv)
+      if method(@command).parameters.include?(%i[key rest])
+        puts __send__(@command, *@argv, rest: @rest_argv)
+      else
+        puts __send__(@command, *@argv)
+      end
     else
       @command and @command = @command.inspect
       @command ||= 'n/a'
@@ -248,24 +253,27 @@ class Git::Story::App
   end
 
   command doc: 'output log of changes since last production deploy tag'
-  def deploy_log(ref = deploy_tags.last, last_ref = nil)
+  def deploy_log(ref = deploy_tags.last, last_ref = nil, rest: [])
     fetch_tags
-    opts = '--pretty=tformat:"%C(yellow)%h%Creset %C(green)%ci%Creset %s (%Cred%an <%ae>%Creset)"'
+    opts = ([
+      '--color',
+      '--pretty=tformat:"%C(yellow)%h%Creset %C(green)%ci%Creset %s (%Cred%an <%ae>%Creset)"'
+    ] | rest) * ' '
     capture("git log #{opts} #{ref}..#{last_ref}")
   end
 
   command doc: '[REF] output diff since last production deploy tag'
-  def deploy_diff(ref = nil)
+  def deploy_diff(ref = nil, rest: [])
     fetch_tags
-    opts = '-u'
-    capture("git diff --color #{opts} #{ref} #{deploy_tags.last}")
+    opts = (%w[ --color -u ] | rest) * ' '
+    capture("git diff #{opts} #{ref} #{deploy_tags.last}")
   end
 
   command doc: '[REF] output migration diff since last production deploy tag'
-  def deploy_migrate_diff(ref = nil)
+  def deploy_migrate_diff(ref = nil, rest: [])
     fetch_tags
-    opts = '-u'
-    capture("git diff --color #{opts} #{deploy_tags.last} #{ref} -- db/migrate")
+    opts = (%w[ --color -u ] | rest) * ' '
+    capture("git diff #{opts} #{deploy_tags.last} #{ref} -- db/migrate")
   end
 
   command doc: '[STORYID] create a story for story STORYID'

data/lib/git/story/version.rb

@@ -1,6 +1,6 @@
 module Git::Story
   # Git::Story version
-  VERSION         = '0.5.3'
+  VERSION         = '0.6.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-story-workflow
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2018-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Gem abstracting a git workflow