saddler-reporter-support-git 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98eeae525928a40adc311bf7604f9031897a133d
-  data.tar.gz: ada9f45ead3535d22d51bbb80652ad30ae72bdbc
+  metadata.gz: 7466560b02e7c4227e113d4c375e20d6063c1565
+  data.tar.gz: e080c3a0b2a914aed5b4f4ec7c6c4ae38d2246d4
 SHA512:
-  metadata.gz: 53a9e1bd716eba35b869082725711b782d1bd43a504d49fb4f5c5aff8baf79894aa30f2a675c63fe3ad41bbed24d194283af64818f754d8550b68b038356f396
-  data.tar.gz: 02bff7146e8ce55f1f1ead3055891a0ccd989620dc180a2fe44f94ea4a16aa951bd4e797c8479b53b790b45f8883ddad263ddd9e2fdc0e0304e340cfbd73aabc
+  metadata.gz: f6f52383fc838407b5716d3f893819b3bc8c52a178c1bfb911683eaf2c49d68a94527457ea5477469f48d08a802ef31c6aeeecb94ab2e8b333c98655a6e253b9
+  data.tar.gz: b9ee3c11b900ac0524c21e1bbe8a56cd2268a27743a309569e01df91ce25f292da7aaff7421902f3fdb7bbda95e88b9926b14b3e8b1bd982aa643f53339a42d3

data/.travis.yml

@@ -13,3 +13,7 @@ notifications:
 branches:
   only:
     - master
+script: bundle exec rake --verbose
+matrix:
+  allow_failures:
+    - rvm: 2.2

data/Rakefile

@@ -4,6 +4,7 @@ require 'rake/testtask'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.test_files = FileList['test/**/test*.rb']
+  t.verbose = true
 end
 
 task default: :test

data/lib/saddler/reporter/support/git.rb

@@ -1,4 +1,5 @@
 require 'git'
+require 'addressable/uri'
 require 'saddler/reporter/support/git/version'
 require 'saddler/reporter/support/git/repository'
 

data/lib/saddler/reporter/support/git/repository.rb

@@ -3,26 +3,25 @@ module Saddler
     module Support
       module Git
         class Repository
-          def initialize(path)
-            @git = ::Git.open(path)
+          attr_reader :git
+
+          def initialize(path, options = {})
+            @git = ::Git.open(path, options)
           end
 
           def slug
-            name = /[[:alnum:]_\-\.]*/
-            repo = /[[:alnum:]_\-\.]*/
-            regex_slug = %r{#{name}/#{repo}}
-            regex = /.*?#{Regexp.quote(github_domain)}.*?(?<slug>#{regex_slug})/
-            target = remote_urls.map do |url|
-              match = regex.match(strip_git_extension(url))
+            slug_regex = %r{\A/?(?<slug>.*?)(?:\.git)?\Z}
+            remote_urls.map do |url|
+              uri = Addressable::URI.parse(url)
+              match = slug_regex.match(uri.path)
               match[:slug] if match
             end.compact.first
           end
 
           def remote_urls
             @git
-              .branches
-              .remote
-              .map { |branch| branch.remote.url }
+              .remotes
+              .map(&:url)
           end
 
           def current_branch
@@ -33,21 +32,16 @@ module Saddler
             @git.object('HEAD')
           end
 
-          def strip_git_extension(name)
-            match = /\A(?<identity>.*?)(?:\.git)?\z/.match(name)
-            match[:identity] if match
-          end
-
-          # FIXME: if endpoint set, this return wrong result
-          def github_domain
-            github_api_endpoint
-              .split('.')
-              .slice(-2, 2)
-              .join('.')
+          def push_endpoint
+            (env_push_endpoint || 'github.com').chomp('/')
           end
 
-          def github_api_endpoint
-            ENV['GITHUB_API_ENDPOINT'] || 'api.github.com'
+          # e.g. 'github.com'
+          # git@github.com:packsaddle/ruby-saddler-reporter-support-git.git
+          def env_push_endpoint
+            if ENV['PUSH_ENDPOINT']
+              ENV['PUSH_ENDPOINT']
+            end
           end
 
           def env_current_branch

data/lib/saddler/reporter/support/git/version.rb

@@ -2,7 +2,7 @@ module Saddler
   module Reporter
     module Support
       module Git
-        VERSION = '0.1.1'
+        VERSION = '0.1.2'
       end
     end
   end

data/saddler-reporter-support-git.gemspec

@@ -20,8 +20,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'git'
+  spec.add_runtime_dependency 'addressable'
 
   spec.add_development_dependency 'bundler', '~> 1.8'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'test-unit'
+  spec.add_development_dependency 'mocha'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saddler-reporter-support-git
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - sanemat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Utilities for Saddler reporter and git repository.
 email:
 - o.gata.ken@gmail.com