pivotal-integration 1.6.0.2 → 1.6.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDA0MzQ0NjdkMTNiN2ViMTViM2Y0MGU2YmYzN2M5Nzg4OGRmMjAxYw==
+    ZGUzMzE5YTYzZWZmNDU1MTdmOTgwNTUxNjY4OWEwZDVhZGZmZTg0MA==
   data.tar.gz: !binary |-
-    ZDI5NmVkMTI4YWRhZjk0M2M4NzgzODg2MTg3MDBlMTAzZDI5ZWY1OQ==
+    MTA3MTFlNGJjYjk1NDUzMDQ1ZDhjMmQyNzE1ZjdmZjVhMDZhNjM1OA==
 SHA512:
   metadata.gz: !binary |-
-    NDc3OWNmMzYzMzg4YzMyOWE2NzQ3OGFjNjBmMWYxODNiZGIwMTQ5ZmRlNTk4
-    NDBhN2VmYjcwYTM4NzU4ZDFhOGVkYzBiZWI4NWMwNjIzNTcwNGJkOWU3OWFi
-    YjI5M2Y0NWViMGRmOTFlZTE2NGYyNTc5OTE2NThjZjkyZTAzMzA=
+    NjUwYzc3MmZjZGViNzA2ZmQyNTc3OWJjMWYxMDBjMDhhYjA0MjhjZDJkM2I1
+    YzNhMmY2OGJlYWY5ZmE2NDZiZmY0MDdiMmYyNjI4N2VlNTQ2YTA3NTc0M2Fk
+    Yjg1YjdlODIxMzg3ZWE5MTFlY2Y2MzQwN2E0NTA5ZjQ5NDYwMmQ=
   data.tar.gz: !binary |-
-    YjEzODE1ODdkMTU4ODk0Nzc1NjdhMjQ3Y2YwZmVlZjQ4ZmY3YmIwNmRjYTZh
-    NDlhZTUyZjFiY2YwYzliMTgwYTVmZWI2ODg5NjBlOTk4ODk5NGUwMGFhMDMw
-    ZWRmN2U4M2RmMjIwZDlkODM1YWQwNjUwZmViYTcyNmUzNzk0MmE=
+    MjZkY2FlMTEwNjFmNDg0NTQzMjAwMTc5ZjhlNjZlN2VlMDU0OTlmNzI2ZTNj
+    NGFiYWJjOTRlZDZiOTAyMzUzNGYzYjc1ZDUyZjU1MTJkZTczM2RmNTJhYzA1
+    YTUzYzY1MzY2ODY3NjEyYzFmZDQxZWU5M2FiNDIzZDJkZTcyODY=

data/bin/pivotal

@@ -91,7 +91,7 @@ begin
     command_class = PivotalIntegration::Command.const_get(command.classify)
     command_class.new(options).run(*ARGV)
 
-  elsif ARGV.empty?
+  elsif ARGV.empty? || ARGV.first == 'help'
     show_help
 
   else

data/lib/pivotal-integration/command/finish.rb

@@ -33,8 +33,11 @@ class PivotalIntegration::Command::Finish < PivotalIntegration::Command::Base
     pull_request = @options.fetch(:pull_request, false) || PivotalIntegration::Util::Git.finish_mode == :pull_request
 
     if pull_request
+      root_branch = PivotalIntegration::Util::Git.get_config('root-branch', :branch)
+      root_branch = nil if root_branch == 'master'
+
       PivotalIntegration::Util::Git.push PivotalIntegration::Util::Git.branch_name
-      PivotalIntegration::Util::Git.create_pull_request(@configuration.story)
+      PivotalIntegration::Util::Git.create_pull_request(@configuration.story, root_branch)
       PivotalIntegration::Util::Story.mark(@configuration.story, :finished)
       return
     end

data/lib/pivotal-integration/command/version.rb

@@ -0,0 +1,7 @@
+class PivotalIntegration::Command::Version < PivotalIntegration::Command::Base
+  desc "Show the version of this utility"
+
+  def run(*arguments)
+    puts PivotalIntegration::VERSION
+  end
+end

data/lib/pivotal-integration/util/git.rb

@@ -171,13 +171,22 @@ class PivotalIntegration::Util::Git
     end
   end
 
-  def self.create_pull_request(story)
+  def self.create_pull_request(story, to_branch = nil)
     case get_config_with_default('pivotal.pull-request-editor', :web).to_sym
       when :web
         # Open the PR editor in a web browser
         repo = get_config('remote.origin.url')[/(?<=git@github.com:)[a-z0-9_-]+\/[a-z0-9_-]+/]
-        title = CGI::escape("[##{story.id}] #{story.name}]")
-        Launchy.open "https://github.com/#{repo}/compare/#{branch_name}?expand=1&pull_request[title]=#{title}"
+        title = CGI::escape("[##{story.id}] #{story.name}")
+
+        url = "https://github.com/#{repo}/compare/"
+
+        if to_branch
+          upstream = get_config('remote.upstream.url')[/(?<=git@github.com:)[a-z0-9_-]+/]
+          url << "#{upstream}:#{to_branch}..."
+        end
+
+        url << "#{branch_name}?expand=1&pull_request[title]=#{title}"
+        Launchy.open url
 
       else
         print 'Checking for hub installation... '

data/lib/pivotal_integration.rb

@@ -15,5 +15,5 @@
 
 # The root module for the project
 module PivotalIntegration
-  VERSION = '1.6.0.2'
+  VERSION = '1.6.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pivotal-integration
 version: !ruby/object:Gem::Version
-  version: 1.6.0.2
+  version: 1.6.0.3
 platform: ruby
 authors:
 - Ben Hale
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
@@ -177,6 +177,7 @@ files:
 - lib/pivotal-integration/command/release.rb
 - lib/pivotal-integration/command/start.rb
 - lib/pivotal-integration/command/switch.rb
+- lib/pivotal-integration/command/version.rb
 - lib/pivotal-integration/util/git.rb
 - lib/pivotal-integration/util/label.rb
 - lib/pivotal-integration/util/shell.rb