socialcast-git-extensions 1.3.2 → 1.4.0

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.4.0

data/bin/git-release

@@ -8,7 +8,7 @@ raise "Cannot release reserved branch" if %w{master staging}.include?(branch)
 
 tickets = assert_tickets_provided(ARGV, branch)
 
-exit unless HighLine.ask("This will release #{branch} to production.  Are you sure (y/n)? ") == 'y'
+exit unless HighLine.agree("Release #{branch} to production? (y/n)")
 
 run_cmd 'git update'
 integrate branch, 'master'

data/bin/git-release-pending

@@ -19,23 +19,23 @@ issues_with_no_branch = issues.reject do |issue|
   issue.customFieldValues.detect {|k| k.customfieldId == GIT_BRANCH_FIELD }
 end
 if issues_with_no_branch.any?
-  puts "\n\nThe following tickets do not have a git branch configured:"
+  HighLine.say "\n<%= color('The following tickets do NOT have a git branch properly configured:', :red) %>"
   issues_with_no_branch.each do |issue|
-    puts "#{issue.key} - #{issue.summary}"
+    print_issue issue
   end
 end
 
 branches.each do |branch|
-  puts "\n\nChecking state of branch #{branch}:"
+  HighLine.say "\nThe changes on branch <%= color('#{branch}', :green) %> "
   if branches(:merged => true, :remote => true).include?(branch)
-    puts "All changes in #{branch} have been merged into master"
+    HighLine.say "<%= color('HAVE', :green) %> been merged into master"
     releasable_tickets = tickets_from_branch(branch).select do |issue|
-      puts "#{issue.key} - #{issue.summary}"
-      HighLine.ask("Mark this issue as released? (y/n)? ") == 'y'
+      print_issue issue
+      HighLine.agree("Mark this issue as released? (y/n)")
     end
     release_tickets releasable_tickets
   else
-    puts "#{branch} has NOT yet been merged into master"
+    HighLine.say "<%= color('HAVE NOT', :red) %> been merged into master"
   end
 end
 

data/bin/git-update

@@ -5,7 +5,7 @@ include Socialcast
 
 branch = current_branch
 
-puts "updating #{branch} to have most recent changes from master"
+HighLine.say "updating <%= color('#{branch}', :green) %> to have most recent changes from master"
 run_cmd "git pull origin #{branch}" rescue nil
 run_cmd 'git pull origin master'
 run_cmd 'git push origin HEAD'

data/lib/socialcast-git-extensions.rb

@@ -35,7 +35,7 @@ module Socialcast
       @jira.login credentials[:username], credentials[:password]
       return @jira
     rescue => e
-      puts "Error: #{e.message}"
+      print_error e
       File.delete config_file
       raise e
     end
@@ -59,14 +59,14 @@ module Socialcast
   end
   def update_tickets(tickets, options = {})
     tickets.each do |ticket|
-      puts "Updating ticket: #{ticket.key} - #{ticket.summary}"
+      HighLine.say "Updating ticket: <%= color('#{ticket.key}', :green) %> - #{ticket.summary}"
       fields = []
       fields << Jira4R::V2::RemoteFieldValue.new(GIT_BRANCH_FIELD, [options[:branch]]) if options[:branch]
       fields << Jira4R::V2::RemoteFieldValue.new(IN_STAGING_FIELD, ['true']) if options[:in_staging]
       begin
         jira_server.updateIssue ticket.key, fields
       rescue => e
-        puts "Error updating ticket: #{e.message}"
+        HighLine.say "<%= color('Error: #{e.message}', :red)"
       end
     end
   end
@@ -90,13 +90,19 @@ module Socialcast
       begin
         jira_server.progressWorkflowAction issue.key, action.to_s, []
       rescue => e
-        puts "Error updating ticket: #{e.message}"
+        print_error e
       end
     end
   end
+  def print_issue(issue)
+    HighLine.say "<%= color('#{issue.key}', :green) - #{issue.summary}"
+  end
+  def print_error(e)
+    HighLine.say "<%= color('Error: #{e.message}', :red)"
+  end
 
   def run_cmd(cmd)
-    puts "\nRunning: #{cmd}"
+    HighLine.say "\n> <%= color('#{cmd}', :red) %>"
     raise "#{cmd} failed" unless system cmd
   end
 
@@ -125,7 +131,7 @@ module Socialcast
   end
 
   def integrate(branch, destination_branch = 'staging')
-    puts "integrating #{branch} into #{destination_branch}"
+    HighLine.say "integrating <%= color('#{branch}', :green) %> into <%= color('#{destination_branch}', :green) %>"
     run_cmd "git remote prune origin"
     unless destination_branch == 'master'
       run_cmd "git branch -D #{destination_branch}" rescue nil

data/socialcast-git-extensions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{socialcast-git-extensions}
-  s.version = "1.3.2"
+  s.version = "1.4.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-30}
+  s.date = %q{2010-09-09}
   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: 31
+  hash: 7
   prerelease: false
   segments: 
   - 1
-  - 3
-  - 2
-  version: 1.3.2
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 -05:00
+date: 2010-09-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency