spire-git-pivotal-tracker 1.2.0 → 1.3.0

data/lib/git-pivotal-tracker-integration/command/configuration.rb

@@ -92,7 +92,7 @@ class GitPivotalTrackerIntegration::Command::Configuration
 
     repo = GitPivotalTrackerIntegration::Util::Git.repo_name
 
-    ::Github.new(:oauth_token => token, :org => "spire-inc", :repo => repo, :user => "spire-inc")
+    ::Github.new(:oauth_token => token)
   end
 
   private

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

@@ -34,15 +34,13 @@ class GitPivotalTrackerIntegration::Command::Finish < GitPivotalTrackerIntegrati
 
     story = @configuration.story(@project)
 
-    branch_name = GitPivotalTrackerIntegration::Util::Git.branch_name
-
-    print 'Creating PR on Github... '
+    print "Creating PR on Github... \n"
     pr = github.pull_requests.create(
-      user: github.user,
-      repo: github.repo,
+      user: GitPivotalTrackerIntegration::Util::Git.org_name,
+      repo: GitPivotalTrackerIntegration::Util::Git.repo_name,
       base: GitPivotalTrackerIntegration::Util::Git.root_branch,
-      head: branch_name,
-      title: "[Delivers ##{story.id}] #{branch_name.gsub("#{story.id}-","")}",
+      head: GitPivotalTrackerIntegration::Util::Git.branch_name,
+      title: "[Delivers ##{story.id}] #{story.name}",
       body: "#{story.name}\n#{story.description}\nPivotal Task: #{story.url}"
     )
     puts 'OK'

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

@@ -56,7 +56,11 @@ class GitPivotalTrackerIntegration::Util::Git
   end
 
   def self.repo_name
-    GitPivotalTrackerIntegration::Util::Shell.exec('git config -l').scan(/spire\-inc\/(.*)\.git/)[0][0]
+    GitPivotalTrackerIntegration::Util::Shell.exec('git config remote.origin.url').scan(/:(.*)\/(.*)\.git/)[0][1]
+  end
+
+  def self.org_name
+    GitPivotalTrackerIntegration::Util::Shell.exec('git config remote.origin.url').scan(/:(.*)\/(.*)\.git/)[0][0]
   end
 
   # Creates a branch with a given +name+.  First pulls the current branch to

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spire-git-pivotal-tracker
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline