tachikoma 4.2.3 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccefb5b3e08fc2bb64e40a77a2c47ee8e904eba3
-  data.tar.gz: 697ec5ac1435b638f60369dc6d3e0e2ff0016ab9
+  metadata.gz: 522b54b9884e1e63e68b6cf5f79fe0ce762357fc
+  data.tar.gz: 9aab06a2596c184e427f442771dc242c4e18fcf9
 SHA512:
-  metadata.gz: c61d525e247595a7455892582e523434e817d8cc7f12316b283732956d325d753f54afd1e189e1701393cca414d323a1f081d3945be632e36cd049906cf69301
-  data.tar.gz: 02e9fba402f3e61054ae23da4887f911183f0c2df4af9111539350c0c2b539a0082a29a1c1e74f39d70ca7842db2ff1bff0272f2a33c6e5f765e4af4fa8f7c0b
+  metadata.gz: a92aa07095cc333cdc6f9d695b7c511e5a391bd11f14f27c0fa0f094a85b6acd6e7ef8c0394c6d1b733b41ce523e934f74713f0aea1fece5cf66c1c8dc5bbf73
+  data.tar.gz: 3134b45bfec31b93daa0aab3df1edba8e76bcdab4ca3079b7ad4c0c3c6981f667252887f9f84ae189edcf0ea0b6120afba96fed8f0eda40692f1ec1354a32b5c

data/.gitignore

@@ -16,5 +16,8 @@ test/tmp
 test/version_tmp
 tmp
 
-$ Ignore dotenv setting
+# Ignore dotenv setting
 /.env
+
+# Ignore bundler binstubs
+/bundle_bin

data/.rubocop.yml

@@ -1,14 +1,19 @@
-inherit_from: rubocop-todo.yml
 AllCops:
   Include:
     - '**/Rakefile'
     - Gemfile
     - tachikoma.gemspec
-    - bin/**
+    - bin/**/*
     - lib/**/*.rake
   Exclude:
-    - pkg/**
-    - repos/**
-    - vendor/**
+    - pkg/**/*
+    - repos/**/*
+    - vendor/**/*
 StringLiterals:
   EnforcedStyle: single_quotes
+LineLength:
+  Max: 120
+Blocks:
+  Enabled: false
+Style/DotPosition:
+  Enabled: true

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.9
   - 2.0
   - 2.1
+  - 2.2
 before_install:
   - gem update bundler
 notifications:

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 4.2.4 (2015-01-31)
+
+Features:
+  - Use shalow copy(optional) (#151, #141, #139, @laiso, @sanemat)
+
 ## 4.2.3 (2014-12-18)
 
 Features:

data/README.md

@@ -64,6 +64,8 @@ version:
   '2.0.0'
 pull_request_body:
   ':ideograph_advantage::ideograph_advantage::ideograph_advantage:'
+git_clone_depth:
+  50
 ```
 
 ### Build script example

data/data/default.yaml

@@ -14,3 +14,5 @@ pull_request_base:
   'master'
 bundler_parallel_number:
   4
+git_clone_depth:
+  false

data/lib/tachikoma/application.rb

@@ -48,6 +48,7 @@ module Tachikoma
       @timestamp_format = @configure['timestamp_format']
       @readable_time = Time.now.utc.strftime(@timestamp_format)
       @parallel_option = bundler_parallel_option(Bundler::VERSION, @configure['bundler_parallel_number'])
+      @depth_option = git_clone_depth_option(@configure['git_clone_depth'])
 
       @target_head = target_repository_user(@type, @url, @github_account)
       @pull_request_url = repository_identity(@url)
@@ -64,21 +65,35 @@ module Tachikoma
 
     def fetch
       clean
-      sh "git clone #{@authorized_base_url} #{Tachikoma.repos_path}/#{@build_for}"
+      sh(*([
+        'git', 'clone',
+        *@depth_option,
+        @authorized_base_url,
+        "#{Tachikoma.repos_path}/#{@build_for}"
+      ].compact))
     end
 
     def bundler
       Dir.chdir("#{Tachikoma.repos_path}/#{@build_for}") do
         Bundler.with_clean_env do
-          sh %(ruby -i -pe '$_.gsub! /^ruby/, "#ruby"' Gemfile)
-          sh "git config user.name #{@commiter_name}"
-          sh "git config user.email #{@commiter_email}"
-          sh "git checkout -b tachikoma/update-#{@readable_time} #{@base_remote_branch}"
-          sh "bundle --gemfile Gemfile --no-deployment --without nothing --path vendor/bundle #{@parallel_option}"
-          sh 'bundle update'
-          sh 'git add Gemfile.lock'
-          sh %(git commit -m "Bundle update #{@readable_time}") do; end # ignore exitstatus
-          sh "git push #{@authorized_compare_url} tachikoma/update-#{@readable_time}"
+          sh(*['ruby', '-i', '-pe', '$_.gsub! /^ruby/, "#ruby"', 'Gemfile'])
+          sh(*['git', 'config', 'user.name', @commiter_name])
+          sh(*['git', 'config', 'user.email', @commiter_email])
+          sh(*['git', 'checkout', '-b', "tachikoma/update-#{@readable_time}", @base_remote_branch])
+          sh(*([
+            'bundle',
+            '--gemfile', 'Gemfile',
+            '--no-deployment',
+            '--without', 'nothing',
+            '--path', 'vendor/bundle',
+            @parallel_option
+          ].compact))
+          sh(*%w(bundle update))
+          sh(*['git', 'add', 'Gemfile.lock'])
+          sh(*['git', 'commit', '-m', "Bundle update #{@readable_time}"]) do
+            # ignore exitstatus
+          end
+          sh(*['git', 'push', @authorized_compare_url, "tachikoma/update-#{@readable_time}"])
         end
       end
     end
@@ -90,71 +105,87 @@ module Tachikoma
 
     def carton
       Dir.chdir("#{Tachikoma.repos_path}/#{@build_for}") do
-        sh "git config user.name #{@commiter_name}"
-        sh "git config user.email #{@commiter_email}"
-        sh "git checkout -b tachikoma/update-#{@readable_time} #{@base_remote_branch}"
-        sh 'carton install'
-        sh 'carton update'
-        sh 'git add carton.lock' if File.exist?('carton.lock')
-        sh 'git add cpanfile.snapshot' if File.exist?('cpanfile.snapshot')
-        sh %(git commit -m "Carton update #{@readable_time}") do; end # ignore exitstatus
-        sh "git push #{@authorized_compare_url} tachikoma/update-#{@readable_time}"
+        sh(*['git', 'config', 'user.name', @commiter_name])
+        sh(*['git', 'config', 'user.email', @commiter_email])
+        sh(*['git', 'checkout', '-b', "tachikoma/update-#{@readable_time}", @base_remote_branch])
+        sh(*%w(carton install))
+        sh(*%w(carton update))
+        sh(*['git', 'add', 'carton.lock']) if File.exist?('carton.lock')
+        sh(*['git', 'add', 'cpanfile.snapshot']) if File.exist?('cpanfile.snapshot')
+        sh(*['git', 'commit', '-m', "Carton update #{@readable_time}"]) do
+          # ignore exitstatus
+        end
+        sh(*['git', 'push', @authorized_compare_url, "tachikoma/update-#{@readable_time}"])
       end
     end
 
     def none
       Dir.chdir("#{Tachikoma.repos_path}/#{@build_for}") do
-        sh "git config user.name #{@commiter_name}"
-        sh "git config user.email #{@commiter_email}"
-        sh "git checkout -b tachikoma/update-#{@readable_time} #{@base_remote_branch}"
-        sh %(git commit --allow-empty -m "None update #{@readable_time}") do; end # ignore exitstatus
-        sh "git push #{@authorized_compare_url} tachikoma/update-#{@readable_time}"
+        sh(*['git', 'config', 'user.name', @commiter_name])
+        sh(*['git', 'config', 'user.email', @commiter_email])
+        sh(*['git', 'checkout', '-b', "tachikoma/update-#{@readable_time}", @base_remote_branch])
+        sh(*['git', 'commit', '--allow-empty', '-m', "None update #{@readable_time}"]) do
+          # ignore exitstatus
+        end
+        sh(*['git', 'push', @authorized_compare_url, "tachikoma/update-#{@readable_time}"])
       end
     end
 
     def david
       Dir.chdir("#{Tachikoma.repos_path}/#{@build_for}") do
-        sh "git config user.name #{@commiter_name}"
-        sh "git config user.email #{@commiter_email}"
-        sh "git checkout -b tachikoma/update-#{@readable_time} #{@base_remote_branch}"
-        sh 'david update --warn404'
-        sh 'git add package.json'
-        sh %(git commit -m "David update #{@readable_time}") do; end # ignore exitstatus
-        sh "git push #{@authorized_compare_url} tachikoma/update-#{@readable_time}"
+        sh(*['git', 'config', 'user.name', @commiter_name])
+        sh(*['git', 'config', 'user.email', @commiter_email])
+        sh(*['git', 'checkout', '-b', "tachikoma/update-#{@readable_time}", @base_remote_branch])
+        sh(*['david', 'update', '--warn404'])
+        sh(*['git', 'add', 'package.json'])
+        sh(*['git', 'commit', '-m', "David update #{@readable_time}"]) do
+          # ignore exitstatus
+        end
+        sh(*['git', 'push', @authorized_compare_url, "tachikoma/update-#{@readable_time}"])
       end
     end
 
     def composer
       Dir.chdir("#{Tachikoma.repos_path}/#{@build_for}") do
-        sh "git config user.name #{@commiter_name}"
-        sh "git config user.email #{@commiter_email}"
-        sh "git checkout -b tachikoma/update-#{@readable_time} #{@base_remote_branch}"
+        sh(*['git', 'config', 'user.name', @commiter_name])
+        sh(*['git', 'config', 'user.email', @commiter_email])
+        sh(*['git', 'checkout', '-b', "tachikoma/update-#{@readable_time}", @base_remote_branch])
         # FIXME: Use Octokit.api_endpoint for GitHub Enterprise
-        sh "composer config github-oauth.github.com #{@github_token}"
-        sh 'composer install --no-interaction'
-        sh 'composer update --no-interaction'
-        sh 'git add composer.lock'
-        sh %(git commit -m "Composer update #{@readable_time}") do; end # ignore exitstatus
-        sh "git push #{@authorized_compare_url} tachikoma/update-#{@readable_time}"
+        sh(*['composer', 'config', 'github-oauth.github.com', @github_token])
+        sh(*['composer', 'install', '--no-interaction'])
+        sh(*['composer', 'update', '--no-interaction'])
+        sh(*['git', 'add', 'composer.lock'])
+        sh(*['git', 'commit', '-m', "Composer update #{@readable_time}"]) do
+          # ignore exitstatus
+        end
+        sh(*['git', 'push', @authorized_compare_url, "tachikoma/update-#{@readable_time}"])
       end
     end
 
     def cocoapods
       Dir.chdir("#{Tachikoma.repos_path}/#{@build_for}") do
-        sh "git config user.name #{@commiter_name}"
-        sh "git config user.email #{@commiter_email}"
-        sh "git checkout -b tachikoma/update-#{@readable_time} #{@base_remote_branch}"
-        sh 'pod install'
-        sh 'pod update'
-        sh 'git add Podfile.lock'
-        sh %(git commit -m "Cocoapods update #{@readable_time}") do; end # ignore exitstatus
-        sh "git push #{@authorized_compare_url} tachikoma/update-#{@readable_time}"
+        sh(*['git', 'config', 'user.name', @commiter_name])
+        sh(*['git', 'config', 'user.email', @commiter_email])
+        sh(*['git', 'checkout', '-b', "tachikoma/update-#{@readable_time}", @base_remote_branch])
+        sh(*%w(pod install))
+        sh(*%w(pod update))
+        sh(*['git', 'add', 'Podfile.lock'])
+        sh(*['git', 'commit', '-m', "Cocoapods update #{@readable_time}"]) do
+          # ignore exitstatus
+        end
+        sh(*['git', 'push', @authorized_compare_url, "tachikoma/update-#{@readable_time}"])
       end
     end
 
     def pull_request
       @client = Octokit::Client.new access_token: @github_token
-      @client.create_pull_request(@pull_request_url, @pull_request_base, @pull_request_head, @pull_request_title, @pull_request_body)
+      @client.create_pull_request(
+        @pull_request_url,
+        @pull_request_base,
+        @pull_request_head,
+        @pull_request_title,
+        @pull_request_body
+      )
     rescue Octokit::UnprocessableEntity
     end
 
@@ -212,10 +243,18 @@ module Tachikoma
     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
-        "--jobs=#{parallel_number}"
-      end
+      return if !bundler_parallel_available?(bundler_version) || parallel_number <= 1
+      "--jobs=#{parallel_number}"
+    end
+
+    def bundler_parallel_available?(bundler_version)
+      # bundler 1.4.0 gets parallel number option
+      Gem::Version.create(bundler_version) >= Gem::Version.create('1.4.0')
+    end
+
+    def git_clone_depth_option(depth)
+      return [nil] unless depth
+      ['--depth', depth.to_s]
     end
   end
 end

data/lib/tachikoma/templates/data/bot-motoko-tachikoma.yaml

@@ -8,3 +8,5 @@ language:
   'ruby'
 version:
   '2.0.0'
+git_clone_depth:
+  50

data/lib/tachikoma/version.rb

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

data/spec/tachikoma/application_spec.rb

@@ -142,6 +142,25 @@ YAML
     end
   end
 
+  describe '#git_clone_depth_option' do
+    subject { described_class.new }
+
+    context 'depth is not provided' do
+      let(:nil_for_expand) { [nil] }
+      it 'returns nil' do
+        expect(subject.git_clone_depth_option(nil)).to eq nil_for_expand
+      end
+    end
+
+    context 'depth is provided' do
+      let(:depth) { 10 }
+      let(:depth_for_expand) { ['--depth', '10'] }
+      it 'returns depth' do
+        expect(subject.git_clone_depth_option(depth)).to eq depth_for_expand
+      end
+    end
+  end
+
   describe '#repository_identity' do
     subject { described_class.new }
     let(:identity) { 'example1/example2' }

data/spec/tasks/app_task_spec.rb

@@ -7,7 +7,9 @@ describe 'Tachikoma::Aplication' do
   describe '#pull_request' do
     context 'when github returns 422 UnprocessableEntity' do
       before do
-        allow(Octokit::Client).to receive_message_chain(:new, :create_pull_request).and_raise(Octokit::UnprocessableEntity)
+        allow(Octokit::Client).to \
+          receive_message_chain(:new, :create_pull_request)
+          .and_raise(Octokit::UnprocessableEntity)
       end
 
       it 'should not raise Octokit::UnprocessableEntity error' do

data/tachikoma.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ['lib']
 
   spec.add_dependency 'safe_yaml'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tachikoma
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.2.4
 platform: ruby
 authors:
 - sanemat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -171,7 +171,6 @@ files:
 - lib/tachikoma/templates/repos/.gitkeep
 - lib/tachikoma/version.rb
 - lib/tasks/app.rake
-- rubocop-todo.yml
 - spec/spec_helper.rb
 - spec/tachikoma/application_spec.rb
 - spec/tachikoma/settings_spec.rb
@@ -197,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Update gem frequently gets less pain. Let's doing bundle update as a habit!

data/rubocop-todo.yml

@@ -1,9 +0,0 @@
-# This configuration was generated by `rubocop --auto-gen-config`.
-# The point is for the user to remove these configuration records
-# one by one as the offences are removed from the code base.
-
-Blocks:
-  Enabled: false
-
-LineLength:
-  Enabled: false