git-story-workflow 0.10.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0a262c355dd2d101911c442e5e9ba5d12da74967e3db37a600dc5f2f21ed1d9
-  data.tar.gz: bfe8ea9f227c933eaec80aae69bef429cac5d76eb311b0ddf40b7bd6247e7779
+  metadata.gz: 7436139595b89b702416d8a9d0f792d2c4cf078a89d56ae462093e4a36c8b1f4
+  data.tar.gz: 3a2542c050b36b046b49130b356284825fa3fd6d2cfef9bffbdea7735298555f
 SHA512:
-  metadata.gz: b4957004998e3f360de92b4724a65a86ea3bc0e8264e5a740c1f8c6d4e725a4e787f449d429cfb2e5e738cd8c60cc81a38f3b481a10682282dc075c22a196ff4
-  data.tar.gz: 89b63867df083dccceb9673a9d18b6bfc04dcbe2e592cecf7a24826b753883079e5a8072d4645660a2e2af89427c516eba8019f3f55f189b825f1db9e4f7f3dd
+  metadata.gz: eb7071e5a13b018ed232b9ff0e15357037b417c24720ea420b0d1ed370e83ecd8b54b65f60f4f426c8a6c6c30db236894a6839504d389bf0343e6f2efac2771f
+  data.tar.gz: c1755fe341e1f171169627dfe4a9b40b20a9fe34fc565f5ae2ee2d2925aebbdb38949fd5b8a1e7285730bd25fffba1c7d7b750113a44b9af4acb4204de2725a9

data/VERSION

@@ -1 +1 @@
-0.10.0
+1.0.0

data/git-story-workflow.gemspec

@@ -1,23 +1,23 @@
 # -*- encoding: utf-8 -*-
-# stub: git-story-workflow 0.10.0 ruby lib
+# stub: git-story-workflow 1.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "git-story-workflow".freeze
-  s.version = "0.10.0"
+  s.version = "1.0.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 = "2020-02-11"
+  s.date = "2020-09-10"
   s.description = "Gem abstracting a git workflow\u2026".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["git-story".freeze]
-  s.extra_rdoc_files = ["README.md".freeze, "lib/git/story.rb".freeze, "lib/git/story/app.rb".freeze, "lib/git/story/semaphore.rb".freeze, "lib/git/story/setup.rb".freeze, "lib/git/story/utils.rb".freeze, "lib/git/story/version.rb".freeze]
-  s.files = [".gitignore".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/git-story".freeze, "config/story.yml".freeze, "git-story-workflow.gemspec".freeze, "lib/git/story.rb".freeze, "lib/git/story/app.rb".freeze, "lib/git/story/prepare-commit-msg".freeze, "lib/git/story/semaphore.rb".freeze, "lib/git/story/setup.rb".freeze, "lib/git/story/utils.rb".freeze, "lib/git/story/version.rb".freeze, "spec/git/story/app_spec.rb".freeze, "spec/spec_helper.rb".freeze]
+  s.extra_rdoc_files = ["README.md".freeze, "lib/git/story.rb".freeze, "lib/git/story/app.rb".freeze, "lib/git/story/setup.rb".freeze, "lib/git/story/utils.rb".freeze, "lib/git/story/version.rb".freeze]
+  s.files = [".gitignore".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/git-story".freeze, "config/story.yml".freeze, "git-story-workflow.gemspec".freeze, "lib/git/story.rb".freeze, "lib/git/story/app.rb".freeze, "lib/git/story/prepare-commit-msg".freeze, "lib/git/story/setup.rb".freeze, "lib/git/story/utils.rb".freeze, "lib/git/story/version.rb".freeze, "spec/git/story/app_spec.rb".freeze, "spec/spec_helper.rb".freeze]
   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 = "3.1.2".freeze
+  s.rubygems_version = "3.1.4".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.rb

@@ -21,5 +21,4 @@ end
 require 'git/story/version'
 require 'git/story/utils'
 require 'git/story/setup'
-require 'git/story/semaphore'
 require 'git/story/app'

data/lib/git/story/app.rb

@@ -36,9 +36,9 @@ class Git::Story::App
   def initialize(argv = ARGV.dup, debug: ENV['DEBUG'].to_i == 1)
     @rest_argv = (sep = argv.index('--')) ? argv.slice!(sep..-1).tap(&:shift) : []
     @argv      = argv
-    @opts    = go 'n:', @argv
-    @command = @argv.shift&.to_sym
-    @debug   = debug
+    @opts      = go 'n:', @argv
+    @debug     = debug
+    determine_command
   end
 
   def run
@@ -50,8 +50,11 @@ class Git::Story::App
         puts __send__(@command, *@argv)
       end
     else
-      @command and @command = @command.inspect
-      @command ||= 'n/a'
+      if @command
+        @command = @command.inspect
+      else
+        @command = 'n/a'
+      end
       STDERR.puts "Unknown command #{@command}\n\n#{help.join(?\n)}"
       exit 1
     end
@@ -64,7 +67,7 @@ class Git::Story::App
     longest = command_annotations.keys.map(&:size).max
     result.concat(
       command_annotations.map { |name, a|
-        "#{name.to_s.ljust(longest)} #{a[:doc]}"
+        "#{name.to_s.gsub(?_, ' ').ljust(longest)} #{a[:doc]}"
       }
     )
   end
@@ -104,62 +107,6 @@ class Git::Story::App
     end
   end
 
-  command doc: '[BRANCH] display test status of branch, -n SECONDS refreshes'
-  def test_status(branch = current(check: false))
-    url = nil
-    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: '[SERVER] display deploy status of branch, -n SECONDS refreshes'
-  def deploy_status(server = complex_config.story.semaphore_default_server)
-    url = nil
-    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}/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
-  end
-
-  command doc: '[BRANCH] display build status for branch, -n SECONDS refreshes'
-  def build_status(branch = current(check: false))
-    watch do
-      [
-        "Test Status".bold,
-        test_status(branch) || 'n/a',
-        "Deploy Status".bold,
-        deploy_status       || 'n/a',
-      ] * "\n\n"
-    end
-  end
-
-
   command doc: '[STORY_ID] fetch status of current story, -n SECONDS refreshes'
   def status(story_id = current(check: true)&.[](/_(\d+)\z/, 1)&.to_i)
     if story = fetch_story(story_id)
@@ -317,34 +264,25 @@ class Git::Story::App
   command doc: '[PATTERN] switch to story matching PATTERN'
   def switch(pattern = nil)
     fetch_commits
-    ss = stories.map(&:story_base_name)
-    branch = Search.new(
-      match: -> answer {
-        answer = answer.strip.delete(?#).downcase
-
-        matcher = Amatch::PairDistance.new(answer)
-        matches = ss.map { |n| [ n, -matcher.similar(n.downcase) ] }.
-          select { |_, s| s < 0 }.sort_by(&:last).map(&:first)
-
-        matches.empty? and matches = ss
-        matches.first(Tins::Terminal.lines - 1)
-      },
-      query: -> _answer, matches, selector {
-        matches.each_with_index.
-          map { |m, i| i == selector ? '⏻ ' + Search.on_blue(m) : '┊ ' + m } * ?\n
-      },
-      found: -> _answer, matches, selector {
-        matches[selector]
-      },
-      prompt: 'Story? %s'.bold,
-      output: STDOUT
-    ).start
-    if branch
+    if branch = pick_branch(prompt: 'Switch to story? %s')
       sh "git checkout #{branch}"
       return "Switched to story: #{branch}".green
     end
   end
 
+  command doc: '[PATTERN] delete story branch matching PATTERN'
+  def delete(pattern = nil)
+    fetch_commits
+    if branch = pick_branch(prompt: 'Delete story branch? %s', symbol: ?⌦)
+      sh "git pull origin #{branch}"
+      sh "git branch -d #{branch}"
+      if ask(prompt: 'Delete remote branch? (y/N) ') =~ /\Ay\z/i
+        sh "git push origin #{branch} --delete"
+      end
+      return "Deleted story branch: #{branch}".green
+    end
+  end
+
   command doc: '[BRANCH] open branch on github'
   def github(branch = current(check: false))
     if url = github_url(branch)
@@ -364,6 +302,48 @@ class Git::Story::App
 
   private
 
+  def determine_command
+    c, command = [], nil
+    possible_commands = []
+    until @argv.empty?
+      c << @argv.shift
+      command = c.join(?_).to_sym
+      if command_of(command)
+        possible_commands << [ command, @argv.dup ]
+      end
+    end
+    unless possible_commands.empty?
+      @command, argv = possible_commands.last
+      @argv.replace(argv)
+    end
+    self
+  end
+
+  def pick_branch(prompt:, symbol: ?⏻)
+    ss = stories.map(&:story_base_name)
+    branch = Search.new(
+      match: -> answer {
+        answer = answer.strip.delete(?#).downcase
+
+        matcher = Amatch::PairDistance.new(answer)
+        matches = ss.map { |n| [ n, -matcher.similar(n.downcase) ] }.
+          select { |_, s| s < 0 }.sort_by(&:last).map(&:first)
+
+        matches.empty? and matches = ss
+        matches.first(Tins::Terminal.lines - 1)
+      },
+      query: -> _answer, matches, selector {
+        matches.each_with_index.
+          map { |m, i| i == selector ? "#{symbol} " + Search.on_blue(m) : '┊ ' + m } * ?\n
+      },
+      found: -> _answer, matches, selector {
+        matches[selector]
+      },
+      prompt: prompt.bold,
+      output: STDOUT
+    ).start
+  end
+
   def default_ref
     tags.last
   end

data/lib/git/story/version.rb

@@ -1,6 +1,6 @@
 module Git::Story
   # Git::Story version
-  VERSION         = '0.10.0'
+  VERSION         = '1.0.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.10.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Florian Frank
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -159,7 +159,6 @@ extra_rdoc_files:
 - README.md
 - lib/git/story.rb
 - lib/git/story/app.rb
-- lib/git/story/semaphore.rb
 - lib/git/story/setup.rb
 - lib/git/story/utils.rb
 - lib/git/story/version.rb
@@ -176,7 +175,6 @@ files:
 - lib/git/story.rb
 - lib/git/story/app.rb
 - lib/git/story/prepare-commit-msg
-- lib/git/story/semaphore.rb
 - lib/git/story/setup.rb
 - lib/git/story/utils.rb
 - lib/git/story/version.rb
@@ -186,7 +184,7 @@ homepage: http://flori.github.com/git-story-workflow
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - Git-story-workflow
@@ -205,8 +203,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Gem abstracting a git workflow
 test_files:

data/lib/git/story/semaphore.rb

@@ -1,141 +0,0 @@
-require 'json'
-require 'time'
-require 'open-uri'
-require 'infobar'
-
-class Git::Story::SemaphoreResponse < JSON::GenericObject
-  def self.get(url, debug: false)
-    data = URI.open(url).read
-    debug and STDERR.puts JSON.pretty_generate(JSON(data))
-    result = JSON(data, object_class: self)
-    result.debug = debug
-    result
-  end
-
-  def duration(time = nil)
-    unless time
-      if finished_at.nil?
-        time = Time.now
-      else
-        time = Time.parse(finished_at)
-      end
-    end
-    if started_at
-      Tins::Duration.new(time - Time.parse(started_at))
-    else
-      Tins::Duration.new(0)
-    end
-  end
-
-  def pending?
-    result == 'pending'
-  end
-
-  def building?
-    !started_at.nil?
-  end
-
-  def passed?
-    result == 'passed'
-  end
-
-  def failed?
-    result == 'failed'
-  end
-
-  def canceled?
-    result == 'canceled'
-  end
-
-  def finished?
-    finished_at.blank?
-  end
-
-  def sha1
-    commit.id[0,10]
-  end
-
-  def entity_url
-    server_html_url || build_url
-  end
-
-  def entity_name
-    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
-    if ed = super
-      ed
-    else
-      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 infobar_style
-    case
-    when passed?, pending?
-      {
-        done_fg_color: '#005f00',
-        done_bg_color: '#00d700',
-        todo_fg_color: '#00d700',
-        todo_bg_color: '#005f00',
-      }
-    else
-      {
-        done_fg_color: '#5f0000',
-        done_bg_color: '#d70000',
-        todo_fg_color: '#d70000',
-        todo_bg_color: '#5f0000',
-      }
-    end
-  end
-
-  def to_s
-    r = case
-        when pending? && building?
-          "#{entity_name} ##{sha1} building for #{duration(Time.now)}".yellow.bold
-        when pending?
-          "#{entity_name} ##{sha1} pending at the moment".yellow
-        when passed?
-          "#{entity_name} ##{sha1} passed after #{duration}".green
-        when failed?
-          "#{entity_name} ##{sha1} failed after #{duration}".red
-        else
-          "#{entity_name} ##{sha1} in state #{result}".blue
-        end
-    r = StringIO.new(r)
-    duration_seconds = duration.to_f.to_i
-    if passed? || failed?
-      total_seconds = duration_seconds
-    else
-      total_seconds = estimated_duration.to_i
-    end
-    Infobar(
-      current: duration_seconds,
-      total: total_seconds,
-      message: ' %l %c/%t seconds ',
-      style: infobar_style,
-      output: r
-    ).update
-    r <<
-      "\n  Semaphore: #{entity_url}" <<
-      "\n  Commit: #{commit.url}\n#{commit.message&.gsub(/^/, " " * 10)&.color(33)}" <<
-      "\n  Authored: #{(commit.author_name + ' <' + commit.author_email + ?>).bold} @#{commit.timestamp}"
-    r.tap(&:rewind).read
-  end
-end