sah 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 943298c329c6e3796b8831e50e8403212ea0dd4c
-  data.tar.gz: a0a820abd2f289162d7431fb0fa1da7abe215a3f
+  metadata.gz: 1fb7a7617f52d704128e17c620b4835074e87b90
+  data.tar.gz: 7c3d6d3dcbd5730780f602e39434d9ad12061355
 SHA512:
-  metadata.gz: 206ab03675d1edb8cb801a2fa2365dff6face301a1d64043654a19cdc04b25c783011855004566c5a31d190af940ba2141136330c54e9c9dd0a217eea711a623
-  data.tar.gz: 1d0bc24733d03825741cf6cb71a2001228d6ab9ebf3066bc3f31d78321123e9c6565050a2bc3edaf90872b2b3295928199282ef4f153c69f9f969207acf5d7c1
+  metadata.gz: ad8ff3f7795b283f087839aefe3cf96225c335b0f4dd761f9194f974cbcb37310a0a94994744c7088332141d3a370bd0908f3136e1ef47a933a0e627dc64be15
+  data.tar.gz: 83f3ca44626f4353fb2c8fab5ed1a97b7bde94439cdd08f79eac4c2f44219ca76920df95cba34c7b62b325cb840566360f8825eae2823e09cc96216c54fda32c

data/README.md

@@ -105,6 +105,12 @@ If you use multiple Bitbucket Server, define profile(s) and specify it.
     sah project PROJECT
     # show project detail
 
+### pull-request
+
+   sah pull-request
+   # create pull-request to upstream repository's default branch
+   # open $EDITOR to edit title and description
+
 ### repository
 
     sah repository PROJECT
@@ -115,10 +121,10 @@ If you use multiple Bitbucket Server, define profile(s) and specify it.
 
 ### upstream
 
-    upstream
+    sah upstream
     # show upstream information
 
-    upstream --add-remote [--fetch-pull-request] [--prevent-push]
+    sah upstream --add-remote [--fetch-pull-request] [--prevent-push]
     # add upstream to remote settings
 
 #### configutration

data/lib/sah/api.rb

@@ -18,6 +18,12 @@ module Sah
       end
     end
 
+    def show_branches(project, repository)
+      @conn.get do |req|
+        req.url @config.url.path + "/rest/api/1.0/projects/#{project}/repos/#{repository}/branches"
+      end
+    end
+
     def fork_repository(project, repo, name=nil)
       body = {slug: repo}
       body = body.merge(name: name) if name
@@ -75,5 +81,41 @@ module Sah
         req.url @config.url.path + "/rest/api/1.0/projects/#{project}/repos/#{repository}"
       end
     end
+
+    def create_pull_request(source, target, title="", description="", reviewers=[])
+      @conn.post do |req|
+        req.url @config.url.path +
+          "/rest/api/1.0/projects/#{target[:project]}/repos/#{target[:repository]}/pull-requests"
+        req.headers['Content-Type'] = 'application/json'
+        req.body = {
+          title: title,
+          description: description,
+          state: "OPEN",
+          closed: false,
+          fromRef: {
+            id: "refs/heads/#{source[:branch]}",
+            repository: {
+              slug: source[:repository],
+              name: nil,
+              project: {
+                key: source[:project]
+              }
+            }
+          },
+          toRef: {
+            id: "refs/heads/#{target[:branch]}",
+            repository: {
+              slug: target[:repository],
+              name: nil,
+              project: {
+                key: target[:project]
+              }
+            }
+          },
+          locked: false,
+          reviewers: reviewers.map{ |r| { user: { name: r } } }
+        }.to_json
+      end
+    end
   end
 end

data/lib/sah/cli.rb

@@ -3,6 +3,7 @@ require "thor"
 require "hirb"
 require "hirb-unicode"
 require "launchy"
+require "tempfile"
 
 module Sah
   class CLI < Thor
@@ -202,6 +203,86 @@ module Sah
       end
     end
 
+    desc "pull-request", "Create pull request"
+    map %w(pr pull-request) => "pull_request"
+    long_desc <<-LONG_DESCRIPTION
+    sah pull-request
+    \x5# create pull-request to upstream repository's default branch
+    \x5# open $EDITOR to edit title and body
+
+    \x5sah pull-request [--source,-s PROJECT/REPOSITORY:BRANCH
+    \x5                 [--target,-t PROJECT/REPOSITORY:BRANCH
+    \x5                 [--message,-m MESSAGE]
+    \x5                 [--reviewer,-r REVIEWER1 REVIEWER2 ...]
+    LONG_DESCRIPTION
+    method_option :source, aliases: "-s", desc: "Set source project/repository:branch"
+    method_option :target, aliases: "-t", desc: "Set target project/repository:branch"
+    method_option :title, desc: "Set title"
+    method_option :description, desc: "Set description"
+    method_option :reviewer,
+      aliases: "-r", type: :array, desc: "Set reviwer(s)"
+    def pull_request
+      source_project, source_repository, source_branch = nil, nil, nil
+      if options[:source]
+        m = options[:source].match(%r{^([^/:]+)/([^/:]+):([^/:]+)$})
+        if m.nil?
+          abort "Invalid format: --source #{options[:source]}"
+        end
+        source_project, source_repository, source_branch = $1, $2, $3
+      else
+        remote_url = `git config --get remote.origin.url`.chomp
+        remote_url.match %r%/([^/]+)/([^/]+?)(?:\.git)?$%
+        source_project, source_repository = $1, $2
+        source_branch = current_branch
+      end
+      source = {project: source_project, repository: source_repository,
+                branch: source_branch}
+
+      target_project, target_repository, target_branch = nil, nil, nil
+      if options[:target]
+        m = options[:target].match(%r{^([^/:]+)/([^/:]+):([^/:]+)$})
+        if m.nil?
+          abort "Invalid format: --target #{options[:target]}"
+        end
+        target_project, target_repository, target_branch = $1, $2, $3
+      else
+        upstream = upstream_repository
+        target_project = upstream["origin"]["project"]["key"]
+        target_repository = upstream["origin"]["slug"]
+        res = api.show_branches(target_project, target_repository)
+        if res.body.key? "errors"
+          abort res.body["errors"].first["message"]
+        end
+        branches = res.body
+        target_branch = branches["values"].find{|b| b["isDefault"] }["displayId"]
+      end
+      target = {project: target_project, repository: target_repository,
+                branch: target_branch}
+
+      puts "%s/%s:%s => %s/%s:%s" % [
+        source[:project], source[:repository], source[:branch],
+        target[:project], target[:repository], target[:branch],
+      ]
+
+      title = options[:title] || (
+        puts "Edit title... (press enter key)"
+        STDIN.gets
+        open_editor.strip
+      )
+      description = options[:description] || (
+        puts "Edit description... (press enter key)"
+        STDIN.gets
+        open_editor.strip
+      )
+      reviewers = options[:reviewer] || []
+
+      res = api.create_pull_request source, target, title, description, reviewers
+      if res.body.key? "errors"
+        abort res.body["errors"].first["message"]
+      end
+      puts res.body["links"]["self"].first["href"]
+    end
+
     desc "repository PROJECT[/REPOS]", "Show repository information"
     long_desc <<-LONG_DESCRIPTION
     sah repository PROJECT
@@ -242,22 +323,8 @@ module Sah
     method_option :"fetch-pull-request", desc: "Fetch pull requests"
     method_option :"prevent-push", desc: "Prevent push to upstream"
     def upstream
-      remote_url = `git config --get remote.origin.url`.chomp
-      remote_url.match %r%/([^/]+)/([^/]+?)(?:\.git)?$%
-      project, repository = $1, $2
-
-      res = api.show_repository(project, repository)
-      if res.body.key? "errors"
-        abort res.body["errors"].first["message"]
-      end
-
-      repository = res.body
-      unless repository.key? "origin"
-        abort "Upstream repos does not exist."
-      end
-
       upstream_url =
-        repository["origin"]["links"]["clone"].find{ |e| e["name"] == config.protocol }["href"]
+        upstream_repository["origin"]["links"]["clone"].find{ |e| e["name"] == config.protocol }["href"]
 
       if options[:"add-remote"]
         system "git", "remote", "add", "upstream", upstream_url
@@ -313,5 +380,34 @@ module Sah
     def api
       @api ||= API.new(config)
     end
+
+    def open_editor
+      tmp = Tempfile.new('sah')
+      editor = ENV['GIT_EDITOR'] || ENV['EDITOR'] || 'vi'
+      system(editor, tmp.path)
+      File.open(tmp.path).read
+    end
+
+    def current_branch
+      %x(/usr/local/bin/git rev-parse --abbrev-ref HEAD).chomp
+    end
+
+    def upstream_repository
+      remote_url = `git config --get remote.origin.url`.chomp
+      remote_url.match %r%/([^/]+)/([^/]+?)(?:\.git)?$%
+      project, repository = $1, $2
+
+      res = api.show_repository(project, repository)
+      if res.body.key? "errors"
+        abort res.body["errors"].first["message"]
+      end
+
+      repository = res.body
+      unless repository.key? "origin"
+        abort "Upstream repos does not exist."
+      end
+
+      repository
+    end
   end
 end

data/lib/sah/version.rb

@@ -1,3 +1,3 @@
 module Sah
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sah
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - f440
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-03 00:00:00.000000000 Z
+date: 2015-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -207,9 +207,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Command line util for Atlassian Bitbucket Server
 test_files: []
-has_rdoc: