gitcycle 0.2.33 → 0.3.0

data/README.md

@@ -76,6 +76,13 @@ When the branch is ready for code review:
 
 This will label the pull request as "Pending Review".
 
+Open
+----
+
+If you want to view the pull request without updating the ticket:
+
+	gitc open
+
 Code Review
 -----------
 
@@ -142,6 +149,12 @@ Checkout a branch from a ticket URL:
 
 	gitc checkout [TICKET URL]
 
+### From Ticket Number
+
+Checkout a branch from a ticket #:
+
+	gitc checkout [TICKET NUMBER]
+
 ### From User's Fork
 
 	gitc checkout user/branch
@@ -169,4 +182,4 @@ Nice to haves:
 $ gitc st - shortcut
 * gitc clean # to clean up old branches
 * fail should change to inactive
-* gitc pull: shouldnt matter who does it, it should update the latest br/rc, not working https://gist.github.com/22b1e248e8dba7a32288
+* gitc pull: shouldnt matter who does it, it should update the latest br/rc, not working https://gist.github.com/22b1e248e8dba7a32288

data/gitcycle.gemspec

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "gitcycle"
-  s.version     = '0.2.33'
+  s.version     = '0.3.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Winton Welsh' ]
   s.email       = [ 'mail@wintoni.us' ]
@@ -28,4 +28,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency "launchy", "= 2.0.5"
   s.add_dependency "yajl-ruby", "= 1.1.0"
+  s.add_dependency "httpclient", "= 2.1.5"
+  s.add_dependency "httpi", "= 0.9.6"
 end

data/lib/gitcycle.rb

@@ -1,9 +1,10 @@
 require 'rubygems'
 
 require 'fileutils'
-require 'open-uri'
 require 'uri'
 require 'yaml'
+require 'httpclient'
+require 'httpi'
 
 gem 'launchy', '= 2.0.5'
 require 'launchy'
@@ -92,23 +93,23 @@ class Gitcycle
         :branch => branch['source'],
         :target => name
       )
+
+      puts "Sending branch information to gitcycle.".green
+      get('branch',
+          'branch[home]' => branch['home'],
+          'branch[name]' => branch['name'],
+          'branch[rename]' => name != branch['name'] ? name : nil,
+          'branch[source]' => branch['source']
+      )
     rescue SystemExit, Interrupt
       puts "\nDeleting branch from gitcycle.\n".green
-      branch = get('branch',
+      get('branch',
         'branch[name]' => branch['name'],
         'create' => 0,
         'reset' => 1
       )
     end
 
-    puts "Sending branch information to gitcycle.".green
-    get('branch',
-      'branch[home]' => branch['home'],
-      'branch[name]' => branch['name'],
-      'branch[rename]' => name != branch['name'] ? name : nil,
-      'branch[source]' => branch['source']
-    )
-
     puts "\n"
   end
 
@@ -128,6 +129,24 @@ class Gitcycle
         puts "\nBranch not found!\n".red
         puts "\nDid you mean: gitc branch #{args[0]}\n".yellow
       end
+    elsif args[0] =~ /^\d*$/
+      puts "\nLooking for a branch for LH ticket ##{args[0]}.\n".green
+      results = branches(:array => true).select {|b| b.include?("-#{args[0]}-") }
+      if results.size == 0
+        puts "\nNo matches for ticket ##{args[0]} found.\n".red
+      elsif results.size == 1
+        branch = results.first
+        if branch.strip == branches(:current => true).strip
+          puts "Already on Github branch for LH ticket ##{args[0]} (#{branch})".yellow
+        else
+          puts "\nSwitching to branch '#{branch}'\n".green
+          run("git checkout #{branch}")
+        end
+      else
+        puts "\nFound #{results.size} matches with that LH ticket number:\n".yellow
+        puts results
+        puts "\nDid not switch branches. Please check your ticket number.\n".red
+      end
     else
       remote, branch = args[0].split('/')
       remote, branch = nil, remote if branch.nil?
@@ -504,6 +523,34 @@ class Gitcycle
     end
   end
 
+  def open(*issues)
+    require_git && require_config
+
+    if issues.empty?
+      branch = create_pull_request
+
+      if branch == false
+        puts "Branch not found.\n".red
+      elsif branch['issue_url']
+        puts "\nOpening the pull request in GitHub\n".green
+
+        puts "Opening issue: #{branch['issue_url']}\n".green
+        Launchy.open(branch['issue_url'])
+      else
+        puts "You must push code before opening a pull request.\n".red
+      end
+    else
+      puts "\nRetrieving branch information from gitcycle.\n".green
+
+      get('branch', 'issues' => issues, 'scope' => 'repo').each do |branch|
+        if branch['issue_url']
+          puts "Opening issue: #{branch['issue_url']}\n".green
+          Launchy.open(branch['issue_url'])
+        end
+      end
+    end
+  end
+
   def setup(login, repo, token)
     repo = "#{login}/#{repo}" unless repo.include?('/')
     @config[repo] = [ login, token ]
@@ -556,6 +603,8 @@ class Gitcycle
       b.match(/\*\s+(.+)/)[1]
     elsif options[:match]
       b.match(/([\s]+|origin\/)(#{options[:match]})$/)[2] rescue nil
+    elsif options[:array]
+      b.split(/\n/).map{|b| b[2..-1]}
     else
       b
     end
@@ -757,9 +806,12 @@ class Gitcycle
   def get(path, hash={})
     hash.merge!(
       :login => @login,
-      :token => @token
+      :token => @token,
+      :uid   => (0...20).map{ ('a'..'z').to_a[rand(26)] }.join
     )
 
+    puts "\nTransaction ID: #{hash[:uid]}".green
+
     params = ''
     hash[:session] = 0
     hash.each do |k, v|
@@ -772,8 +824,10 @@ class Gitcycle
     params.chop! # trailing &
 
     begin
-      json = open("#{API}/#{path}.json?#{params}").read
-    rescue Exception
+      req = HTTPI::Request.new "#{API}/#{path}.json?#{params}"
+      json = HTTPI.get(req).body
+    rescue Exception => error
+      puts error.to_s
       puts "\nCould not connect to Gitcycle.".red
       puts "\nPlease verify your Internet connection and try again later.\n".yellow
       exit

metadata

@@ -1,102 +1,116 @@
 --- !ruby/object:Gem::Specification
 name: gitcycle
 version: !ruby/object:Gem::Version
-  version: 0.2.33
+  version: 0.3.0
+  prerelease: 
 platform: ruby
 authors:
 - Winton Welsh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: lighthouse
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -118,10 +134,43 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.5
+- !ruby/object:Gem::Dependency
+  name: httpi
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.6
 description: Tame your development cycle.
 email:
 - mail@wintoni.us
@@ -154,26 +203,27 @@ files:
 - lib/gitcycle.rb
 homepage: https://github.com/winton/gitcycle
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Tame your development cycle
 test_files:
 - features/branch.feature

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: b085b23b392ce71dd72c7a3593744ca86f074ec5
-  data.tar.gz: abb887b371c6fe7ae835df8c904ebdb70bb18523
-SHA512:
-  metadata.gz: b229a874f88d9ca9540eda5b45d25888fbde97386be130a9aeb6b8d8d23e30a548f516ea541bd7bfd9f8fa12d768aa9bc572f42b4bac1d5ee153a0626ec63c87
-  data.tar.gz: e1130baee89daf8a181860bc4c0a6012174d14e5872b76493c0f665ccce7c49c93b6af56556cae32ced42ad6cbfeeaad9d9117c04e6c15385678351977cfeddb