braid 0.7.0 → 0.7.1

data/Gemfile

@@ -1,3 +1,6 @@
 source "http://rubygems.org"
 
 gemspec
+
+gem 'rake'
+

data/README.md

@@ -0,0 +1,115 @@
+# Braid
+
+Braid is a simple tool to help track git and svn vendor branches in a git repository.
+
+The project homepage is [here](http://github.com/evilchelu/braid/wikis/home).
+
+## Requirements
+
+ * git 1.6+ (and git-svn if you want to mirror svn repositories)
+ * main >= 4.2.0
+ * open4 >= 1.0.1 (unless using jruby)
+
+## Installing using rubygems - official releases
+
+    gem install braid
+
+## Installing from source
+
+    git clone git://github.com/evilchelu/braid.git
+    cd braid
+    bundle install
+    rake install # possibly requiring sudo
+
+## Quick usage - ruby project
+
+Let's assume we're writing something like gitnub that needs grit in lib/grit. Initialize the repo (nothing braid related here):
+
+    git init gritty
+    cd gritty
+    touch README
+    git add README
+    git commit -m "initial commit"
+
+Now let's vendor grit:
+
+    braid add git://github.com/mojombo/grit.git lib/grit
+
+And you're done! Braid vendored grit into lib/grit. Feel free to inspect the changes with git log or git show.
+
+If further down the line, you want to bring new changes from grit in your repository, just update the mirror:
+
+    braid update lib/grit
+
+## Quick usage - rails project
+
+Let's assume you want to start a new rails app called shiny. Initialize the repo (nothing braid related here):
+
+    git init shiny
+    cd shiny
+    touch README
+    git add README
+    git commit -m "initial commit"
+
+Vendor rails (this might take a while because the rails repo is huge!):
+
+    braid add git://github.com/rails/rails.git vendor/rails
+
+Create your new rails app (nothing braid related here):
+
+    ruby vendor/rails/railties/bin/rails .
+    git add .
+    git commit -m "rails ."
+
+Add any plugins you might need:
+
+    braid add git://github.com/thoughtbot/shoulda.git -p
+    braid add git://github.com/thoughtbot/factory_girl.git -p
+    braid add git://github.com/mbleigh/subdomain-fu.git -p
+
+And you're done! Braid vendored rails and your plugins. Feel free to inspect the changes with git log or git show.
+
+If further down the line, you want to bring new changes from rails in your repository, just update the mirror:
+
+    braid update vendor/rails
+
+Or, if you want all mirrors updated:
+
+    braid update
+
+## More usage
+
+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).
+
+## 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)
+
+## Authors
+
+ * Cristi Balan (evilchelu)
+ * Norbert Crombach (norbert)
+
+## Contributors (alphabetically)
+
+* Alan Harper
+* Christoph Sturm
+* Dennis Muhlestein
+* Ferdinand Svehla
+* Michael Klishin
+* Roman Heinrich
+* Travis Tilley
+* Tyler Rick

data/bin/braid

@@ -137,10 +137,11 @@ Main {
       Set up git and git-svn remotes.
     TXT
 
-    mixin :optional_path, :option_verbose
+    mixin :optional_path, :option_verbose, :option_force
 
     run {
       Braid.verbose = verbose
+      Braid.force = force
       Braid::Command.run(:setup, path)
     }
   }
@@ -156,7 +157,10 @@ Main {
   mode(:list) {
     description 'Show all tracked mirrors (and if updates are available).'
 
+    mixin :option_verbose
+
     run {
+      Braid.verbose = verbose
       Braid::Command.run(:list)
     }
   }
@@ -239,6 +243,14 @@ Main {
     }
   }
 
+  mixin(:option_force) {
+    option(:force, :f) {
+      optional
+      desc 'force'
+      attr
+    }
+  }
+
   mixin(:option_keep_remote) {
     option(:keep) {
       optional

data/braid.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.has_rdoc           = false
   s.rdoc_options       = ["--line-numbers", "--inline-source", "--title", "braid", "--main"]
 
-  s.add_dependency(%q<main>, [">= 4.2.0"])
+  s.add_dependency(%q<main>, [">= 4.7.3"])
   s.add_dependency(%q<open4>, [">= 1.0.1"]) unless defined?(JRUBY_VERSION)
 
   s.add_development_dependency(%q<test-spec>, [">= 0.10.0"])

data/lib/braid.rb

@@ -13,6 +13,14 @@ module Braid
     @verbose = !!new_value
   end
 
+  def self.force
+    @force || false
+  end
+
+  def self.force=(new_value)
+    @force = !!new_value
+  end
+
   def self.use_local_cache
     [nil, "true", "1"].include?(ENV["BRAID_USE_LOCAL_CACHE"])
   end

data/lib/braid/command.rb

@@ -38,6 +38,10 @@ module Braid
       Braid.verbose
     end
 
+    def force?
+      Braid.force
+    end
+
     private
 
     def setup_remote(mirror)

data/lib/braid/commands/push.rb

@@ -34,7 +34,7 @@ module Braid
           msg "Cloning mirror with local changes."
           git.init
           git.fetch(source_dir)
-          git.fetch(remote_url)
+          git.fetch(remote_url, "+refs/heads/#{mirror.branch}")
           git.checkout(base_revision)
           git.apply(diff)
           system("git commit -v")

data/lib/braid/commands/setup.rb

@@ -18,8 +18,13 @@ module Braid
         mirror = config.get!(path)
 
         if git.remote_url(mirror.remote)
-          msg "Setup: Mirror '#{mirror.path}' already has a remote. Reusing it." if verbose?
-          return
+          if force?
+            msg "Setup: Mirror '#{mirror.path}' already has a remote. Replacing it (force)" if verbose?
+            git.remote_rm(mirror.remote)
+          else
+            msg "Setup: Mirror '#{mirror.path}' already has a remote. Reusing it." if verbose?
+            return
+          end
         end
 
         msg "Setup: Creating remote for '#{mirror.path}'."

data/lib/braid/mirror.rb

@@ -47,7 +47,7 @@ module Braid
         path = "vendor/plugins/#{path}"
       end
 
-      remote   = "braid/#{path}".gsub("_", '-') # stupid git svn changes all _ to ., weird
+      remote   = "#{branch}/braid/#{path}".gsub("_", '-') # stupid git svn changes all _ to ., weird
       squashed = !options["full"]
       branch = nil if type == "svn"
 
@@ -118,6 +118,14 @@ module Braid
       git_cache.path(url)
     end
 
+    def remote
+      if (attributes["remote"] && attributes["remote"] =~ /^braid\//)
+        attributes["remote"] = "#{branch}/#{attributes["remote"]}"
+      else
+        attributes["remote"]
+      end
+    end
+
     private
 
     def method_missing(name, *args)

data/lib/braid/version.rb

@@ -1,3 +1,3 @@
 module Braid
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,138 +1,178 @@
 --- !ruby/object:Gem::Specification 
 name: braid
 version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: 
-  version: 0.7.0
+  segments: 
+  - 0
+  - 7
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
-  - Cristi Balan
-  - Norbert Crombach
+- Cristi Balan
+- Norbert Crombach
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 -04:00
-default_executable: braid
+date: 2011-08-25 00:00:00 Z
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: main
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 4.2.0
-    type: :runtime
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: test-spec
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.10.0
-    type: :development
-    version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: mocha
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.9.11
-    type: :development
-    version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: main
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 37
+        segments: 
+        - 4
+        - 7
+        - 3
+        version: 4.7.3
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: open4
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: test-spec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 10
+        - 0
+        version: 0.10.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 45
+        segments: 
+        - 0
+        - 9
+        - 11
+        version: 0.9.11
+  type: :development
+  version_requirements: *id004
 description: A simple tool for tracking vendor branches in git.
 email: evil@che.lu
 executables: 
-  - braid
+- braid
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
-  - .gitignore
-  - Gemfile
-  - LICENSE
-  - README.textile
-  - Rakefile
-  - bin/braid
-  - braid.gemspec
-  - lib/braid.rb
-  - lib/braid/command.rb
-  - lib/braid/commands/add.rb
-  - lib/braid/commands/diff.rb
-  - lib/braid/commands/list.rb
-  - lib/braid/commands/push.rb
-  - lib/braid/commands/remove.rb
-  - lib/braid/commands/setup.rb
-  - lib/braid/commands/update.rb
-  - lib/braid/config.rb
-  - lib/braid/mirror.rb
-  - lib/braid/operations.rb
-  - lib/braid/version.rb
-  - lib/core_ext.rb
-  - test/braid_test.rb
-  - test/config_test.rb
-  - test/fixtures/shiny/README
-  - test/fixtures/skit1.1/layouts/layout.liquid
-  - test/fixtures/skit1.2/layouts/layout.liquid
-  - test/fixtures/skit1/layouts/layout.liquid
-  - test/fixtures/skit1/preview.png
-  - test/integration/adding_test.rb
-  - test/integration/updating_test.rb
-  - test/integration_helper.rb
-  - test/mirror_test.rb
-  - test/operations_test.rb
-  - test/test_helper.rb
-has_rdoc: true
+- .gitignore
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- bin/braid
+- braid.gemspec
+- lib/braid.rb
+- lib/braid/command.rb
+- lib/braid/commands/add.rb
+- lib/braid/commands/diff.rb
+- lib/braid/commands/list.rb
+- lib/braid/commands/push.rb
+- lib/braid/commands/remove.rb
+- lib/braid/commands/setup.rb
+- lib/braid/commands/update.rb
+- lib/braid/config.rb
+- lib/braid/mirror.rb
+- lib/braid/operations.rb
+- lib/braid/version.rb
+- lib/core_ext.rb
+- test/braid_test.rb
+- test/config_test.rb
+- test/fixtures/shiny/README
+- test/fixtures/skit1.1/layouts/layout.liquid
+- test/fixtures/skit1.2/layouts/layout.liquid
+- test/fixtures/skit1/layouts/layout.liquid
+- test/fixtures/skit1/preview.png
+- test/integration/adding_test.rb
+- test/integration/updating_test.rb
+- test/integration_helper.rb
+- test/mirror_test.rb
+- test/operations_test.rb
+- test/test_helper.rb
 homepage: http://evil.che.lu/projects/braid
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-  - --line-numbers
-  - --inline-source
-  - --title
-  - braid
-  - --main
+- --line-numbers
+- --inline-source
+- --title
+- braid
+- --main
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: braid
-rubygems_version: 1.5.1
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: A simple tool for tracking vendor branches in git.
 test_files: 
-  - test/braid_test.rb
-  - test/config_test.rb
-  - test/fixtures/shiny/README
-  - test/fixtures/skit1.1/layouts/layout.liquid
-  - test/fixtures/skit1.2/layouts/layout.liquid
-  - test/fixtures/skit1/layouts/layout.liquid
-  - test/fixtures/skit1/preview.png
-  - test/integration/adding_test.rb
-  - test/integration/updating_test.rb
-  - test/integration_helper.rb
-  - test/mirror_test.rb
-  - test/operations_test.rb
-  - test/test_helper.rb
+- test/braid_test.rb
+- test/config_test.rb
+- test/fixtures/shiny/README
+- test/fixtures/skit1.1/layouts/layout.liquid
+- test/fixtures/skit1.2/layouts/layout.liquid
+- test/fixtures/skit1/layouts/layout.liquid
+- test/fixtures/skit1/preview.png
+- test/integration/adding_test.rb
+- test/integration/updating_test.rb
+- test/integration_helper.rb
+- test/mirror_test.rb
+- test/operations_test.rb
+- test/test_helper.rb

data/README.textile

@@ -1,115 +0,0 @@
-h1. Braid
-
-Braid is a simple tool to help track git and svn vendor branches in a git repository.
-
-The project homepage is at "http://github.com/evilchelu/braid/wikis/home":http://github.com/evilchelu/braid/wikis/home
-
-h2. Requirements
-
-* git 1.6+ (and git-svn if you want to mirror svn repositories)
-* main >= 4.2.0
-* open4 >= 1.0.1 (unless using jruby)
-
-h2. Installing using rubygems - official releases
-
-  gem install braid
-
-h2. Installing from source
-
-  git clone git://github.com/evilchelu/braid.git
-  cd braid
-  bundle install
-  rake install # possibly requiring sudo
-
-h2. Quick usage - ruby project
-
-Let's assume we're writing something like gitnub that needs grit in lib/grit. Initialize the repo (nothing braid related here):
-
-  git init gritty
-  cd gritty
-  touch README
-  git add README
-  git commit -m "initial commit"
-
-Now let's vendor grit:
-
-  braid add git://github.com/mojombo/grit.git lib/grit
-
-And you're done! Braid vendored grit into lib/grit. Feel free to inspect the changes with git log or git show.
-
-If further down the line, you want to bring new changes from grit in your repository, just update the mirror:
-
-  braid update lib/grit
-
-h2. Quick usage - rails project
-
-Let's assume you want to start a new rails app called shiny. Initialize the repo (nothing braid related here):
-
-  git init shiny
-  cd shiny
-  touch README
-  git add README
-  git commit -m "initial commit"
-
-Vendor rails (this might take a while because the rails repo is huge!):
-
-  braid add git://github.com/rails/rails.git vendor/rails
-
-Create your new rails app (nothing braid related here):
-
-  ruby vendor/rails/railties/bin/rails .
-  git add .
-  git commit -m "rails ."
-
-Add any plugins you might need:
-
-  braid add git://github.com/thoughtbot/shoulda.git -p
-  braid add git://github.com/thoughtbot/factory_girl.git -p
-  braid add git://github.com/mbleigh/subdomain-fu.git -p
-
-And you're done! Braid vendored rails and your plugins. Feel free to inspect the changes with git log or git show.
-
-If further down the line, you want to bring new changes from rails in your repository, just update the mirror:
-
-  braid update vendor/rails
-
-Or, if you want all mirrors updated:
-
-  braid update
-
-h2. More usage
-
-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.
-
-h2. Troubleshooting
-
-Check "Troubleshooting":http://github.com/evilchelu/braid/wikis/troubleshooting if you're having issues.
-
-h2. 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
-
-h2. Authors
-
-* Cristi Balan (evilchelu)
-* Norbert Crombach (norbert)
-
-h2. Contributors (alphabetically)
-
-* Alan Harper
-* Christoph Sturm
-* Dennis Muhlestein
-* Ferdinand Svehla
-* Michael Klishin
-* Roman Heinrich
-* Travis Tilley
-* Tyler Rick