tachikoma 4.2.5 → 4.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5548941aa82fb6234ddc3ee7fce57d6836a21669
-  data.tar.gz: 70d19fe95c900c694794e625444a216c13b30940
+  metadata.gz: d14b81721227fd38687a4383e23c4ffd08c1cf83
+  data.tar.gz: 1827828be31e74a8eec415eef34933484bac17c7
 SHA512:
-  metadata.gz: c8f23c4fcfe5a0b9034882040b52849ccbc1d942c580ae30f71e66d11a3833bec798aa11415591d204adeb198b5d0ee4098bee755a091cd28ed19f72221ae114
-  data.tar.gz: 6e315375f8162508488f6c3a9bd273b2c531bf88f042a28312802225f27d69a2c47a6e6c62fb001557f1d7d16d2aaba9a66dfa23095ae02059745851d273d288
+  metadata.gz: bee96b8a378fb6674c16a9eda7a9ec6722ed98afd1c79757fbc3eac92a69f36dfd8be4e99714e255a6997b49ffa7f69525d9b968612a5d43db7ccb15d4d0455f
+  data.tar.gz: be14294de2094f9a6497d7fa7eacf5ca6508f4f7da3478f98b441319b18e4f3fafe09ceee0e1350df1c433d12ae6d5c49b18ebbe81c4daa70f9a41fea11e5dc6

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## master
 
+Features:
+
+## 4.2.6 (2015-06-22)
+
+Features:
+  - Add option: bundler_restore_bundled_with (#185, #187, @sanemat)
+
 ## 4.2.5 (2015-05-07)
 
 Features:

data/data/default.yaml

@@ -4,49 +4,69 @@
 # See:
 # https://github.com/sanemat/do-not-merge-wip-for-github/commit/597425a65b87e22657a69172de182f978eed4d72
 # TODO: commiter is typo, committer is valid, so I'll fix this v5
+#
 commiter_name: 'bot-motoko'
+#
 # The email as a committer email on git commit.
 # See:
 # https://github.com/sanemat/do-not-merge-wip-for-github/commit/597425a65b87e22657a69172de182f978eed4d72
 # TODO: commiter is typo, committer is valid, so I'll fix this v5
+#
 commiter_email: 'bot-motoko@al.sane.jp'
+#
 # The GitHub account for pull request.
 # See:
 # https://github.com/sanemat/do-not-merge-wip-for-github/pull/25
+#
 github_account: 'bot-motoko'
+#
 # The branch is checked out.
 # e.g. $ git checkout -b new_branch [origin/master]
+#
 base_remote_branch: 'origin/master'
+#
 # The timestamp is used identifying branch/pull request
 # with human readable format.
 # See available format:
 # http://docs.ruby-lang.org/en/2.2.0/Time.html#method-i-strftime
+#
 timestamp_format: '%Y%m%d%H%M%S'
+#
 # The pull request body contents.
 # you can use text/html/markdown and any format
 # which GitHub(via Octokit) accepts.
 # See:
 # https://github.com/sanemat/gist-mail/pull/54
+#
 pull_request_body: ':hamster::hamster::hamster:'
+#
 # The base branch which you want to pull request,
 # master is most popular, develop and gh-pages are common.
+#
 pull_request_base: 'master'
+#
 # The type about fork & pull and shared repository
 # See also:
 # https://help.github.com/articles/using-pull-requests/#types-of-collaborative-development-models
 #
 # Supported: 'fork', 'shared'
+#
 type: 'fork'
+#
 # The URL of git repository you want to execute.
 # https is highly recommended.
+#
 url: 'https://example.com/git-url.git'
+#
 # For ruby bundler parallel install option
 # Require Bundler v1.4.0 or higher
 # See also:
 # http://robots.thoughtbot.com/parallel-gem-installing-using-bundler
 #
 # Supported: 1, 2, 3, ...
+#
 bundler_parallel_number: 4
+#
 # Use shallow clone for huge repository, if you want.
 # Require Git v1.9.0 or higher
 # We can push from a shallowly-cloned repository above git v1.9.0
@@ -56,4 +76,18 @@ bundler_parallel_number: 4
 # e.g. Tachikoma.io's default is 100, Travis-CI's default is 50 :)
 #
 # Supported: false, 1, 2, 3, ...
+#
 git_clone_depth: false
+#
+# Bundler v1.10.0 or higher tracks Bundler version in lockfile.
+# We should use latest Bundler, but sometimes we are afraid we have to use older Bundler.
+# We use Different version of Bundler between a project and a local machine.
+# In addition, Bundler v1.9.x removes BUNDLED WITH section.
+# RestoreBundledWith solves these conflicts.
+# RestoreBundledWith restores BUNDLED WITH section from git repository.
+# See also:
+# https://github.com/packsaddle/ruby-restore_bundled_with
+#
+# Supported: true, false
+#
+bundler_restore_bundled_with: false

data/lib/tachikoma/application.rb

@@ -3,6 +3,7 @@ require 'uri'
 require 'tachikoma'
 require 'octokit'
 require 'fileutils'
+require 'restore_bundled_with'
 
 module Tachikoma
   # Main logic of Tachikoma
@@ -49,6 +50,7 @@ module Tachikoma
       @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'])
+      @bundler_restore_bundled_with = @configure['bundler_restore_bundled_with']
 
       @target_head = target_repository_user(@type, @url, @github_account)
       @pull_request_url = repository_identity(@url)
@@ -99,6 +101,15 @@ module Tachikoma
             @parallel_option
           ].compact))
           sh(*%w(bundle update))
+
+          if @bundler_restore_bundled_with
+            # restore_bundled_with
+            lock_file_contents = File.read(@bundler_lock_file)
+            lock_file = RestoreBundledWith::Lock.restore(
+              lock_file_contents, @bundler_lock_file)
+            File.write(@bundler_lock_file, lock_file.body)
+          end
+
           sh(*['git', 'add', @bundler_lock_file])
           sh(*['git', 'commit', '-m', "Bundle update #{@readable_time}"]) do
             # ignore exitstatus

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

@@ -1,6 +1,93 @@
-url:
-  'https://github.com/sanemat/bot-motoko-tachikoma.git'
-type:
-  'fork'
-git_clone_depth:
-  50
+# These are default Tachikoma's settings.
+#
+# The name as a committer name on git commit.
+# See:
+# https://github.com/sanemat/do-not-merge-wip-for-github/commit/597425a65b87e22657a69172de182f978eed4d72
+# TODO: commiter is typo, committer is valid, so I'll fix this v5
+#
+#commiter_name: 'bot-motoko'
+#
+# The email as a committer email on git commit.
+# See:
+# https://github.com/sanemat/do-not-merge-wip-for-github/commit/597425a65b87e22657a69172de182f978eed4d72
+# TODO: commiter is typo, committer is valid, so I'll fix this v5
+#
+#commiter_email: 'bot-motoko@al.sane.jp'
+#
+# The GitHub account for pull request.
+# See:
+# https://github.com/sanemat/do-not-merge-wip-for-github/pull/25
+#
+#github_account: 'bot-motoko'
+#
+# The branch is checked out.
+# e.g. $ git checkout -b new_branch [origin/master]
+#
+#base_remote_branch: 'origin/master'
+#
+# The timestamp is used identifying branch/pull request
+# with human readable format.
+# See available format:
+# http://docs.ruby-lang.org/en/2.2.0/Time.html#method-i-strftime
+#
+#timestamp_format: '%Y%m%d%H%M%S'
+#
+# The pull request body contents.
+# you can use text/html/markdown and any format
+# which GitHub(via Octokit) accepts.
+# See:
+# https://github.com/sanemat/gist-mail/pull/54
+#
+#pull_request_body: ':hamster::hamster::hamster:'
+#
+# The base branch which you want to pull request,
+# master is most popular, develop and gh-pages are common.
+#
+#pull_request_base: 'master'
+#
+# The type about fork & pull and shared repository
+# See also:
+# https://help.github.com/articles/using-pull-requests/#types-of-collaborative-development-models
+#
+# Supported: 'fork', 'shared'
+#
+type: 'fork'
+#
+# The URL of git repository you want to execute.
+# https is highly recommended.
+#
+url: 'https://github.com/sanemat/bot-motoko-tachikoma.git'
+#
+# For ruby bundler parallel install option
+# Require Bundler v1.4.0 or higher
+# See also:
+# http://robots.thoughtbot.com/parallel-gem-installing-using-bundler
+#
+# Supported: 1, 2, 3, ...
+#
+#bundler_parallel_number: 4
+#
+# Use shallow clone for huge repository, if you want.
+# Require Git v1.9.0 or higher
+# We can push from a shallowly-cloned repository above git v1.9.0
+# https://github.com/git/git/blob/master/Documentation/RelNotes/1.9.0.txt
+# See also:
+# http://blogs.atlassian.com/2014/05/handle-big-repositories-git/
+# e.g. Tachikoma.io's default is 100, Travis-CI's default is 50 :)
+#
+# Supported: false, 1, 2, 3, ...
+#
+git_clone_depth: 50
+#
+# Bundler v1.10.0 or higher tracks Bundler version in lockfile.
+# We should use latest Bundler, but sometimes we are afraid we have to use older Bundler.
+# We use Different version of Bundler between a project and a local machine.
+# In addition, Bundler v1.9.x removes BUNDLED WITH section.
+# RestoreBundledWith solves these conflicts.
+# RestoreBundledWith restores BUNDLED WITH section from git repository.
+# See also:
+# https://github.com/packsaddle/ruby-restore_bundled_with
+#
+# Supported: true, false
+#
+#bundler_restore_bundled_with: false

data/lib/tachikoma/version.rb

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

data/tachikoma.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'octokit', '>= 3.2', '< 4.0'
   spec.add_dependency 'json'
   spec.add_dependency 'thor'
+  spec.add_dependency 'restore_bundled_with'
 
   spec.add_development_dependency 'bundler', '>= 1.3', '< 2.0'
   spec.add_development_dependency 'dotenv'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tachikoma
 version: !ruby/object:Gem::Version
-  version: 4.2.5
+  version: 4.2.6
 platform: ruby
 authors:
 - sanemat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -86,6 +86,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: restore_bundled_with
+  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