git-story-workflow 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f354b91d58da485c046c3eda0a06571ee59af8b
-  data.tar.gz: 4e023a2278d47239f859cab5969814d5b5a2cdab
+  metadata.gz: afbc0ec1026b7efc6444cac3bfe109237e4bed31
+  data.tar.gz: 30c494fc6cbf366f7d8a00ee0a7e3c3532d3e6cb
 SHA512:
-  metadata.gz: 491e64e415aa2db7afc25c3efd36fd8558f9dd8b2ce07fc3108c04ad29cc6aa7cdc031596efc325544279d35f1d0bc9c00dd7362f03402c623e7939258c566f1
-  data.tar.gz: 641d8a133fbabf70d320e1a078d7ff29a887307907bd11a0ce62ee99039db9d1a83a89087157e9cf4d2f870eeaf31f367d0ed6c0499a9720ee43d3c3cf479fda
+  metadata.gz: f4764c0e9dddfab11351794a7fb71f7e1bd5916e67c8ef37be38bd0ebceed372e1cc2d0ce8fa97b425a0f8c981e2cf5b3da7b9e821215f4f89bae430435911da
+  data.tar.gz: 6f041023d6cdf3b186850f71ed74775dd19ba997aa751a3ca3589761ba9d5759abe05bffd953e0ec9f70b165e8d641a194710b559eebd92d06d53cc204ef9f9f

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/git-story-workflow.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: git-story-workflow 0.3.4 ruby lib
+# stub: git-story-workflow 0.3.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "git-story-workflow".freeze
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   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

@@ -110,7 +110,11 @@ class Git::Story::App
     server   = Git::Story::SemaphoreResponse.get(url, debug: @debug)
     deploys  = server.deploys
     upcoming = deploys.select(&:pending?)&.last
-    current  = deploys.find(&:passed?)
+    passed = deploys.select(&:passed?)
+    current  = passed.first
+    if !passed.empty? && upcoming
+      upcoming.estimated_duration = passed.sum { |d| d.duration.to_f } / passed.size
+    end
     <<~end
       Server: #{server.server_name&.green}
       Branch: #{server.branch_name&.color('#ff5f00')}

data/lib/git/story/semaphore.rb

@@ -20,7 +20,11 @@ class Git::Story::SemaphoreResponse < JSON::GenericObject
         time = Time.parse(finished_at)
       end
     end
-    Tins::Duration.new(time - Time.parse(started_at))
+    if started_at
+      Tins::Duration.new(time - Time.parse(started_at))
+    else
+      Tins::Duration.new(0)
+    end
   end
 
   def pending?
@@ -68,14 +72,18 @@ class Git::Story::SemaphoreResponse < JSON::GenericObject
   end
 
   def estimated_duration
-    times = branch_history.select { |b| b.result == 'passed' }.map { |b|
-      Time.parse(b.finished_at) - Time.parse(b.started_at)
-    }
-    if times.empty?
-      duration
+    if ed = super
+      ed
     else
-      times.sum / times.size
-    end.to_f
+      times = branch_history.select(&:passed?).map { |b|
+        Time.parse(b.finished_at) - Time.parse(b.started_at)
+      }
+      if times.empty?
+        duration
+      else
+        times.sum / times.size
+      end.to_f
+    end
   end
 
   def to_s

data/lib/git/story/version.rb

@@ -1,6 +1,6 @@
 module Git::Story
   # Git::Story version
-  VERSION         = '0.3.4'
+  VERSION         = '0.3.5'
   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.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Florian Frank