git-story-workflow 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46807494af7a6be5225943b1039b703e780e17a5
-  data.tar.gz: 5127db01c16bbc1da8eaae977a1daa697a0ad8d7
+  metadata.gz: bf07f9f4c2ba53aa0f34cfd6bd62b50c35f03cdf
+  data.tar.gz: b1e14858e8fb8006ed03f52dce06580132335d90
 SHA512:
-  metadata.gz: f05b445a33d9259f375c3b092e256f27ef2ee16ec4c634beb580ef0163281536f32223517f7e85937856817e235edfb5fdc82f7fb4ff132052683545a3327510
-  data.tar.gz: 821da3ebd77d2426467121f112eca6e21a9f1d8488b587476c95179aa56891ac7bb35020d2285b68fa26bacbfbaf59058bc91fdff75487be868e9d1348fafa69
+  metadata.gz: 7e86b06c49a7154dd16d444788023df00ec7c63af4d517b7da3e5d30584366fdc4ee8d038716e5ee6468fb3d98d48bea1371e65af01d50a4d090071ec671313f
+  data.tar.gz: 02fced5abd048bd96743f7c1605d17ed1f3d068ce3e5d6e3eb4b288aea483f8fd2b05f5cd7fe0fa2b0b7f251c5c75813c8f9e19f6ced63fb67ac59428fd04b91

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/git-story-workflow.gemspec

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

@@ -20,9 +20,10 @@ class Git::Story::App
     attr_accessor :story_id
   end
 
-  def initialize(argv = ARGV)
+  def initialize(argv = ARGV, debug: ENV['DEBUG'].to_i == 1)
     @argv    = argv
     @command = @argv.shift&.to_sym
+    @debug   = debug
   end
 
   def run
@@ -84,7 +85,9 @@ class Git::Story::App
   command doc: 'list all production deploy tags'
   def deploy_tags
     fetch_tags
-    `git tag | grep ^#{complex_config.story.deploy_tag_prefix} | sort`.lines.map(&:chomp)
+    capture(
+      "git tag | grep ^#{complex_config.story.deploy_tag_prefix} | sort"
+    ).lines.map(&:chomp)
   end
 
   command doc: 'output the times of all production deploys'
@@ -107,21 +110,21 @@ class Git::Story::App
   def deploy_log
     fetch_tags
     opts = '--pretty=tformat:"%C(yellow)%h%Creset %C(green)%ci%Creset %s (%Cred%an <%ae>%Creset)"'
-    `git log #{opts} #{deploy_tags.last}..`
+    capture("git log #{opts} #{deploy_tags.last}..")
   end
 
   command doc: 'output diff since last production deploy tag'
-  def deploy_diff
+  def deploy_diff(ref = nil)
     fetch_tags
     opts = '-u'
-    `git diff --color #{opts} #{deploy_tags.last}`
+    capture("git diff --color #{opts} #{ref} #{deploy_tags.last}")
   end
 
-  command doc: 'outpit migration diff since last production deploy tag'
-  def deploy_migrate_diff
+  command doc: 'output migration diff since last production deploy tag'
+  def deploy_migrate_diff(ref = nil)
     fetch_tags
     opts = '-u'
-    `git diff --color #{opts} #{deploy_tags.last} -- db/migrate`
+    capture("git diff --color #{opts} #{deploy_tags.last} #{ref} -- db/migrate")
   end
 
   command doc: '[STORYID] create a story for story STORYID'
@@ -196,7 +199,7 @@ class Git::Story::App
   def pivotal_get(path)
     path = path.sub(/\A\/*/, '')
     url = "https://www.pivotaltracker.com/services/v5/#{path}"
-    $DEBUG and warn "Fetching #{url.inspect}"
+    @debug and STDERR.puts "Fetching #{url.inspect}"
     open(url,
          'X-TrackerToken' => pivotal_token,
          'Content-Type'   => 'application/xml',
@@ -215,7 +218,7 @@ class Git::Story::App
 
   def stories
     sh 'git remote prune origin', error: false
-    `git branch -r | grep -e '^ *origin/'`.lines.map do |l|
+    capture("git branch -r | grep -e '^ *origin/'").lines.map do |l|
       b = l.strip
       b_base = File.basename(b)
       if b_base =~ BRANCH_NAME_REGEX
@@ -229,7 +232,7 @@ class Git::Story::App
   end
 
   def current_branch
-    `git rev-parse --abbrev-ref HEAD`.strip
+    capture("git rev-parse --abbrev-ref HEAD").strip
   end
 
   def check_current

data/lib/git/story/utils.rb

@@ -4,6 +4,7 @@ module Git::Story::Utils
   include FileUtils::Verbose
 
   def sh(*a, error: true)
+    @debug and STDERR.puts("Executing #{a * ' '}")
     system(*a)
     if error && !$?.success?
       STDERR.puts ("Failed with rc #{$?.exitstatus}: " + a.join(' ')).red
@@ -11,6 +12,13 @@ module Git::Story::Utils
     end
   end
 
+  def capture(command)
+    @debug and STDERR.puts("Executing #{command.inspect}")
+    result = `#{command}`
+    @debug and STDERR.puts("Result\n#{result}")
+    result
+  end
+
   def ask(prompt: '? ', **options, &block)
     response = options[:preset]
     unless response

data/lib/git/story/version.rb

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