socialcast-git-extensions 1.4.1 → 1.5.0

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.5.0

data/bin/git-integrate

@@ -11,7 +11,7 @@ branch = current_branch
 tickets = assert_tickets_provided(ARGV, branch)
 
 run_cmd 'git update'
-integrate(branch, 'staging')
+integrate(branch, 'prototype')
 
-update_tickets tickets, :branch => branch, :in_staging => true
+update_tickets tickets, :branch => branch, :in_prototype => true
 start_tickets tickets

data/bin/git-promote

@@ -7,9 +7,9 @@ branch = current_branch
 tickets = assert_tickets_provided(ARGV, branch)
 
 run_cmd 'git update'
-integrate(branch, 'next_release')
+integrate(branch, 'staging')
 
-update_tickets tickets, :branch => branch, :in_staging => true
+update_tickets tickets, :branch => branch, :in_prototype => true, :in_staging => true
 resolve_tickets tickets
 
-integrate(branch, 'staging')
+integrate('staging', 'prototype')

data/bin/git-release

@@ -4,7 +4,7 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extension
 include Socialcast
 
 branch = current_branch
-raise "Cannot release reserved branch" if %w{master staging}.include?(branch)
+raise "Cannot release reserved branch" if %w{master staging prototype}.include?(branch)
 
 tickets = assert_tickets_provided(ARGV, branch)
 
@@ -16,6 +16,6 @@ integrate branch, 'master'
 update_tickets tickets, :branch => branch
 release_tickets tickets
 
-integrate branch, 'next_release'
 integrate branch, 'staging'
+integrate 'staging', 'prototype'
 run_cmd "grb rm #{branch}"

data/bin/{git-release-pending → git-release-staging}

@@ -5,7 +5,7 @@ include Socialcast
 
 run_cmd 'git checkout master'
 run_cmd 'git pull'
-run_cmd 'git pull origin last_known_good_next_release'
+run_cmd 'git pull origin last_known_good_staging'
 run_cmd 'git push origin HEAD'
 
 filter_id = '10102'

data/bin/{git-reset-staging → git-reset-prototype}

@@ -3,14 +3,14 @@
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
 include Socialcast
 
-reset_branch('staging')
-reset_branch('last_known_good_staging')
+reset_branch('prototype')
+reset_branch('last_known_good_prototype')
 
 filter_id = '10103'
 issues = jira_server.getIssuesFromFilterWithLimit filter_id, 0, 1000
 
-HighLine.say "Updating the following tickets to no longer be in staging:"
+HighLine.say "Updating the following tickets to no longer be in prototype:"
 issues.each do |issue|
   print_issue issue
-  jira_server.updateIssue issue.key, [Jira4R::V2::RemoteFieldValue.new(IN_STAGING_FIELD, [''])]
+  jira_server.updateIssue issue.key, [Jira4R::V2::RemoteFieldValue.new(IN_PROTOTYPE_FIELD, ['false'])]
 end

data/lib/socialcast-git-extensions.rb

@@ -5,6 +5,7 @@ require 'highline/import'
 
 module Socialcast
   GIT_BRANCH_FIELD = 'customfield_10010'
+  IN_PROTOTYPE_FIELD = 'customfield_10033'
   IN_STAGING_FIELD = 'customfield_10020'
   JIRA_CREDENTIALS_FILE = File.expand_path('~/.jira_key')
 
@@ -62,6 +63,7 @@ module Socialcast
       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_PROTOTYPE_FIELD, ['true']) if options[:in_prototype]
       fields << Jira4R::V2::RemoteFieldValue.new(IN_STAGING_FIELD, ['true']) if options[:in_staging]
       begin
         jira_server.updateIssue ticket.key, fields

data/socialcast-git-extensions.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{socialcast-git-extensions}
-  s.version = "1.4.1"
+  s.version = "1.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Sonnek"]
-  s.date = %q{2010-09-10}
+  s.date = %q{2010-10-18}
   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"]
+  s.executables = ["git-integrate", "git-promote", "git-prune-merged", "git-release", "git-release-staging", "git-reset-prototype", "git-start", "git-track", "git-update", "git-wtf"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -28,8 +28,8 @@ Gem::Specification.new do |s|
      "bin/git-promote",
      "bin/git-prune-merged",
      "bin/git-release",
-     "bin/git-release-pending",
-     "bin/git-reset-staging",
+     "bin/git-release-staging",
+     "bin/git-reset-prototype",
      "bin/git-start",
      "bin/git-track",
      "bin/git-update",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 1
-  - 4
-  - 1
-  version: 1.4.1
+  - 5
+  - 0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 -05:00
+date: 2010-10-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,8 +109,8 @@ executables:
 - git-promote
 - git-prune-merged
 - git-release
-- git-release-pending
-- git-reset-staging
+- git-release-staging
+- git-reset-prototype
 - git-start
 - git-track
 - git-update
@@ -131,8 +131,8 @@ files:
 - bin/git-promote
 - bin/git-prune-merged
 - bin/git-release
-- bin/git-release-pending
-- bin/git-reset-staging
+- bin/git-release-staging
+- bin/git-reset-prototype
 - bin/git-start
 - bin/git-track
 - bin/git-update