realityforge-braid 0.9.4 → 0.9.5

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
   - 1.9.3
+  - jruby-19mode

data/bin/braid

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 require 'braid'
 
 require 'rubygems'
@@ -44,7 +44,7 @@ Main {
 
     run {
       Braid.verbose = verbose
-      Braid::Command.run(:add, url, {"path" => path, "branch" => branch, "revision" => revision, "full" => full})
+      Braid::Command.run(:add, url, {'path' => path, 'branch' => branch, 'revision' => revision, 'full' => full})
     }
   }
 
@@ -68,7 +68,7 @@ Main {
 
     run {
       Braid.verbose = verbose
-      Braid::Command.run(:update, path, {"revision" => revision, "head" => head})
+      Braid::Command.run(:update, path, {'revision' => revision, 'head' => head})
     }
   }
 

data/lib/braid/mirror.rb

@@ -9,7 +9,7 @@ module Braid
     end
     class PathRequired < BraidError
       def message
-        "path is required"
+        'path is required'
       end
     end
 
@@ -25,16 +25,16 @@ module Braid
     def self.new_from_options(url, options = {})
       url    = url.sub(/\/$/, '')
 
-      branch = options["branch"] || "master"
+      branch = options['branch'] || 'master'
 
-      unless path = options["path"] || extract_path_from_url(url)
+      unless path = options['path'] || extract_path_from_url(url)
         raise PathRequired
       end
 
       remote   = "#{branch}/braid/#{path}"
-      squashed = !options["full"]
+      squashed = !options['full']
 
-      attributes = {"url" => url, "remote" => remote, "branch" => branch, "squashed" => squashed}
+      attributes = {'url' => url, 'remote' => remote, 'branch' => branch, 'squashed' => squashed}
       self.new(path, attributes)
     end
 
@@ -57,14 +57,15 @@ module Braid
       if squashed?
         !!base_revision && git.merge_base(commit, base_revision) == commit
       else
-        git.merge_base(commit, "HEAD") == commit
+        git.merge_base(commit, 'HEAD') == commit
       end
     end
 
     def diff
+      fetch
       remote_hash = git.rev_parse("#{base_revision}:")
       local_hash  = git.tree_hash(path)
-      remote_hash != local_hash ? git.diff_tree(remote_hash, local_hash) : ""
+      remote_hash != local_hash ? git.diff_tree(remote_hash, local_hash) : ''
     end
 
     def fetch
@@ -89,10 +90,10 @@ module Braid
     end
 
     def remote
-      if (attributes["remote"] && attributes["remote"] =~ /^braid\//)
-        attributes["remote"] = "#{branch}/#{attributes["remote"]}"
+      if (attributes['remote'] && attributes['remote'] =~ /^braid\//)
+        attributes['remote'] = "#{branch}/#{attributes['remote']}"
       else
-        attributes["remote"]
+        attributes['remote']
       end
     end
 
@@ -111,8 +112,8 @@ module Braid
     end
 
     def inferred_revision
-      local_commits = git.rev_list("HEAD", "-- #{path}").split("\n")
-      remote_hashes = git.rev_list("--pretty=format:\"%T\"", remote).split("commit ").map do |chunk|
+      local_commits = git.rev_list('HEAD', "-- #{path}").split("\n")
+      remote_hashes = git.rev_list("--pretty=format:\"%T\"", remote).split('commit ').map do |chunk|
         chunk.split("\n", 2).map { |value| value.strip }
       end
       hash          = nil
@@ -130,12 +131,9 @@ module Braid
       return nil unless url
       name = File.basename(url)
 
-      if File.extname(name) == ".git"
+      if File.extname(name) == '.git'
         # strip .git
         name[0..-5]
-      elsif name == "trunk"
-        # use parent
-        File.basename(File.dirname(url))
       else
         name
       end

data/lib/braid/operations.rb

@@ -1,5 +1,10 @@
 require 'singleton'
 require 'rubygems'
+if defined?(JRUBY_VERSION) || Gem.win_platform?
+  require'open3'
+else
+  require 'open4'
+end
 require defined?(JRUBY_VERSION) ? 'open3' : 'open4'
 require 'tempfile'
 
@@ -103,14 +108,15 @@ module Braid
         ENV['LANG']   = 'C'
 
         out, err = nil
+        status, pid = 0
         log(cmd)
 
-        if defined?(JRUBY_VERSION)
-          Open3.popen3(cmd) do |stdin, stdout, stderr|
+        if defined?(JRUBY_VERSION) || Gem.win_platform?
+          Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
             out = stdout.read
             err = stderr.read
+            status = wait_thr.value # Process::Status object returned.
           end
-          status = $?.exitstatus
         else
           status = Open4.popen4(cmd) do |pid, stdin, stdout, stderr|
             out = stdout.read
@@ -176,7 +182,7 @@ module Braid
       def fetch(remote = nil, *args)
         args.unshift "-n #{remote}" if remote
         # open4 messes with the pipes of index-pack
-        sh("git fetch #{args.join(' ')} 2>&1 >/dev/null")
+        sh("git fetch #{args.join(' ')} 2>&1 > #{Gem.win_platform? ? 'nul' : '/dev/null'}")
       end
 
       def checkout(treeish)
@@ -284,17 +290,19 @@ module Braid
       end
 
       def apply(diff, *args)
-        err = nil
+        status, err = nil, nil
+
+        command = "git apply --index --whitespace=nowarn #{args.join(' ')} -"
 
-        if defined?(JRUBY_VERSION)
-          Open3.popen3("git apply --index --whitespace=nowarn #{args.join(' ')} -") do |stdin, stdout, stderr|
+        if defined?(JRUBY_VERSION) || Gem.win_platform?
+          Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
             stdin.puts(diff)
             stdin.close
             err = stderr.read
+            status = wait_thr.value # Process::Status object returned.
           end
-          status = $?.exitstatus
         else
-          status = Open4.popen4("git apply --index --whitespace=nowarn #{args.join(' ')} -") do |pid, stdin, stdout, stderr|
+          status = Open4.popen4(command) do |pid, stdin, stdout, stderr|
             stdin.puts(diff)
             stdin.close
             err = stderr.read

data/lib/braid/version.rb

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

data/lib/braid.rb

@@ -1,11 +1,11 @@
 require 'braid/version'
 
 module Braid
-  CONFIG_FILE          = ".braids"
-  REQUIRED_GIT_VERSION = "1.6"
+  CONFIG_FILE          = '.braids'
+  REQUIRED_GIT_VERSION = '1.6'
 
   def self.verbose
-    @verbose || false
+    !!@verbose
   end
 
   def self.verbose=(new_value)
@@ -13,7 +13,7 @@ module Braid
   end
 
   def self.force
-    @force || false
+    !!@force
   end
 
   def self.force=(new_value)
@@ -21,11 +21,11 @@ module Braid
   end
 
   def self.use_local_cache
-    [nil, "true", "1"].include?(ENV["BRAID_USE_LOCAL_CACHE"])
+    [nil, 'true', '1'].include?(ENV['BRAID_USE_LOCAL_CACHE'])
   end
 
   def self.local_cache_dir
-    File.expand_path(ENV["BRAID_LOCAL_CACHE_DIR"] || "#{ENV["HOME"]}/.braid/cache")
+    File.expand_path(ENV['BRAID_LOCAL_CACHE_DIR'] || "#{ENV['HOME']}/.braid/cache")
   end
 
   class BraidError < StandardError

data/spec/integration_helper.rb

@@ -11,7 +11,8 @@ BRAID_PATH   = Pathname.new(File.dirname(__FILE__)).parent.realpath
 FIXTURE_PATH = File.join(BRAID_PATH, "spec", "fixtures")
 FileUtils.rm_rf(TMP_PATH)
 FileUtils.mkdir_p(TMP_PATH)
-BRAID_BIN = File.join(BRAID_PATH, "bin", "braid")
+
+BRAID_BIN = ((defined?(JRUBY_VERSION) || Gem.win_platform?) ? 'ruby ' : '') + File.join(BRAID_PATH, 'bin', 'braid')
 
 def in_dir(dir = TMP_PATH)
   Dir.chdir(dir)

data/spec/mirror_spec.rb

@@ -14,7 +14,7 @@ end
 
 describe "Braid::Mirror#diff" do
   before(:each) do
-    @mirror = build_mirror("revision" => 'a' * 40)
+    @mirror = build_mirror('revision' => 'a' * 40, 'url' => 'git://path')
     @mirror.stubs(:base_revision).returns(@mirror.revision) # bypass rev_parse
   end
 
@@ -25,6 +25,7 @@ describe "Braid::Mirror#diff" do
 
   it "should return an empty string when the hashes match" do
     set_hashes('b' * 40, 'b' * 40)
+    git.expects(:fetch)
     git.expects(:diff_tree).never
     @mirror.diff.should == ""
   end
@@ -32,6 +33,7 @@ describe "Braid::Mirror#diff" do
   it "should generate a diff when the hashes do not match" do
     set_hashes('b' * 40, 'c' * 40)
     diff = "diff --git a/path b/path\n"
+    git.expects(:fetch)
     git.expects(:diff_tree).with('b' * 40, 'c' * 40).returns(diff)
     @mirror.diff.should == diff
   end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: realityforge-braid
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
+  prerelease: 
 platform: ruby
 authors:
 - Cristi Balan
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -28,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -42,6 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -49,6 +55,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -56,6 +63,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -63,6 +71,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,7 +120,6 @@ files:
 - spec/test_helper.rb
 homepage: http://evil.che.lu/projects/braid
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -122,20 +130,21 @@ 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: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A simple tool for tracking vendor branches in git.
 test_files: []
-has_rdoc: false

checksums.yaml

@@ -1,15 +0,0 @@
----
-!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=