git-story-workflow 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 561a439d3accf19a1702592bd7af589740e8fcae
-  data.tar.gz: bd18119c0f54547d96f989c28fbaa88cbb727994
+  metadata.gz: 0f354b91d58da485c046c3eda0a06571ee59af8b
+  data.tar.gz: 4e023a2278d47239f859cab5969814d5b5a2cdab
 SHA512:
-  metadata.gz: 22dc838d3bcfae51859c4ce6f71663e20ebc5fc5009452533ba1c584adbb05bef5fccf811cb53f87f020d4266c08c7f1a40bdf8a58508eee5f9580374756677a
-  data.tar.gz: fa3b43b63f4f4864d4f53dec07d29e52822aa8fae5dd49345d13e41470451a169374dd1c86400f818f5a804cd98a708e2cd4717b42e2a3786e6ad18b2b2b4f0e
+  metadata.gz: 491e64e415aa2db7afc25c3efd36fd8558f9dd8b2ce07fc3108c04ad29cc6aa7cdc031596efc325544279d35f1d0bc9c00dd7362f03402c623e7939258c566f1
+  data.tar.gz: 641d8a133fbabf70d320e1a078d7ff29a887307907bd11a0ce62ee99039db9d1a83a89087157e9cf4d2f870eeaf31f367d0ed6c0499a9720ee43d3c3cf479fda

data/Rakefile

@@ -17,6 +17,7 @@ GemHadar do
   title       name.camelize
   executables << 'git-story'
 
+  dependency 'infobar'
   dependency 'tins'
   dependency 'mize'
   dependency 'term-ansicolor'

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/git-story-workflow.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: git-story-workflow 0.3.3 ruby lib
+# stub: git-story-workflow 0.3.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "git-story-workflow".freeze
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   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-01-17"
+  s.date = "2018-02-12"
   s.description = "Gem abstracting a git workflow\u2026".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["git-story".freeze]
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rake>.freeze, [">= 0"])
       s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
       s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<infobar>.freeze, [">= 0"])
       s.add_runtime_dependency(%q<tins>.freeze, [">= 0"])
       s.add_runtime_dependency(%q<mize>.freeze, [">= 0"])
       s.add_runtime_dependency(%q<term-ansicolor>.freeze, [">= 0"])
@@ -38,6 +39,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rake>.freeze, [">= 0"])
       s.add_dependency(%q<simplecov>.freeze, [">= 0"])
       s.add_dependency(%q<rspec>.freeze, [">= 0"])
+      s.add_dependency(%q<infobar>.freeze, [">= 0"])
       s.add_dependency(%q<tins>.freeze, [">= 0"])
       s.add_dependency(%q<mize>.freeze, [">= 0"])
       s.add_dependency(%q<term-ansicolor>.freeze, [">= 0"])
@@ -48,6 +50,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rake>.freeze, [">= 0"])
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     s.add_dependency(%q<rspec>.freeze, [">= 0"])
+    s.add_dependency(%q<infobar>.freeze, [">= 0"])
     s.add_dependency(%q<tins>.freeze, [">= 0"])
     s.add_dependency(%q<mize>.freeze, [">= 0"])
     s.add_dependency(%q<term-ansicolor>.freeze, [">= 0"])

data/lib/git/story/app.rb

@@ -97,7 +97,7 @@ class Git::Story::App
     auth_token = complex_config.story.semaphore_auth_token
     project    = complex_config.story.semaphore_project
     url        = "https://semaphoreci.com/api/v1/projects/#{project}/#{branch}/status?auth_token=#{auth_token}"
-    Git::Story::SemaphoreResponse.get(url)
+    Git::Story::SemaphoreResponse.get(url, debug: @debug)
   rescue => e
     "Getting #{url.inspect} => #{e.class}: #{e}".red
   end
@@ -107,7 +107,7 @@ class Git::Story::App
     auth_token = complex_config.story.semaphore_auth_token
     project    = complex_config.story.semaphore_project
     url        = "https://semaphoreci.com/api/v1/projects/#{project}/servers/#{server}?auth_token=#{auth_token}"
-    server   = Git::Story::SemaphoreResponse.get(url)
+    server   = Git::Story::SemaphoreResponse.get(url, debug: @debug)
     deploys  = server.deploys
     upcoming = deploys.select(&:pending?)&.last
     current  = deploys.find(&:passed?)

data/lib/git/story/semaphore.rb

@@ -1,12 +1,15 @@
 require 'json'
 require 'time'
 require 'open-uri'
+require 'infobar'
 
 class Git::Story::SemaphoreResponse < JSON::GenericObject
   def self.get(url, debug: false)
     data = open(url).read
     debug and STDERR.puts JSON.pretty_generate(JSON(data))
-    JSON(data, object_class: self)
+    result = JSON(data, object_class: self)
+    result.debug = debug
+    result
   end
 
   def duration(time = nil)
@@ -56,6 +59,25 @@ class Git::Story::SemaphoreResponse < JSON::GenericObject
     branch_name || server_name
   end
 
+  def branch_history
+    if branch_history_url
+      self.class.get(branch_history_url, debug: debug)&.builds
+    else
+      []
+    end
+  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
+    else
+      times.sum / times.size
+    end.to_f
+  end
+
   def to_s
     r = case
         when pending? && building?
@@ -69,9 +91,17 @@ class Git::Story::SemaphoreResponse < JSON::GenericObject
         else
           "#{entity_name} ##{sha1} in state #{result}".blue
         end
+    r = StringIO.new(r)
+    Infobar(
+      current: duration.to_f.to_i,
+      total: estimated_duration.to_i,
+      message: ' %l %c/%t seconds ',
+      output: r
+    ).update
     r <<
       "\n  Semaphore: #{entity_url}" <<
       "\n  Commit: #{commit.url}" <<
       "\n  Authored: #{(commit.author_name + ' <' + commit.author_email + ?>).bold} @#{commit.timestamp}"
+    r.tap(&:rewind).read
   end
 end

data/lib/git/story/version.rb

@@ -1,6 +1,6 @@
 module Git::Story
   # Git::Story version
-  VERSION         = '0.3.3'
+  VERSION         = '0.3.4'
   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.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2018-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: infobar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement