tachikoma 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95857c09c8a6d64057d226b230bf5c100963c859
-  data.tar.gz: b096c79c85420335f46b3f121a327c77e04c83e4
+  metadata.gz: 0e420c143e9b31006147d41f0d6bb6243c49eeb0
+  data.tar.gz: 1244dae1519ef83e67404dda6c6d64677ae85eae
 SHA512:
-  metadata.gz: b6d29a6d0eaf97d1c591260c519d7e948bdd025bc29fd8313bbded3f6a5ceab535f65aff11d9490b0b1c284373fb23017c01d21aeab9615e85c3f393b453cfbd
-  data.tar.gz: aee389b7f454f11834ef3c7c71575c83d7cb43401c928bad04bf89259bc20219bbf7d999ccb7943a0fb1f830e9844dc4f4a3f3cd6278d23302460e9ce42a41c6
+  metadata.gz: a3639dc3d960b1bc648536fddf770f5b230a480f4bdfa87051bcc0b22efdf959e1a6e641b26e5983a60b3b999c7ac42e7f1b386f0f8be2e2b39a95e10b6da3ed
+  data.tar.gz: bcd5f79dad24aeaa84f0c69781edcf6ce70856058b37396c39723695adf1776bb1bdc2d21cad313ec997dd56d2a54b68f1ce1e34795729353b0e44b540ca6f0a

data/.hound.yml

@@ -0,0 +1,3 @@
+ruby:
+  enabled: true
+  config_file: .rubocop.yml

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.2
+  - 2.1.4
 before_install:
   - gem update bundler
 notifications:

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 4.2.2 (2014-11-01)
+
+Features:
+  - Fix stripping a repos name too match if the url includes .git(#123, @sanemat)
+
 ## 4.2.1 (2014-09-28)
 
 Features:

data/lib/tachikoma/application.rb

@@ -202,10 +202,15 @@ module Tachikoma
 
     def repository_identity(url)
       project_name, user_name, _ = url.split('/').reverse
-      project_name_identity = project_name.split('.git').first
+      project_name_identity = strip_extension(project_name)
       user_name + '/' + project_name_identity
     end
 
+    def strip_extension(name)
+      /\A(?<identity>.*?)(?:\.git)?\z/ =~ name
+      identity
+    end
+
     def bundler_parallel_option(bundler_version, parallel_number)
       # bundler 1.4.0.pre.1 gets parallel number option
       if Gem::Version.create(bundler_version) >= Gem::Version.create('1.4.0.pre.1') && parallel_number > 1

data/lib/tachikoma/version.rb

@@ -1,4 +1,4 @@
 # Version of tachikoma
 module Tachikoma
-  VERSION = '4.2.1'
+  VERSION = '4.2.2'
 end

data/spec/tachikoma/application_spec.rb

@@ -158,6 +158,11 @@ YAML
       let(:url) { 'https://github.com/example1/example2/' }
       it { expect(subject.repository_identity(url)).to eq identity }
     end
+    context '[regression] include .github.com' do
+      let(:identity) { 'example1/example2.github.com' }
+      let(:url) { 'https://github.com/example1/example2.github.com.git' }
+      it { expect(subject.repository_identity(url)).to eq identity }
+    end
   end
 
   describe '#target_repository_user' do
@@ -208,9 +213,25 @@ YAML
       let(:base_url) { 'https://github.com/writable/example2.git' }
       let(:account) { 'me' }
       let(:type) { 'invalid' }
-      # FIXME: Use `is_expected` ?
       it { expect { subject }.to raise_error(InvalidType) }
     end
+
+    context '[regression] include .github.com' do
+      context 'fork' do
+        let(:base_url) { 'https://github.com/can-not-write/example.github.com.git' }
+        let(:account) { 'readonly' }
+        let(:type) { 'fork' }
+        let(:authorized_compare_url) { 'https://token:x-oauth-basic@github.com/readonly/example.github.com.git' }
+        it { is_expected.to eq authorized_compare_url }
+      end
+      context 'shared' do
+        let(:base_url) { 'https://github.com/writable/example.github.com.git' }
+        let(:account) { 'me' }
+        let(:type) { 'shared' }
+        let(:authorized_compare_url) { 'https://token:x-oauth-basic@github.com/writable/example.github.com.git' }
+        it { is_expected.to eq authorized_compare_url }
+      end
+    end
   end
 
   describe '#authorized_base_url_with_type' do
@@ -238,7 +259,6 @@ YAML
       let(:base_url) { 'https://github.com/writable/example2.git' }
       let(:account) { 'me' }
       let(:type) { 'invalid' }
-      # FIXME: Use `is_expected` ?
       it { expect { subject }.to raise_error(InvalidType) }
     end
   end

data/tachikoma.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'safe_yaml'
   spec.add_dependency 'rake'
-  spec.add_dependency 'octokit', '>= 3.2', '< 3.4'
+  spec.add_dependency 'octokit', '>= 3.2', '< 4.0'
   spec.add_dependency 'json'
   spec.add_dependency 'thor'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tachikoma
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - sanemat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -47,7 +47,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +145,7 @@ extra_rdoc_files: []
 files:
 - ".env.example"
 - ".gitignore"
+- ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".tachikoma.yml"