realityforge-braid 0.9.3 → 0.9.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml ADDED
@@ -0,0 +1,15 @@
1
+ ---
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ YmEwNDIxOTcxMzU5YzI5Nzc1NTg3MGI4NDRhMDQ1Nzk5YTAyZDZiYg==
5
+ data.tar.gz: !binary |-
6
+ NDhiN2ZiYzE5MTM4MmRkYWNiZTMzMTAxMGRhMGFjZjM0OWY5MjBhZA==
7
+ !binary "U0hBNTEy":
8
+ metadata.gz: !binary |-
9
+ Y2Y4M2JlMGVhZDViZjk4ZmM5ODQ3OThjZmM4ODliNTNmZDAzMTRiZTI3YTFm
10
+ OGY0Yjc4NTFkODNlMjA3MDU2M2Y0MmJjNjFiYTk3MzNhODE4YTg1ODlmM2Mx
11
+ MzBjNzZkNWY2Mzc5NmM3MzIyZTRmZTg5YjY3YTg1MDNjZjg3MGY=
12
+ data.tar.gz: !binary |-
13
+ OTg3YWI1ZTZmNTFkY2Y2NWMxNTAyODQ1MjFiMWVhZDc4Mzk5NDAyZmJjYTRh
14
+ MjBmOGZjMjE3OGQwYzVjMGJhYzc3NmU2OTdiMDliZjE1Mjg2MjgwMmQ2Mjg5
15
+ YTNmOWU0ZDMwMWRkZDU0NTU2NGVmYWViZDMyZGVhNjEzMjgyYzU=
data/.travis.yml CHANGED
@@ -1,16 +1,3 @@
1
1
  language: ruby
2
2
  rvm:
3
3
  - 1.9.3
4
- - jruby-18mode
5
- - jruby-19mode
6
- - jruby-head
7
- jdk:
8
- - openjdk6
9
- - openjdk7
10
- - oraclejdk7
11
- matrix:
12
- exclude:
13
- - rvm: 1.9.3
14
- jdk: openjdk7
15
- - rvm: 1.9.2
16
- jdk: oraclejdk7
data/CONTRIBUTING.md CHANGED
@@ -12,7 +12,7 @@ Pester us if we don't get your Pull Requests merged in a timely fashion. :)
12
12
 
13
13
  ## How to speed the merging of pull requests
14
14
 
15
- * Describe your changes in the CHANGELOG.
15
+ * Describe your changes in the CHANGELOG.
16
16
  * Give yourself some credit in the appropriate place (usually the CHANGELOG).
17
17
  * Make commits of logical units.
18
18
  * Ensure your commit messages help others understand what you are doing and why.
@@ -24,3 +24,4 @@ Pester us if we don't get your Pull Requests merged in a timely fashion. :)
24
24
 
25
25
  * [General GitHub documentation](http://help.github.com/)
26
26
  * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
27
+
data/bin/braid CHANGED
@@ -40,11 +40,11 @@ Main {
40
40
  . braid add http://remote/path local/dir
41
41
  TXT
42
42
 
43
- mixin :argument_url, :option_type, :optional_path, :option_branch, :option_rails_plugin, :option_revision, :option_full, :option_verbose
43
+ mixin :argument_url, :optional_path, :option_branch, :option_revision, :option_full, :option_verbose
44
44
 
45
45
  run {
46
46
  Braid.verbose = verbose
47
- Braid::Command.run(:add, url, {"type" => type, "path" => path, "branch" => branch, "rails_plugin" => rails_plugin, "revision" => revision, "full" => full})
47
+ Braid::Command.run(:add, url, {"path" => path, "branch" => branch, "revision" => revision, "full" => full})
48
48
  }
49
49
  }
50
50
 
@@ -78,7 +78,7 @@ Main {
78
78
 
79
79
  * removes metadata from .braids
80
80
  * removes the local directory and commits the removal
81
- * removes the git remote by default, --keep can be used to supress that
81
+ * removes the git remote by default, --keep can be used to suppress that
82
82
  TXT
83
83
 
84
84
  examples <<-TXT
@@ -173,15 +173,6 @@ Main {
173
173
  }
174
174
  }
175
175
 
176
- mixin(:option_type) {
177
- option(:type, :t) {
178
- optional
179
- argument :required
180
- desc 'mirror type'
181
- attr
182
- }
183
- }
184
-
185
176
  mixin(:option_branch) {
186
177
  option(:branch, :b) {
187
178
  optional
@@ -191,14 +182,6 @@ Main {
191
182
  }
192
183
  }
193
184
 
194
- mixin(:option_rails_plugin) {
195
- option(:rails_plugin, :p) {
196
- optional
197
- desc 'added mirror is a Rails plugin'
198
- attr
199
- }
200
- }
201
-
202
185
  mixin(:option_revision) {
203
186
  option(:revision, :r) {
204
187
  optional
@@ -5,8 +5,8 @@ module Braid
5
5
  with_reset_on_error do
6
6
  mirror = config.add_from_options(url, options)
7
7
 
8
- branch_message = (mirror.branch == "master") ? "" : " branch '#{mirror.branch}'"
9
- revision_message = options["revision"] ? " at #{display_revision(mirror, options["revision"])}" : ""
8
+ branch_message = (mirror.branch == 'master') ? '' : " branch '#{mirror.branch}'"
9
+ revision_message = options['revision'] ? " at #{display_revision(mirror, options['revision'])}" : ''
10
10
  msg "Adding mirror of '#{mirror.url}'#{branch_message}#{revision_message}."
11
11
 
12
12
  # these commands are explained in the subtree merge guide
@@ -15,7 +15,7 @@ module Braid
15
15
  setup_remote(mirror)
16
16
  mirror.fetch
17
17
 
18
- new_revision = validate_new_revision(mirror, options["revision"])
18
+ new_revision = validate_new_revision(mirror, options['revision'])
19
19
  target_revision = determine_target_revision(new_revision)
20
20
 
21
21
  unless mirror.squashed?
@@ -24,7 +24,7 @@ module Braid
24
24
  git.read_tree_prefix(target_revision, mirror.path)
25
25
 
26
26
  mirror.revision = new_revision
27
- mirror.lock = new_revision if options["revision"]
27
+ mirror.lock = new_revision if options['revision']
28
28
  config.update(mirror)
29
29
  add_config_file
30
30
 
@@ -15,13 +15,13 @@ module Braid
15
15
  config.mirrors.each do |path|
16
16
  mirror = config.get!(path)
17
17
  print "#{path.to_s}"
18
- print " [LOCKED]" if mirror.locked?
18
+ print ' [LOCKED]' if mirror.locked?
19
19
  setup_remote(mirror)
20
20
  msg "Fetching new commits for '#{mirror.path}'." if verbose?
21
21
  mirror.fetch
22
22
  new_revision = validate_new_revision(mirror, options["revision"])
23
- print " (Remote Modified)" if new_revision.to_s != mirror.base_revision.to_s
24
- print " (Locally Modified)" unless mirror.diff.empty?
23
+ print ' (Remote Modified)' if new_revision.to_s != mirror.base_revision.to_s
24
+ print ' (Locally Modified)' unless mirror.diff.empty?
25
25
  print "\n"
26
26
  end
27
27
  print "\n"
@@ -6,7 +6,7 @@ module Braid
6
6
  end
7
7
 
8
8
  protected
9
-
9
+
10
10
  def setup_all
11
11
  msg "Setting up all mirrors."
12
12
  config.mirrors.each do |path|
@@ -34,3 +34,4 @@ module Braid
34
34
  end
35
35
  end
36
36
  end
37
+
data/lib/braid/config.rb CHANGED
@@ -79,6 +79,9 @@ module Braid
79
79
  new_db = {}
80
80
  @db.keys.sort.each do |key|
81
81
  new_db[key] = @db[key]
82
+ new_db[key].keys.each do |k|
83
+ new_db[key].delete(k) if !Braid::Mirror::ATTRIBUTES.include?(k)
84
+ end
82
85
  end
83
86
  File.open(@config_file, "wb") do |f|
84
87
  f.write JSON.pretty_generate(new_db)
data/lib/braid/mirror.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Braid
2
2
  class Mirror
3
- ATTRIBUTES = %w(url remote type branch squashed revision lock)
3
+ ATTRIBUTES = %w(url remote branch squashed revision lock)
4
4
 
5
5
  class UnknownType < BraidError
6
6
  def message
@@ -31,10 +31,6 @@ module Braid
31
31
  raise PathRequired
32
32
  end
33
33
 
34
- if options["rails_plugin"]
35
- path = "vendor/plugins/#{path}"
36
- end
37
-
38
34
  remote = "#{branch}/braid/#{path}"
39
35
  squashed = !options["full"]
40
36
 
data/lib/braid/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Braid
2
- VERSION = "0.9.3"
2
+ VERSION = '0.9.4'
3
3
  end
metadata CHANGED
@@ -1,8 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: realityforge-braid
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.3
5
- prerelease:
4
+ version: 0.9.4
6
5
  platform: ruby
7
6
  authors:
8
7
  - Cristi Balan
@@ -10,12 +9,11 @@ authors:
10
9
  autorequire:
11
10
  bindir: bin
12
11
  cert_chain: []
13
- date: 2013-08-08 00:00:00.000000000 Z
12
+ date: 2014-04-17 00:00:00.000000000 Z
14
13
  dependencies:
15
14
  - !ruby/object:Gem::Dependency
16
15
  name: main
17
16
  requirement: !ruby/object:Gem::Requirement
18
- none: false
19
17
  requirements:
20
18
  - - ! '>='
21
19
  - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
23
21
  type: :runtime
24
22
  prerelease: false
25
23
  version_requirements: !ruby/object:Gem::Requirement
26
- none: false
27
24
  requirements:
28
25
  - - ! '>='
29
26
  - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
31
28
  - !ruby/object:Gem::Dependency
32
29
  name: open4
33
30
  requirement: !ruby/object:Gem::Requirement
34
- none: false
35
31
  requirements:
36
32
  - - ! '>='
37
33
  - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
39
35
  type: :runtime
40
36
  prerelease: false
41
37
  version_requirements: !ruby/object:Gem::Requirement
42
- none: false
43
38
  requirements:
44
39
  - - ! '>='
45
40
  - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
47
42
  - !ruby/object:Gem::Dependency
48
43
  name: rspec
49
44
  requirement: !ruby/object:Gem::Requirement
50
- none: false
51
45
  requirements:
52
46
  - - '='
53
47
  - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
55
49
  type: :development
56
50
  prerelease: false
57
51
  version_requirements: !ruby/object:Gem::Requirement
58
- none: false
59
52
  requirements:
60
53
  - - '='
61
54
  - !ruby/object:Gem::Version
@@ -63,7 +56,6 @@ dependencies:
63
56
  - !ruby/object:Gem::Dependency
64
57
  name: mocha
65
58
  requirement: !ruby/object:Gem::Requirement
66
- none: false
67
59
  requirements:
68
60
  - - ! '>='
69
61
  - !ruby/object:Gem::Version
@@ -71,7 +63,6 @@ dependencies:
71
63
  type: :development
72
64
  prerelease: false
73
65
  version_requirements: !ruby/object:Gem::Requirement
74
- none: false
75
66
  requirements:
76
67
  - - ! '>='
77
68
  - !ruby/object:Gem::Version
@@ -88,7 +79,6 @@ files:
88
79
  - .travis.yml
89
80
  - CONTRIBUTING.md
90
81
  - Gemfile
91
- - Gemfile.lock
92
82
  - LICENSE
93
83
  - README.md
94
84
  - Rakefile
@@ -121,6 +111,7 @@ files:
121
111
  - spec/test_helper.rb
122
112
  homepage: http://evil.che.lu/projects/braid
123
113
  licenses: []
114
+ metadata: {}
124
115
  post_install_message:
125
116
  rdoc_options:
126
117
  - --line-numbers
@@ -131,21 +122,20 @@ rdoc_options:
131
122
  require_paths:
132
123
  - lib
133
124
  required_ruby_version: !ruby/object:Gem::Requirement
134
- none: false
135
125
  requirements:
136
126
  - - ! '>='
137
127
  - !ruby/object:Gem::Version
138
128
  version: '0'
139
129
  required_rubygems_version: !ruby/object:Gem::Requirement
140
- none: false
141
130
  requirements:
142
131
  - - ! '>='
143
132
  - !ruby/object:Gem::Version
144
133
  version: '0'
145
134
  requirements: []
146
135
  rubyforge_project: braid
147
- rubygems_version: 1.8.23
136
+ rubygems_version: 2.0.3
148
137
  signing_key:
149
- specification_version: 3
138
+ specification_version: 4
150
139
  summary: A simple tool for tracking vendor branches in git.
151
140
  test_files: []
141
+ has_rdoc: false
data/Gemfile.lock DELETED
@@ -1,42 +0,0 @@
1
- PATH
2
- remote: .
3
- specs:
4
- realityforge-braid (0.9.2)
5
- main (>= 4.7.3)
6
- open4 (>= 1.0.1)
7
-
8
- GEM
9
- remote: http://rubygems.org/
10
- specs:
11
- arrayfields (4.9.0)
12
- chronic (0.9.1)
13
- diff-lcs (1.1.3)
14
- fattr (2.2.1)
15
- main (5.2.0)
16
- arrayfields (>= 4.7.4)
17
- chronic (>= 0.6.2)
18
- fattr (>= 2.2.0)
19
- map (>= 5.1.0)
20
- map (6.3.0)
21
- metaclass (0.0.1)
22
- mocha (0.13.3)
23
- metaclass (~> 0.0.1)
24
- open4 (1.3.0)
25
- rake (10.0.3)
26
- rspec (2.12.0)
27
- rspec-core (~> 2.12.0)
28
- rspec-expectations (~> 2.12.0)
29
- rspec-mocks (~> 2.12.0)
30
- rspec-core (2.12.2)
31
- rspec-expectations (2.12.1)
32
- diff-lcs (~> 1.1.3)
33
- rspec-mocks (2.12.2)
34
-
35
- PLATFORMS
36
- ruby
37
-
38
- DEPENDENCIES
39
- mocha (>= 0.9.11)
40
- rake
41
- realityforge-braid!
42
- rspec (= 2.12.0)