atlassian-stash 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d0009ed8acaad9711ee3e29dbe108de0b0d2f75
-  data.tar.gz: 2bf41f992cf2678e4c2ef53c9f2a9253e14af500
+  metadata.gz: e6f81d9c053732742249900feca5fddb74f3a461
+  data.tar.gz: 27493f645b3d5bf6e773b6764fb0c9770c9c8339
 SHA512:
-  metadata.gz: 0ac4b1f8d5130864804dc8188ad38091fd2855ad7d8fc0d853967bdbba83f74beadb328e9c1525f88789318e9f9f90ef474cee7d7a6cdecb3a0949b199282470
-  data.tar.gz: 176a1f547d3102e85f3034e79dfee1ccb3cdb18754b1058a3efcd07e9d534d248e51348ac28c600f65e522b7a667513b8f265ef04813250a4d5d502f8ffd55a6
+  metadata.gz: 295a94d7eccbf34b67c98fb480c5d2a6c865728e7318b8f369d05baee1084614c4fe7d3e15cdf418370d95d1834bfe23928852bd4bb1459ee4117cbb7327a61e
+  data.tar.gz: 66bb5e44dd120ddaee257622a3f319aea8c75886ac306bd0ba60ae881ae007ed5bbba531c72390a2e4d9d06d0f1da7f944175d2b68069ebca4e120a5f2fc42ac

data/Gemfile

@@ -3,8 +3,8 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "git", "~> 1.2.5"
-gem "json", "~> 1.7.5"
+gem "git", ">= 1.2.5"
+gem "json", ">= 1.7.5"
 gem "commander", "~> 4.1.2"
 gem "launchy", "~> 2.4.2"
 
@@ -17,4 +17,5 @@ group :development do
   gem "jeweler", "~> 2.0.0"
   gem "rcov", ">= 0", :platforms => :ruby_18
   gem "simplecov", ">= 0", :platforms => :ruby_19, :require => "false"
+  gem "minitest", ">= 0", :platforms => :ruby_19
 end

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/bin/stash

@@ -5,6 +5,7 @@ require File.dirname(__FILE__) + "/../lib/stash_cli"
 require 'commander/import'
 require 'yaml'
 require 'launchy'
+require 'pathname'
 
 program :name, "Atlassian Stash CLI"
 program :version, Atlassian::Stash::Version::STRING
@@ -19,9 +20,18 @@ def load_config
   raise "No Stash configuration found; please run configure" unless File.exists? $configFile
   config = YAML.load_file($configFile)
   raise "Stash configuration file is incomplete, please re-run configure" unless config['username'] and config['stash_url']
+  config.merge! repo_config
   config
 end
 
+def repo_config
+  return @repo_config if @repo_config
+  ascender = Pathname.pwd.to_enum(:ascend)
+  config_path = ascender.detect { |path| (path + '.stash').exist? }
+  @repo_config = YAML.load_file(path + '.stash')
+  @repo_config
+end
+
 command 'configure' do |c|
   c.syntax = 'configure'
   c.description = 'Setup configuration details to your Stash instance'
@@ -29,10 +39,12 @@ command 'configure' do |c|
   c.option '--username user', String, 'Writes your Stash username to the configuration file'
   c.option '--password password', String, 'Writes your Stash user password to the configuration file. If omitted, password will be prompted to be entered'
   c.option '--stashUrl', String, 'Writes the Stash server url to the configuration file'
+  c.option '--remote', String, 'Pull requests will be created in the Stash repository specified by the given remote'
   c.action do |args, options|
     username = options.username ? options.username : ask("Stash Username: ")
     password = options.password ? options.password : ask("Stash Password (optional): ") { |q| q.echo = "*" }
     stashUrl = options.stashUrl ? options.stashUrl : ask("Stash URL: ")
+    remote   = options.remote   ? options.remote   : ask("Remote (optional): ")
 
     c = {
       'stash_url' => stashUrl.to_s
@@ -40,6 +52,7 @@ command 'configure' do |c|
 
     c['username'] = username.to_s unless username.empty?
     c['password'] = password.to_s unless password.empty?
+    c['remote']   = remote.to_s   unless remote.empty?
 
     File.open($configFile, 'w') do |out|
       YAML.dump(c, out)
@@ -53,16 +66,21 @@ end
 
 command 'pull-request' do |c|
   def extract_reviewers(args = [])
-    args.collect { |user|
+    default_reviewers = Array(repo_config[:reviewers])
+    default_reviewers.concat args.collect { |user|
       user[1..-1] if user.start_with?("@")
     }.compact
   end
 
   c.syntax = 'pull-request [sourceBranch] targetBranch [@reviewer1 @reviewer2] [options]'
   c.description = 'Create a pull request in Stash'
+  c.option '-d DESCRIPTION', '--description DESCRIPTION', String, 'Use the following description when creating the pull request'
+  c.option '-T TITLE', '--title TITLE', String, 'Use the following title when creating the pull request'
+  c.option '-r remote', '--remote remote', String, 'Creates the pull request in the Stash repository specified by the given remote'
   c.option '-o', '--open', 'Open the created pull request page in a web browser'
   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.action do |args, options|
     if args.length == 0
       command(:help).run('pull-request')
@@ -90,13 +108,19 @@ command 'browse' do |c|
   c.syntax = 'browse [browse|commits|pull-requests]'
   c.description = 'Open the Stash web ui for this repository'
   c.option '-b branch', '--branch branch', String, 'Open the Stash web ui at the specified branch, tag or commit hash. Defaults to the current branch'
+  c.option '-r remote', '--remote remote', String, 'Creates the pull request in the Stash repository specified by the given remote'
   c.example 'stash browse -b master', 'Open the files view for this repository at the current branch'
+  c.example 'stash browse -r upstream', 'Open the files view for the "upstream" remote repository'
 
   c.action do |args, options|
 
     tab = args.shift unless args.empty?
 
-    repoInfo = RepoInfo.create(load_config)
+    config = load_config
+    remote = options.remote || config['remote']
+    remote_url = get_remote_url(remote)
+
+    repoInfo = RepoInfo.create(config, remote_url)
 
     branch = options.branch || get_current_branch
 

data/lib/atlassian/stash/git.rb

@@ -15,8 +15,8 @@ module Atlassian
         %x(git remote -v)
       end
 
-      def get_remote_url
-        origin = get_remotes.split("\n").collect { |r| r.strip }.grep(/^origin.*\(push\)$/).first
+      def get_remote_url(remote = 'origin')
+        origin = get_remotes.split("\n").collect { |r| r.strip }.grep(/^#{remote}.*\(push\)$/).first
         URI.extract(origin).first
       end
 

data/lib/atlassian/stash/pull_request.rb

@@ -56,7 +56,10 @@ module Atlassian
         @source = source
         @target = target
 
-        repoInfo = RepoInfo.create(@config)
+        remote = get_remote_url(options.remote || @config["remote"])
+        repoInfo = RepoInfo.create(@config, remote)
+
+        title, description = title_and_description(options)
 
         resource = CreatePullRequestResource.new(repoInfo.projectKey, repoInfo.slug, title, description, reviewers, @source, @target).resource
 
@@ -112,14 +115,10 @@ module Atlassian
 
       private
 
-      def title
+      def title_from_branch
         convert_branch_name_to_sentence(@source) || "Merge '#{@source}' into '#{@target}'"
       end
 
-      def description
-        git_commit_messages
-      end
-
       def git_commit_messages
         @commit_messages ||= `git log --reverse --format=%s #{@target}..#{@source}`
       end
@@ -135,6 +134,13 @@ module Atlassian
         end
         [addr, port]
       end
+
+      def title_and_description(options)
+        descr = (options.description or git_commit_messages)
+        title = (options.title or title_from_branch)
+
+        [title, descr]
+      end
     end
   end
 end

data/lib/atlassian/stash/repo_info.rb

@@ -38,7 +38,7 @@ module Atlassian
       end
 
       def self.create (config, url = get_remote_url)
-        if m = url.match(/\/([a-zA-Z~][a-zA-Z0-9_]*)\/([[:alnum:]][\w\-\.]*).git$/)
+        if m = url.match(/\/([a-zA-Z~][a-zA-Z0-9_\-]*)\/([[:alnum:]][\w\-\.]*).git$/)
           return RepoInfo.new(config, m[1], m[2])
         end
         raise "Repository does not seem to be hosted in Stash; Remote url: " + url

data/test/helper.rb

@@ -15,7 +15,7 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'test/unit'
+require 'minitest/autorun'
 require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -24,5 +24,5 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require File.dirname(__FILE__) + "/../lib/stash_cli"
 
 
-class Test::Unit::TestCase
+class Minitest::Test
 end

data/test/test_stash-create-pull-request.rb

@@ -3,7 +3,7 @@ require 'helper'
 include Atlassian::Stash
 include Atlassian::Stash::Git
 
-class TestStashCreatePullRequest < Test::Unit::TestCase
+class TestStashCreatePullRequest < Minitest::Test
 
   context "#parse_proxy" do
     setup do
@@ -40,4 +40,45 @@ class TestStashCreatePullRequest < Test::Unit::TestCase
       end
     end
   end
+
+  context '#title_and_description' do
+    setup do
+      @cpr = CreatePullRequest.new nil
+      def @cpr.title_from_branch; 'title_from_branch'; end
+      def @cpr.git_commit_messages; 'git_commit_messages'; end
+      @options = Struct.new(:title, :description)
+    end
+
+    context 'with no options' do
+      should 'sets default title and description' do
+        title, descr = @cpr.send(:title_and_description, @options.new(nil, nil))
+        assert_equal title, 'title_from_branch'
+        assert_equal descr, 'git_commit_messages'
+      end
+    end
+
+    context 'with title option' do
+      should 'sets custom title and default description' do
+        title, descr = @cpr.send(:title_and_description, @options.new('custom title', nil))
+        assert_equal title, 'custom title'
+        assert_equal descr, 'git_commit_messages'
+      end
+    end
+
+    context 'with description option' do
+      should 'sets default title and custom description' do
+        title, descr = @cpr.send(:title_and_description, @options.new(nil, 'custom description'))
+        assert_equal title, 'title_from_branch'
+        assert_equal descr, 'custom description'
+      end
+    end
+
+    context 'with both title and description options' do
+      should 'sets custom title and description' do
+        title, descr = @cpr.send(:title_and_description, @options.new('custom title', 'custom description'))
+        assert_equal title, 'custom title'
+        assert_equal descr, 'custom description'
+      end
+    end
+  end
 end

data/test/test_stash-git.rb

@@ -3,7 +3,7 @@ require 'helper'
 include Atlassian::Stash
 include Atlassian::Stash::Git
 
-class TestGit < Test::Unit::TestCase
+class TestGit < Minitest::Test
 
 	should "extract remote with ssh remote" do
 		Atlassian::Stash::Git.instance_eval do
@@ -54,4 +54,26 @@ class TestGit < Test::Unit::TestCase
 		end
 		assert_equal 'ssh://git@stash.atlassian.com:7999/STASH/stash.git', Atlassian::Stash::Git.get_remote_url
 	end
+
+	should "extract custom remote with multiple remote urls" do
+		Atlassian::Stash::Git.instance_eval do
+			def get_remotes
+				"bitbucket	git@bitbucket.org:atlassian/stash-command-line-tools.git (fetch)
+				bitbucket	git@bitbucket.org:atlassian/stash-command-line-tools.git (push)
+				kostya  http://admin@kostya:7990/scm/CA/cylon.git (fetch)
+				kostya  http://admin@kostya:7990/scm/CA/cylon.git (push)
+				local   http://delirium:7990/git/STASH/stash.git (fetch)
+				local   http://delirium:7990/git/STASH/stash.git (push)
+				origin  ssh://git@stash.atlassian.com:7999/STASH/stash.git (fetch)
+				origin  ssh://git@stash.atlassian.com:7999/STASH/stash.git (push)
+				upstream  ssh://git@stash.atlassian.com:7999/ATLASSIAN/stash.git (fetch)
+				upstream  ssh://git@stash.atlassian.com:7999/ATLASSIAN/stash.git (push)
+				seb     http://adam@sonoma:7990/stash/scm/QA/stash.git (fetch)
+				seb     http://adam@sonoma:7990/stash/scm/QA/stash.git (push)
+				upstream        http://github-enterprise-11-10/stash/stash.git (fetch)
+				upstream        http://github-enterprise-11-10/stash/stash.git (push)"
+			end
+		end
+		assert_equal 'ssh://git@stash.atlassian.com:7999/ATLASSIAN/stash.git', Atlassian::Stash::Git.get_remote_url('upstream')
+	end
 end

data/test/test_stash-repo-info.rb

@@ -3,7 +3,7 @@ require 'helper'
 include Atlassian::Stash
 include Atlassian::Stash::Git
 
-class TestStashRepoInfo < Test::Unit::TestCase
+class TestStashRepoInfo < Minitest::Test
 
   context "Extract repository info" do
     should "extract project key and repo slug from Stash remote" do
@@ -15,7 +15,7 @@ class TestStashRepoInfo < Test::Unit::TestCase
 
     should "extracting project key and repo slug from non stash url raises exception" do
       remote = "git@bitbucket.org:sebr/atlassian-stash-rubygem.git"
-      assert_raise(RuntimeError) { RepoInfo.create nil, remote }
+      assert_raises(RuntimeError) { RepoInfo.create nil, remote }
     end
 
     should "repo with hyphes" do

data/test/test_text-util.rb

@@ -1,7 +1,7 @@
 
 include Atlassian::Util::TextUtil
 
-class TextUtilTest < Test::Unit::TestCase
+class TextUtilTest < Minitest::Test
 
   context "to_sentence_case" do
     should "work with an empty string" do

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: atlassian-stash
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Seb Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.5
 - !ruby/object:Gem::Dependency
@@ -150,6 +150,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides convenient functions for interacting with Atlassian Stash through
   the command line
 email: sruiz@atlassian.com