atlassian-stash 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d378f61db7522c5d9871c7b62c11417d4d36f1fd
-  data.tar.gz: 962a88dee48cc89db7d571a6ea26b19f0780c295
+  metadata.gz: f542f9e4f0ec7a27fc9a7a24ba23946f1e498aec
+  data.tar.gz: b842b2d4caaa4f6ccbe06174ab626d27521fbe4b
 SHA512:
-  metadata.gz: bb4c15d5dd4222fee274a182d788daaa480a6eaa5ca0d9a708f138febc610a984ab29e2c8a2a366e0ecf899fe81f67267a903e45c1df5e2cb4f75846ed6c950e
-  data.tar.gz: f6cb1f5021840101f9675b49f9ebebf12b98457372994e2459e86ecfc8d35833eee7a945cf89b4405af842d4d4677348069957cac96245bd584fee5f71463e55
+  metadata.gz: 2dc56d9a2571ffd9fd5cb65cbccb741ac979f8fb29fa1dfbe408eb6591652e5d2334412a2ed1708b05edaa10a751c684ff82c1d4825090bb034c35e92cec7f7a
+  data.tar.gz: dc1b2b8fc10e8d86c8a8137a303505487cce431be380a4d4f51d61e921a06b76742df541acb6260278cc6180b4ed541e0e137f63be6523dd530bd4bcf907d308

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/bin/stash

@@ -86,6 +86,8 @@ command 'pull-request' do |c|
   c.example 'stash pull-request topicBranch master @michael', "Create a pull request from branch 'topicBranch' into 'master' with 'michael' added as a reviewer"
   c.example 'stash pull-request master', "Create a pull request from the current git branch into 'master'"
   c.example 'stash pull-request master -T "JIRA-1234 new feature" -d "Adds new feature as described in JIRA-1234"', "Create a pull request from the current git branch into 'master' with the title 'JIRA-1234 new feature' and description 'Adds new feature as described in JIRA-1234'"
+  c.example 'stash pull-request topicBranch upstream/master', "Create a pull request from branch 'topicBranch' into branch 'master' on the remote named 'upstream'"
+  c.example 'stash pull-request remotes/upstream/master', "Create a pull request from the current branch into branch 'master' on the remote named 'upstream'"
   c.action do |args, options|
     if args.length == 0
       command(:help).run('pull-request')
@@ -102,6 +104,34 @@ command 'pull-request' do |c|
       reviewers = extract_reviewers args
     end
 
+    # Strip out any starting 'remotes/' from branch name for matching
+    if source.index('remotes/') == 0
+        source = source['remotes/'.size..-1]
+    end
+    if target.index('remotes/') == 0
+        target = target['remotes/'.size..-1]
+    end
+
+    options.src_remote = options.remote
+    if not is_branch?(source)
+      if not is_branch?("remotes/" + source)
+        raise "fatal: unrecogonized source branch"
+      end
+      # If a remote matches, split the remote out of the refspec
+      options.src_remote = source.split('/')[0]
+      source = source.split('/')[1..-1].join('/')
+    end
+
+    options.target_remote = options.remote
+    if not is_branch?(target)
+      if not is_branch?("remotes/" + target)
+        raise "fatal: unrecognized target branch"
+      end
+      # If a remote matches, split the remote out of the refspec
+      options.target_remote = target.split('/')[0]
+      target = target.split('/')[1..-1].join('/')
+    end
+
     ensure_within_git! do
       cpr = CreatePullRequest.new(load_config)
       cpr.create_pull_request source, target, reviewers, options

data/lib/atlassian/stash/git.rb

@@ -10,6 +10,16 @@ module Atlassian
         %x(git symbolic-ref HEAD)[/refs\/heads\/(.*)/, 1]
       end
 
+      def get_branches()
+        all = %x{git branch -a}.gsub("*","").gsub(" ", "").split("\n")
+        all.select{|x| not x.include? "->"}
+      end
+
+      def is_branch?(match)
+        all = get_branches
+        not all.select{|x| x == match}.empty?
+      end
+
       def is_in_git_repository?
         system('git rev-parse')
       end

data/lib/atlassian/stash/pull_request.rb

@@ -11,20 +11,26 @@ module Atlassian
     class CreatePullRequestResource
       attr_accessor :resource
 
-      def initialize(projectKey, slug, title, description, reviewers, source, target)
-        repository = {
-        'slug' => slug,
+      def initialize(sourceRepoInfo, targetRepoInfo, title, description, reviewers, source, target)
+        src_repository = {
+        'slug' => sourceRepoInfo.slug,
         'project' => {
-          'key' => projectKey
+          'key' => sourceRepoInfo.projectKey
+          }
+        }
+        target_repository = {
+        'slug' => targetRepoInfo.slug,
+        'project' => {
+          'key' => targetRepoInfo.projectKey
           }
         }
         fromRef = {
           'id' => source,
-          'repository' => repository
+          'repository' => src_repository
         }
         toRef = {
           'id' => target,
-          'repository' => repository
+          'repository' => target_repository
         }
         @resource = {
           'title' => title,
@@ -56,11 +62,12 @@ module Atlassian
         @source = source
         @target = target
 
-        repoInfo = RepoInfo.create(@config, options.remote)
+        srcRepoInfo = RepoInfo.create(@config, options.src_remote)
+        targetRepoInfo = RepoInfo.create(@config, options.target_remote)
 
         title, description = title_and_description(options)
 
-        resource = CreatePullRequestResource.new(repoInfo.projectKey, repoInfo.slug, title, description, reviewers, @source, @target).resource
+        resource = CreatePullRequestResource.new(srcRepoInfo, targetRepoInfo, title, description, reviewers, @source, @target).resource
 
         username = @config["username"]
         password = @config["password"]
@@ -70,7 +77,7 @@ module Atlassian
         password = ask("Password: ") { |q| q.echo = '*' } unless @config["password"]
 
         uri = URI.parse(@config["stash_url"])
-        prPath = repoInfo.repoPath + '/pull-requests'
+        prPath = targetRepoInfo.repoPath + '/pull-requests'
          
         req = Net::HTTP::Post.new(uri.query.nil? ? "#{prPath}" : "#{prPath}?#{uri.query}", {'Content-Type' => 'application/json', 'Accept' => 'application/json'})
         req.basic_auth username, password

data/test/test_stash-git.rb

@@ -77,4 +77,20 @@ class TestGit < Minitest::Test
 		)
 		assert_equal nil, Atlassian::Stash::Git.get_remote_url('origin')
 	end
-end
+
+        should "branches are matched" do
+                Atlassian::Stash::Git.stubs(:get_branches).returns(
+                                "  feature
+                                  temp
+                                * master
+                                  remotes/origin/master
+                                  remotes/origin/release/v1.0
+                                  remotes/origin/feature/awesome
+                                  remotes/upstream/master
+                                  remotes/upstream/release/v1.0
+                                  remotes/upstream/feature/Issue7")
+                assert_equal true, Atlassian::Stash::Git.is_branch?('master')
+                assert_equal true, Atlassian::Stash::Git.is_branch?('remotes/upstream/master')
+        end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atlassian-stash
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Seb Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Command line tools for Atlassian Stash