atlassian-stash 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0be0d6772ce793494d20df00f95ce16587ff5a9e
-  data.tar.gz: 67ad7b07621a675f2992fdcf59fb52908b9eeba2
+  metadata.gz: 682bc271a57ab40dff60664829c0eb186b85f69c
+  data.tar.gz: 77065a5e776e9a090981dd406d67a315ad346888
 SHA512:
-  metadata.gz: aab230757aa8b89aa4276ef30efdc1e978f97ff385eaf9d085e12ad1286c959900124fa1dc6e4537975a93d973db1308890d649803ed17591bd143682cf0f7cf
-  data.tar.gz: 17ce45b32d675377acb3a01b8b628d0b06e142cdd26b7cb9a94614763245ef8cd3f2d827718d4fbf111c93601d437aba9d9cfca71863653bdd2b828213316042
+  metadata.gz: d78247c9ade2009da701d9703dde0264cf51928f3c75a3a14eb65760e35e1a43609672866d7151ff57ad3e741d8f296556fa23244131dfc28aa3ced118e052b0
+  data.tar.gz: c1d5600c4575f3099fc91e1ae108d172011c93aa2d680bd0348ece4f873e2698226407dc4f4475500f30a2d74aa5ea6f40822e1b43d6556b362218bf5f060a11

data/README.md

@@ -13,7 +13,25 @@ $> gem install atlassian-stash
 Once the gem is installed, the command `stash` will be in your `$PATH`
 
 ## Configuration and usage
-Run `stash configure`. This will prompt for details about your Stash instance. If no password is provided, then you will be prompted for a password when executing commands to Stash. Currently, the password is stored in plain text in a configuration file, `~/.stashconfig.yml` which is protected with a permission bit of `0600`. 
+Run `stash configure`. This will prompt for details about your Stash instance. If no password is provided, then you will be prompted for a password when executing commands to Stash.
+
+The global configuration file lives at `$HOME/.stashconfig.yml` and any options in a similarly named `.stashconfig.yml` file in the root of a git repository will take precedence.
+
+### Passwords
+There are currently two ways to store your password in the configuration file. You may store it as plain text with the key `password`, for example:
+
+```
+password: s3cre7
+```
+
+Or you may store a command string with the `passwordeval` key which allows you to use any encrypted method you like in order to store your password. For example, if using gpg:
+
+```
+passwordeval: gpg --no-tty --quiet --decrypt ~/.secret.gpg
+```
+
+The `stash configure` utility will not prompt you for this. If you wish to use `passwordeval`, omit a password during the configuration and add it to `~/.stashconfig.yml` afterwards.
+
 
 ### Creating a pull request
 Use the `pull-request` command to create a pull request in Stash. For example:
@@ -56,6 +74,7 @@ Running `stash configure` will prepopulate `~/.stashconfig.yml` with a variety o
 username: seb # username to connect to stash server.
 password: s3cr3t # password for user. If ommitted, you will be prompted at the terminal when making a request to Stash
 stash_url: https://stash.server.com # fully qualified stash url
+remote: upstream # Pull requests will be created in the Stash repository specified by this remote
 open: true # opens newly created pull requests in the browser
 ssl_no_verify: true # do not check ssl certificates for the configured stash server
 ```
@@ -111,4 +130,4 @@ version:write       -- writes out an explicit version
 
 ```
 $> rake release
-```
+```

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/bin/stash

@@ -21,6 +21,11 @@ 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']
+
+  if config['password'].nil? && !config['passwordeval'].nil?
+    config['password'] = `#{config['passwordeval']}`.strip
+  end
+
   config.merge! repo_config if repo_config
   config
 end
@@ -112,7 +117,6 @@ command 'pull-request' do |c|
         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"
@@ -120,7 +124,10 @@ command 'pull-request' do |c|
       # If a remote matches, split the remote out of the refspec
       options.src_remote = source.split('/')[0]
       source = source.split('/')[1..-1].join('/')
+    else
+      options.src_remote = Atlassian::Stash::Git.get_remote(source)
     end
+    options.src_remote = options.remote if options.src_remote.nil? || options.src_remote.empty?
 
     options.target_remote = options.remote
     if not is_branch?(target)

data/lib/atlassian/stash/git.rb

@@ -11,7 +11,7 @@ module Atlassian
       end
 
       def get_branches()
-        all = %x{git branch -a}.gsub("*","").gsub(" ", "").split("\n")
+        all = %x{git branch --no-color -a}.gsub("*","").gsub(" ", "").split("\n")
         all.select{|x| not x.include? "->"}
       end
 
@@ -28,6 +28,12 @@ module Atlassian
         %x(git remote -v)
       end
 
+      def get_remote(branch = nil)
+        remote_branch = %x(git rev-parse --abbrev-ref --symbolic-full-name #{branch}@{u} 2>/dev/null)
+        remote = remote_branch.split('/').first
+        remote == "" ? nil : remote
+      end
+
       def get_remote_url(remote=nil)
         remotes = get_remotes
         return nil if remotes.empty?

data/lib/atlassian/stash/pull_request.rb

@@ -136,7 +136,7 @@ module Atlassian
       end
 
       def git_commit_messages
-        @commit_messages ||= `git log --reverse --format=%s #{@target_ref}..#{@source_ref}`
+        @commit_messages ||= `git log --no-color --reverse --format=%s #{@target_ref}..#{@source_ref}`
       end
 
       def parse_proxy(conf)

data/lib/atlassian/stash/repo_info.rb

@@ -52,11 +52,11 @@ module Atlassian
           end
         end
 
-        if m = remoteUrl.match(/\/([a-zA-Z~][a-zA-Z0-9_\-]*)\/([[:alnum:]][\w\-\.]*).git$/)
+        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: " + remoteUrl
       end
     end
   end
-end
+end

data/test/test_stash-git.rb

@@ -79,16 +79,16 @@ class TestGit < Minitest::Test
 	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")
+                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

data/test/test_stash-repo-info.rb

@@ -14,9 +14,12 @@ class TestStashRepoInfo < Minitest::Test
       assert_equal 'stash', ri.slug
     end
 
-    should "extracting project key and repo slug from non stash url raises exception" do
-      Atlassian::Stash::Git.stubs(:get_remotes).returns("origin git@bitbucket.org:sebr/atlassian-stash-rubygem.git (push)")
-      assert_raises(RuntimeError) { RepoInfo.create({}) }
+    should "extracting project key and repo slug from SSH remote" do
+      Atlassian::Stash::Git.stubs(:get_remotes).returns("origin sruiz@stash-dev.atlassian.com:STASH/stash.git (push)")
+
+      ri = RepoInfo.create({})
+      assert_equal 'STASH', ri.projectKey
+      assert_equal 'stash', ri.slug
     end
 
     should "repo with hyphes" do
@@ -88,4 +91,4 @@ class TestStashRepoInfo < Minitest::Test
       assert_equal 'https://www.stash.com/foo/projects/STASH/repos/stash/commits?git=ftw&at=develop', ri.repoUrl('commits', 'develop')
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atlassian-stash
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Seb Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git