git-story-workflow 1.4.1 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ef8d1e191f13d4e77de20b5fc538031c49bbc464c3ee345636f440552d944ac
-  data.tar.gz: 748a64331b6287988c2361052148ff60d0399dc74db0f09de01f8d180d38f99a
+  metadata.gz: b2d8278e31abf927d6a9621efe9be58361e75b6edc02ca47015d97bbf61f2674
+  data.tar.gz: b6a82b12b583966eaf6fb10ea2c6e1f24aa3e0fd79db83aca76c2ee37494e7e0
 SHA512:
-  metadata.gz: 88608ce799a9ac2ac6ea5b2f13353bb159319838f3bf6f8201efc4ffdbf151904c3afee2040824f326104173895837bb791834eea4459db0c05e950b393228cc
-  data.tar.gz: 557b78253cd6e7fcb48886ab607d914dfa5199ea884a066774a5ddfb270fe70e6a5ddaca31741d2839bb048a4845976d0b74db78201a6b7a9d792645adee2a7c
+  metadata.gz: cc21f4fa064f87add0afbef50b7c53d807107f040f89e3a0309bf34b3ba9da289abfd1b1901dedb422aa058eb78feb685643fc1331542902885cc3de4bdbe240
+  data.tar.gz: 0b6860587a49c17bc15143415bb12e5d29622b24cf3bf8095f7c606675090aa5b44951e9a62d05267ae68520330673d67237934127b443c0a334ba944a551e3c

data/Rakefile

@@ -27,6 +27,7 @@ GemHadar do
   development_dependency 'rake'
   development_dependency 'simplecov'
   development_dependency 'rspec'
+  development_dependency 'byebug'
   licenses << 'Apache-2.0'
 end
 

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.6.1

data/config/story.yml

@@ -1,4 +1,8 @@
 ---
-pivotal_token: <%= ENV['PIVOTAL_TOKEN'] %>
-pivotal_project: 123456789
+pivotal_token:   <%= ENV['PIVOTAL_TOKEN'] %>
+pivotal_project: 1254912
+pivotal_reference_prefix: pivotal
 deploy_tag_prefix: production_deploy_
+semaphore_auth_token: <%= ENV['SEMAPHORE_AUTH_TOKEN'] %>
+semaphore_project_url: https://betterplace.semaphoreci.com/projects/betterplace
+todo_nudging: <%= ENV['TODO_NUDGING'].to_i == 1 %>

data/git-story-workflow.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: git-story-workflow 1.4.1 ruby lib
+# stub: git-story-workflow 1.6.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "git-story-workflow".freeze
-  s.version = "1.4.1"
+  s.version = "1.6.1"
 
   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 = "2021-08-17"
+  s.date = "2021-12-08"
   s.description = "Gem abstracting a git workflow\u2026".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["git-story".freeze]
@@ -30,6 +30,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_development_dependency(%q<byebug>.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"])
@@ -41,6 +42,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<byebug>.freeze, [">= 0"])
     s.add_dependency(%q<infobar>.freeze, [">= 0"])
     s.add_dependency(%q<tins>.freeze, [">= 0"])
     s.add_dependency(%q<mize>.freeze, [">= 0"])

data/lib/git/story/app.rb

@@ -39,7 +39,13 @@ class Git::Story::App
     @opts      = go 'n:', @argv
     @debug     = debug
     determine_command
-    Git::Story::Setup.perform
+    if !cc.story? && @command != :setup
+      warn "git story configuration file " +
+        "config/story.yml".bold + " is missing.\n\nCall " +
+        "git story setup".bold + " to create an initial one, inspect and " +
+        "edit it yourself, and also set the appropriate env vars.\n\n"
+      @command, @argv = :help, []
+    end
   end
 
   def run
@@ -72,6 +78,15 @@ class Git::Story::App
     )
   end
 
+  command doc: 'initialize git story config file if missing'
+  def setup
+    if cc.config?
+      red("config/story.yml configration already exists!")
+    else
+      Git::Story::Setup.perform
+    end
+  end
+
   command doc: 'output the current story branch if it is checked out'
   def current(check: true)
     if check
@@ -85,31 +100,9 @@ class Git::Story::App
     end
   end
 
-  def provide_name(story_id = nil)
-    until story_id.present?
-      story_id = ask(prompt: 'Story id? ').strip
-    end
-    story_id = story_id.gsub(/[^0-9]+/, '')
-    @story_id = Integer(story_id)
-    if stories.any? { |s| s.story_id == @story_id }
-      @reason = "story for ##@story_id already created"
-      return
-    end
-    if name = fetch_story_name(@story_id)
-      name = normalize_name(
-        name,
-        max_size: 128 - 'story'.size - @story_id.to_s.size - 2 * ?_.size
-      ).full? || name
-      [ 'story', name, @story_id ] * ?_
-    else
-      @reason = "name for ##@story_id could not be fetched from tracker"
-      return
-    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)
+    if story = fetch_story(story_id, with_owner: true)
       color_state =
         case cs = story.current_state
         when 'unscheduled', 'planned', 'unstarted'
@@ -132,20 +125,21 @@ class Git::Story::App
         else
           t
         end
-      owners = Array(fetch_story_owners(story_id)).map { |o| "#{o.name} <#{o.email}>" }
       result = <<~end
         Id: #{(?# + story.id.to_s).green}
         Name: #{story.name.inspect.bold}
         Type: #{color_type}
         Estimate: #{story.estimate.to_s.full? { |e| e.yellow.bold } || 'n/a'}
         State: #{color_state}
-        Branch: #{current_branch_checked?&.color('#ff5f00')}
         Labels: #{story.labels.map { |l| l.name.on_color(91) }.join(' ')}
-        Owners: #{owners.join(', ').yellow}
+        Owners: #{story.owners.map { |o| "%s <%s>" % [ o.name, o.email ] }.join(', ').yellow}
         Pivotal: #{story.url.color(33)}
       end
-      if url = github_url(current_branch_checked?)
-        result << "Github: #{url.color(33)}\n"
+      if branch = current_branch_checked? and url = github_url(current_branch_checked?)
+        result << <<~end
+          Github: #{url.color(33)}
+          Branch: #{branch.color('#ff5f00')}
+        end
       end
       result
     end
@@ -211,7 +205,8 @@ class Git::Story::App
     fetch_tags
     opts = ([
       '--color=never',
-      '--pretty=%B'
+      '--pretty=%B',
+      '--reverse',
     ] | rest) * ' '
     output = capture("git log #{opts} #{ref}")
     pivotal_ids = SortedSet[]
@@ -219,18 +214,44 @@ class Git::Story::App
     fetch_statuses(pivotal_ids) * (?┄ * Tins::Terminal.cols << ?\n)
   end
 
-  def fetch_statuses(pivotal_ids)
-    tg = ThreadGroup.new
-    pivotal_ids.each do |pid|
-      tg.add Thread.new { Thread.current[:status] = status(pid) }
+  command doc: '[REF] Create some parts of deploy document'
+  def deploy_document(ref = default_ref, rest: [])
+    ref = build_ref_range(ref)
+    fetch_commits
+    fetch_tags
+    opts = ([
+      '--color=never',
+      '--pretty=%B'
+    ] | rest) * ' '
+    output = capture("git log #{opts} #{ref}")
+    pivotal_ids = SortedSet[]
+    output.scan(/\[\s*#\s*(\d+)\s*\]/) { pivotal_ids << $1.to_i }
+    stories   = ''
+    attendees = Set[]
+    fetch_stories(pivotal_ids) do |pid|
+      story = fetch_story(pid, with_owner: true)
+      attendees.merge story.owners
+      stories << <<~end
+      • [##{story.id}] #{story.name}
+        ○ Pivotal: https://www.pivotaltracker.com/story/show/#{pid}
+        ○ Type: #{story.story_type}
+        ○ Status: #{story.current_state}
+        ○ Owners: #{story.owners.map { |o| "%s <%s>" % [ o.name, o.email ] }.join(', ')}
+        ○ Tasks to be done before deployment:
+          ☐ …
+        ○ Tasks to be done after deployment:
+         ☐ …
+      end
     end
-    tg.list.with_infobar(label: 'Story').map do |t|
-      +infobar
-      t.join
-      t[:status]
+    attendees.map! { |a| "• @#{a.email}" }
+    <<~end
+      #{attendees.join(?\n)}
+
+      #{stories}
     end
   end
 
+
   command doc: '[REF] output diff since last production deploy tag'
   def deploy_diff(ref = default_ref, rest: [])
     ref = build_ref_range(ref)
@@ -261,8 +282,8 @@ class Git::Story::App
     "Story #{name} created.".green
   end
 
-  command doc: '[PATTERN] switch to story matching PATTERN'
-  def switch(pattern = nil)
+  command doc: 'switch to selected story branch'
+  def switch
     fetch_commits
     if branch = pick_branch(prompt: 'Switch to story? %s')
       sh "git checkout #{branch}"
@@ -270,7 +291,7 @@ class Git::Story::App
     end
   end
 
-  command doc: '[PATTERN] delete story branch matching PATTERN'
+  command doc: 'delete selected story branch'
   def delete(pattern = nil)
     fetch_commits
     if branch = pick_branch(prompt: 'Delete story branch? %s', symbol: ?⌦)
@@ -322,6 +343,28 @@ class Git::Story::App
 
   private
 
+  def provide_name(story_id = nil)
+    until story_id.present?
+      story_id = ask(prompt: 'Story id? ').strip
+    end
+    story_id = story_id.gsub(/[^0-9]+/, '')
+    @story_id = Integer(story_id)
+    if stories.any? { |s| s.story_id == @story_id }
+      @reason = "story for ##@story_id already created"
+      return
+    end
+    if name = fetch_story_name(@story_id)
+      name = normalize_name(
+        name,
+        max_size: 128 - 'story'.size - @story_id.to_s.size - 2 * ?_.size
+      ).full? || name
+      [ 'story', name, @story_id ] * ?_
+    else
+      @reason = "name for ##@story_id could not be fetched from tracker"
+      return
+    end
+  end
+
   def determine_command
     c, command = [], nil
     possible_commands = []
@@ -433,11 +476,6 @@ class Git::Story::App
     name
   end
 
-  def apply_pattern(pattern, stories)
-    pattern = pattern.gsub(?#, '')
-    stories.grep(/#{Regexp.quote(pattern)}/)
-  end
-
   def error(msg)
     puts msg.red
     exit 1
@@ -455,8 +493,11 @@ class Git::Story::App
     fetch_story(story_id)&.name
   end
 
-  def fetch_story(story_id)
-    pivotal_get("projects/#{pivotal_project}/stories/#{story_id}").full?
+  def fetch_story(story_id, with_owner: false)
+    if story = pivotal_get("projects/#{pivotal_project}/stories/#{story_id}").full?
+      story.owners = Array((fetch_story_owners(story_id) if with_owner))
+    end
+    story
   end
 
   def fetch_story_owners(story_id)
@@ -466,7 +507,12 @@ class Git::Story::App
   def pivotal_get(path)
     path = path.sub(/\A\/*/, '')
     url = "https://www.pivotaltracker.com/services/v5/#{path}"
-    @debug and STDERR.puts "Fetching #{url.inspect}"
+    if pivotal_token
+      @debug and STDERR.puts "Fetching #{url.inspect}"
+    else
+      STDERR.puts "Cannot fetch #{url.inspect} without PIVOTAL_TOKEN set as env var"
+      return
+    end
     URI.open(url,
          'X-TrackerToken' => pivotal_token,
          'Content-Type'   => 'application/xml',
@@ -566,4 +612,27 @@ class Git::Story::App
     url = url.sub('git@github.com:', 'https://github.com/')
     url = url.sub(/(\.git)\z/, "/tree/#{branch}")
   end
+
+  def fetch_stories(pivotal_ids, &block)
+    block or raise ArgumentError, '&block parameter is required'
+    tg = ThreadGroup.new
+    pivotal_ids.each do |pid|
+      order = 0
+      tg.add Thread.new {
+        Thread.current[:order] = order
+        Thread.current[:result] = block.(pid)
+      }
+    end
+    tg.list.with_infobar(label: 'Story').map do |t|
+      t.join
+      +infobar
+      [ t[:order], t[:result] ]
+    end.sort_by(&:first).transpose[1]
+  end
+
+  def fetch_statuses(pivotal_ids)
+    fetch_stories(pivotal_ids) do |pid|
+      status(pid)
+    end
+  end
 end

data/lib/git/story/setup.rb

@@ -8,15 +8,35 @@ module Git::Story::Setup
   PREPARE_COMMIT_MESSAGE_SRC = File.join(__dir__, 'prepare-commit-msg')
   PREPARE_COMMIT_MESSAGE_DST = File.join(HOOKS_DIR, 'prepare-commit-msg')
 
+  CONFIG_TEMPLATE = <<~end
+    ---
+    pivotal_token:   <%= ENV['PIVOTAL_TOKEN'] %>
+    pivotal_project: 123456789
+    pivotal_reference_prefix: pivotal
+    deploy_tag_prefix: production_deploy_
+    semaphore_auth_token: <%= ENV['SEMAPHORE_AUTH_TOKEN'] %>
+    semaphore_project_url: https://betterplace.semaphoreci.com/projects/betterplace
+    todo_nudging: <%= ENV['TODO_NUDGING'].to_i == 1 %>
+  end
+
+
   module_function
 
   def perform(force: false)
+    unless File.directory?('.git')
+      puts "No directory .git found, you need an initialized git repo for this to work"
+      return
+    end
+    install_config('config/story.yml', force: force)
+    install_hooks(force: force)
+    "Setup was performed."
+  end
+
+  def install_hooks(force: false)
     for filename in %w[ prepare-commit-msg pre-push ]
       if path = file_installed?(filename)
-        if force
+        if force || File.read(path).match?(MARKER)
           install_file filename
-        elsif File.read(path).match?(MARKER)
-          ;
         else
           ask(
             prompt: "File #{path.inspect} not created by git-story."\
@@ -43,6 +63,28 @@ module Git::Story::Setup
 
   def install_file(filename)
     File.exist?(HOOKS_DIR) or mkdir_p(HOOKS_DIR)
-    cp File.join(__dir__, filename), File.join(HOOKS_DIR, filename)
+    cp File.join(__dir__, filename), dest = File.join(HOOKS_DIR, filename)
+    puts "#{filename.to_s.inspect} was installed to #{dest.to_s.inspect}."
+  end
+
+  def install_config(filename, force: false)
+    filename = File.expand_path(filename)
+    if !force && File.exist?(filename)
+      ask(
+        prompt: "File #{filename.to_s.inspect} exists."\
+        " Overwrite? (y/n, default is %s) ",
+        default: ?n,
+      ) do |response|
+        if response != ?y
+          puts "Skipping creation of #{filename.to_s.inspect}."
+          return
+        end
+      end
+    end
+    mkdir_p File.dirname(filename)
+    File.secure_write(filename) do |io|
+      io.puts CONFIG_TEMPLATE
+    end
+    puts "#{filename.to_s.inspect} was created."
   end
 end

data/lib/git/story/version.rb

@@ -1,6 +1,6 @@
 module Git::Story
   # Git::Story version
-  VERSION         = '1.4.1'
+  VERSION         = '1.6.1'
   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: 1.4.1
+  version: 1.6.1
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-12-08 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: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: infobar
   requirement: !ruby/object:Gem::Requirement