socialcast-git-extensions 1.1.0 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/socialcast-git-extensions.rb

@@ -46,12 +46,12 @@ module Socialcast
   end
 
   def assert_tickets_provided(ticket_ids, branch)
-    tickets = tickets_from_branch_and_arguments(ticket_ids, branch)
+    tickets = tickets_from_arguments_or_branch(ticket_ids, branch)
     raise "JIRA ticket id or existing JIRA Git Branch is required to run this process" unless tickets.any?
     tickets
   end
-  def tickets_from_branch_and_arguments(ticket_ids, branch)
-    tickets_from_arguments(ticket_ids) + tickets_from_branch(branch)
+  def tickets_from_arguments_or_branch(ticket_ids, branch)
+    ticket_ids.any? ? tickets_from_arguments(ticket_ids) : tickets_from_branch(branch)
   end
   def tickets_from_arguments(ticket_ids)
     ticket_ids.collect do |key|

data/socialcast-git-extensions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{socialcast-git-extensions}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Sonnek"]
-  s.date = %q{2010-08-02}
+  s.date = %q{2010-08-06}
   s.description = %q{git extension scripts for socialcast workflow}
   s.email = %q{ryan@socialcast.com}
   s.executables = ["git-integrate", "git-promote", "git-prune-merged", "git-release", "git-release-pending", "git-reset-staging", "git-start", "git-track", "git-update", "git-wtf"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-02 00:00:00 -05:00
+date: 2010-08-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency