gitbc 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9cde4872d0db042174216009deb16045c9d9902
-  data.tar.gz: 86307914e0ca9e847d0ac657f32d9eee1b336f0d
+  metadata.gz: 6adf83591c23faed7401a40dd2a608dfb5e2e173
+  data.tar.gz: 8b434cf71eaa42a7cb143386cee8b8e4858b44de
 SHA512:
-  metadata.gz: 7ccdfe24751c1d79754852a8fe1d85c45e816fae33c625a1f23436a099f1048bcc8b6b5beaadedad5d7a63552f296530ce653bf5984295848475b05fb008f26c
-  data.tar.gz: 452e3e4767ff406e589c907f01fe6b0df00437b9515c72c8603ca30af4f17d6825ffc6c56698b0ba334de47bd15e873dfb49478032e058bf1de165f05777411f
+  metadata.gz: cb69df4ab6c43414625bd51b9923121fbb327cde9154389d71503ba3cbcabd89691e54820f33ef1cbff388603aa66a55cb6e74dd65ca04ff3337121a7397ef65
+  data.tar.gz: 9d53b92fc602b07252f2bd32b12fd244ca463955a4bb53354a27bd2ab6607e0f89736bf3e64a5ff51f8346f7eec4722b843cd0d6aa112ad99001759fc4ff6d48

data/bin/gitbc

@@ -154,11 +154,12 @@ if basecamp_todos.count > 0
   puts "end tag: #{options[:end_tag]}"
   puts "branch: #{options[:branch]}"
   puts "repository: #{options[:repository]}"
-  puts "********************************************"
+  puts ''
   basecamp_todos.each do |pr, todos|
-    puts "PR #{pr}"
-    todos.each do |todo|
-      puts "  #{todo[:url]}" + (todo[:content] ? ": #{todo[:content]}" : '')
+    body = todos[:body].gsub("\r\n", '')
+    puts "* PR #{pr}" + (todos[:lines].length == 0 && body.length > 0 ? ", #{body}" : '')
+    todos[:lines].each do |line|
+      puts "  --#{line[:url]}" + (line[:content] ? ", #{line[:content]}" : '')
     end
   end
 end

data/lib/gitbc/version.rb

@@ -1,3 +1,3 @@
 module Gitbc
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/gitbc.rb

@@ -10,6 +10,7 @@ require 'open3'
 class GitHubBasecampExtractor
   DEFAULT_CONFIG_FILE = File.expand_path('~/.gitbc')
   DEFAULT_END_TAG = 'HEAD'
+  MAX_PR_BODY_LENGTH = 235
 
   def initialize(params)
     @params = params
@@ -75,10 +76,11 @@ class GitHubBasecampExtractor
     basecamp_todos = pull_requests.inject({}) do |memo, pull_request_id|
       pr = @github_client.pull_request(@params[:repository], pull_request_id)
       basecamp_lines = pr.attrs[:body].split("\r\n").grep(/.*https\:\/\/basecamp\.com.*/)
+      memo[pull_request_id] = {body: pr.attrs[:body][0..MAX_PR_BODY_LENGTH].strip, lines: []}
       if basecamp_lines.count > 0
-        memo[pull_request_id] = basecamp_lines.map { |line| {url: line[/.*(https\:\/\/basecamp\.com[^!?#:;,.\s]*)/, 1]} }.uniq
+        memo[pull_request_id][:lines] = basecamp_lines.map { |line| {url: line[/.*(https\:\/\/basecamp\.com[^!?#:;,.\s]*)/, 1]} }.uniq
         if @params[:basecamp_content]
-          memo[pull_request_id].each do |line|
+          memo[pull_request_id][:lines].each do |line|
             line[:url].match /(https\:\/\/basecamp\.com\/\d+\/)(.*)/ do |match|
               begin
                 ret = HTTParty.get "#{match[1]}api/v1/#{match[2]}.json", {basic_auth: {username: @params[:basecamp_user], password: @params[:basecamp_password]}, headers: {'Content-Type' => 'application/json', 'User-Agent' => "gitbc API (#{@params[:basecamp_user]})"}}
@@ -89,8 +91,7 @@ class GitHubBasecampExtractor
           end
         end
       end
-      memo[pull_request_id] ||= []
-      yield(pull_request_id, memo[pull_request_id])
+      yield(pull_request_id, memo[pull_request_id]) if block_given?
       memo
     end
     basecamp_todos

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitbc
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Orest Kulik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit