bitbucket-pr-post 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e246ed7320ac673c0e1d0b66720249cdd2ba47fe
-  data.tar.gz: e3045c65de0dc31393243f6bb1fec4c8cdc5d3c9
+  metadata.gz: 4f007cd6b37ff304ff37f6712db30c370d96b85d
+  data.tar.gz: 1e4acd1cf3bc85d5ffbb1493145703f21fe9b4b1
 SHA512:
-  metadata.gz: 763609183537f9398bbca609d9a11cfb73bb82af8a9bad530356336fb726bf676fe39480b06f7481dcecaf444142520e09f1f018da02e2703286ab21fe021bd5
-  data.tar.gz: 97048dcbbb09f6b56855b1a505c43fb2207b0b684408f763369032da07d8005380bceff7ab3db120b57b129b800a60fcada6845f203ff00cc711ba91d9121ea0
+  metadata.gz: 878573f347f416136d6fe3e87e4dd52d60f94011ce5c6a30e74b1c63be82342d0558b9303b777cba3b5a840f1599dde25fcbc68de3746456156d67b358953573
+  data.tar.gz: 5dce84076a7149e17f14e6dbac1920f1a2febfa7f140a8a230a1aa2270f0565cfc187864553956fbcf775eb5f45814e36d61720725ad15c177b37e802a9866b2

data/lib/bitbucket/pr/post.rb

@@ -21,7 +21,8 @@ module Bitbucket
         o = OptionParser.new
         o.on('-p', '--pass=Bitbucket Password'){|v| @opts[:pass]  = v }
         o.on('-t', '--title=PR Title'){|v| @opts[:title] = v }
-        o.on('-s', '--slug=SLUG(Repository Name)'){|v| @opts[:slug]  = v }
+        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('-y', '--yes'){|v| @opts[:yes] = v }
@@ -41,11 +42,11 @@ module Bitbucket
         end
 
         if url[:pub]
-          dummy,domain,@pub_user,@slug = url[:pub].split /[@:\/]/
+          dummy,domain,@pub_user,@public_slug = url[:pub].split /[@:\/]/
         end
 
         if url[:master]
-          dummy,domain,@master_user,@slug = url[:master].split /[@:\/]/
+          dummy,domain,@master_user,@master_slug = url[:master].split /[@:\/]/
           @dst_user = @master_user
         end
 
@@ -58,10 +59,11 @@ module Bitbucket
 
         @user = @pub_user || @master_user
 
-        @user       = @opts[:user] || @user
-        @slug       = @opts[:slug] || @slug.sub('.git', '')
-        @branch     = @opts[:branch] || `git branch | grep '*'`.split(" ")[1]
-        @dst_branch = @opts[:dst_branch] || 'master'
+        @user        = @opts[:user] || @user
+        @public_slug = @opts[:pubilc_slug] || @public_slug.sub('.git', '')
+        @master_slug = @opts[:master_slug] || @master_slug.sub('.git', '')
+        @branch      = @opts[:branch] || `git branch | grep '*'`.split(" ")[1]
+        @dst_branch  = @opts[:dst_branch] || 'master'
 
         if @branch == 'master'
           puts "Current Branch is master!"
@@ -84,10 +86,10 @@ module Bitbucket
       puts <<-CONFIRM
       title: #{@title}#{@notice}
 description: #{@description}
-        src: #{@user}/#{@slug}/#{@branch}
+        src: #{@user}/#{@public_slug}/#{@branch}
              v v v
              v v v
-        dst: #{@dst_user}/#{@slug}/#{@dst_branch}
+        dst: #{@dst_user}/#{@master_slug}/#{@dst_branch}
 
       CONFIRM
 
@@ -107,7 +109,7 @@ description: #{@description}
           description: @description,
           source: {
             branch: { name: @branch },
-            repository: { full_name: "#{@user}/#{@slug}" }
+            repository: { full_name: "#{@user}/#{@public_slug}" }
           },
           destination: {
             branch: { name: "master" },
@@ -129,7 +131,7 @@ description: #{@description}
           -X #{method}
           -H "Content-Type: application/json"
           -u #{@user}:#{@pass}
-          https://api.bitbucket.org/2.0/repositories/#{@dst_user}/#{@slug}/pullrequests/
+          https://api.bitbucket.org/2.0/repositories/#{@dst_user}/#{@master_slug}/pullrequests/
           -d '#{request_data}'
         }
         cmd = curl.join " "

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitbucket-pr-post
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - hiroshi kobayashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,7 @@ files:
 - Rakefile
 - bin/bit_bucket_pr_post
 - bitbucket-pr-post-0.0.1.gem
+- bitbucket-pr-post-0.0.2.gem
 - bitbucket-pr-post.gemspec
 - lib/bitbucket/pr/post.rb
 - lib/bitbucket/pr/post/version.rb