atlassian-stash 0.1.8 → 0.1.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d28ba066e1e70f765042c3fc2387e87d30cce8db
+  data.tar.gz: 0a5704ce8f49dbe7d6a94a71eb0c2b7ac95f9330
+SHA512:
+  metadata.gz: 6d5bdc31894cd70d496ffe4de1992c3b276683dda42c9d40aaded6994444fbfeac938456bf88f0baf09a5cc45da0436c3521330c32f11f14aa90cea1a1215361
+  data.tar.gz: 921109a45341bd763ca3ec3872162e8d16f26c73d1b662307955f96a92b0de178259bd3b00e666b761ad2bf0f1fcc415c0f519b0cc0c588438698a609e2fbf39

data/Gemfile

@@ -14,7 +14,7 @@ group :development do
   gem "shoulda", ">= 0"
   gem "rdoc", "~> 3.12"
   gem "bundler", ">= 1.2.0"
-  gem "jeweler", "~> 1.8.4"
+  gem "jeweler", "~> 2.0.0"
   gem "rcov", ">= 0", :platforms => :ruby_18
   gem "simplecov", ">= 0", :platforms => :ruby_19, :require => "false"
 end

data/README.md

@@ -3,7 +3,8 @@
 ## Installing this tool
 This command line helper for Stash is written in Ruby and is deployed as a [Ruby Gem](https://rubygems.org/gems/atlassian-stash/). Installation is easy, simply run the following command
 
-    $> gem install atlassian-stash
+	:::text
+        $> gem install atlassian-stash
 
 (Protip: you might need to `sudo`)
 
@@ -15,18 +16,33 @@ Run `stash configure`. This will prompt for details about your Stash instance. I
 ### Creating a pull request
 Use the `pull-request` command to create a pull request in Stash. E.g:
 
-    $> stash pull-request topicBranch master @michael
-    Create a pull request from branch 'topicBranch' into 'master' with 'michael' added as a reviewer
+    :::text
+        $> stash pull-request topicBranch master @michael
+        Create a pull request from branch 'topicBranch' into 'master' with 'michael' added as a reviewer
 
 See the usage for command details 
 
-    stash help
+    :::text
+        stash help pull-request
+
+### Opening the Stash web UI
+Use the `browse` command to open the Stash UI for your repository in the browser.
+
+    :::text
+        $> stash browse -b develop
+        Open the browser at the Stash repository page for the branch 'develop'
+
+For more options, see the help
+
+    :::text
+        stash help browse
 
 ## Troubleshooting
 Q: I installed the gem, but the `stash` command doesn't work.  
 A: Do you have another command called `stash` or do you have an alias? Have a look where the command maps to
 
-    $> which -a stash
+    :::text
+        $> which -a stash
 
 Then check the value of your $PATH
 
@@ -36,7 +52,8 @@ Thanks! Please [fork this project](https://bitbucket.org/atlassian/stash-command
 ### Build instructions
 Building this gem is easy. To get started, run the following commands:
 
-    $> gem install bundler
-    $> bundle install
+    :::text
+        $> gem install bundler
+        $> bundle install
 
 Now start hacking, and run the stash command by invoking `./bin/stash command`

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/bin/stash

@@ -2,9 +2,9 @@
 
 require 'rubygems'
 require File.dirname(__FILE__) + "/../lib/stash_cli"
-#require 'stash_cli'
 require 'commander/import'
 require 'yaml'
+require 'launchy'
 
 program :name, "Atlassian Stash CLI"
 program :version, Atlassian::Stash::Version::STRING
@@ -86,9 +86,28 @@ command 'pull-request' do |c|
   end
 end
 
+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.example 'stash browse -b master', 'Open the files view for this repository at the current branch'
+
+  c.action do |args, options|
+
+    tab = args.shift unless args.empty?
+
+    repoInfo = RepoInfo.create(load_config)
+
+    branch = options.branch || get_current_branch
+
+    Launchy.open repoInfo.repoUrl(tab, branch)
+  end
+end
+
+
 default_command :help
 program :help_formatter, :compact
-program :help, 'Authors', 'Seb Ruiz <sruiz@atlassian.com> with others'
+program :help, 'Authors', 'Seb Ruiz <sruiz@atlassian.com>'
 program :help, 'Website', 'https://bitbucket.org/atlassian/stash-command-line-tools'
 
 

data/lib/atlassian/stash/{pullrequest.rb → pull_request.rb}

@@ -45,26 +45,17 @@ module Atlassian
 
     class CreatePullRequest
 
-      RepoInfo = Struct.new(:projectKey, :slug)
-
       def initialize(config)
         @config = config
       end
 
-      def extract_repository_info (url = get_remote_url)
-        if m = url.match(/\/([a-zA-Z~][a-zA-Z0-9_]*)\/([[:alnum:]][\w\-\.]*).git$/)
-          return RepoInfo.new(m[1], m[2])
-        end
-        raise "Repository does not seem to be hosted in Stash"
-      end
-
       def create_pull_request(source, target, reviewers, options)
         Process.exit if not target or not source
 
         @source = source
         @target = target
 
-        repoInfo = extract_repository_info
+        repoInfo = RepoInfo.create(@config)
 
         resource = CreatePullRequestResource.new(repoInfo.projectKey, repoInfo.slug, title, description, reviewers, @source, @target).resource
 
@@ -76,10 +67,9 @@ module Atlassian
         password = ask("Password: ") { |q| q.echo = '*' } unless @config["password"]
 
         uri = URI.parse(@config["stash_url"])
-        prPath = uri.path + '/projects/' + repoInfo.projectKey + '/repos/' + repoInfo.slug + '/pull-requests'
-        prPath = uri.query.nil? ? "#{prPath}" : "#{prPath}?#{uri.query}"
-
-        req = Net::HTTP::Post.new(prPath, {'Content-Type' => 'application/json', 'Accept' => 'application/json'})
+        prPath = repoInfo.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
         req.body = resource.to_json
         http = Net::HTTP.new(uri.host, uri.port, proxy_addr, proxy_port)
@@ -110,6 +100,7 @@ module Atlassian
           responseBody = JSON.parse(response.body)
           prUri = uri.clone
           prUri.path = prPath + '/' + responseBody['id'].to_s
+          prUri.query = uri.query
           puts prUri.to_s
 
           if @config["open"] || options.open

data/lib/atlassian/stash/repo_info.rb

@@ -0,0 +1,48 @@
+require 'git'
+
+module Atlassian
+  module Stash
+    class RepoInfo
+      def initialize(config, projectKey, slug)
+        @config = config
+        @projectKey = projectKey
+        @slug = slug
+      end
+
+      def projectKey
+        @projectKey
+      end
+
+      def slug
+        @slug
+      end
+
+      def repoPath
+        uri = URI.parse(@config["stash_url"])
+        repoPath = uri.path + '/projects/' + @projectKey + '/repos/' + @slug
+        repoPath
+      end
+
+      def repoUrl(suffix, branch)
+        uri = URI.parse(@config["stash_url"])
+        path = repoPath + (suffix.nil? ? '' : '/' + suffix)
+        uri.path = path
+        
+        if (!branch.nil? and !branch.empty?)
+            q = uri.query || ''
+            q = q + (q.empty? ? '' : '&') + 'at=' + branch unless branch.nil?
+            uri.query = q
+        end
+
+        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$/)
+          return RepoInfo.new(config, m[1], m[2])
+        end
+        raise "Repository does not seem to be hosted in Stash; Remote url: " + url
+      end
+    end
+  end
+end

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

@@ -5,30 +5,6 @@ include Atlassian::Stash::Git
 
 class TestStashCreatePullRequest < Test::Unit::TestCase
 
-  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"
-      cpr = CreatePullRequest.new nil
-      ri = cpr.extract_repository_info remote
-      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"
-      cpr = CreatePullRequest.new nil
-      assert_raise(RuntimeError) { cpr.extract_repository_info remote }
-    end
-
-    should "repo with hyphes" do
-      remote = "https://sruiz@stash-dev.atlassian.com/scm/s745h/stash-repository.git"
-      cpr = CreatePullRequest.new nil
-      ri = cpr.extract_repository_info remote
-      assert_equal 's745h', ri.projectKey
-      assert_equal 'stash-repository', ri.slug
-    end
-  end
-
   context "#parse_proxy" do
     setup do
       @cpr = CreatePullRequest.new nil

data/test/test_stash-repo-info.rb

@@ -0,0 +1,90 @@
+require 'helper'
+
+include Atlassian::Stash
+include Atlassian::Stash::Git
+
+class TestStashRepoInfo < Test::Unit::TestCase
+
+  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
+      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_raise(RuntimeError) { RepoInfo.create nil, remote }
+    end
+
+    should "repo with hyphes" do
+      remote = "https://sruiz@stash-dev.atlassian.com/scm/s745h/stash-repository.git"
+      ri = RepoInfo.create nil, remote
+      assert_equal 's745h', ri.projectKey
+      assert_equal 'stash-repository', ri.slug
+    end
+  end
+
+  context "Create repo url" do
+    setup do 
+      @remote = "https://sruiz@stash-dev.atlassian.com/scm/STASH/stash.git"
+    end
+
+    should "create expected repo path" do
+      config = {
+        'stash_url' => 'https://www.stash.com'
+      }
+      ri = RepoInfo.create config, @remote
+      assert_equal '/projects/STASH/repos/stash', ri.repoPath
+    end
+
+    should "create expected repo path with context" do
+      config = {
+        'stash_url' => 'https://www.stash.com/foo'
+      }
+      ri = RepoInfo.create config, @remote
+      assert_equal '/foo/projects/STASH/repos/stash', ri.repoPath
+    end
+
+    should "create expected repo path with context and query" do
+      config = {
+        'stash_url' => 'https://www.stash.com/foo'
+      }
+      ri = RepoInfo.create config, @remote
+      assert_equal '/foo/projects/STASH/repos/stash', ri.repoPath
+    end
+
+    should "create expected repo url with no suffix or branch" do
+      config = {
+        'stash_url' => 'https://www.stash.com'
+      }
+      ri = RepoInfo.create config, @remote
+      assert_equal 'https://www.stash.com/projects/STASH/repos/stash', ri.repoUrl(nil, nil)
+    end
+
+    should "create expected repo url with context" do
+      config = {
+        'stash_url' => 'https://www.stash.com/foo'
+      }
+      ri = RepoInfo.create config, @remote
+      assert_equal 'https://www.stash.com/foo/projects/STASH/repos/stash', ri.repoUrl(nil, nil)
+    end
+
+    should "create expected repo url with path and branch" do
+      config = {
+        'stash_url' => 'https://www.stash.com/foo'
+      }
+      ri = RepoInfo.create config, @remote
+      assert_equal 'https://www.stash.com/foo/projects/STASH/repos/stash/commits?at=develop', ri.repoUrl('commits', 'develop')
+    end
+
+    should "create expected repo url with context, query, path and branch" do
+      config = {
+        'stash_url' => 'https://www.stash.com/foo?git=ftw'
+      }
+      ri = RepoInfo.create config, @remote
+      assert_equal 'https://www.stash.com/foo/projects/STASH/repos/stash/commits?git=ftw&at=develop', ri.repoUrl('commits', 'develop')
+    end
+  end
+end

metadata

@@ -1,100 +1,88 @@
 --- !ruby/object:Gem::Specification
 name: atlassian-stash
 version: !ruby/object:Gem::Version
-  version: 0.1.8
-  prerelease: 
+  version: 0.1.9
 platform: ruby
 authors:
 - Seb Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,65 +97,57 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rcov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Provides convenient functions for interacting with Atlassian Stash through
@@ -189,40 +168,38 @@ files:
 - VERSION
 - bin/stash
 - lib/atlassian/stash/git.rb
-- lib/atlassian/stash/pullrequest.rb
+- lib/atlassian/stash/pull_request.rb
+- lib/atlassian/stash/repo_info.rb
 - lib/atlassian/stash/version.rb
 - lib/atlassian/util/text_util.rb
 - lib/stash_cli.rb
 - test/helper.rb
 - test/test_stash-create-pull-request.rb
 - test/test_stash-git.rb
+- test/test_stash-repo-info.rb
 - test/test_text-util.rb
 homepage: https://bitbucket.org/atlassian/stash-command-line-tools
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4305375427045807658
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Command line tools for Atlassian Stash
 test_files: []