devtools-jdiff 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb03878b0815ae6c847bf65d121323c0d4f28720
-  data.tar.gz: be362377156fef0f1bd7ac147b17a25b87ad9790
+  metadata.gz: c0724457fede3383a2e9653e143980b65e38f309
+  data.tar.gz: db10e913a6fafc9859d761070fd6f0ae06b26574
 SHA512:
-  metadata.gz: 10f0bf6619e4a1c15db2828447d1a6f16e5ffc50c012f9b0240c35c6a798d02ea37675d2202ebdb5f2c8b1eaa3a713ebdce1bc3f27c60d63c97f9695d5dc6ab4
-  data.tar.gz: 7668654ff35a70baf40d3b8cde29576ba61d45982a3815dbb85fef6b0a018756bdc5f8a85ee05cdbebbfcd9514aa945fe3910e9ccb7cdf0f53b20f60e8d23bdd
+  metadata.gz: 7c5eed3c6442333d79b3b6ce1a4ecb0ec4c0cffb65bb5f16c05e5e0dc4ed82d4f86918f1999642a2787d63f6b1aeda114171c43b7d4cf32e42ab483a29743cc2
+  data.tar.gz: b4be7bd611b3426ef1785541729224faffe7817c6273968994e3f517604b2d81e70765a6758646be24494c45c091ae719e0f23ecfde0e1f62d47b04d23b5503e

data/.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.3
-before_install: gem install bundler -v 1.13.5
+  - 2.4.0
+before_install: gem install bundler -v 1.14.3

data/devtools-jdiff.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "jira_diff/globals"
+require "jira_diff/version"
 
 Gem::Specification.new do |spec|
   spec.name    = "devtools-jdiff"
@@ -21,13 +21,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "config", "~> 1.3"
-  spec.add_dependency "octokit", "~> 4.0"
+  spec.add_dependency "config", "~> 1.4"
+  spec.add_dependency "octokit", "~> 4.6"
   spec.add_dependency "devtools-base", "~> 2.0"
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "pry", "~> 0.4"
-  spec.add_development_dependency "factory_girl", "~> 4.0"
+  spec.add_development_dependency "bundler", "~> 1.14"
+  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rspec", "~> 3.5"
+  spec.add_development_dependency "pry", "~> 0.10"
+  spec.add_development_dependency "factory_girl", "~> 4.8"
 end

data/lib/jira_diff.rb

@@ -1,5 +1,5 @@
 require "devtools"
-require "jira_diff/globals"
+require "jira_diff/version"
 require "jira_diff/options"
 require "jira_diff/stories"
 

data/lib/jira_diff/git.rb

@@ -12,18 +12,18 @@ module JIRADiff
 
     def log(branch)
       raise RuntimeError, "Invalid branch: #{branch}" unless branch_valid? branch
-      run_command("\\git --no-pager log --no-merges --pretty='%H|%s' #{branch}")
+      run_command("\\git --no-pager log --no-merges --pretty='%H|%B\1' #{branch}").split("\1")
     end
 
     def branch_valid?(branch)
-      run_command("\\git branch --all --list #{branch}")[0] =~ /#{branch}/
+      run_command("\\git branch --all --list #{branch}").split("/n")[0] =~ /#{branch}/
     end
 
     private
 
     def run_command(cmd)
       Open3.popen3(cmd, chdir: @working_dir) do |_i, o, _e, _t|
-        o.read.split("\n")
+        o.read
       end
     end
   end

data/lib/jira_diff/stories.rb

@@ -5,11 +5,11 @@ module JIRADiff
   class Stories
 
     def initialize(opts = Options.defaults)
-      @branches = _get_branches(opts[:master], opts[:source])
+      @branches  = _get_branches(opts[:master], opts[:source])
       @directory = opts[:directory] || '.'
-      @includes = _get_includes(opts.includes)
-      @options = opts
-      @stories = opts[:stories] || {}
+      @includes  = _get_includes(opts.includes)
+      @options   = opts
+      @stories   = opts[:stories] || {}
 
       _get_stories if @stories == {}
     end
@@ -43,7 +43,7 @@ module JIRADiff
 
     def master=(new_master)
       @stories[master] = []
-      @branches[0] = new_master
+      @branches[0]     = new_master
       _get_stories(new_master)
     end
 
@@ -77,14 +77,14 @@ module JIRADiff
 
     def diff
       stories = []
-      opts = @options
+      opts    = @options
 
       source_stories.each do |story|
         stories << story unless find(master, story.sha)
       end
 
-      opts.source = ['diff']
-      opts.stories = {'diff' => stories.flatten}
+      opts.source  = ['diff']
+      opts.stories = { 'diff' => stories.flatten }
       Stories.new opts
     end
 
@@ -112,6 +112,8 @@ module JIRADiff
       branches.to_a.each do |branch|
         puts "checking #{branch}" if @options.debug
         git.log(branch).each do |line|
+          line.strip!
+          next if line.empty?
           add_story branch, Story.new(line)
         end
       end

data/lib/jira_diff/story.rb

@@ -1,31 +1,28 @@
 module JIRADiff
 
   class Story
-    def initialize( story )
-      unless story =~ /\S+|\S+/
-        raise ArgumentError, "story must follow 'SHA|description' format"
+    def initialize(story)
+      unless story =~ /\w{40}|.*/
+        raise ArgumentError, 'story must follow "SHA|description" format'
       end
 
-      @sha, @description = story.split('|')
+      @sha, description      = story.split("|")
+      @stories, @description = split_story description
 
       raise ArgumentError if @sha.nil? || @description.nil?
     end
-    attr_reader :sha
 
-    def split_story( description = @description )
-      raise RuntimeError 'description cannot be blank' unless description
+    attr_reader :sha, :stories, :description
 
-      stories = []
-      story_pattern = /\[?(((SRMPRT|OSMCLOUD)\-\d+)|NO-JIRA)\]?[,:\-\s]+\s*(.*)$/
-      line = description.match(story_pattern)
+    def split_story(description)
+      raise RuntimeError, "description cannot be blank" unless description
 
-      if line.nil? # did not find a JIRA ticket pattern
-        stories.push 'NO-JIRA'
-        desc = description.strip
-      else
-        stories.push line.captures[0]
-        desc = line.captures[3].strip
-      end
+      stories       = []
+      story_pattern = /\[?(((SRMPRT|OSMCLOUD)\-\d+)|NO-JIRA)\]?[,:\-\s]?\s*(.*)$/m
+      line          = description.match(story_pattern)
+
+      stories.push line ? line.captures[0] : "JIRA-NOT-FOUND"
+      desc = (line ? line.captures[3] : description).strip
 
       # Perform recursion if there are multiple tickets in the description
       if desc =~ story_pattern
@@ -37,16 +34,12 @@ module JIRADiff
       [stories.flatten, desc]
     end
 
-    def tickets
-      (split_story)[0]
-    end
-
-    def desc
-      (split_story)[1]
+    def subject
+      @description.split("\n")[0].gsub(/[*:-]/, " ").strip rescue "No Description Provided"
     end
 
     def to_s
-      '[%07.07s] %s - %s' % [sha, tickets.join(', '), desc]
+      "[%07.07s] %-14s - %.80s" % [sha, stories.join(", "), subject]
     end
 
   end

data/lib/jira_diff/{globals.rb → version.rb}

@@ -1,4 +1,4 @@
 module JIRADiff
   PROGRAM_NAME = "JIRADiff"
-  VERSION      = "1.0.0"
+  VERSION      = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devtools-jdiff
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Donovan Young
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: config
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.6'
 - !ruby/object:Gem::Dependency
   name: devtools-base
   requirement: !ruby/object:Gem::Requirement
@@ -58,70 +58,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.8'
 description: Looks for JIRA stories within the commits in a git repositoryand compares
   branches to find stories included in one branchbut not another
 email:
@@ -146,10 +146,10 @@ files:
 - exe/jdiff
 - lib/jira_diff.rb
 - lib/jira_diff/git.rb
-- lib/jira_diff/globals.rb
 - lib/jira_diff/options.rb
 - lib/jira_diff/stories.rb
 - lib/jira_diff/story.rb
+- lib/jira_diff/version.rb
 homepage: https://github.com/dyoung522/devtools-jdiff
 licenses:
 - MIT
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Compares git branches, searching for JIRA stories