realityforge-braid 0.9.0 → 0.9.1

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p362
+1.9.3-p327

data/CONTRIBUTING.md

@@ -0,0 +1,26 @@
+# How to Contribute
+
+Pull requests are greatly appreciated and are what makes opensource great. Here's a quick guide:
+
+* Fork it
+* Create your feature branch (`git checkout -b my-new-feature`)
+* Commit your changes (`git commit -am 'Add some feature'`)
+* Push to the branch (`git push origin my-new-feature`)
+* Create new Pull Request
+
+Pester us if we don't get your Pull Requests merged in a timely fashion. :)
+
+## How to speed the merging of pull requests
+
+* Describe your changes in the CHANGELOG. 
+* Give yourself some credit in the appropriate place (usually the CHANGELOG).
+* Make commits of logical units.
+* Ensure your commit messages help others understand what you are doing and why.
+* Check for unnecessary whitespace with `git diff --check` before committing.
+* Maintain the same code style.
+* Maintain the same level of test coverage or improve it.
+
+## Additional Resources
+
+* [General GitHub documentation](http://help.github.com/)
+* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)

data/README.md

@@ -14,11 +14,11 @@ The project homepage is [here](http://github.com/realityforge/braid/wikis/home).
 
 ## Installing using rubygems - official releases
 
-    gem install braid
+    gem install realityforge-braid
 
 ## Installing from source
 
-    git clone git://github.com/evilchelu/braid.git
+    git clone git://github.com/realityforge/braid.git
     cd braid
     bundle install
     rake install # possibly requiring sudo
@@ -86,19 +86,11 @@ Use the built in help system to find out about all commands and options:
     braid help
     braid help add # or braid add --help
 
-You may also want to read [Usage and examples](http://github.com/evilchelu/braid/wikis/usage-and-examples).
+You may also want to read [Usage and examples](http://github.com/realityforge/braid/wikis/usage-and-examples).
 
 ## Troubleshooting
 
-Check [Troubleshooting](http://github.com/evilchelu/braid/wikis/troubleshooting) if you're having issues.
-
-## Contributing
-
-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.
-
-Bugs and feature requests: [braid project on lighthouse](http://evilchelu.lighthouseapp.com/projects/10600-braid)
-
-Discussions and community support: [braid-gem google group](http://groups.google.com/group/braid-gem)
+Check [Troubleshooting](http://github.com/realityforge/braid/wikis/troubleshooting) if you're having issues.
 
 ## Authors
 

data/lib/braid/command.rb

@@ -94,7 +94,7 @@ module Braid
       new_revision
     end
 
-    def determine_target_revision(mirror, new_revision)
+    def determine_target_revision(new_revision)
       git.rev_parse(new_revision)
     end
   end

data/lib/braid/commands/add.rb

@@ -18,7 +18,7 @@ module Braid
           mirror.fetch
 
           new_revision    = validate_new_revision(mirror, options["revision"])
-          target_revision = determine_target_revision(mirror, new_revision)
+          target_revision = determine_target_revision(new_revision)
 
           unless mirror.squashed?
             git.merge_ours(target_revision)

data/lib/braid/commands/list.rb

@@ -12,16 +12,16 @@ module Braid
         options.reject! { |k, v| %w(revision head).include?(k) }
         print "\n"
         msg "Listing all mirrors.\n=======================================================\n"
-        config.mirrors.each_with_index do |path, i|
+        config.mirrors.each do |path|
           mirror = config.get!(path)
-          print " #{i + 1}) #{path.to_s}"
+          print "#{path.to_s}"
           print " [LOCKED]" if mirror.locked?
           setup_remote(mirror)
           msg "Fetching new commits for '#{mirror.path}'." if verbose?
           mirror.fetch
           new_revision    = validate_new_revision(mirror, options["revision"])
-          target_revision = determine_target_revision(mirror, new_revision)
-          print " !!! UPDATE AVAILABLE !!!" if new_revision.to_s != mirror.base_revision.to_s
+          print " (Remote Modified)" if new_revision.to_s != mirror.base_revision.to_s
+          print " (Locally Modified)" unless mirror.diff.empty?
           print "\n"
         end
         print "\n"

data/lib/braid/commands/update.rb

@@ -41,7 +41,7 @@ module Braid
         mirror.fetch
 
         new_revision    = validate_new_revision(mirror, options["revision"])
-        target_revision = determine_target_revision(mirror, new_revision)
+        target_revision = determine_target_revision(new_revision)
 
         if mirror.merged?(target_revision)
           msg "Mirror '#{mirror.path}' is already up to date."

data/lib/braid/version.rb

@@ -1,3 +1,3 @@
 module Braid
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/spec/integration_helper.rb

@@ -35,6 +35,8 @@ def create_git_repo_from_fixture(fixture_name)
   update_dir_from_fixture(fixture_name)
 
   in_dir(git_repo) do
+    run_command("git config --global --get user.email || git config --global user.email \"you@example.com\"")
+    run_command("git config --global --get user.name  || git config --global user.name \"Your Name\"")
     run_command('git init')
     run_command('git add *')
     run_command("git commit -m \"initial commit of #{fixture_name}\"")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: realityforge-braid
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -86,6 +86,7 @@ files:
 - .gitignore
 - .ruby-version
 - .travis.yml
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md