realityforge-braid 0.9.7 → 0.9.8

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.
@@ -14,14 +14,19 @@ module Braid
14
14
  msg "Listing all mirrors.\n=======================================================\n"
15
15
  config.mirrors.each do |path|
16
16
  mirror = config.get!(path)
17
- print "#{path.to_s}"
17
+ print path.to_s
18
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
- new_revision = validate_new_revision(mirror, options["revision"])
22
+ new_revision = validate_new_revision(mirror, options['revision'])
23
23
  print ' (Remote Modified)' if new_revision.to_s != mirror.base_revision.to_s
24
- print ' (Locally Modified)' unless mirror.diff.empty?
24
+ local_file_count = git.read_ls_files(mirror.path).split.size
25
+ if 0 == local_file_count
26
+ print ' (Removed Locally)'
27
+ elsif mirror.diff.empty?
28
+ print ' (Locally Modified)'
29
+ end
25
30
  print "\n"
26
31
  end
27
32
  print "\n"
@@ -251,6 +251,10 @@ module Braid
251
251
  raise MergeError
252
252
  end
253
253
 
254
+ def read_ls_files(prefix)
255
+ invoke('ls-files', prefix)
256
+ end
257
+
254
258
  def read_tree_prefix(treeish, prefix)
255
259
  invoke(:read_tree, "--prefix=#{prefix}/ -u", treeish)
256
260
  true
data/lib/braid/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Braid
2
- VERSION = '0.9.7'
2
+ VERSION = '0.9.8'
3
3
  end
metadata CHANGED
@@ -1,58 +1,81 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: realityforge-braid
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.7
4
+ version: 0.9.8
5
+ prerelease:
5
6
  platform: ruby
6
7
  authors:
7
8
  - Cristi Balan
8
9
  - Norbert Crombach
9
- autorequire:
10
+ autorequire:
10
11
  bindir: bin
11
12
  cert_chain: []
12
13
  date: 2014-05-02 00:00:00.000000000 Z
13
14
  dependencies:
14
15
  - !ruby/object:Gem::Dependency
15
16
  name: main
17
+ requirement: !ruby/object:Gem::Requirement
18
+ none: false
19
+ requirements:
20
+ - - ! '>='
21
+ - !ruby/object:Gem::Version
22
+ version: 4.7.3
23
+ type: :runtime
24
+ prerelease: false
16
25
  version_requirements: !ruby/object:Gem::Requirement
26
+ none: false
17
27
  requirements:
18
- - - '>='
28
+ - - ! '>='
19
29
  - !ruby/object:Gem::Version
20
30
  version: 4.7.3
31
+ - !ruby/object:Gem::Dependency
32
+ name: open4
21
33
  requirement: !ruby/object:Gem::Requirement
34
+ none: false
22
35
  requirements:
23
- - - '>='
36
+ - - ! '>='
24
37
  - !ruby/object:Gem::Version
25
- version: 4.7.3
26
- prerelease: false
38
+ version: 1.0.1
27
39
  type: :runtime
40
+ prerelease: false
41
+ version_requirements: !ruby/object:Gem::Requirement
42
+ none: false
43
+ requirements:
44
+ - - ! '>='
45
+ - !ruby/object:Gem::Version
46
+ version: 1.0.1
28
47
  - !ruby/object:Gem::Dependency
29
48
  name: rspec
30
- version_requirements: !ruby/object:Gem::Requirement
49
+ requirement: !ruby/object:Gem::Requirement
50
+ none: false
31
51
  requirements:
32
52
  - - '='
33
53
  - !ruby/object:Gem::Version
34
54
  version: 2.12.0
35
- requirement: !ruby/object:Gem::Requirement
55
+ type: :development
56
+ prerelease: false
57
+ version_requirements: !ruby/object:Gem::Requirement
58
+ none: false
36
59
  requirements:
37
60
  - - '='
38
61
  - !ruby/object:Gem::Version
39
62
  version: 2.12.0
40
- prerelease: false
41
- type: :development
42
63
  - !ruby/object:Gem::Dependency
43
64
  name: mocha
44
- version_requirements: !ruby/object:Gem::Requirement
65
+ requirement: !ruby/object:Gem::Requirement
66
+ none: false
45
67
  requirements:
46
- - - '>='
68
+ - - ! '>='
47
69
  - !ruby/object:Gem::Version
48
70
  version: 0.9.11
49
- requirement: !ruby/object:Gem::Requirement
71
+ type: :development
72
+ prerelease: false
73
+ version_requirements: !ruby/object:Gem::Requirement
74
+ none: false
50
75
  requirements:
51
- - - '>='
76
+ - - ! '>='
52
77
  - !ruby/object:Gem::Version
53
78
  version: 0.9.11
54
- prerelease: false
55
- type: :development
56
79
  description: A simple tool for tracking vendor branches in git.
57
80
  email: evil@che.lu
58
81
  executables:
@@ -97,8 +120,7 @@ files:
97
120
  - spec/test_helper.rb
98
121
  homepage: http://evil.che.lu/projects/braid
99
122
  licenses: []
100
- metadata: {}
101
- post_install_message:
123
+ post_install_message:
102
124
  rdoc_options:
103
125
  - --line-numbers
104
126
  - --inline-source
@@ -108,19 +130,21 @@ rdoc_options:
108
130
  require_paths:
109
131
  - lib
110
132
  required_ruby_version: !ruby/object:Gem::Requirement
133
+ none: false
111
134
  requirements:
112
- - - '>='
135
+ - - ! '>='
113
136
  - !ruby/object:Gem::Version
114
137
  version: '0'
115
138
  required_rubygems_version: !ruby/object:Gem::Requirement
139
+ none: false
116
140
  requirements:
117
- - - '>='
141
+ - - ! '>='
118
142
  - !ruby/object:Gem::Version
119
143
  version: '0'
120
144
  requirements: []
121
145
  rubyforge_project: braid
122
- rubygems_version: 2.1.5
123
- signing_key:
124
- specification_version: 4
146
+ rubygems_version: 1.8.23
147
+ signing_key:
148
+ specification_version: 3
125
149
  summary: A simple tool for tracking vendor branches in git.
126
150
  test_files: []
checksums.yaml DELETED
@@ -1,7 +0,0 @@
1
- ---
2
- SHA1:
3
- metadata.gz: c009c76db25682b5b8188e31e96ee1ea36b208c9
4
- data.tar.gz: c3190ab5f44db8c7c4f0630b7e42083ac6247f55
5
- SHA512:
6
- metadata.gz: a28aa73685116294d8897483beb9f224086cdda864cb3be5faa19d408f5baa3a6d5e36035744c1eb47c6e8f3a5c74836e83d46f53807b7f5d424412dd1aeb3a0
7
- data.tar.gz: 19abc0fe85eed2959c820e82dde08f6f224ac749f0f44f610d47a41b471eb31a9150cf8640e455c159716bb502b4e0fa8cd255a2dc083d28631757951dc488fa