atlassian-stash 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f108029674203b07feb43c788c21b500f2a681d6
-  data.tar.gz: 969ff0cb30cf6bb55fa6f137714aaf7b7ea8db50
+  metadata.gz: d378f61db7522c5d9871c7b62c11417d4d36f1fd
+  data.tar.gz: 962a88dee48cc89db7d571a6ea26b19f0780c295
 SHA512:
-  metadata.gz: 283e3979a42e790293548dc7a5e5f0164c16e185dd7361b2853e7dd1a5b6b2e2114484f0817ebb39db3a930f90c771553e73c71d4735b5674eaa336c831e3cd8
-  data.tar.gz: db3063ea5662fbd4d1a9ad9ae065130d9e65aff823bf66e58a4b6087d9f7239cceee67a7268f4a290cf8915dcf163337a6b1bf7681247f604d6c705d3a776e6c
+  metadata.gz: bb4c15d5dd4222fee274a182d788daaa480a6eaa5ca0d9a708f138febc610a984ab29e2c8a2a366e0ecf899fe81f67267a903e45c1df5e2cb4f75846ed6c950e
+  data.tar.gz: f6cb1f5021840101f9675b49f9ebebf12b98457372994e2459e86ecfc8d35833eee7a945cf89b4405af842d4d4677348069957cac96245bd584fee5f71463e55

data/Gemfile

@@ -18,4 +18,5 @@ group :development do
   gem "rcov", ">= 0", :platforms => :ruby_18
   gem "simplecov", ">= 0", :platforms => :ruby_19, :require => "false"
   gem "minitest", ">= 0", :platforms => :ruby_19
+  gem "mocha", ">= 0"
 end

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/bin/stash

@@ -34,7 +34,7 @@ def repo_config
   if (stash_config.exist? && stash_config.file?)
     @repo_config = YAML.load_file(stash_config)
   end
-  @repo_config
+  Hash.new
 end
 
 command 'configure' do |c|
@@ -71,7 +71,7 @@ end
 
 command 'pull-request' do |c|
   def extract_reviewers(args = [])
-    default_reviewers = repo_config.nil? ? [] : Array(repo_config[:reviewers])
+    default_reviewers = repo_config.nil? ? Array.new : Array(repo_config[:reviewers])
     default_reviewers.concat args.collect { |user|
       user[1..-1] if user.start_with?("@")
     }.compact
@@ -122,10 +122,8 @@ command 'browse' do |c|
     tab = args.shift unless args.empty?
 
     config = load_config
-    remote = options.remote || config['remote']
-    remote_url = get_remote_url(remote)
 
-    repoInfo = RepoInfo.create(config, remote_url)
+    repoInfo = RepoInfo.create(config, options.remote)
 
     branch = options.branch || get_current_branch
 

data/lib/atlassian/stash/git.rb

@@ -3,6 +3,9 @@
 module Atlassian
   module Stash
     module Git
+
+      DEFAULT_REMOTE="origin"
+
       def get_current_branch
         %x(git symbolic-ref HEAD)[/refs\/heads\/(.*)/, 1]
       end
@@ -15,8 +18,14 @@ module Atlassian
         %x(git remote -v)
       end
 
-      def get_remote_url(remote = 'origin')
-        origin = get_remotes.split("\n").collect { |r| r.strip }.grep(/^#{remote}.*\(push\)$/).first
+      def get_remote_url(remote=nil)
+        remotes = get_remotes
+        return nil if remotes.empty?
+
+        remote = DEFAULT_REMOTE if remote.nil? || remote.empty?
+
+        origin = remotes.split("\n").collect { |r| r.strip }.grep(/^#{remote}.*\(push\)$/).first
+        return nil if origin.nil?
         URI.extract(origin).first
       end
 

data/lib/atlassian/stash/pull_request.rb

@@ -56,8 +56,7 @@ module Atlassian
         @source = source
         @target = target
 
-        remote = get_remote_url(options.remote || @config["remote"])
-        repoInfo = RepoInfo.create(@config, remote)
+        repoInfo = RepoInfo.create(@config, options.remote)
 
         title, description = title_and_description(options)
 

data/lib/atlassian/stash/repo_info.rb

@@ -37,11 +37,25 @@ module Atlassian
         uri.to_s
       end
 
-      def self.create (config, url = get_remote_url)
-        if m = url.match(/\/([a-zA-Z~][a-zA-Z0-9_\-]*)\/([[:alnum:]][\w\-\.]*).git$/)
+      def self.create (config, remote=nil)
+        config = Hash.new if config.nil?
+        remote = config["remote"] if (remote.nil? || remote.empty?)
+        remoteUrl = Atlassian::Stash::Git.get_remote_url(remote)
+
+        if remoteUrl.nil?
+          remotes = Atlassian::Stash::Git.get_remotes
+          if remotes.empty?
+            raise "No git remotes found, could not determine Stash project URL"
+          else
+            remote = Atlassian::Stash::Git::DEFAULT_REMOTE if (remote.nil? || remote.empty?)
+            raise "Could not find requested git remote '#{remote}'. Remotes found: \r\n" + remotes
+          end
+        end
+
+        if m = remoteUrl.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
+        raise "Repository does not seem to be hosted in Stash; Remote url: " + remoteUrl
       end
     end
   end

data/test/helper.rb

@@ -17,6 +17,7 @@ rescue Bundler::BundlerError => e
 end
 require 'minitest/autorun'
 require 'shoulda'
+require "mocha/mini_test"
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_stash-git.rb

@@ -6,38 +6,31 @@ include Atlassian::Stash::Git
 class TestGit < Minitest::Test
 
 	should "extract remote with ssh remote" do
-		Atlassian::Stash::Git.instance_eval do
-			def get_remotes
+		Atlassian::Stash::Git.stubs(:get_remotes).returns(
 				"origin	ssh://git@stash.atlassian.com:7999/STASH/stash.git (fetch)
 				origin	ssh://git@stash.atlassian.com:7999/STASH/stash.git (push)"
-			end
-		end
+				)
 		assert_equal 'ssh://git@stash.atlassian.com:7999/STASH/stash.git', Atlassian::Stash::Git.get_remote_url
 	end
 
 	should "extract push remote with different fetch and push urls" do
-		Atlassian::Stash::Git.instance_eval do
-			def get_remotes
+		Atlassian::Stash::Git.stubs(:get_remotes).returns(
 				"origin	ssh://git@github.com/~sebr/stash.git (fetch)
 				origin	ssh://git@stash.atlassian.com:7999/STASH/stash.git (push)"
-			end
-		end
+				)
 		assert_equal 'ssh://git@stash.atlassian.com:7999/STASH/stash.git', Atlassian::Stash::Git.get_remote_url
 	end
 
 	should "extract remote with http remote" do
-		Atlassian::Stash::Git.instance_eval do
-			def get_remotes
+		Atlassian::Stash::Git.stubs(:get_remotes).returns(
 				"origin     http://adam@sonoma:7990/stash/scm/QA/stash.git (fetch)
 				origin     http://adam@sonoma:7990/stash/scm/QA/stash.git (push)"
-			end
-		end
+				)
 		assert_equal 'http://adam@sonoma:7990/stash/scm/QA/stash.git', Atlassian::Stash::Git.get_remote_url
 	end
 
 	should "extract remote with multiple remote urls" do
-		Atlassian::Stash::Git.instance_eval do
-			def get_remotes
+		Atlassian::Stash::Git.stubs(:get_remotes).returns(
 				"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)
@@ -49,15 +42,12 @@ class TestGit < Minitest::Test
 				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
+				upstream        http://github-enterprise-11-10/stash/stash.git (push)")
 		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
+		Atlassian::Stash::Git.stubs(:get_remotes).returns(
 				"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)
@@ -71,9 +61,20 @@ class TestGit < Minitest::Test
 				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
+				upstream        http://github-enterprise-11-10/stash/stash.git (push)")
 		assert_equal 'ssh://git@stash.atlassian.com:7999/ATLASSIAN/stash.git', Atlassian::Stash::Git.get_remote_url('upstream')
 	end
+
+	should "repo with no remotes returns nil" do
+		Atlassian::Stash::Git.stubs(:get_remotes).returns("")
+		assert_equal nil, Atlassian::Stash::Git.get_remote_url
+	end
+
+	should "repo with unfound remote returns nil" do
+		Atlassian::Stash::Git.stubs(:get_remotes).returns(
+				"bitbucket	git@bitbucket.org:atlassian/stash-command-line-tools.git (fetch)
+				bitbucket	git@bitbucket.org:atlassian/stash-command-line-tools.git (push)"
+		)
+		assert_equal nil, Atlassian::Stash::Git.get_remote_url('origin')
+	end
 end

data/test/test_stash-repo-info.rb

@@ -7,20 +7,21 @@ class TestStashRepoInfo < Minitest::Test
 
   context "Extract repository info" do
     should "extract project key and repo slug from Stash remote" do
-      remote = "https://sruiz@stash-dev.atlassian.com/scm/STASH/stash.git"
-      ri = RepoInfo.create nil, remote
+      Atlassian::Stash::Git.stubs(:get_remotes).returns("origin https://sruiz@stash-dev.atlassian.com/scm/STASH/stash.git (push)")
+
+      ri = RepoInfo.create({})
       assert_equal 'STASH', ri.projectKey
       assert_equal 'stash', ri.slug
     end
 
     should "extracting project key and repo slug from non stash url raises exception" do
-      remote = "git@bitbucket.org:sebr/atlassian-stash-rubygem.git"
-      assert_raises(RuntimeError) { RepoInfo.create nil, remote }
+      Atlassian::Stash::Git.stubs(:get_remotes).returns("origin git@bitbucket.org:sebr/atlassian-stash-rubygem.git (push)")
+      assert_raises(RuntimeError) { RepoInfo.create({}) }
     end
 
     should "repo with hyphes" do
-      remote = "https://sruiz@stash-dev.atlassian.com/scm/s745h/stash-repository.git"
-      ri = RepoInfo.create nil, remote
+      Atlassian::Stash::Git.stubs(:get_remotes).returns("origin https://sruiz@stash-dev.atlassian.com/scm/s745h/stash-repository.git (push)")
+      ri = RepoInfo.create({})
       assert_equal 's745h', ri.projectKey
       assert_equal 'stash-repository', ri.slug
     end
@@ -28,14 +29,14 @@ class TestStashRepoInfo < Minitest::Test
 
   context "Create repo url" do
     setup do 
-      @remote = "https://sruiz@stash-dev.atlassian.com/scm/STASH/stash.git"
+      Atlassian::Stash::Git.stubs(:get_remotes).returns("origin https://sruiz@stash-dev.atlassian.com/scm/STASH/stash.git (push)")
     end
 
     should "create expected repo path" do
       config = {
         'stash_url' => 'https://www.stash.com'
       }
-      ri = RepoInfo.create config, @remote
+      ri = RepoInfo.create config
       assert_equal '/projects/STASH/repos/stash', ri.repoPath
     end
 
@@ -43,7 +44,7 @@ class TestStashRepoInfo < Minitest::Test
       config = {
         'stash_url' => 'https://www.stash.com/foo'
       }
-      ri = RepoInfo.create config, @remote
+      ri = RepoInfo.create config
       assert_equal '/foo/projects/STASH/repos/stash', ri.repoPath
     end
 
@@ -51,7 +52,7 @@ class TestStashRepoInfo < Minitest::Test
       config = {
         'stash_url' => 'https://www.stash.com/foo'
       }
-      ri = RepoInfo.create config, @remote
+      ri = RepoInfo.create config
       assert_equal '/foo/projects/STASH/repos/stash', ri.repoPath
     end
 
@@ -59,7 +60,7 @@ class TestStashRepoInfo < Minitest::Test
       config = {
         'stash_url' => 'https://www.stash.com'
       }
-      ri = RepoInfo.create config, @remote
+      ri = RepoInfo.create config
       assert_equal 'https://www.stash.com/projects/STASH/repos/stash', ri.repoUrl(nil, nil)
     end
 
@@ -67,7 +68,7 @@ class TestStashRepoInfo < Minitest::Test
       config = {
         'stash_url' => 'https://www.stash.com/foo'
       }
-      ri = RepoInfo.create config, @remote
+      ri = RepoInfo.create config
       assert_equal 'https://www.stash.com/foo/projects/STASH/repos/stash', ri.repoUrl(nil, nil)
     end
 
@@ -75,7 +76,7 @@ class TestStashRepoInfo < Minitest::Test
       config = {
         'stash_url' => 'https://www.stash.com/foo'
       }
-      ri = RepoInfo.create config, @remote
+      ri = RepoInfo.create config
       assert_equal 'https://www.stash.com/foo/projects/STASH/repos/stash/commits?at=develop', ri.repoUrl('commits', 'develop')
     end
 
@@ -83,7 +84,7 @@ class TestStashRepoInfo < Minitest::Test
       config = {
         'stash_url' => 'https://www.stash.com/foo?git=ftw'
       }
-      ri = RepoInfo.create config, @remote
+      ri = RepoInfo.create config
       assert_equal 'https://www.stash.com/foo/projects/STASH/repos/stash/commits?git=ftw&at=develop', ri.repoUrl('commits', 'develop')
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atlassian-stash
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Seb Ruiz
@@ -164,6 +164,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  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