socialcast-git-extensions 2.0.8 → 2.1.0

data/bin/git-integrate

@@ -10,14 +10,8 @@ include Socialcast
 is_quiet = ARGV.delete("--quiet") || ARGV.delete("-q")
 
 branch = current_branch
-tickets = tickets_from_arguments_or_branch(ARGV, branch)
 
 run_cmd 'git update'
 integrate(branch, 'prototype')
 
-if tickets.any?
-  update_tickets tickets, :branch => branch, :in_prototype => true
-  start_tickets tickets
-end
-
 run_cmd "socialcast share '#worklog integrating #{branch} into prototype #scgitx'" unless is_quiet

data/bin/git-promote

@@ -6,15 +6,10 @@ include Socialcast
 is_quiet = ARGV.delete("--quiet") || ARGV.delete("-q")
 
 branch = current_branch
-tickets = tickets_from_arguments_or_branch(ARGV, branch)
 
 run_cmd 'git update'
 integrate(branch, 'staging')
 
-if tickets.any?
-  update_tickets tickets, :branch => branch, :in_prototype => true, :in_staging => true
-  resolve_tickets tickets
-end
 
 integrate('staging', 'prototype')
 run_cmd "git checkout #{branch}"

data/bin/git-release

@@ -7,18 +7,12 @@ branch = current_branch
 abort("Cannot release reserved branch") if %w{master staging prototype}.include?(branch)
 
 is_quiet = ARGV.delete("--quiet") || ARGV.delete("-q")
-tickets = tickets_from_arguments_or_branch(ARGV, branch)
 
 exit unless HighLine.agree("<%= color('Release #{branch} to production? (y/n)', :green) %>")
 
 run_cmd 'git update'
 integrate branch, 'master'
 
-if tickets.any?
-  update_tickets tickets, :branch => branch
-  release_tickets tickets
-end
-
 integrate branch, 'staging'
 integrate 'staging', 'prototype'
 run_cmd "git checkout master"

data/bin/git-release-staging

@@ -10,37 +10,6 @@ run_cmd 'git pull'
 run_cmd 'git pull origin last_known_good_staging'
 run_cmd 'git push origin HEAD'
 
-filter_id = '10102'
-issues = jira_server.getIssuesFromFilterWithLimit filter_id, 0, 1000
-branches = issues.collect do |issue|
-  field = issue.customFieldValues.detect {|k| k.customfieldId == GIT_BRANCH_FIELD }
-  field ? field.values.first : nil
-end.uniq.compact
-
-issues_with_no_branch = issues.reject do |issue| 
-  issue.customFieldValues.detect {|k| k.customfieldId == GIT_BRANCH_FIELD }
-end
-if issues_with_no_branch.any?
-  HighLine.say "\n<%= color('The following tickets do NOT have a git branch properly configured:', :red) %>"
-  issues_with_no_branch.each do |issue|
-    print_issue issue
-  end
-end
-
-branches.each do |branch|
-  HighLine.say "\nThe changes on branch <%= color('#{branch}', :green) %> "
-  if branches(:merged => true, :remote => true).include?(branch)
-    HighLine.say "<%= color('HAVE', :green) %> been merged into master"
-    releasable_tickets = tickets_from_branch(branch).select do |issue|
-      print_issue issue
-      HighLine.agree("Mark this issue as released? (y/n)")
-    end
-    release_tickets releasable_tickets
-  else
-    HighLine.say "<%= color('HAVE NOT', :red) %> been merged into master"
-  end
-end
-
 run_cmd 'git prune-merged -r'
 
 run_cmd "socialcast share '#worklog releasing staging branch to production #scgitx'" unless is_quiet

data/bin/git-reset-prototype

@@ -6,11 +6,7 @@ include Socialcast
 reset_branch('prototype')
 reset_branch('last_known_good_prototype')
 
-filter_id = '10151'
-issues = jira_server.getIssuesFromFilterWithLimit filter_id, 0, 1000
-
 HighLine.say "\n<%= color('Updating the following tickets to no longer be in prototype:', :red) %>"
-update_tickets issues, :in_prototype => false
 
 is_quiet = ARGV.delete("--quiet") || ARGV.delete("-q")
 run_cmd "socialcast share '#worklog resetting prototype branch #scgitx'" unless is_quiet

data/bin/git-reset-staging

@@ -6,11 +6,5 @@ include Socialcast
 reset_branch('staging')
 reset_branch('last_known_good_staging')
 
-filter_id = '10102'
-issues = jira_server.getIssuesFromFilterWithLimit filter_id, 0, 1000
-
-HighLine.say "\n<%= color('Updating the following tickets to no longer be in staging:', :red) %>"
-update_tickets issues, :in_staging => false
-
 is_quiet = ARGV.delete("--quiet") || ARGV.delete("-q")
 run_cmd "socialcast share '#worklog resetting staging branch #scgitx'" unless is_quiet

data/bin/git-start

@@ -6,25 +6,21 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extension
 include Socialcast
 
 is_quiet = ARGV.delete("--quiet") || ARGV.delete("-q")
-tickets = tickets_from_arguments ARGV
 
-example_branch = %w{ api-fix-invalid-auth desktop-cleanup-avatar-markup share-form-add-edit-link }.sort_by { rand }.first
-repo = Grit::Repo.new(Dir.pwd)
-remote_branches = repo.remotes.collect {|b| b.name.split('/').last }
-until branch_name = HighLine.ask("What would you like to name your branch? (ex: #{example_branch})") {|q| 
-    q.validate = Proc.new { |branch|
-      branch =~ /^[A-Za-z0-9\-_]+$/ && !remote_branches.include?(branch)
+unless branch_name = ARGV.first
+  example_branch = %w{ api-fix-invalid-auth desktop-cleanup-avatar-markup share-form-add-edit-link }.sort_by { rand }.first
+  repo = Grit::Repo.new(Dir.pwd)
+  remote_branches = repo.remotes.collect {|b| b.name.split('/').last }
+  until branch_name = HighLine.ask("What would you like to name your branch? (ex: #{example_branch})") {|q| 
+      q.validate = Proc.new { |branch|
+        branch =~ /^[A-Za-z0-9\-_]+$/ && !remote_branches.include?(branch)
+      }
     }
-  }
+  end
 end
 
 run_cmd 'git checkout master'
 run_cmd 'git pull'
 run_cmd "git checkout -b #{branch_name}"
 
-if tickets.any?
-  update_tickets tickets, :branch => branch_name
-  start_tickets tickets
-end
-
 run_cmd "socialcast share '#worklog starting work on #{branch_name} #scgitx'" unless is_quiet

data/lib/socialcast-git-extensions.rb

@@ -1,117 +1,14 @@
-require 'jira4r'
 require 'grit'
 require 'active_support/all'
 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')
 
   def current_branch
     repo = Grit::Repo.new(Dir.pwd)
     Grit::Head.current(repo).name
   end
-  def jira_credentials
-    @credentials ||= YAML.load_file(JIRA_CREDENTIALS_FILE).symbolize_keys!
-    @credentials
-  end
-  def jira_server
-    return @jira if @jira
-    if !File.exists?(JIRA_CREDENTIALS_FILE)
-      input = {}
-      input[:username] = HighLine.ask("JIRA username: ")
-      input[:password] = HighLine.ask("JIRA password: ") { |q| q.echo = "*" }
-
-      File.open(JIRA_CREDENTIALS_FILE, "w") do |f|
-        f.write input.to_yaml
-      end
-    end
-    File.chmod 0600, JIRA_CREDENTIALS_FILE
-    credentials = jira_credentials
-
-    begin
-      @jira = Jira4R::JiraTool.new 2, "https://issues.socialcast.com"
-      @jira.login credentials[:username], credentials[:password]
-      return @jira
-    rescue => e
-      print_error e.message
-      File.delete config_file
-      raise e
-    end
-  end
-
-  def assert_tickets_provided(ticket_ids, branch)
-    tickets = tickets_from_arguments_or_branch(ticket_ids, branch)
-    abort("JIRA ticket id or existing JIRA Git Branch is required to run this process") unless tickets.any?
-    tickets
-  end
-  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|
-      jira_server.getIssue key
-    end
-  end
-  def tickets_from_branch(branch)
-    jira_server.getIssuesFromJqlSearch "project = 'SCWEBAPP' and 'Git Branch' ~ '#{branch}'", 1000
-  end
-  def update_tickets(tickets, options = {})
-    tickets.each do |ticket|
-      print_issue ticket
-      fields = []
-      fields << Jira4R::V2::RemoteFieldValue.new(GIT_BRANCH_FIELD, [options[:branch]]) unless options[:branch].nil?
-      fields << Jira4R::V2::RemoteFieldValue.new(IN_PROTOTYPE_FIELD, [options[:in_prototype].to_s]) unless options[:in_prototype].nil?
-      fields << Jira4R::V2::RemoteFieldValue.new(IN_STAGING_FIELD, [options[:in_staging] ? 'true' : '']) unless options[:in_staging].nil?
-      begin
-        jira_server.updateIssue ticket.key, fields
-      rescue => e
-        print_error e.message
-      end
-    end
-  end
-  STANDARD_WORKFLOW_TYPES = []
-  STANDARD_WORKFLOW_TYPES << 1 #bug
-  STANDARD_WORKFLOW_TYPES << 2 #feature
-  STANDARD_WORKFLOW_TYPES << 9 #story
-
-  WORKFLOW_MAPPINGS = {
-    :start => {:standard => 11, :other => 21},
-    :resolve => {:standard => 21, :other => nil},
-    :release => {:standard => 101, :other => 31}
-  }
-  def start_tickets(tickets)
-    transition_tickets tickets, :start
-  end
-  def resolve_tickets(tickets)
-    start_tickets tickets
-    transition_tickets tickets, :resolve
-  end
-  def release_tickets(tickets)
-    resolve_tickets tickets
-    transition_tickets tickets, :release
-  end
-  def transition_tickets(tickets, action)
-    tickets.each do |ticket|
-      begin
-        mappings = WORKFLOW_MAPPINGS[action]
-        transition = STANDARD_WORKFLOW_TYPES.include?(ticket.type.to_i) ? mappings[:standard] : mappings[:other]
-        next unless transition
-        jira_server.progressWorkflowAction ticket.key, transition.to_s, []
-      rescue => e
-        print_error "Unable to transition issue #{ticket.key} to #{action}"
-      end
-    end
-  end
-  def print_issue(issue)
-    HighLine.say "<%= color('#{issue.key}', :green) %> - #{issue.summary}"
-  end
-  def print_error(message)
-    HighLine.say "<%= color('Error: ', :red) %> #{message}"
-  end
-
+ 
   def run_cmd(cmd)
     HighLine.say "\n> <%= color('#{cmd.gsub("'", '')}', :red) %>"
     raise "#{cmd} failed" unless system cmd

data/lib/socialcast-git-extensions/version.rb

@@ -1,7 +1,7 @@
 module Socialcast
   module Git
     module Extensions
-      VERSION = "2.0.8"
+      VERSION = "2.1.0"
     end
   end
 end

data/socialcast-git-extensions.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "socialcast-git-extensions"
 
   s.add_runtime_dependency(%q<grit>, [">= 0"])
-  s.add_runtime_dependency(%q<wireframe-jira4r>, [">= 0"])
   s.add_runtime_dependency(%q<activesupport>, [">= 0"])
   s.add_runtime_dependency(%q<git_remote_branch>, [">= 0"])
   s.add_runtime_dependency(%q<highline>, [">= 0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 11
   prerelease: 
   segments: 
   - 2
+  - 1
   - 0
-  - 8
-  version: 2.0.8
+  version: 2.1.0
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-10 00:00:00 Z
+date: 2011-09-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: grit
@@ -32,7 +32,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: wireframe-jira4r
+  name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -46,7 +46,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: git_remote_branch
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,7 +60,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: git_remote_branch
+  name: highline
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -73,24 +73,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: highline
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: socialcast
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -102,7 +88,7 @@ dependencies:
         - 4
         version: 0.3.4
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 description: GIT it done!
 email: 
 - ryan@socialcast.com
@@ -176,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: socialcast-git-extensions
-rubygems_version: 1.8.1
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: git extension scripts for socialcast workflow