socialcast-git-extensions 1.3.1 → 1.3.2

data/Rakefile

@@ -15,6 +15,7 @@ begin
     gem.add_runtime_dependency "wireframe-jira4r", ">= 0"
     gem.add_runtime_dependency "activesupport", ">= 0"
     gem.add_runtime_dependency "git_remote_branch", ">= 0"
+    gem.add_runtime_dependency 'highline', '>= 0'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

data/bin/git-release

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-require 'readline'
 include Socialcast
 
 branch = current_branch
@@ -9,7 +8,7 @@ raise "Cannot release reserved branch" if %w{master staging}.include?(branch)
 
 tickets = assert_tickets_provided(ARGV, branch)
 
-exit unless Readline.readline("This will release #{branch} to production.  Are you sure (y/n)? ") == 'y'
+exit unless HighLine.ask("This will release #{branch} to production.  Are you sure (y/n)? ") == 'y'
 
 run_cmd 'git update'
 integrate branch, 'master'

data/bin/git-release-pending

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-require 'readline'
 include Socialcast
 
 run_cmd 'git checkout master'
@@ -32,7 +31,7 @@ branches.each do |branch|
     puts "All changes in #{branch} have been merged into master"
     releasable_tickets = tickets_from_branch(branch).select do |issue|
       puts "#{issue.key} - #{issue.summary}"
-      Readline.readline("Mark this issue as released? (y/n)? ") == 'y'
+      HighLine.ask("Mark this issue as released? (y/n)? ") == 'y'
     end
     release_tickets releasable_tickets
   else

data/bin/git-start

@@ -3,26 +3,18 @@
 #start a new git branch with latest changes from master
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-require 'readline'
 include Socialcast
 
 tickets = tickets_from_arguments ARGV
 raise "JIRA ticket id is required to run this process" unless tickets.any?
 
-def validate_branch_name(proposed_branch_name)
-  proposed_branch_name = proposed_branch_name.strip.parameterize
-  if !(proposed_branch_name =~ /^[A-Za-z0-9\-_]+$/)
-    puts "'#{proposed_branch_name}' isn't a valid branch name; stick with letters, numbers, dashes, and underscores."
-    return nil
-  end
-
-  proposed_branch_name
-end
-
-branch_name = nil
-until branch_name.present?
-  proposed_branch_name = Readline.readline("What would you like to name your branch? ")
-  branch_name = validate_branch_name(proposed_branch_name)
+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?") {|q| 
+    q.validate = Proc.new { |branch|
+      branch =~ /^[A-Za-z0-9\-_]+$/ && !remote_branches.include?(branch)
+    }
+  }
 end
 
 run_cmd 'git checkout master'

data/lib/socialcast-git-extensions.rb

@@ -1,7 +1,7 @@
 require 'jira4r'
-
-require 'active_support/all'
 require 'grit'
+require 'active_support/all'
+require 'highline/import'
 
 module Socialcast
   GIT_BRANCH_FIELD = 'customfield_10010'
@@ -17,10 +17,6 @@ module Socialcast
     @credentials
   end
   def jira_server
-    #make sure soap4r is installed
-    require 'jira4r'
-    require "highline/import.rb"
-
     return @jira if @jira
     if !File.exists?(JIRA_CREDENTIALS_FILE)
       input = {}

data/socialcast-git-extensions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{socialcast-git-extensions}
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Sonnek"]
-  s.date = %q{2010-08-23}
+  s.date = %q{2010-08-30}
   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"]
@@ -59,12 +59,14 @@ Gem::Specification.new do |s|
       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"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_dependency(%q<grit>, [">= 0"])
       s.add_dependency(%q<wireframe-jira4r>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<git_remote_branch>, [">= 0"])
+      s.add_dependency(%q<highline>, [">= 0"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
@@ -72,6 +74,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<wireframe-jira4r>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<git_remote_branch>, [">= 0"])
+    s.add_dependency(%q<highline>, [">= 0"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 -05:00
+date: 2010-08-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,6 +88,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: highline
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
 description: git extension scripts for socialcast workflow
 email: ryan@socialcast.com
 executables: