git-story-workflow 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a59013fb08e6b4782e2a0c9639d0743d33d80a616134caffd1b0a8cbbefad0ac
-  data.tar.gz: 9f0aa8fed701287a779f033ef7e17b3e37139104c6e3ff113b0966f4567bcc03
+  metadata.gz: dfb4794483a9fc8fae288f546621e9b2b3ca26cb4957a1b38234ed5a5c224f38
+  data.tar.gz: b41cfb8c0e1b5fe6aea8e7093b19a0d34aa743a2dbd4da89cb5fcc5fcf077a67
 SHA512:
-  metadata.gz: 89032b278d2faf60ef6eb40bf22dd472584cd7b52bc9ffc34ed83008e1a55924277cd709f461d68300f91c180f2d2888144c6651ec0f0683cc72336043c2cc2a
-  data.tar.gz: 0ff7fc99a9f59fbdc5cc8afd1368780030be99a81a962899434303e38d012d38c1d4a58fd6f2fc04bc58eb6a74656e9ef65512c5551422963b1b070671806bd8
+  metadata.gz: 529663aa542c6afc333d21bf6f3155d5a361456f05f76abfcb41581834fffb1f0271e3ea3a2a2ff97a8620c9805b9bedc6b33b77172617fb0b39868bc3cf363c
+  data.tar.gz: 971b4044b632e27edda167a514fffc97967bc73c5b17ff685ecfda07b73dfdaaa6d825412e5033d0f4b5988f69f53e14271f77a58b33e346c86315da52349b4b

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.5.0

data/git-story-workflow.gemspec

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

@@ -1,5 +1,6 @@
 require 'time'
 require 'open-uri'
+require 'tins/go'
 
 class Git::Story::App
   class ::String
@@ -9,6 +10,7 @@ class Git::Story::App
   include Git::Story::Utils
   extend Git::Story::Utils
   include ComplexConfig::Provider::Shortcuts
+  include Tins::GO
 
   annotate :command
 
@@ -26,8 +28,9 @@ class Git::Story::App
     attr_accessor :story_author
   end
 
-  def initialize(argv = ARGV, debug: ENV['DEBUG'].to_i == 1)
+  def initialize(argv = ARGV.dup, debug: ENV['DEBUG'].to_i == 1)
     @argv    = argv
+    @opts    = go 'n:', @argv
     @command = @argv.shift&.to_sym
     @debug   = debug
   end
@@ -93,46 +96,52 @@ class Git::Story::App
 
   command doc: '[BRANCH] display test status of branch'
   def test_status(branch = current(check: false))
-    auth_token = complex_config.story.semaphore_auth_token
-    project    = complex_config.story.semaphore_test_project
-    url        = "https://semaphoreci.com/api/v1/projects/#{project}/#{branch}/status?auth_token=#{auth_token}"
-    Git::Story::SemaphoreResponse.get(url, debug: @debug)
+    watch do
+      auth_token = complex_config.story.semaphore_auth_token
+      project    = complex_config.story.semaphore_test_project
+      url        = "https://semaphoreci.com/api/v1/projects/#{project}/#{branch}/status?auth_token=#{auth_token}"
+      Git::Story::SemaphoreResponse.get(url, debug: @debug)
+    end
   rescue => e
     "Getting #{url.inspect} => #{e.class}: #{e}".red
   end
 
   command doc: '[BRANCH] display docker build status of branch'
   def docker_status
-    auth_token = complex_config.story.semaphore_auth_token
-    project    = complex_config.story.semaphore_docker_project
-    url        = "https://semaphoreci.com/api/v1/projects/#{project}/docker/status?auth_token=#{auth_token}"
-    Git::Story::SemaphoreResponse.get(url, debug: @debug)
+    watch do
+      auth_token = complex_config.story.semaphore_auth_token
+      project    = complex_config.story.semaphore_docker_project
+      url        = "https://semaphoreci.com/api/v1/projects/#{project}/docker/status?auth_token=#{auth_token}"
+      Git::Story::SemaphoreResponse.get(url, debug: @debug)
+    end
   rescue => e
     "Getting #{url.inspect} => #{e.class}: #{e}".red
   end
 
   command doc: '[SERVER] display deploy status of branch'
   def deploy_status(server = complex_config.story.semaphore_default_server)
-    auth_token = complex_config.story.semaphore_auth_token
-    project    = complex_config.story.semaphore_docker_project
-    url        = "https://semaphoreci.com/api/v1/projects/#{project}/servers/#{server}?auth_token=#{auth_token}"
-    server   = Git::Story::SemaphoreResponse.get(url, debug: @debug)
-    deploys  = server.deploys
-    upcoming = deploys.select(&:pending?)&.last
-    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')}
-      Semaphore: #{server.server_url}
-      Strategy: #{server.strategy}
-      Upcoming:
-      #{upcoming}
-      Current:
-      #{current}
+    watch do
+      auth_token = complex_config.story.semaphore_auth_token
+      project    = complex_config.story.semaphore_docker_project
+      url        = "https://semaphoreci.com/api/v1/projects/#{project}/servers/#{server}?auth_token=#{auth_token}"
+      server   = Git::Story::SemaphoreResponse.get(url, debug: @debug)
+      deploys  = server.deploys
+      upcoming = deploys.select(&:pending?)&.last
+      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')}
+        Semaphore: #{server.server_url}
+        Strategy: #{server.strategy}
+        Upcoming:
+        #{upcoming}
+        Current:
+        #{current}
+      end
     end
   rescue => e
     "Getting #{url.inspect} => #{e.class}: #{e}".red
@@ -140,14 +149,16 @@ class Git::Story::App
 
   command doc: '[BRANCH] display build status for branch'
   def build_status(branch = current(check: false))
-    [
-      "Test Status".bold,
-      test_status(branch) || 'n/a',
-      "Docker Status".bold,
-      docker_status       || 'n/a',
-      "Deploy Status".bold,
-      deploy_status       || 'n/a',
-    ] * "\n\n"
+    watch do
+      [
+        "Test Status".bold,
+        test_status(branch) || 'n/a',
+        "Docker Status".bold,
+        docker_status       || 'n/a',
+        "Deploy Status".bold,
+        deploy_status       || 'n/a',
+      ] * "\n\n"
+    end
   end
 
 
@@ -316,6 +327,29 @@ class Git::Story::App
 
   private
 
+  def watch(&block)
+    if seconds = @opts[?n]&.to_i and !@watching
+      @watching = true
+      if seconds == 0
+        seconds = 60
+      end
+      loop do
+        r = block.()
+        system('clear')
+        start = Time.now
+        puts r
+        refresh_at = start + seconds
+        duration = refresh_at - start
+        if duration > 0
+          puts "<<< #{Time.now.iso8601} Refresh every #{seconds} seconds >>>".rjust(Tins::Terminal.cols)
+          sleep duration
+        end
+      end
+    else
+      block.()
+    end
+  end
+
   def normalize_name(name, max_size: nil)
     name = name.downcase
     name = name.tr('äöü', 'aou').tr(?ß, 'ss')

data/lib/git/story/semaphore.rb

@@ -101,12 +101,11 @@ class Git::Story::SemaphoreResponse < JSON::GenericObject
         end
     r = StringIO.new(r)
     duration_seconds = duration.to_f.to_i
-    total_seconds =
-      if passed? || failed?
-        [ estimated_duration.to_i, duration_seconds ].min
-      else
-        estimated_duration.to_i
-      end
+    if passed? || failed?
+      total_seconds = duration_seconds
+    else
+      total_seconds = estimated_duration.to_i
+    end
     Infobar(
       current: duration_seconds,
       total: total_seconds,

data/lib/git/story/version.rb

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