git-story-workflow 0.11.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c437719bf4e7298ee339477a48e37e6652a028876c7c1ef524953a24792b4099
-  data.tar.gz: 2dfe54728f5d8ad1d0655ad6e9c1706e905ae952af8678812002bb2fc6b20f46
+  metadata.gz: 7db0a45891bcce9a80051da5c583b30218ef6ad2881006440c6995e6ba95ad40
+  data.tar.gz: abcb5921d4d65d818c39ff0ee8af5c77e8b3fd517506db141e0c25e8cd1ca8ac
 SHA512:
-  metadata.gz: d32bb92036c60fbea1492caa8c79fc211d96aa60adc389386d9e8ed585d3613c8a3abf8562c19fafdf68450a6a21a3b4ff297a0df94ac111ff7a5317aa3b1942
-  data.tar.gz: 571614a5c236d81ea10bbe3628ff5bbf2812d6d1b2f68b479fcb2c0d02c6b2c55d54cbb367e3b3bf49592c8ef4e5b03cbc58f8098df6e7f276d018716135b85c
+  metadata.gz: e69e2cfd05235940649f29100fa36acfb3edfec918c673e7a79f5468b1ee529db3a54c9d00cd0eca3e0cec12df0578b6b185cef6e45fe0af747664eac897a7f9
+  data.tar.gz: 13f82228787833511601d676f2a648d3e0cc00f31b6462794a8f99c062309cbfd66e362d4647e24c8d70154a0f0e651c3c463881e726f8f2f22c61aa9de432f0

data/VERSION

@@ -1 +1 @@
-0.11.0
+1.1.0

data/git-story-workflow.gemspec

@@ -1,23 +1,23 @@
 # -*- encoding: utf-8 -*-
-# stub: git-story-workflow 0.11.0 ruby lib
+# stub: git-story-workflow 1.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "git-story-workflow".freeze
-  s.version = "0.11.0"
+  s.version = "1.1.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-28"
+  s.date = "2020-11-27"
   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/pre-push".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,13 +36,13 @@ 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
+    Git::Story::Setup.perform
   end
 
   def run
-    Git::Story::Setup.perform
     if command_of(@command)
       if method(@command).parameters.include?(%i[key rest])
         puts __send__(@command, *@argv, rest: @rest_argv)
@@ -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)
@@ -355,6 +302,23 @@ 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(

data/lib/git/story/pre-push

@@ -0,0 +1,35 @@
+#!/bin/sh
+# Installed by the git-story gem
+
+remote="$1"
+url="$2"
+
+z40=0000000000000000000000000000000000000000
+
+while read local_ref local_sha remote_ref remote_sha
+do
+	if [ "$local_sha" = $z40 ]
+	then
+		# Handle delete
+		:
+	else
+		if [ "$remote_sha" = $z40 ]
+		then
+			# New branch, examine all commits
+			range="$local_sha"
+		else
+			# Update to existing branch, examine new commits
+			range="$remote_sha..$local_sha"
+		fi
+
+		# Check for WIP or [TODO] commit
+		commit=`git rev-list -n 1 --pretty=%B "$range" | egrep -i 'WIP|\[TODO\]'`
+		if [ -n "$commit" -a "$FORCE" != "1" ]
+		then
+			echo >&2 "Found WIP / [TODO] commit in $local_ref, not pushing"
+			exit 1
+		fi
+	fi
+done
+
+exit 0

data/lib/git/story/setup.rb

@@ -11,30 +11,38 @@ module Git::Story::Setup
   module_function
 
   def perform(force: false)
-    pcm = PREPARE_COMMIT_MESSAGE_DST
-    if File.exist?(pcm)
-      if force
-        install_prepare_commit_msg
-      elsif File.read(pcm).match?(MARKER)
-        ;
-      else
-        ask(
-          prompt: "File #{pcm.inspect} not created by git-story."\
-            " Overwrite? (y/n, default is %s)",
-          default: ?n,
-        ) do |response|
-          if response == ?y
-            install_prepare_commit_msg
+    for filename in %w[ prepare-commit-msg pre-push ]
+      if path = file_installed?(filename)
+        if force
+          install_file filename
+        elsif File.read(path).match?(MARKER)
+          ;
+        else
+          ask(
+            prompt: "File #{path.inspect} not created by git-story."\
+              " Overwrite? (y/n, default is %s) ",
+            default: ?n,
+          ) do |response|
+            if response == ?y
+              install_file filename
+            end
           end
         end
+      else
+        install_file filename
       end
-    else
-      install_prepare_commit_msg
     end
   end
 
-  def install_prepare_commit_msg
+  def file_installed?(filename)
+    path = File.join(HOOKS_DIR, filename)
+    if File.exist?(path)
+      path
+    end
+  end
+
+  def install_file(filename)
     File.exist?(HOOKS_DIR) or mkdir_p(HOOKS_DIR)
-    cp PREPARE_COMMIT_MESSAGE_SRC, PREPARE_COMMIT_MESSAGE_DST
+    cp File.join(__dir__, filename), File.join(HOOKS_DIR, filename)
   end
 end

data/lib/git/story/version.rb

@@ -1,6 +1,6 @@
 module Git::Story
   # Git::Story version
-  VERSION         = '0.11.0'
+  VERSION         = '1.1.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.11.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Florian Frank
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2020-11-27 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
@@ -175,8 +174,8 @@ files:
 - git-story-workflow.gemspec
 - lib/git/story.rb
 - lib/git/story/app.rb
+- lib/git/story/pre-push
 - 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 +185,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 +204,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