bitbucket-pr-post 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f007cd6b37ff304ff37f6712db30c370d96b85d
-  data.tar.gz: 1e4acd1cf3bc85d5ffbb1493145703f21fe9b4b1
+  metadata.gz: e8ef01f033c2f913b2749bfc3223255355f9b2bb
+  data.tar.gz: 3efa94e41b45eefce0d8d14d3ea796b6e1270f17
 SHA512:
-  metadata.gz: 878573f347f416136d6fe3e87e4dd52d60f94011ce5c6a30e74b1c63be82342d0558b9303b777cba3b5a840f1599dde25fcbc68de3746456156d67b358953573
-  data.tar.gz: 5dce84076a7149e17f14e6dbac1920f1a2febfa7f140a8a230a1aa2270f0565cfc187864553956fbcf775eb5f45814e36d61720725ad15c177b37e802a9866b2
+  metadata.gz: 6bd2284a6ba2fb438d31c61bea16b3dffee864c2a1d8661bd9be87ce1b9921d4897ed1bfac481a3b511891dce1f7950fe588536549c9182b43fad24c62085b27
+  data.tar.gz: 57275eb28a7325306e9eb819ece761602e1e061c9086ee35a4764330adf4cea93f61d9c9892c54453046403eaf5e94e4a76d9533a18fd4b833d9fe4b9e55971f

data/lib/bitbucket/pr/post.rb

@@ -24,11 +24,12 @@ module Bitbucket
         o.on('-ps', '--public-slug=SLUG(Public Repository Name)'){|v| @opts[:public_slug]  = v }
         o.on('-ms', '--master-slug=SLUG(MasterRepository Name)'){|v| @opts[:master_slug]  = v }
         o.on('-u', '--user=Bitbucket User'){|v| @opts[:user]  = v }
-        o.on('-d', '--debug'){|v| @opts[:debug] = v }
+        o.on('-D', '--debug'){|v| @opts[:debug] = v }
         o.on('-y', '--yes'){|v| @opts[:yes] = v }
         o.on('-o', '--open-diff-url'){|v| @opts[:open_diff_url] = v}
         o.on('-b', '--dst-branch=Destination Branch'){|v| @opts[:dst_branch] = v}
         o.on('-U', '--update'){|v| @opts[:update] = v}
+        o.on('-d', '--description'){|v| @opts[:description] = v }
 
         o.parse!(argv)
 
@@ -75,17 +76,23 @@ module Bitbucket
           @notice = ''
         else
           @title = `git log --summary --shortstat -1 --format="%s" --no-color --no-notes | head -1`.strip
-          @notice = "\n             ^ This is Last Commit Mesasge. Use Option `--title` If You Want Change."
+          @title_notice = "\n             ^ This is Last Commit Mesasge. Use Option `--title` If You Want Change."
+        end
+
+        if @opts[:description]
+          @description = @opts[:description]
+        else
+          @description = `git log --summary -1 --format="%b" --no-color --no-notes`.strip
+          @description_notice = "\n             ^ This is Last Commit Mesasge. Use Option `--description` If You Want Change."
         end
-        @description = @opts[:description] || ''
 
         debug_print @opts
       end
 
       def confirm
       puts <<-CONFIRM
-      title: #{@title}#{@notice}
-description: #{@description}
+      title: #{@title}#{@title_notice}
+description: #{@description.gsub("\n", "\n             ")}#{@description_notice}
         src: #{@user}/#{@public_slug}/#{@branch}
              v v v
              v v v
@@ -105,15 +112,16 @@ description: #{@description}
 
       def request_data
         data = {
-          title: @title.gsub("'", "\'"),
-          description: @description,
+          title: @title,
+          description: "#{@description}",
           source: {
             branch: { name: @branch },
             repository: { full_name: "#{@user}/#{@public_slug}" }
           },
           destination: {
             branch: { name: "master" },
-          }
+          },
+          "close_source_branch": true
         }
 
         debug_print(JSON.pretty_generate data)
@@ -132,7 +140,7 @@ description: #{@description}
           -H "Content-Type: application/json"
           -u #{@user}:#{@pass}
           https://api.bitbucket.org/2.0/repositories/#{@dst_user}/#{@master_slug}/pullrequests/
-          -d '#{request_data}'
+          -d '#{request_data.gsub("'"){"\\'"}}'
         }
         cmd = curl.join " "
         debug_print cmd

data/lib/bitbucket/pr/post/version.rb

@@ -1,7 +1,7 @@
 module Bitbucket
   module Pr
     class Post
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitbucket-pr-post
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - hiroshi kobayashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler