tachikoma 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f618004743a16b2c9bfeab746b69f3edc0488625
-  data.tar.gz: 13ef48e03589ed1aa6959079afdda7d303a7ba3b
+  metadata.gz: 5746c103a46826dd181c6f50858a3ce5badce2fb
+  data.tar.gz: 8c80c9dd4c8b4972210a82b0cb2fc3f71f2a6286
 SHA512:
-  metadata.gz: 039c38ee4a88403b275e3c65044d48d2205c653f586e8a50982bcb50df012bd90559f411d462266b1eae549e163afcdd14e8cc9714ef18e045ba49e9ee9101b6
-  data.tar.gz: 9c22939957a1abe16a6628b851e2bd488d789ad11a40ecc847e9e42d64c9a9d46211f9bd92f33aa4558db9a5aba7880084534b8841f93bcd0b9ce362f655bc1f
+  metadata.gz: 999cd4d63592d622f4787a3461de54f8548fe522906cd06dc1048390f1bd2167799e0d2657dc78fe610e21d202d62ce7252801a51d8534e4e3732a0c59be9492
+  data.tar.gz: aff163726e8d97294c200bffdb0d0eb3716ee273c0181bd7a13c106dbc5da3aefd465bea08a7be610a1c1401058ef592cff80fb372cb6b4b501b2dee8e8c19b6

data/.travis.yml

@@ -2,9 +2,10 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0-preview2
+  - 2.1.0-rc1
 before_install:
   - gem update bundler
+  - gem install json
 notifications:
   email:
     - ogataken@gmail.com

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 4.0.3
+
+Features:
+
+  - Fix trailing slash in identify url (#71, @sanemat)
+  - Add Tachikoma::Exception (#73, @sanemat)
+  - All `git clone` and `git push` requests use github authentication token (#77, @sanemat)
+  - Deprecate `type: private` (#77, @sanemat)
+
 ## 4.0.2 (2013-12-20)
 
 Features:

data/Gemfile

@@ -8,6 +8,7 @@ group :development, :test do
   gem 'rspec-core', git: 'https://github.com/rspec/rspec-core.git', branch: 'master'
   # https://github.com/rspec/rspec-mocks/pull/467
   gem 'rspec-mocks', git: 'https://github.com/rspec/rspec-mocks.git', branch: 'master'
+  gem 'coveralls', require: false
 end
 
 gem 'oj'

data/README.md

@@ -3,6 +3,7 @@
 [![Gem Version](https://badge.fury.io/rb/tachikoma.png)](http://badge.fury.io/rb/tachikoma)
 [![Build Status](https://api.travis-ci.org/sanemat/tachikoma.png?branch=master)](https://travis-ci.org/sanemat/tachikoma)
 [![Code Climate](https://codeclimate.com/github/sanemat/tachikoma.png)](https://codeclimate.com/github/sanemat/tachikoma)
+[![Coverage Status](https://coveralls.io/repos/sanemat/tachikoma/badge.png?branch=master)](https://coveralls.io/r/sanemat/tachikoma)
 
 Daily Pull Requester with bundle/carton update. [Actual pull request](https://github.com/mrtaddy/fenix-knight/pull/25)
 

data/lib/tachikoma.rb

@@ -1,5 +1,6 @@
 require 'tachikoma/version'
 require 'tachikoma/settings'
+require 'tachikoma/exception'
 
 # Namespace of tachikoma
 module Tachikoma

data/lib/tachikoma/application.rb

@@ -42,7 +42,8 @@ module Tachikoma
       @url = @configure['url']
       @type = @configure['type']
       @base_remote_branch = @configure['base_remote_branch']
-      @authorized_url = authorized_url_with_type(@url, @type, @github_token, @github_account)
+      @authorized_compare_url = authorized_compare_url_with_type(@url, @type, @github_token, @github_account)
+      @authorized_base_url = authorized_base_url_with_type(@url, @type, @github_token, @github_account)
       @timestamp_format = @configure['timestamp_format']
       @readable_time = Time.now.utc.strftime(@timestamp_format)
       @parallel_option = bundler_parallel_option(Bundler::VERSION, @configure['bundler_parallel_number'])
@@ -62,11 +63,7 @@ module Tachikoma
 
     def fetch
       clean
-      if @type == 'private'
-        sh "git clone #{@authorized_url} #{Tachikoma.repos_path.to_s}/#{@build_for}"
-      else
-        sh "git clone #{@url} #{Tachikoma.repos_path.to_s}/#{@build_for}"
-      end
+      sh "git clone #{@authorized_base_url} #{Tachikoma.repos_path.to_s}/#{@build_for}"
     end
 
     def bundle
@@ -80,7 +77,7 @@ module Tachikoma
           sh 'bundle update'
           sh 'git add Gemfile.lock'
           sh %Q!git commit -m "Bundle update #{@readable_time}"! do; end # ignore exitstatus
-          sh "git push #{@authorized_url} feature/bundle-#{@readable_time}"
+          sh "git push #{@authorized_compare_url} feature/bundle-#{@readable_time}"
         end
       end
     end
@@ -95,7 +92,7 @@ module Tachikoma
         sh 'git add carton.lock' if File.exist?('carton.lock')
         sh 'git add cpanfile.snapshot' if File.exist?('cpanfile.snapshot')
         sh %Q!git commit -m "Carton update #{@readable_time}"! do; end # ignore exitstatus
-        sh "git push #{@authorized_url} feature/carton-#{@readable_time}"
+        sh "git push #{@authorized_compare_url} feature/carton-#{@readable_time}"
       end
     end
 
@@ -112,15 +109,31 @@ module Tachikoma
       "TOKEN_#{build_for}".gsub(/-/, '_').upcase
     end
 
-    def authorized_url_with_type(fetch_url, type, github_token, github_account)
+    def authorized_compare_url_with_type(fetch_url, type, github_token, github_account)
       uri = URI.parse(fetch_url)
       case type
       when 'fork'
         %Q!#{uri.scheme}://#{github_token}:x-oauth-basic@#{uri.host}#{path_for_fork(uri.path, github_account)}!
-      when 'shared', 'private'
+      when 'shared'
+        "#{uri.scheme}://#{github_token}:x-oauth-basic@#{uri.host}#{uri.path}"
+      when 'private'
+        warn '[DEPRECATION] `type: private` is deprecated. Please use `type: fork` or `type: shared` instead.'
+        "#{uri.scheme}://#{github_token}:x-oauth-basic@#{uri.host}#{uri.path}"
+      else
+        raise InvalidType, "Invalid type #{type}"
+      end
+    end
+
+    def authorized_base_url_with_type(fetch_url, type, github_token, github_account)
+      uri = URI.parse(fetch_url)
+      case type
+      when 'fork', 'shared'
+        "#{uri.scheme}://#{github_token}:x-oauth-basic@#{uri.host}#{uri.path}"
+      when 'private'
+        warn '[DEPRECATION] `type: private` is deprecated. Please use `type: fork` or `type: shared` instead.'
         "#{uri.scheme}://#{github_token}:x-oauth-basic@#{uri.host}#{uri.path}"
       else
-        raise "Invalid type #{type}"
+        raise InvalidType, "Invalid type #{type}"
       end
     end
 
@@ -132,16 +145,20 @@ module Tachikoma
       case type
       when 'fork'
         github_account
-      when 'shared', 'private'
-        uri = URI.parse(fetch_url)
-        uri.path.sub(%r!/([^/]+)/.*!) { $1 }
+      when 'shared'
+        URI.parse(fetch_url).path.split('/', 3)[1]
+      when 'private'
+        warn '[DEPRECATION] `type: private` is deprecated. Please use `type: fork` or `type: shared` instead.'
+        URI.parse(fetch_url).path.split('/', 3)[1]
       else
-        raise "Invalid type #{type}"
+        raise InvalidType, "Invalid type: #{type}"
       end
     end
 
     def repository_identity(url)
-      %r!((?:[^/]*?)/(?:[^/]*?))(?:\.git)?$!.match(url)[1]
+      project_name, user_name, _ = url.split('/').reverse
+      project_name_identity = project_name.split('.git').first
+      user_name + '/' + project_name_identity
     end
 
     def bundler_parallel_option(bundler_version, parallel_number)

data/lib/tachikoma/cli.rb

@@ -4,6 +4,8 @@ module Tachikoma
   class CLI < Thor
     include Thor::Actions
 
+    map %w(-v --version) => :version
+
     desc 'init', 'Initialize files'
     def init
       require 'fileutils'
@@ -36,6 +38,11 @@ module Tachikoma
       puts 'You might want to see README!'
     end
 
+    desc 'version', 'Display Tachikoma gem version'
+    def version
+      puts Tachikoma::VERSION
+    end
+
     def self.help(shell, *)
       list = printable_tasks
 

data/lib/tachikoma/exception.rb

@@ -0,0 +1,4 @@
+module Tachikoma
+  class Exception < StandardError; end
+end
+class InvalidType < Tachikoma::Exception; end

data/lib/tachikoma/version.rb

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

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear!
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # Require this file using `require "spec_helper"` to ensure that it is only

data/spec/tachikoma/application_spec.rb

@@ -45,4 +45,154 @@ YAML
       Tachikoma::Application.run 'carton'
     end
   end
+
+  describe '#bundler_parallel_option' do
+    subject { described_class.new }
+
+    context 'bundler does not support parallel' do
+      let(:bundler_version) { '1.3.5' }
+      let(:parallel_number) { 3 }
+      it 'returns nil' do
+        expect(subject.bundler_parallel_option(bundler_version, parallel_number)).to be_nil
+      end
+    end
+
+    context 'bundler supports parallel' do
+      let(:bundler_version) { '1.5.0' }
+
+      context 'parallel less than 1' do
+        let(:parallel_number) { 1 }
+        it 'returns nil' do
+          expect(subject.bundler_parallel_option(bundler_version, parallel_number)).to be_nil
+        end
+      end
+
+      context 'parallel above 1' do
+        let(:parallel_number) { 3 }
+        let(:parallel_option) { "--jobs=#{parallel_number}" }
+        it 'returns parallel option' do
+          expect(subject.bundler_parallel_option(bundler_version, parallel_number)).to eq parallel_option
+        end
+      end
+    end
+  end
+
+  describe '#repository_identity' do
+    subject { described_class.new }
+    let(:identity) { 'example1/example2' }
+
+    context 'https with .git' do
+      let(:url) { 'https://github.com/example1/example2.git' }
+      it { expect(subject.repository_identity(url)).to eq identity }
+    end
+    context 'https without .git' do
+      let(:url) { 'https://github.com/example1/example2' }
+      it { expect(subject.repository_identity(url)).to eq identity }
+    end
+    context 'https with trail slash' do
+      let(:url) { 'https://github.com/example1/example2/' }
+      it { expect(subject.repository_identity(url)).to eq identity }
+    end
+  end
+
+  describe '#target_repository_user' do
+    subject { described_class.new }
+    let(:url) { 'https://github.com/example/example2.git' }
+    let(:repos_user) { 'example' }
+    let(:github_user) { 'me' }
+
+    context 'valid type' do
+      context 'fork' do
+        let(:type) { 'fork' }
+        it { expect(subject.target_repository_user(type, url, github_user)).to eq github_user }
+      end
+      context 'shared' do
+        let(:type) { 'shared' }
+        it { expect(subject.target_repository_user(type, url, github_user)).to eq repos_user }
+      end
+      context 'private' do
+        let(:type) { 'private' }
+        it { expect(subject.target_repository_user(type, url, github_user)).to eq repos_user }
+      end
+    end
+
+    context 'invalid type' do
+      let(:type) { 'invalid' }
+      it { expect { subject.target_repository_user(type, url, github_user) }.to raise_error(InvalidType) }
+    end
+  end
+
+  describe '#authorized_compare_url_with_type' do
+    subject { described_class.new.authorized_compare_url_with_type(base_url, type, token, account) }
+    let(:token) { 'token' }
+
+    context 'valid type' do
+      context 'fork' do
+        let(:base_url) { 'https://github.com/can-not-write/example2.git' }
+        let(:account) { 'readonly' }
+        let(:type) { 'fork' }
+        let(:authorized_compare_url) { 'https://token:x-oauth-basic@github.com/readonly/example2.git' }
+        it { is_expected.to eq authorized_compare_url }
+      end
+      context 'shared' do
+        let(:base_url) { 'https://github.com/writable/example2.git' }
+        let(:account) { 'me' }
+        let(:type) { 'shared' }
+        let(:authorized_compare_url) { 'https://token:x-oauth-basic@github.com/writable/example2.git' }
+        it { is_expected.to eq authorized_compare_url }
+      end
+      context 'private' do
+        let(:base_url) { 'https://github.com/writable/example2.git' }
+        let(:account) { 'me' }
+        let(:type) { 'private' }
+        let(:authorized_compare_url) { 'https://token:x-oauth-basic@github.com/writable/example2.git' }
+        it { is_expected.to eq authorized_compare_url }
+      end
+    end
+
+    context 'invalid type' do
+      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
+
+  describe '#authorized_base_url_with_type' do
+    subject { described_class.new.authorized_base_url_with_type(base_url, type, token, account) }
+    let(:token) { 'token' }
+
+    context 'valid type' do
+      context 'fork' do
+        let(:base_url) { 'https://github.com/can-not-write/example2.git' }
+        let(:account) { 'readonly' }
+        let(:type) { 'fork' }
+        let(:authorized_base_url) { 'https://token:x-oauth-basic@github.com/can-not-write/example2.git' }
+        it { is_expected.to eq authorized_base_url }
+      end
+      context 'shared' do
+        let(:base_url) { 'https://github.com/writable/example2.git' }
+        let(:account) { 'me' }
+        let(:type) { 'shared' }
+        let(:authorized_base_url) { 'https://token:x-oauth-basic@github.com/writable/example2.git' }
+        it { is_expected.to eq authorized_base_url }
+      end
+      context 'private' do
+        let(:base_url) { 'https://github.com/writable/example2.git' }
+        let(:account) { 'me' }
+        let(:type) { 'private' }
+        let(:authorized_base_url) { 'https://token:x-oauth-basic@github.com/writable/example2.git' }
+        it { is_expected.to eq authorized_base_url }
+      end
+    end
+
+    context 'invalid type' do
+      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
 end

metadata

@@ -1,131 +1,131 @@
 --- !ruby/object:Gem::Specification
 name: tachikoma
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - sanemat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   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: rake
   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: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: json
   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: thor
   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
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: dotenv
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0.beta
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0.beta
 description: Interval pull requester with bundle/carton update.
@@ -136,11 +136,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .env.example
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
+- ".env.example"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -152,6 +152,7 @@ files:
 - lib/tachikoma.rb
 - lib/tachikoma/application.rb
 - lib/tachikoma/cli.rb
+- lib/tachikoma/exception.rb
 - lib/tachikoma/settings.rb
 - lib/tachikoma/tasks.rb
 - lib/tachikoma/templates/.gitignore
@@ -177,17 +178,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Update gem frequently gets less pain. Let's doing bundle update as a habit!