devflow 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aabd5ba8f8d9adc8ea4b665dfe1c1b03a4963950056bba769300e3c86bc3945d
-  data.tar.gz: a0661dbe39969fde87d8223f2d7f26f4847df2414bf2bc77a2210192d4e537aa
+  metadata.gz: 522a84a07b02411019278e88f44ceb22bdce60ae90b37f1779834096aa86fc85
+  data.tar.gz: 04e7cdd660cd65bb4a6cbae00ed346e488f0e957337d1cbd1be5534ac75e8f16
 SHA512:
-  metadata.gz: 5ad4d483aae485978e2eeb710c0eb453750ae36d58367101462c34ecbbcdc4926c215c2da202777540a22a3f85c85e729db472bfd9c78f9a5c9bbf05967d819e
-  data.tar.gz: 97f98c813de002e534d572a915ede57feba97c74a9706227d21058ecf8dabd85680760a52bb3932005bd4819d6e0973550c0db52c7696806c78c4827214e536c
+  metadata.gz: 8ea1599bad93df1a17d09809693f81c4bf53506476211122d50b577e5eb37d67428fc09d2ed24035fa8aa7672995b896582d8d7dcf2acf05178179a247e82cef
+  data.tar.gz: 65df0c951f96bece6f5ea622714ccb624693356602ca193e7d628221072f5448ce1eac5ebbc1165af5019dcfc3c5868be7d0dd5b700bfb7141f7935276351a8e

data/README.md

@@ -23,11 +23,10 @@ This gem aims to solve that.
 3. run `devflow` when starting working on a new story
 4. Profit?
 
-
 ## Bonus
 Install [hub](https://github.com/github/hub) and add to your .gitconfig;
 ```
 [alias]
-  p-r = "!pr_template_builder | hub -c core.commentChar=';' pull-request -oe -F -"
+  p-r = "!devflow pr | hub -c core.commentChar=';' pull-request -oe -F -"
 ```
 Now you can easily create PRs from the commandline!

data/bin/devflow

@@ -4,25 +4,11 @@ require "devflow"
 
 DevFlow::TargetProcess.check_config!
 
-assignments = DevFlow::TargetProcess.assignments
+args = ARGV[1..-1]
 
-if assignments.count == 1
-  assignment = assignments.first
+case ARGV[0]
+when "pr"
+  DevFlow::Commands::PR.new(args)
 else
-  puts "Multiple tasks in progress. Which one are you working on?"
-  assignments.each do |a|
-    puts "#{a[:id]}: #{a[:name]}"
-  end
-  selection = gets.chomp.to_i
-
-  assignment = assignments.find { |a| a[:id] == selection }
-
-  unless assignment
-    puts "No such task"
-    exit 1
-  end
+  DevFlow::Commands::Branch.new(args)
 end
-
-branch = "#{assignment[:id]}-#{DevFlow.branchify(assignment[:name])}"
-
-`git checkout -b #{branch}`

data/lib/devflow/command.rb

@@ -0,0 +1,11 @@
+module DevFlow
+  class Command
+    def initialize(args)
+      @args = args
+    end
+
+    private
+
+    attr_reader :args
+  end
+end

data/lib/devflow/commands/branch.rb

@@ -0,0 +1,37 @@
+module DevFlow
+  module Commands
+    class Branch < DevFlow::Command
+      def call
+        unless current_assignment
+          puts "No such task"
+          exit 1
+        end
+
+        branch = "#{assignment[:id]}-#{DevFlow.branchify(assignment[:name])}"
+
+        `git checkout -b #{branch}`
+      end
+
+      private
+
+      def assignments
+        DevFlow::TargetProcess.assignments
+      end
+
+      def current_assignment
+        @current_assignment =
+          if assignments.count == 1
+            assignments.first
+          else
+            puts "Multiple tasks in progress. Which one are you working on?"
+            assignments.each do |a|
+              puts "#{a[:id]}: #{a[:name]}"
+            end
+            selection = gets.chomp.to_i
+
+            assignments.find { |a| a[:id] == selection }
+          end
+      end
+    end
+  end
+end

data/lib/devflow/commands/pr.rb

@@ -0,0 +1,50 @@
+module DevFlow
+  module Commands
+    class PR < DevFlow::Command
+      STORY_URL_BASE = "#{DevFlow::TargetProcess::BASE_URI}/entity"
+      STORY_URL_PATTERN = /#{STORY_URL_BASE}\/(\d+)/
+      STORY_REGEX = /^(\d+)-(.*)/
+      FV_REGEX = /^fv-(.*)/
+      PR_TEMPLATES_PATHS = %w[
+        .github/PULL_REQUEST_TEMPLATE.md
+      ]
+
+      def call
+        branch = `git rev-parse --abbrev-ref HEAD`
+
+        def titleize(str)
+          str.tr("-", " ").capitalize
+        end
+
+        case branch
+        when story_regex
+          story_id = $1
+          story_url = STORY_URL_BASE + "/" + story_id
+          title = "[#{story_id}] #{titleize($2)}"
+        when fv_regex
+          story_url = ""
+          title = "[FV] #{titleize($1)}"
+        else
+          story_url = ""
+          title = titleize(branch)
+        end
+
+        message = if (file = PR_TEMPLATES_PATHS.find { |p| File.exist?(p) })
+                    <<~MESS
+                      #{title}
+
+                      #{File.read(file).gsub(STORY_URL_PATTERN, story_url)}
+                    MESS
+                  else
+                    <<~MESS
+                      #{title}
+
+                      #{story_url}
+                    MESS
+                  end
+
+        puts message
+      end
+    end
+  end
+end

data/lib/devflow/version.rb

@@ -1,3 +1,3 @@
 module DevFlow
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devflow
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Micke Lisinge
@@ -43,7 +43,6 @@ email:
 - hi@micke.me
 executables:
 - devflow
-- pr_template_builder
 extensions: []
 extra_rdoc_files: []
 files:
@@ -53,9 +52,11 @@ files:
 - LICENSE
 - README.md
 - bin/devflow
-- bin/pr_template_builder
 - devflow.gemspec
 - lib/devflow.rb
+- lib/devflow/command.rb
+- lib/devflow/commands/branch.rb
+- lib/devflow/commands/pr.rb
 - lib/devflow/target_process.rb
 - lib/devflow/target_process/error.rb
 - lib/devflow/version.rb

data/bin/pr_template_builder

@@ -1,47 +0,0 @@
-#!/usr/bin/env ruby
-
-require "devflow"
-
-DevFlow::TargetProcess.check_config!
-
-story_url_base = "#{DevFlow::TargetProcess::BASE_URI}/entity"
-story_url_pattern = /#{story_url_base}\/(\d+)/
-story_regex = /^(\d+)-(.*)/
-fv_regex = /^fv-(.*)/
-branch = `git rev-parse --abbrev-ref HEAD`
-pr_templates_paths = %w[
-  .github/PULL_REQUEST_TEMPLATE.md
-]
-
-def titleize(str)
-  str.tr("-", " ").capitalize
-end
-
-case branch
-when story_regex
-  story_id = $1
-  story_url = story_url_base + "/" + story_id
-  title = "[#{story_id}] #{titleize($2)}"
-when fv_regex
-  story_url = ""
-  title = "[FV] #{titleize($1)}"
-else
-  story_url = ""
-  title = titleize(branch)
-end
-
-message = if (file = pr_templates_paths.find { |p| File.exist?(p) })
-  <<~MESS
-  #{title}
-
-  #{File.read(file).gsub(story_url_pattern, story_url)}
-  MESS
-else
-  <<~MESS
-  #{title}
-
-  #{story_url}
-  MESS
-end
-
-puts message