realityforge-braid 0.9.3 → 0.9.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YmEwNDIxOTcxMzU5YzI5Nzc1NTg3MGI4NDRhMDQ1Nzk5YTAyZDZiYg==
+  data.tar.gz: !binary |-
+    NDhiN2ZiYzE5MTM4MmRkYWNiZTMzMTAxMGRhMGFjZjM0OWY5MjBhZA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    Y2Y4M2JlMGVhZDViZjk4ZmM5ODQ3OThjZmM4ODliNTNmZDAzMTRiZTI3YTFm
+    OGY0Yjc4NTFkODNlMjA3MDU2M2Y0MmJjNjFiYTk3MzNhODE4YTg1ODlmM2Mx
+    MzBjNzZkNWY2Mzc5NmM3MzIyZTRmZTg5YjY3YTg1MDNjZjg3MGY=
+  data.tar.gz: !binary |-
+    OTg3YWI1ZTZmNTFkY2Y2NWMxNTAyODQ1MjFiMWVhZDc4Mzk5NDAyZmJjYTRh
+    MjBmOGZjMjE3OGQwYzVjMGJhYzc3NmU2OTdiMDliZjE1Mjg2MjgwMmQ2Mjg5
+    YTNmOWU0ZDMwMWRkZDU0NTU2NGVmYWViZDMyZGVhNjEzMjgyYzU=

data/.travis.yml

@@ -1,16 +1,3 @@
 language: ruby
 rvm:
   - 1.9.3
-  - jruby-18mode
-  - jruby-19mode
-  - jruby-head
-jdk:
-  - openjdk6
-  - openjdk7
-  - oraclejdk7
-matrix:
-  exclude:
-- rvm: 1.9.3
-  jdk: openjdk7
-- rvm: 1.9.2
-  jdk: oraclejdk7

data/CONTRIBUTING.md

@@ -12,7 +12,7 @@ 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. 
+* 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.
@@ -24,3 +24,4 @@ Pester us if we don't get your Pull Requests merged in a timely fashion. :)
 
 * [General GitHub documentation](http://help.github.com/)
 * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
+

data/bin/braid

@@ -40,11 +40,11 @@ Main {
       . braid add http://remote/path local/dir
     TXT
 
-    mixin :argument_url, :option_type, :optional_path, :option_branch, :option_rails_plugin, :option_revision, :option_full, :option_verbose
+    mixin :argument_url, :optional_path, :option_branch, :option_revision, :option_full, :option_verbose
 
     run {
       Braid.verbose = verbose
-      Braid::Command.run(:add, url, {"type" => type, "path" => path, "branch" => branch, "rails_plugin" => rails_plugin, "revision" => revision, "full" => full})
+      Braid::Command.run(:add, url, {"path" => path, "branch" => branch, "revision" => revision, "full" => full})
     }
   }
 
@@ -78,7 +78,7 @@ Main {
 
         * removes metadata from .braids
         * removes the local directory and commits the removal
-        * removes the git remote by default, --keep can be used to supress that
+        * removes the git remote by default, --keep can be used to suppress that
     TXT
 
     examples <<-TXT
@@ -173,15 +173,6 @@ Main {
     }
   }
 
-  mixin(:option_type) {
-    option(:type, :t) {
-      optional
-      argument :required
-      desc 'mirror type'
-      attr
-    }
-  }
-
   mixin(:option_branch) {
     option(:branch, :b) {
       optional
@@ -191,14 +182,6 @@ Main {
     }
   }
 
-  mixin(:option_rails_plugin) {
-    option(:rails_plugin, :p) {
-      optional
-      desc 'added mirror is a Rails plugin'
-      attr
-    }
-  }
-
   mixin(:option_revision) {
     option(:revision, :r) {
       optional

data/lib/braid/commands/add.rb

@@ -5,8 +5,8 @@ module Braid
         with_reset_on_error do
           mirror           = config.add_from_options(url, options)
 
-          branch_message   = (mirror.branch == "master") ? "" : " branch '#{mirror.branch}'"
-          revision_message = options["revision"] ? " at #{display_revision(mirror, options["revision"])}" : ""
+          branch_message   = (mirror.branch == 'master') ? '' : " branch '#{mirror.branch}'"
+          revision_message = options['revision'] ? " at #{display_revision(mirror, options['revision'])}" : ''
           msg "Adding mirror of '#{mirror.url}'#{branch_message}#{revision_message}."
 
           # these commands are explained in the subtree merge guide
@@ -15,7 +15,7 @@ module Braid
           setup_remote(mirror)
           mirror.fetch
 
-          new_revision    = validate_new_revision(mirror, options["revision"])
+          new_revision    = validate_new_revision(mirror, options['revision'])
           target_revision = determine_target_revision(new_revision)
 
           unless mirror.squashed?
@@ -24,7 +24,7 @@ module Braid
           git.read_tree_prefix(target_revision, mirror.path)
 
           mirror.revision = new_revision
-          mirror.lock = new_revision if options["revision"]
+          mirror.lock = new_revision if options['revision']
           config.update(mirror)
           add_config_file
 

data/lib/braid/commands/list.rb

@@ -15,13 +15,13 @@ module Braid
         config.mirrors.each do |path|
           mirror = config.get!(path)
           print "#{path.to_s}"
-          print " [LOCKED]" if mirror.locked?
+          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"])
-          print " (Remote Modified)" if new_revision.to_s != mirror.base_revision.to_s
-          print " (Locally Modified)" unless mirror.diff.empty?
+          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/setup.rb

@@ -6,7 +6,7 @@ module Braid
       end
 
       protected
-      
+
       def setup_all
         msg "Setting up all mirrors."
         config.mirrors.each do |path|
@@ -34,3 +34,4 @@ module Braid
     end
   end
 end
+

data/lib/braid/config.rb

@@ -79,6 +79,9 @@ module Braid
       new_db = {}
       @db.keys.sort.each do |key|
         new_db[key] = @db[key]
+        new_db[key].keys.each do |k|
+          new_db[key].delete(k) if !Braid::Mirror::ATTRIBUTES.include?(k)
+        end
       end
       File.open(@config_file, "wb") do |f|
         f.write JSON.pretty_generate(new_db)

data/lib/braid/mirror.rb

@@ -1,6 +1,6 @@
 module Braid
   class Mirror
-    ATTRIBUTES = %w(url remote type branch squashed revision lock)
+    ATTRIBUTES = %w(url remote branch squashed revision lock)
 
     class UnknownType < BraidError
       def message
@@ -31,10 +31,6 @@ module Braid
         raise PathRequired
       end
 
-      if options["rails_plugin"]
-        path = "vendor/plugins/#{path}"
-      end
-
       remote   = "#{branch}/braid/#{path}"
       squashed = !options["full"]
 

data/lib/braid/version.rb

@@ -1,3 +1,3 @@
 module Braid
-  VERSION = "0.9.3"
+  VERSION = '0.9.4'
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: realityforge-braid
 version: !ruby/object:Gem::Version
-  version: 0.9.3
-  prerelease: 
+  version: 0.9.4
 platform: ruby
 authors:
 - Cristi Balan
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -63,7 +56,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -71,7 +63,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -88,7 +79,6 @@ files:
 - .travis.yml
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -121,6 +111,7 @@ files:
 - spec/test_helper.rb
 homepage: http://evil.che.lu/projects/braid
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -131,21 +122,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: braid
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple tool for tracking vendor branches in git.
 test_files: []
+has_rdoc: false

data/Gemfile.lock

@@ -1,42 +0,0 @@
-PATH
-  remote: .
-  specs:
-    realityforge-braid (0.9.2)
-      main (>= 4.7.3)
-      open4 (>= 1.0.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    arrayfields (4.9.0)
-    chronic (0.9.1)
-    diff-lcs (1.1.3)
-    fattr (2.2.1)
-    main (5.2.0)
-      arrayfields (>= 4.7.4)
-      chronic (>= 0.6.2)
-      fattr (>= 2.2.0)
-      map (>= 5.1.0)
-    map (6.3.0)
-    metaclass (0.0.1)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    open4 (1.3.0)
-    rake (10.0.3)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  mocha (>= 0.9.11)
-  rake
-  realityforge-braid!
-  rspec (= 2.12.0)