tachikoma 4.2.5 → 4.2.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 5548941aa82fb6234ddc3ee7fce57d6836a21669
4
- data.tar.gz: 70d19fe95c900c694794e625444a216c13b30940
3
+ metadata.gz: d14b81721227fd38687a4383e23c4ffd08c1cf83
4
+ data.tar.gz: 1827828be31e74a8eec415eef34933484bac17c7
5
5
  SHA512:
6
- metadata.gz: c8f23c4fcfe5a0b9034882040b52849ccbc1d942c580ae30f71e66d11a3833bec798aa11415591d204adeb198b5d0ee4098bee755a091cd28ed19f72221ae114
7
- data.tar.gz: 6e315375f8162508488f6c3a9bd273b2c531bf88f042a28312802225f27d69a2c47a6e6c62fb001557f1d7d16d2aaba9a66dfa23095ae02059745851d273d288
6
+ metadata.gz: bee96b8a378fb6674c16a9eda7a9ec6722ed98afd1c79757fbc3eac92a69f36dfd8be4e99714e255a6997b49ffa7f69525d9b968612a5d43db7ccb15d4d0455f
7
+ data.tar.gz: be14294de2094f9a6497d7fa7eacf5ca6508f4f7da3478f98b441319b18e4f3fafe09ceee0e1350df1c433d12ae6d5c49b18ebbe81c4daa70f9a41fea11e5dc6
@@ -1,5 +1,12 @@
1
1
  ## master
2
2
 
3
+ Features:
4
+
5
+ ## 4.2.6 (2015-06-22)
6
+
7
+ Features:
8
+ - Add option: bundler_restore_bundled_with (#185, #187, @sanemat)
9
+
3
10
  ## 4.2.5 (2015-05-07)
4
11
 
5
12
  Features:
@@ -4,49 +4,69 @@
4
4
  # See:
5
5
  # https://github.com/sanemat/do-not-merge-wip-for-github/commit/597425a65b87e22657a69172de182f978eed4d72
6
6
  # TODO: commiter is typo, committer is valid, so I'll fix this v5
7
+ #
7
8
  commiter_name: 'bot-motoko'
9
+ #
8
10
  # The email as a committer email on git commit.
9
11
  # See:
10
12
  # https://github.com/sanemat/do-not-merge-wip-for-github/commit/597425a65b87e22657a69172de182f978eed4d72
11
13
  # TODO: commiter is typo, committer is valid, so I'll fix this v5
14
+ #
12
15
  commiter_email: 'bot-motoko@al.sane.jp'
16
+ #
13
17
  # The GitHub account for pull request.
14
18
  # See:
15
19
  # https://github.com/sanemat/do-not-merge-wip-for-github/pull/25
20
+ #
16
21
  github_account: 'bot-motoko'
22
+ #
17
23
  # The branch is checked out.
18
24
  # e.g. $ git checkout -b new_branch [origin/master]
25
+ #
19
26
  base_remote_branch: 'origin/master'
27
+ #
20
28
  # The timestamp is used identifying branch/pull request
21
29
  # with human readable format.
22
30
  # See available format:
23
31
  # http://docs.ruby-lang.org/en/2.2.0/Time.html#method-i-strftime
32
+ #
24
33
  timestamp_format: '%Y%m%d%H%M%S'
34
+ #
25
35
  # The pull request body contents.
26
36
  # you can use text/html/markdown and any format
27
37
  # which GitHub(via Octokit) accepts.
28
38
  # See:
29
39
  # https://github.com/sanemat/gist-mail/pull/54
40
+ #
30
41
  pull_request_body: ':hamster::hamster::hamster:'
42
+ #
31
43
  # The base branch which you want to pull request,
32
44
  # master is most popular, develop and gh-pages are common.
45
+ #
33
46
  pull_request_base: 'master'
47
+ #
34
48
  # The type about fork & pull and shared repository
35
49
  # See also:
36
50
  # https://help.github.com/articles/using-pull-requests/#types-of-collaborative-development-models
37
51
  #
38
52
  # Supported: 'fork', 'shared'
53
+ #
39
54
  type: 'fork'
55
+ #
40
56
  # The URL of git repository you want to execute.
41
57
  # https is highly recommended.
58
+ #
42
59
  url: 'https://example.com/git-url.git'
60
+ #
43
61
  # For ruby bundler parallel install option
44
62
  # Require Bundler v1.4.0 or higher
45
63
  # See also:
46
64
  # http://robots.thoughtbot.com/parallel-gem-installing-using-bundler
47
65
  #
48
66
  # Supported: 1, 2, 3, ...
67
+ #
49
68
  bundler_parallel_number: 4
69
+ #
50
70
  # Use shallow clone for huge repository, if you want.
51
71
  # Require Git v1.9.0 or higher
52
72
  # We can push from a shallowly-cloned repository above git v1.9.0
@@ -56,4 +76,18 @@ bundler_parallel_number: 4
56
76
  # e.g. Tachikoma.io's default is 100, Travis-CI's default is 50 :)
57
77
  #
58
78
  # Supported: false, 1, 2, 3, ...
79
+ #
59
80
  git_clone_depth: false
81
+ #
82
+ # Bundler v1.10.0 or higher tracks Bundler version in lockfile.
83
+ # We should use latest Bundler, but sometimes we are afraid we have to use older Bundler.
84
+ # We use Different version of Bundler between a project and a local machine.
85
+ # In addition, Bundler v1.9.x removes BUNDLED WITH section.
86
+ # RestoreBundledWith solves these conflicts.
87
+ # RestoreBundledWith restores BUNDLED WITH section from git repository.
88
+ # See also:
89
+ # https://github.com/packsaddle/ruby-restore_bundled_with
90
+ #
91
+ # Supported: true, false
92
+ #
93
+ bundler_restore_bundled_with: false
@@ -3,6 +3,7 @@ require 'uri'
3
3
  require 'tachikoma'
4
4
  require 'octokit'
5
5
  require 'fileutils'
6
+ require 'restore_bundled_with'
6
7
 
7
8
  module Tachikoma
8
9
  # Main logic of Tachikoma
@@ -49,6 +50,7 @@ module Tachikoma
49
50
  @readable_time = Time.now.utc.strftime(@timestamp_format)
50
51
  @parallel_option = bundler_parallel_option(Bundler::VERSION, @configure['bundler_parallel_number'])
51
52
  @depth_option = git_clone_depth_option(@configure['git_clone_depth'])
53
+ @bundler_restore_bundled_with = @configure['bundler_restore_bundled_with']
52
54
 
53
55
  @target_head = target_repository_user(@type, @url, @github_account)
54
56
  @pull_request_url = repository_identity(@url)
@@ -99,6 +101,15 @@ module Tachikoma
99
101
  @parallel_option
100
102
  ].compact))
101
103
  sh(*%w(bundle update))
104
+
105
+ if @bundler_restore_bundled_with
106
+ # restore_bundled_with
107
+ lock_file_contents = File.read(@bundler_lock_file)
108
+ lock_file = RestoreBundledWith::Lock.restore(
109
+ lock_file_contents, @bundler_lock_file)
110
+ File.write(@bundler_lock_file, lock_file.body)
111
+ end
112
+
102
113
  sh(*['git', 'add', @bundler_lock_file])
103
114
  sh(*['git', 'commit', '-m', "Bundle update #{@readable_time}"]) do
104
115
  # ignore exitstatus
@@ -1,6 +1,93 @@
1
- url:
2
- 'https://github.com/sanemat/bot-motoko-tachikoma.git'
3
- type:
4
- 'fork'
5
- git_clone_depth:
6
- 50
1
+ # These are default Tachikoma's settings.
2
+ #
3
+ # The name as a committer name on git commit.
4
+ # See:
5
+ # https://github.com/sanemat/do-not-merge-wip-for-github/commit/597425a65b87e22657a69172de182f978eed4d72
6
+ # TODO: commiter is typo, committer is valid, so I'll fix this v5
7
+ #
8
+ #commiter_name: 'bot-motoko'
9
+ #
10
+ # The email as a committer email on git commit.
11
+ # See:
12
+ # https://github.com/sanemat/do-not-merge-wip-for-github/commit/597425a65b87e22657a69172de182f978eed4d72
13
+ # TODO: commiter is typo, committer is valid, so I'll fix this v5
14
+ #
15
+ #commiter_email: 'bot-motoko@al.sane.jp'
16
+ #
17
+ # The GitHub account for pull request.
18
+ # See:
19
+ # https://github.com/sanemat/do-not-merge-wip-for-github/pull/25
20
+ #
21
+ #github_account: 'bot-motoko'
22
+ #
23
+ # The branch is checked out.
24
+ # e.g. $ git checkout -b new_branch [origin/master]
25
+ #
26
+ #base_remote_branch: 'origin/master'
27
+ #
28
+ # The timestamp is used identifying branch/pull request
29
+ # with human readable format.
30
+ # See available format:
31
+ # http://docs.ruby-lang.org/en/2.2.0/Time.html#method-i-strftime
32
+ #
33
+ #timestamp_format: '%Y%m%d%H%M%S'
34
+ #
35
+ # The pull request body contents.
36
+ # you can use text/html/markdown and any format
37
+ # which GitHub(via Octokit) accepts.
38
+ # See:
39
+ # https://github.com/sanemat/gist-mail/pull/54
40
+ #
41
+ #pull_request_body: ':hamster::hamster::hamster:'
42
+ #
43
+ # The base branch which you want to pull request,
44
+ # master is most popular, develop and gh-pages are common.
45
+ #
46
+ #pull_request_base: 'master'
47
+ #
48
+ # The type about fork & pull and shared repository
49
+ # See also:
50
+ # https://help.github.com/articles/using-pull-requests/#types-of-collaborative-development-models
51
+ #
52
+ # Supported: 'fork', 'shared'
53
+ #
54
+ type: 'fork'
55
+ #
56
+ # The URL of git repository you want to execute.
57
+ # https is highly recommended.
58
+ #
59
+ url: 'https://github.com/sanemat/bot-motoko-tachikoma.git'
60
+ #
61
+ # For ruby bundler parallel install option
62
+ # Require Bundler v1.4.0 or higher
63
+ # See also:
64
+ # http://robots.thoughtbot.com/parallel-gem-installing-using-bundler
65
+ #
66
+ # Supported: 1, 2, 3, ...
67
+ #
68
+ #bundler_parallel_number: 4
69
+ #
70
+ # Use shallow clone for huge repository, if you want.
71
+ # Require Git v1.9.0 or higher
72
+ # We can push from a shallowly-cloned repository above git v1.9.0
73
+ # https://github.com/git/git/blob/master/Documentation/RelNotes/1.9.0.txt
74
+ # See also:
75
+ # http://blogs.atlassian.com/2014/05/handle-big-repositories-git/
76
+ # e.g. Tachikoma.io's default is 100, Travis-CI's default is 50 :)
77
+ #
78
+ # Supported: false, 1, 2, 3, ...
79
+ #
80
+ git_clone_depth: 50
81
+ #
82
+ # Bundler v1.10.0 or higher tracks Bundler version in lockfile.
83
+ # We should use latest Bundler, but sometimes we are afraid we have to use older Bundler.
84
+ # We use Different version of Bundler between a project and a local machine.
85
+ # In addition, Bundler v1.9.x removes BUNDLED WITH section.
86
+ # RestoreBundledWith solves these conflicts.
87
+ # RestoreBundledWith restores BUNDLED WITH section from git repository.
88
+ # See also:
89
+ # https://github.com/packsaddle/ruby-restore_bundled_with
90
+ #
91
+ # Supported: true, false
92
+ #
93
+ #bundler_restore_bundled_with: false
@@ -1,4 +1,4 @@
1
1
  # Version of tachikoma
2
2
  module Tachikoma
3
- VERSION = '4.2.5'
3
+ VERSION = '4.2.6'
4
4
  end
@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
23
23
  spec.add_dependency 'octokit', '>= 3.2', '< 4.0'
24
24
  spec.add_dependency 'json'
25
25
  spec.add_dependency 'thor'
26
+ spec.add_dependency 'restore_bundled_with'
26
27
 
27
28
  spec.add_development_dependency 'bundler', '>= 1.3', '< 2.0'
28
29
  spec.add_development_dependency 'dotenv'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tachikoma
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.2.5
4
+ version: 4.2.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - sanemat
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-07 00:00:00.000000000 Z
11
+ date: 2015-06-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: safe_yaml
@@ -86,6 +86,20 @@ dependencies:
86
86
  - - ">="
87
87
  - !ruby/object:Gem::Version
88
88
  version: '0'
89
+ - !ruby/object:Gem::Dependency
90
+ name: restore_bundled_with
91
+ requirement: !ruby/object:Gem::Requirement
92
+ requirements:
93
+ - - ">="
94
+ - !ruby/object:Gem::Version
95
+ version: '0'
96
+ type: :runtime
97
+ prerelease: false
98
+ version_requirements: !ruby/object:Gem::Requirement
99
+ requirements:
100
+ - - ">="
101
+ - !ruby/object:Gem::Version
102
+ version: '0'
89
103
  - !ruby/object:Gem::Dependency
90
104
  name: bundler
91
105
  requirement: !ruby/object:Gem::Requirement