git-story-workflow 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7be8a8f95cb4a4ace84ff31ea834592feaee80135fc822ac5012efe48b1c4958
-  data.tar.gz: 9d7413465c4bfba839ec517d63a28919570dd0d16af27f5daa650224d09b9513
+  metadata.gz: cc6fc0d57caaf1bf1ddc9479956304a9826d639dd64f738c541abdecb9e10658
+  data.tar.gz: 8006409b423a1237f8ab8fbf84e4453b50c15343e1caf3a16a7e308d465baba6
 SHA512:
-  metadata.gz: f42ba31483283a339566427f233675f29bd6010571122443bc4ff82aa14a72f8d1bb17936f59fec97d3d43eb266630dbcf172d9574015ce8716bfa5c8ff585b1
-  data.tar.gz: ffa174f376be96eeeeb76c7df8d6a7246c527117f07b3bf6a3e2286c4595728b58f232eefc3773d3627513a77246148ed118a82b86f01f659eb31b51e79072f6
+  metadata.gz: ed5c753dc90f1e5122cbea04a8d8146eadcdc532bb8fb0f2034860090329e0d3d8c0e5bdc7c219e775b22897659afdafe1e1d4b66ac2368017dce3171fce4bd6
+  data.tar.gz: 86d2cc86c1a2a5279566056f7ad17302f383a3c738f0331496012cb8a8665ca634516f801d2c8059443d9c9e602fd26ddab05226bfaa3692adef2711e615cd3f

data/VERSION

@@ -1 +1 @@
-0.9.9
+0.9.10

data/git-story-workflow.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: git-story-workflow 0.9.9 ruby lib
+# stub: git-story-workflow 0.9.10 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "git-story-workflow".freeze
-  s.version = "0.9.9"
+  s.version = "0.9.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/lib/git/story/app.rb

@@ -223,24 +223,23 @@ class Git::Story::App
 
   command doc: 'list all production deploy tags'
   def deploy_tags
-    capture(tags).lines.map(&:chomp)
+    tags.map { |t| tag_name(t) }
   end
 
   command doc: 'output the times of all production deploys'
   def deploys
-    deploy_tags.map { |t| format_tag(t) }
+    tags.map { |t| format_tag(t) }
   end
   alias deploy_list deploys
 
   command doc: 'output the last production deploy tag'
   def deploy_tags_last
-    deploy_tags.last
+    tag_name(tags.last)
   end
 
   command doc: 'output the time of the last production deploy'
   def deploy_last
-    tag = deploy_tags_last
-    format_tag(tag)
+    format_tag(tags.last)
   end
 
   command doc: '[REF] output log of changes since last production deploy tag'
@@ -361,12 +360,13 @@ class Git::Story::App
   private
 
   def default_ref
-    deploy_tags.last
+    tags.last
   end
 
   def build_ref_range(ref)
-    if 'previous' == ref and (previous = deploy_tags.last(2)).size == 2
-      previous * '..'
+    ref = tag_name(ref)
+    if 'previous' == ref and (previous = tags.last(2)).size == 2
+      previous.map { |t| tag_name(t) } * '..'
     elsif /^(?<before>.+?)?\.\.(?<after>.+)?\z/ =~ ref
       if before && after
         "#{before}..#{after}"
@@ -383,6 +383,10 @@ class Git::Story::App
   end
 
   def tags
+    capture(deploy_tag_command).lines.map(&:chomp)
+  end
+
+  def deploy_tag_command
     fetch_tags
     if command = complex_config.story.deploy_tag_command?
       command
@@ -519,24 +523,31 @@ class Git::Story::App
 
   def tag_time(tag)
     case tag
-    when %r(\d{4}/\d{2}/\d{2}\d{2}:\d{2})
-      Time.strptime($&, '%Y/%m/%d%H:%M')
-    when /\d{4}_\d{2}_\d{2}-\d{2}_\d{2}/
-      Time.strptime($&, '%Y_%m_%d-%H_%M')
+    when %r(\A\d{4}/\d{2}/\d{2}\d{2}:\d{2}:\d{2} (\S+))
+      return Time.strptime($&, '%Y/%m/%d%H:%M'), $1
+    when /\d{4}_\d{2}_\d{2}-\d{2}_\d{2}\z/
+      return Time.strptime($&, '%Y_%m_%d-%H_%M'), tag
+    else
+      return nil, tag
     end
   end
 
+  def tag_name(tag)
+    tag_time(tag)&.last
+  end
+
   def format_tag(tag)
-    if time = tag_time(tag)
+    time, tag_name = tag_time(tag)
+    if time
       day  = Time::RFC2822_DAY_NAME[time.wday]
       "%s %s %s %s" % [
         time.iso8601.green,
         day.green,
-        tag.to_s.yellow,
+        tag_name.to_s.yellow,
         "was #{Tins::Duration.new((Time.now - time).floor)} ago".green,
       ]
     else
-      tag
+      tag_name
     end
   end
 

data/lib/git/story/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-story-workflow
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors:
 - Florian Frank