push_handler 0.1.0 → 0.2.0

data/Gemfile

@@ -2,6 +2,7 @@ source :rubygems
 
 gem 'json'
 gem 'grit'
+gem 'typhoeus'
 
 group :development do
   gem 'jeweler'

data/README.md

@@ -11,54 +11,60 @@ Config
 4. In `.git/hooks/` directory of your repository, create a file called `post-receive`.
 5. Add the following text to `post-receive`, filling in your information:
 
-    #!/usr/bin/ruby
-    require 'rubygems'
-    require 'push_handler'
+```ruby
+#!/usr/bin/ruby
+require 'rubygems'
+require 'push_handler'
 
-    # Through STDIN git passes us: <oldrev> <newrev> <refname>
-    args = STDIN.readlines.first.split(/\s+/)
+# Through STDIN git passes us: <oldrev> <newrev> <refname>
+args = STDIN.readlines.first.split(/\s+/)
 
-    PushHandler.configure do |config|
-      config.repo = {
-        # Where to see the repository on the web
-        'url' => 'http://git.example.com',
+PushHandler.configure do |config|
+  config.repo = {
+    # Where to see the repository on the web
+    'url' => 'http://git.example.com',
 
-        # Repository name
-        'name' => 'Suppa Time',
+    # Repository name
+    'name' => 'Suppa Time',
 
-        # Directory on the machine where the contents of your .git folder lives
-        'working_dir' => '/mnt/suppa_time.git/',
+    # Directory on the machine where the contents of your .git folder lives
+    'working_dir' => '/mnt/suppa_time.git/',
 
-        # Repository owner contact info
-        'owner' => {
-          'name' => 'Big Boss Man',
-          'email' => 'bbm@example.com'
-        }
-      }
+    # True if 'working_dir' is pointing to a bare repository
+    'is_bare' => true,
 
-      # This is the link to the commit. Put the wildcard '%s' where the commit sha should go.
-      config.commit_url = 'http://git.example.com/commits?id=%s'
+    # Repository owner contact info
+    'owner' => {
+      'name' => 'Big Boss Man',
+      'email' => 'bbm@example.com'
+    }
+  }
 
-      # The url that the github-services server is running.
-      config.services['url'] = 'http://localhost:8080'
+  # Links to objects in your repository. Put the wildcard '%s' where the reference should go.
+  config.urls['commit'] = 'http://git.example.com/commits?id=%s'    # '%s' will be replaced with the commit sha
+  config.urls['branch'] = 'http://git.example.com/branches?id=%s'   # '%s' will be the branch name
 
-      # This is your configuration for 3rd parties.
-      config.services['data'] = {
-        'hipchat' => {
-          'auth_token' => '9082afake90210',
-          'room' => 12345,
-          'notify' => true
-        }
-      }
-    end
+  # The url that the github-services server is running.
+  config.services['url'] = 'http://localhost:8080'
 
-    PushHandler.send_to_services(*args)
+  # This is your configuration for 3rd parties.
+  config.services['data'] = {
+    'hipchat' => {
+      'auth_token' => '9082afake90210',
+      'room' => 12345,
+      'notify' => true
+    }
+  }
+end
 
+PushHandler.send_to_services(*args)
+```
 
 Note
 ----
 
 To see the parameters that each service requires you'll have to:
+
 1. Go to the `github-services/` directory
 2. Execute `rake services:config`
 3. Open `config/services.json` and look up the requirements

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/push_handler/config.rb

@@ -1,13 +1,15 @@
 module PushHandler
 	class Config
 		attr_accessor :repo
-		attr_accessor :commit_url
+		attr_accessor :urls
+		attr_accessor :commit_url # DEPRECATED: please use urls['commit'] instead
 		attr_accessor :services
 
 		def initialize
 			@repo = Hash.new('')
 			@services = Hash.new()
 			@commit_url = ''
+			@urls = Hash.new('')
 		end
 	end
 end

data/lib/push_handler.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'grit'
 require 'json'
+require 'typhoeus'
 require 'net/http'
 require 'uri'
 
@@ -20,13 +21,15 @@ module PushHandler
 	def send_to_services(old_commit, new_commit, ref_name)
 		payload = construct_payload(old_commit, new_commit, ref_name)
 		config.services['data'].each_pair do |service, data|
-			puts Net::HTTP.post_form(
-				URI.parse(config.services['url'] + '/' + service + '/push'), 
-				{
+			Typhoeus::Request.post(
+				config.services['url'] + '/' + service + '/push',
+				:method => :post,
+				:params => {
 					'data' => data.to_json,
 					'payload' => payload.to_json
-				}
-			).body
+				},
+				:disable_ssl_peer_verification => true
+			)
 		end
 	end
 
@@ -35,7 +38,8 @@ module PushHandler
 		hash_to_return = {
 			'after' => new_commit,
 			'before' => old_commit,
-			'ref' => ref_name
+			'ref' => ref_name,
+			'branch_url' => config.urls['branch'] % ref_name[/\/([^\/]+)$/, 1]
 		}
 
 		hash_to_return['repository'] = {
@@ -43,7 +47,7 @@ module PushHandler
 			'name' => config.repo['name'],
 			'owner' => config.repo['owner']
 		}
-		repo = Grit::Repo.new(config.repo['working_dir'])
+		repo = Grit::Repo.new(config.repo['working_dir'], :is_bare => config.repo['is_bare'])
 		commits = Grit::Commit.find_all(
 			repo,
 			"#{old_commit}..#{new_commit}",
@@ -59,7 +63,7 @@ module PushHandler
 					commit_hash['distinct'] = true
 					commit_hash['id'] = commit.sha
 					commit_hash['message'] = commit.message
-					commit_hash['url'] = config.commit_url % commit.sha
+					commit_hash['url'] = (config.urls['commit'] || config.commit_url) % commit.sha
 					commit_hash['author'] = {
 						'name'  => commit.author.name,
 						'email' => commit.author.email

data/push_handler.gemspec

@@ -0,0 +1,72 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{push_handler}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Michael Lavrisha"]
+  s.date = %q{2011-09-20}
+  s.description = %q{This gem is for integreting a privately hosted repository with the open source Github services project.}
+  s.email = %q{michael.lavrisha@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "Guardfile",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/push_handler.rb",
+    "lib/push_handler/config.rb",
+    "push_handler.gemspec",
+    "spec/push_handler_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/vrish88/push_handler}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.4.2}
+  s.summary = %q{Format push data in a format that Github services understands.}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<grit>, [">= 0"])
+      s.add_runtime_dependency(%q<typhoeus>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+    else
+      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<grit>, [">= 0"])
+      s.add_dependency(%q<typhoeus>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<grit>, [">= 0"])
+    s.add_dependency(%q<typhoeus>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
+  end
+end
+

data/spec/push_handler_spec.rb

@@ -10,9 +10,13 @@ describe PushHandler do
 			'name' => 'Joe Schmoe', 
 			'email' => 'schmoe@example.com'
 		},
-		'working_dir' => File.expand_path(File.dirname(__FILE__) + '/example_git_repo/')
+		'working_dir' => File.expand_path(File.dirname(__FILE__) + '/example_git_repo/'),
+		'is_bare' => false
+	} }
+	let(:urls)      { {
+		'branch' => 'http://example.com/%s',
+		'commit' => 'http://example.com/master/commit?id=%s'
 	} }
-	let(:commit_url)      { 'http://example.com/master/commit?id=%s'}
 
 	let(:old_commit_hash) { '1afa4eba68c883738af4536f7e04d978964bb523' }
 	let(:new_commit_hash) { '4e1b47e950a2f5d6afa6744fa92f3fce5d606e1b' }
@@ -21,7 +25,8 @@ describe PushHandler do
 	before :all do
 		PushHandler.configure do |config|
 			config.repo = repo
-			config.commit_url = commit_url
+			config.urls['commit'] = urls['commit']
+			config.urls['branch'] = urls['branch']
 			config.services['url'] = 'http://localhost:8080'
 		end
 	end
@@ -50,6 +55,11 @@ describe PushHandler do
 				should include_hash('ref' => ref_name)
 			end
 
+			# NOT IN THE GITHUB SPECIFICATION
+			specify 'branch_url should have the branch name put into the url["branch"] string' do
+				should include_hash('branch_url' => urls['branch'] % 'master')
+			end
+
 			specify 'before should be the old commit hash' do
 				should include_hash('before' => old_commit_hash)
 			end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: push_handler
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Michael Lavrisha
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-15 00:00:00 -06:00
+date: 2011-09-20 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,8 +48,8 @@ dependencies:
   requirement: *id002
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: jeweler
-  type: :development
+  name: typhoeus
+  type: :runtime
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,7 +62,7 @@ dependencies:
   requirement: *id003
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: bundler
+  name: jeweler
   type: :development
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -76,7 +76,7 @@ dependencies:
   requirement: *id004
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rake
+  name: bundler
   type: :development
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -90,7 +90,7 @@ dependencies:
   requirement: *id005
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rspec
+  name: rake
   type: :development
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -104,7 +104,7 @@ dependencies:
   requirement: *id006
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: ruby-debug
+  name: rspec
   type: :development
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -116,6 +116,20 @@ dependencies:
         - 0
         version: "0"
   requirement: *id007
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: ruby-debug
+  type: :development
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id008
 description: This gem is for integreting a privately hosted repository with the open source Github services project.
 email: michael.lavrisha@gmail.com
 executables: []
@@ -135,6 +149,7 @@ files:
 - VERSION
 - lib/push_handler.rb
 - lib/push_handler/config.rb
+- push_handler.gemspec
 - spec/push_handler_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true