realityforge-braid 0.9.0 → 0.9.1

Sign up to get free protection for your applications and to get access to all the features.
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- 1.9.3-p362
1
+ 1.9.3-p327
data/CONTRIBUTING.md ADDED
@@ -0,0 +1,26 @@
1
+ # How to Contribute
2
+
3
+ Pull requests are greatly appreciated and are what makes opensource great. Here's a quick guide:
4
+
5
+ * Fork it
6
+ * Create your feature branch (`git checkout -b my-new-feature`)
7
+ * Commit your changes (`git commit -am 'Add some feature'`)
8
+ * Push to the branch (`git push origin my-new-feature`)
9
+ * Create new Pull Request
10
+
11
+ Pester us if we don't get your Pull Requests merged in a timely fashion. :)
12
+
13
+ ## How to speed the merging of pull requests
14
+
15
+ * Describe your changes in the CHANGELOG.
16
+ * Give yourself some credit in the appropriate place (usually the CHANGELOG).
17
+ * Make commits of logical units.
18
+ * Ensure your commit messages help others understand what you are doing and why.
19
+ * Check for unnecessary whitespace with `git diff --check` before committing.
20
+ * Maintain the same code style.
21
+ * Maintain the same level of test coverage or improve it.
22
+
23
+ ## Additional Resources
24
+
25
+ * [General GitHub documentation](http://help.github.com/)
26
+ * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
data/README.md CHANGED
@@ -14,11 +14,11 @@ The project homepage is [here](http://github.com/realityforge/braid/wikis/home).
14
14
 
15
15
  ## Installing using rubygems - official releases
16
16
 
17
- gem install braid
17
+ gem install realityforge-braid
18
18
 
19
19
  ## Installing from source
20
20
 
21
- git clone git://github.com/evilchelu/braid.git
21
+ git clone git://github.com/realityforge/braid.git
22
22
  cd braid
23
23
  bundle install
24
24
  rake install # possibly requiring sudo
@@ -86,19 +86,11 @@ Use the built in help system to find out about all commands and options:
86
86
  braid help
87
87
  braid help add # or braid add --help
88
88
 
89
- You may also want to read [Usage and examples](http://github.com/evilchelu/braid/wikis/usage-and-examples).
89
+ You may also want to read [Usage and examples](http://github.com/realityforge/braid/wikis/usage-and-examples).
90
90
 
91
91
  ## Troubleshooting
92
92
 
93
- Check [Troubleshooting](http://github.com/evilchelu/braid/wikis/troubleshooting) if you're having issues.
94
-
95
- ## Contributing
96
-
97
- We appreciate any patches, error reports and usage ideas you may have. Please submit a lighthouse ticket or start a thread on the mailing list.
98
-
99
- Bugs and feature requests: [braid project on lighthouse](http://evilchelu.lighthouseapp.com/projects/10600-braid)
100
-
101
- Discussions and community support: [braid-gem google group](http://groups.google.com/group/braid-gem)
93
+ Check [Troubleshooting](http://github.com/realityforge/braid/wikis/troubleshooting) if you're having issues.
102
94
 
103
95
  ## Authors
104
96
 
data/lib/braid/command.rb CHANGED
@@ -94,7 +94,7 @@ module Braid
94
94
  new_revision
95
95
  end
96
96
 
97
- def determine_target_revision(mirror, new_revision)
97
+ def determine_target_revision(new_revision)
98
98
  git.rev_parse(new_revision)
99
99
  end
100
100
  end
@@ -18,7 +18,7 @@ module Braid
18
18
  mirror.fetch
19
19
 
20
20
  new_revision = validate_new_revision(mirror, options["revision"])
21
- target_revision = determine_target_revision(mirror, new_revision)
21
+ target_revision = determine_target_revision(new_revision)
22
22
 
23
23
  unless mirror.squashed?
24
24
  git.merge_ours(target_revision)
@@ -12,16 +12,16 @@ module Braid
12
12
  options.reject! { |k, v| %w(revision head).include?(k) }
13
13
  print "\n"
14
14
  msg "Listing all mirrors.\n=======================================================\n"
15
- config.mirrors.each_with_index do |path, i|
15
+ config.mirrors.each do |path|
16
16
  mirror = config.get!(path)
17
- print " #{i + 1}) #{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
22
  new_revision = validate_new_revision(mirror, options["revision"])
23
- target_revision = determine_target_revision(mirror, new_revision)
24
- print " !!! UPDATE AVAILABLE !!!" if new_revision.to_s != mirror.base_revision.to_s
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"
@@ -41,7 +41,7 @@ module Braid
41
41
  mirror.fetch
42
42
 
43
43
  new_revision = validate_new_revision(mirror, options["revision"])
44
- target_revision = determine_target_revision(mirror, new_revision)
44
+ target_revision = determine_target_revision(new_revision)
45
45
 
46
46
  if mirror.merged?(target_revision)
47
47
  msg "Mirror '#{mirror.path}' is already up to date."
data/lib/braid/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Braid
2
- VERSION = "0.9.0"
2
+ VERSION = "0.9.1"
3
3
  end
@@ -35,6 +35,8 @@ def create_git_repo_from_fixture(fixture_name)
35
35
  update_dir_from_fixture(fixture_name)
36
36
 
37
37
  in_dir(git_repo) do
38
+ run_command("git config --global --get user.email || git config --global user.email \"you@example.com\"")
39
+ run_command("git config --global --get user.name || git config --global user.name \"Your Name\"")
38
40
  run_command('git init')
39
41
  run_command('git add *')
40
42
  run_command("git commit -m \"initial commit of #{fixture_name}\"")
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: realityforge-braid
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.0
4
+ version: 0.9.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-03-13 00:00:00.000000000 Z
13
+ date: 2013-03-15 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: main
@@ -86,6 +86,7 @@ files:
86
86
  - .gitignore
87
87
  - .ruby-version
88
88
  - .travis.yml
89
+ - CONTRIBUTING.md
89
90
  - Gemfile
90
91
  - LICENSE
91
92
  - README.md