braid 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f05634e9b4c3022e78ae6c0af53e9820e6cb3bf1
-  data.tar.gz: 73cf6f286841a8e37df2c6aa5d4692dc2a168106
+  metadata.gz: 48581b45f4b17cc8b8e621d5e24c841b42efba99
+  data.tar.gz: 7bdfa40b888e48c3d9c7a3a6bbd35dfc4b479495
 SHA512:
-  metadata.gz: 823414ff4155dabb3e432953a49f05d68a16b0e504dc8aa29dfd4cae45132d1c664cb935106af0a03ec5403e44b0c4f2bc90783fb2c51129674407dd25b42f01
-  data.tar.gz: 1667e256843a3026d249460ed8ad0faaceb6015008f860f29f8ef68c6c70528c3e0c8a37da0ea3c06ba293ad6d7711253f7e551ad2ccef406d3e7d167d8cb845
+  metadata.gz: 4b9eaae5700bc0b454099d94765acd1994334c5631ef2546026f76ac6a33e94ab7ffc0a106cb3e502dd6f4cce02785069916747adcbf479a3e762d1a01066905
+  data.tar.gz: 3f6bc0b3237ea79ed1fa49d5f7e846a388dcc03c4655185b6ef93535f387c46108dbe888569825d6999635d3e3540c2f3edb7d62a1d77475ed448d93fab39d57

data/README.md

@@ -34,7 +34,7 @@ This is where Braid comes into play. Braid makes it easy to vendor in remote git
 repositories and use an automated mechanism for updating the external library
 and generating patches to upgrade the external library.
 
-Braid creates a file `.braids` in the root of your repository that contains
+Braid creates a file `.braids.json` in the root of your repository that contains
 references to external libraries or mirrors. There are two types of mirrors in
 Braid: squashed and full. Mirrors are squashed by default, which is what you'll
 generally want because they're faster and don't pollute your history with

data/Rakefile

@@ -8,5 +8,5 @@ RSpec::Core::RakeTask.new :spec  do |task|
   task.rspec_opts = %w{--backtrace}
 end
 
-desc "Test and package the gem"
+desc 'Test and package the gem'
 task :default => [:spec, :build]

data/bin/braid

@@ -24,7 +24,7 @@ Main {
     description <<-TXT
       Add a new mirror to be tracked.
 
-        * adds metadata about the mirror to .braids
+        * adds metadata about the mirror to .braids.json
         * adds the git remotes to .git/config
         * fetches and merges remote code into given directory
 
@@ -54,7 +54,7 @@ Main {
 
         * get new changes from remote
         * always creates a merge commit
-        * updates metadata in .braids when revisions are changed
+        * updates metadata in .braids.json when revisions are changed
 
       Defaults to updating all unlocked mirrors if none is specified.
     TXT
@@ -76,7 +76,7 @@ Main {
     description <<-TXT
       Remove a mirror.
 
-        * removes metadata from .braids
+        * removes metadata from .braids.json
         * removes the local directory and commits the removal
         * removes the git remote by default, --keep can be used to suppress that
     TXT

data/lib/braid/command.rb

@@ -75,6 +75,7 @@ module Braid
     end
 
     def add_config_file
+      git.rm(OLD_CONFIG_FILE) if File.exist?(OLD_CONFIG_FILE)
       git.add(CONFIG_FILE)
     end
 

data/lib/braid/commands/add.rb

@@ -32,7 +32,6 @@ module Braid
           msg "Added mirror at #{display_revision(mirror)}."
         end
       end
-
     end
   end
 end

data/lib/braid/commands/update.rb

@@ -20,7 +20,7 @@ module Braid
       def update_one(path, options = {})
         mirror           = config.get!(path)
 
-        revision_message = options["revision"] ? " to #{display_revision(mirror, options["revision"])}" : ""
+        revision_message = options['revision'] ? " to #{display_revision(mirror, options['revision'])}" : ''
         msg "Updating mirror '#{mirror.path}'#{revision_message}."
 
         was_locked = mirror.locked?

data/lib/braid/config.rb

@@ -15,19 +15,25 @@ module Braid
       end
     end
 
-    def initialize(config_file = CONFIG_FILE)
+    def initialize(config_file = CONFIG_FILE, old_config_files = [OLD_CONFIG_FILE])
       @config_file = config_file
-      begin
-        store = YAML::Store.new(@config_file)
-        @db = {}
-        store.transaction(true) do
-          store.roots.each do |path|
-            @db[path] = store[path]
+      (old_config_files + [config_file]).each do |file|
+        next unless File.exist?(file)
+        begin
+          store = YAML::Store.new(file)
+          @db = {}
+          store.transaction(true) do
+            store.roots.each do |path|
+              @db[path] = store[path]
+            end
           end
+          return
+        rescue
+          @db = JSON.parse(file)
+          return if @db
         end
-      rescue
-        @db = JSON.parse(@config_file)
       end
+      @db = {}
     end
 
     def add_from_options(url, options)
@@ -44,7 +50,7 @@ module Braid
     def get(path)
       key = path.to_s.sub(/\/$/, '')
       attributes = @db[key]
-      return attributes ? Mirror.new(path, attributes) : nil
+      attributes ? Mirror.new(path, attributes) : nil
     end
 
     def get!(path)
@@ -70,6 +76,7 @@ module Braid
     end
 
     private
+
     def write_mirror(mirror)
       @db[mirror.path] = clean_attributes(mirror.attributes)
       write_db
@@ -80,10 +87,10 @@ module Braid
       @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)
+          new_db[key].delete(k) unless Braid::Mirror::ATTRIBUTES.include?(k)
         end
       end
-      File.open(@config_file, "wb") do |f|
+      File.open(@config_file, 'wb') do |f|
         f.write JSON.pretty_generate(new_db)
         f.write "\n"
       end

data/lib/braid/operations.rb

@@ -172,7 +172,7 @@ module Braid
       def commit(message, *args)
         cmd = 'git commit --no-verify'
         if message # allow nil
-          message_file = Tempfile.new("braid_commit")
+          message_file = Tempfile.new('braid_commit')
           message_file.print("Braid: #{message}")
           message_file.flush
           message_file.close
@@ -257,16 +257,16 @@ module Braid
       # Merge three trees (local_treeish should match the current state of the
       # index) and update the index and working tree.
       #
-      # The usage of "git merge-recursive" doesn't seem to be officially
+      # The usage of 'git merge-recursive' doesn't seem to be officially
       # documented, but it does accept trees.  When a single base is passed, the
-      # "recursive" part (i.e., merge of bases) does not come into play and only
+      # 'recursive' part (i.e., merge of bases) does not come into play and only
       # the trees matter.  But for some reason, Git's smartest tree merge
-      # algorithm is only available via the "recursive" strategy.
+      # algorithm is only available via the 'recursive' strategy.
       def merge_trees(base_treeish, local_treeish, remote_treeish)
         invoke(:merge_recursive, base_treeish, "-- #{local_treeish} #{remote_treeish}")
         true
       rescue ShellExecutionError => error
-        # "CONFLICT" messages go to stdout.
+        # 'CONFLICT' messages go to stdout.
         raise MergeError, error.out
       end
 
@@ -290,24 +290,24 @@ module Braid
       # Read tree into the root of the index.  This may not be the preferred way
       # to do it, but it seems to work.
       def read_tree_im(treeish)
-        invoke(:read_tree, "-im", treeish)
+        invoke(:read_tree, '-im', treeish)
         true
       end
 
       # Write a tree object for the current index and return its ID.
-      def write_tree()
+      def write_tree
         invoke(:write_tree)
       end
 
       # Execute a block using a temporary git index file, initially empty.
-      def with_temporary_index()
-        Dir.mktmpdir("braid_index") do |dir|
-          orig_index_file = ENV["GIT_INDEX_FILE"]
-          ENV["GIT_INDEX_FILE"] = File.join(dir, "index")
+      def with_temporary_index
+        Dir.mktmpdir('braid_index') do |dir|
+          orig_index_file = ENV['GIT_INDEX_FILE']
+          ENV['GIT_INDEX_FILE'] = File.join(dir, 'index')
           begin
             yield
           ensure
-            ENV["GIT_INDEX_FILE"] = orig_index_file
+            ENV['GIT_INDEX_FILE'] = orig_index_file
           end
         end
       end

data/lib/braid/version.rb

@@ -1,3 +1,3 @@
 module Braid
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 end

data/lib/braid.rb

@@ -1,7 +1,8 @@
 require 'braid/version'
 
 module Braid
-  CONFIG_FILE          = '.braids'
+  OLD_CONFIG_FILE      = '.braids'
+  CONFIG_FILE          = '.braids.json'
   REQUIRED_GIT_VERSION = '1.6'
 
   def self.verbose

data/spec/config_spec.rb

@@ -1,59 +1,59 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-describe "Braid::Config, when empty" do
+describe 'Braid::Config, when empty' do
   before(:each) do
-    @config = Braid::Config.new("tmp.yml")
+    @config = Braid::Config.new('tmp.yml')
   end
 
   after(:each) do
-    FileUtils.rm("tmp.yml") rescue nil
+    FileUtils.rm('tmp.yml') rescue nil
   end
 
-  it "should not get a mirror by name" do
-    @config.get("path").should be_nil
-    lambda { @config.get!("path") }.should raise_error(Braid::Config::MirrorDoesNotExist)
+  it 'should not get a mirror by name' do
+    @config.get('path').should be_nil
+    lambda { @config.get!('path') }.should raise_error(Braid::Config::MirrorDoesNotExist)
   end
 
-  it "should add a mirror and its params" do
+  it 'should add a mirror and its params' do
     @mirror = build_mirror
     @config.add(@mirror)
-    @config.get("path").path.should_not be_nil
+    @config.get('path').path.should_not be_nil
   end
 end
 
-describe "Braid::Config, with one mirror" do
+describe 'Braid::Config, with one mirror' do
   before(:each) do
-    @config = Braid::Config.new("tmp.yml")
+    @config = Braid::Config.new('tmp.yml')
     @mirror = build_mirror
     @config.add(@mirror)
   end
 
   after(:each) do
-    FileUtils.rm("tmp.yml") rescue nil
+    FileUtils.rm('tmp.yml') rescue nil
   end
 
-  it "should get the mirror by name" do
-    @config.get("path").should == @mirror
-    @config.get!("path").should == @mirror
+  it 'should get the mirror by name' do
+    @config.get('path').should == @mirror
+    @config.get!('path').should == @mirror
   end
 
-  it "should raise when trying to overwrite a mirror on add" do
+  it 'should raise when trying to overwrite a mirror on add' do
     lambda { @config.add(@mirror) }.should raise_error(Braid::Config::PathAlreadyInUse)
   end
 
-  it "should remove the mirror" do
+  it 'should remove the mirror' do
     @config.remove(@mirror)
-    @config.get("path").should be_nil
+    @config.get('path').should be_nil
   end
 
-  it "should update the mirror with new params" do
-    @mirror.branch = "other"
+  it 'should update the mirror with new params' do
+    @mirror.branch = 'other'
     @config.update(@mirror)
-    @config.get("path").attributes.should == {"branch" => "other"}
+    @config.get('path').attributes.should == {'branch' => 'other'}
   end
 
-  it "should raise when trying to update nonexistent mirror" do
-    @mirror.instance_variable_set("@path", "other")
+  it 'should raise when trying to update nonexistent mirror' do
+    @mirror.instance_variable_set('@path', 'other')
     lambda { @config.update(@mirror) }.should raise_error(Braid::Config::MirrorDoesNotExist)
   end
 end

data/spec/integration/adding_spec.rb

@@ -1,43 +1,42 @@
 require File.dirname(__FILE__) + '/../integration_helper'
 
-describe "Adding a mirror in a clean repository" do
+describe 'Adding a mirror in a clean repository' do
 
   before do
     FileUtils.rm_rf(TMP_PATH)
     FileUtils.mkdir_p(TMP_PATH)
   end
 
-  describe "from a git repository" do
+  describe 'from a git repository' do
     before do
-      @shiny = create_git_repo_from_fixture("shiny")
-      @skit1 = create_git_repo_from_fixture("skit1")
+      @shiny = create_git_repo_from_fixture('shiny')
+      @skit1 = create_git_repo_from_fixture('skit1')
     end
 
-    it "should add the files and commit" do
+    it 'should add the files and commit' do
       in_dir(@shiny) do
-        `#{BRAID_BIN} add #{@skit1}`
+        run_command("#{BRAID_BIN} add #{@skit1}")
       end
 
-      file_name = "skit1/layouts/layout.liquid"
-      output    = `diff -U 3 #{File.join(FIXTURE_PATH, file_name)} #{File.join(TMP_PATH, "shiny", file_name)}`
-      $?.should be_success
+      file_name = 'skit1/layouts/layout.liquid'
+      run_command("diff -U 3 #{File.join(FIXTURE_PATH, file_name)} #{File.join(TMP_PATH, 'shiny', file_name)}")
 
-      output = `git log --pretty=oneline`.split("\n")
+      output = run_command('git log --pretty=oneline').split("\n")
       output.length.should == 2
       output[0].should =~ /Braid: Add mirror 'skit1' at '[0-9a-f]{7}'/
     end
 
-    it "should create .braids and add the mirror to it" do
+    it 'should create .braids.json and add the mirror to it' do
       in_dir(@shiny) do
-        `#{BRAID_BIN} add #{@skit1}`
+        run_command("#{BRAID_BIN} add #{@skit1}")
       end
 
-      braids = YAML::load_file("#{@shiny}/.braids")
-      braids["skit1"]["squashed"].should == true
-      braids["skit1"]["url"].should == @skit1
-      braids["skit1"]["revision"].should_not be_nil
-      braids["skit1"]["branch"].should == "master"
-      braids["skit1"]["remote"].should == "master/braid/skit1"
+      braids = YAML::load_file("#{@shiny}/#{Braid::CONFIG_FILE}")
+      braids['skit1']['squashed'].should == true
+      braids['skit1']['url'].should == @skit1
+      braids['skit1']['revision'].should_not be_nil
+      braids['skit1']['branch'].should == 'master'
+      braids['skit1']['remote'].should == 'master/braid/skit1'
     end
   end
 end

data/spec/integration/updating_spec.rb

@@ -1,46 +1,44 @@
 require File.dirname(__FILE__) + '/../integration_helper'
 
-describe "Updating a mirror" do
+describe 'Updating a mirror' do
 
   before do
     FileUtils.rm_rf(TMP_PATH)
     FileUtils.mkdir_p(TMP_PATH)
   end
 
-  describe "from a git repository" do
+  describe 'from a git repository' do
     before do
-      @shiny = create_git_repo_from_fixture("shiny")
-      @skit1 = create_git_repo_from_fixture("skit1")
-      @file_name = "layouts/layout.liquid"
+      @shiny = create_git_repo_from_fixture('shiny')
+      @skit1 = create_git_repo_from_fixture('skit1')
+      @file_name = 'layouts/layout.liquid'
 
       in_dir(@shiny) do
-        `#{BRAID_BIN} add #{@skit1}`
+        run_command("#{BRAID_BIN} add #{@skit1}")
       end
 
-      update_dir_from_fixture("skit1", "skit1.1")
+      update_dir_from_fixture('skit1', 'skit1.1')
       in_dir(@skit1) do
-        `git add *`
-        `git commit -m "change default color"`
+        run_command('git add *')
+        run_command('git commit -m "change default color"')
       end
 
-      update_dir_from_fixture("skit1", "skit1.2")
+      update_dir_from_fixture('skit1', 'skit1.2')
       in_dir(@skit1) do
-        `git add *`
-        `git commit -m "add a happy note"`
+        run_command('git add *')
+        run_command('git commit -m "add a happy note"')
       end
-
     end
 
-    context "with no project-specific changes" do
-      it "should add the files and commit" do
+    context 'with no project-specific changes' do
+      it 'should add the files and commit' do
         in_dir(@shiny) do
-          `#{BRAID_BIN} update skit1`
+          run_command("#{BRAID_BIN} update skit1")
         end
 
-        output    = `diff -U 3 #{File.join(FIXTURE_PATH, "skit1.2", @file_name)} #{File.join(TMP_PATH, "shiny", "skit1", @file_name)}`
-        $?.should be_success
+        run_command("diff -U 3 #{File.join(FIXTURE_PATH, 'skit1.2', @file_name)} #{File.join(TMP_PATH, 'shiny', 'skit1', @file_name)}")
 
-        output = `git log --pretty=oneline`.split("\n")
+        output = run_command('git log --pretty=oneline').split("\n")
         output.length.should == 3
         output[0].should =~ /Braid: Update mirror 'skit1' to '[0-9a-f]{7}'/
 
@@ -50,55 +48,53 @@ describe "Updating a mirror" do
       end
     end
 
-    context "with mergeable changes to the same file" do
-      it "should auto-merge and commit" do
-        `cp #{File.join(FIXTURE_PATH, "shiny_skit1_mergeable", @file_name)} #{File.join(TMP_PATH, "shiny", "skit1", @file_name)}`
+    context 'with mergeable changes to the same file' do
+      it 'should auto-merge and commit' do
+        run_command("cp #{File.join(FIXTURE_PATH, 'shiny_skit1_mergeable', @file_name)} #{File.join(TMP_PATH, 'shiny', 'skit1', @file_name)}")
 
         in_dir(@shiny) do
-          `git commit -a -m 'mergeable change'`
-          `#{BRAID_BIN} update skit1`
+          run_command("git commit -a -m 'mergeable change'")
+          run_command("#{BRAID_BIN} update skit1")
         end
 
-        output    = `diff -U 3 #{File.join(FIXTURE_PATH, "shiny_skit1.2_merged", @file_name)} #{File.join(TMP_PATH, "shiny", "skit1", @file_name)}`
-        $?.should be_success
+        run_command("diff -U 3 #{File.join(FIXTURE_PATH, 'shiny_skit1.2_merged', @file_name)} #{File.join(TMP_PATH, 'shiny', 'skit1', @file_name)}")
 
-        output = `git log --pretty=oneline`.split("\n")
+        output = run_command('git log --pretty=oneline').split("\n")
         output.length.should == 4  # plus 'mergeable change'
         output[0].should =~ /Braid: Update mirror 'skit1' to '[0-9a-f]{7}'/
       end
     end
 
-    context "with conflicting changes" do
-      it "should leave conflict markup with the target revision" do
-        `cp #{File.join(FIXTURE_PATH, "shiny_skit1_conflicting", @file_name)} #{File.join(TMP_PATH, "shiny", "skit1", @file_name)}`
+    context 'with conflicting changes' do
+      it 'should leave conflict markup with the target revision' do
+        run_command("cp #{File.join(FIXTURE_PATH, 'shiny_skit1_conflicting', @file_name)} #{File.join(TMP_PATH, 'shiny', 'skit1', @file_name)}")
 
         target_revision = nil
         in_dir(@skit1) do
-          target_revision = `git rev-parse HEAD`
+          target_revision = run_command('git rev-parse HEAD')
         end
 
         braid_output = nil
         in_dir(@shiny) do
-          `git commit -a -m 'conflicting change'`
-          braid_output = `#{BRAID_BIN} update skit1`
+          run_command("git commit -a -m 'conflicting change'")
+          braid_output = run_command("#{BRAID_BIN} update skit1")
         end
         braid_output.should =~ /Caught merge error\. Breaking\./
 
-        `grep -q '>>>>>>> #{target_revision}' #{File.join(TMP_PATH, "shiny", "skit1", @file_name)}`
-        $?.should be_success
+        run_command("grep -q '>>>>>>> #{target_revision}' #{File.join(TMP_PATH, 'shiny', 'skit1', @file_name)}")
       end
     end
 
     # Regression test for https://github.com/cristibalan/braid/issues/41.
-    context "with a convergent deletion" do
-      it "should not detect a bogus rename" do
+    context 'with a convergent deletion' do
+      it 'should not detect a bogus rename' do
         in_dir(@skit1) do
-          `git rm layouts/layout.liquid`
-          `git commit -m "delete"`
+          run_command('git rm layouts/layout.liquid')
+          run_command('git commit -m "delete"')
         end
         in_dir(@shiny) do
-          `git rm skit1/layouts/layout.liquid`
-          `git commit -m "delete here too"`
+          run_command('git rm skit1/layouts/layout.liquid')
+          run_command('git commit -m "delete here too"')
         end
 
 	# Without the fix, when git diffs the base and local trees, it will
@@ -106,7 +102,7 @@ describe "Updating a mirror" do
 	# other-skit/layout.liquid, resulting in a rename-delete conflict.
         braid_output = nil
         in_dir(@shiny) do
-          braid_output = `#{BRAID_BIN} update skit1`
+          braid_output = run_command("#{BRAID_BIN} update skit1")
         end
         braid_output.should_not =~ /Caught merge error\. Breaking\./
       end

data/spec/integration_helper.rb

@@ -6,9 +6,9 @@ require 'tempfile'
 require 'fileutils'
 require 'pathname'
 
-TMP_PATH     = File.join(Dir.tmpdir, "braid_integration")
+TMP_PATH     = File.join(Dir.tmpdir, 'braid_integration')
 BRAID_PATH   = Pathname.new(File.dirname(__FILE__)).parent.realpath
-FIXTURE_PATH = File.join(BRAID_PATH, "spec", "fixtures")
+FIXTURE_PATH = File.join(BRAID_PATH, 'spec', 'fixtures')
 FileUtils.rm_rf(TMP_PATH)
 FileUtils.mkdir_p(TMP_PATH)
 
@@ -28,7 +28,7 @@ end
 def update_dir_from_fixture(dir, fixture = dir)
   to_dir = File.join(TMP_PATH, dir)
   FileUtils.mkdir_p(to_dir)
-  FileUtils.cp_r(File.join(FIXTURE_PATH, fixture) + "/.", to_dir)
+  FileUtils.cp_r(File.join(FIXTURE_PATH, fixture) + '/.', to_dir)
 end
 
 def create_git_repo_from_fixture(fixture_name)

data/spec/mirror_spec.rb

@@ -1,18 +1,18 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-describe "Braid::Mirror.new_from_options" do
-  it "should default branch to master" do
-    new_from_options("git://path")
-    @mirror.branch.should == "master"
+describe 'Braid::Mirror.new_from_options' do
+  it 'should default branch to master' do
+    new_from_options('git://path')
+    @mirror.branch.should == 'master'
   end
 
-  it "should default mirror to last path part, ignoring trailing .git" do
-    new_from_options("http://path.git")
-    @mirror.path.should == "path"
+  it 'should default mirror to last path part, ignoring trailing .git' do
+    new_from_options('http://path.git')
+    @mirror.path.should == 'path'
   end
 end
 
-describe "Braid::Mirror#diff" do
+describe 'Braid::Mirror#diff' do
   before(:each) do
     @mirror = build_mirror('revision' => 'a' * 40, 'url' => 'git://path')
     @mirror.stubs(:base_revision).returns(@mirror.revision) # bypass rev_parse
@@ -23,14 +23,14 @@ describe "Braid::Mirror#diff" do
     git.expects(:tree_hash).with(@mirror.path).returns(local_hash)
   end
 
-  it "should return an empty string when the hashes match" 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 == ""
+    @mirror.diff.should == ''
   end
 
-  it "should generate a diff when the hashes do not match" 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)
@@ -39,24 +39,24 @@ describe "Braid::Mirror#diff" do
   end
 end
 
-describe "Braid::Mirror#base_revision" do
-  it "should be inferred when no revision is set" do
+describe 'Braid::Mirror#base_revision' do
+  it 'should be inferred when no revision is set' do
     @mirror = build_mirror
     @mirror.revision.should be_nil
     @mirror.expects(:inferred_revision).returns('b' * 40)
     @mirror.base_revision.should == 'b' * 40
   end
 
-  it "should be the parsed hash for git mirrors" do
-    @mirror = build_mirror("revision" => 'a' * 7)
+  it 'should be the parsed hash for git mirrors' do
+    @mirror = build_mirror('revision' => 'a' * 7)
     git.expects(:rev_parse).with('a' * 7).returns('a' * 40)
     @mirror.base_revision.should == 'a' * 40
   end
 end
 
-describe "Braid::Mirror#inferred_revision" do
-  it "should return the last commit before the most recent update" do
-    @mirror = new_from_options("git://path")
+describe 'Braid::Mirror#inferred_revision' do
+  it 'should return the last commit before the most recent update' do
+    @mirror = new_from_options('git://path')
     git.expects(:rev_list).times(2).returns(
         "#{'a' * 40}\n",
         "commit #{'b' * 40}\n#{'t' * 40}\n"
@@ -66,17 +66,17 @@ describe "Braid::Mirror#inferred_revision" do
   end
 end
 
-describe "Braid::Mirror#cached?" do
+describe 'Braid::Mirror#cached?' do
   before(:each) do
-    @mirror = new_from_options("git://path")
+    @mirror = new_from_options('git://path')
   end
 
-  it "should be true when the remote path matches the cache path" do
+  it 'should be true when the remote path matches the cache path' do
     git.expects(:remote_url).with(@mirror.remote).returns(git_cache.path(@mirror.url))
     @mirror.should be_cached
   end
 
-  it "should be false if the remote does not point to the cache" do
+  it 'should be false if the remote does not point to the cache' do
     git.expects(:remote_url).with(@mirror.remote).returns(@mirror.url)
     @mirror.should_not be_cached
   end

data/spec/operations_spec.rb

@@ -1,56 +1,56 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-describe "Braid::Operations::Git#remote_url" do
-  it "should use git config" do
+describe 'Braid::Operations::Git#remote_url' do
+  it 'should use git config' do
     # FIXME weak test
-    git.stubs(:invoke).with(:config, 'remote.braid/git/one.url').returns("git://path")
-    git.remote_url("braid/git/one").should == "git://path"
+    git.stubs(:invoke).with(:config, 'remote.braid/git/one.url').returns('git://path')
+    git.remote_url('braid/git/one').should == 'git://path'
   end
 end
 
-describe "Braid::Operations::Git#rev_parse" do
-  it "should return the full hash when a hash is found" do
+describe 'Braid::Operations::Git#rev_parse' do
+  it 'should return the full hash when a hash is found' do
     full_revision = 'a' * 40
-    git.expects(:exec).returns([0, full_revision, ""])
+    git.expects(:exec).returns([0, full_revision, ''])
     git.rev_parse('a' * 7).should == full_revision
   end
 
-  it "should raise a revision error when the hash is not found" do
+  it 'should raise a revision error when the hash is not found' do
     ambiguous_revision = 'b' * 7
-    git.expects(:exec).returns([1, ambiguous_revision, "fatal: ..."])
+    git.expects(:exec).returns([1, ambiguous_revision, 'fatal: ...'])
     lambda { git.rev_parse(ambiguous_revision) }.should raise_error(Braid::Operations::UnknownRevision)
   end
 end
 
-describe "Braid::Operations::Git#version" do
-  ACTUAL_VERSION = "1.5.5.1.98.gf0ec4"
+describe 'Braid::Operations::Git#version' do
+  ACTUAL_VERSION = '1.5.5.1.98.gf0ec4'
 
   before(:each) do
-    git.expects(:exec).returns([0, "git version #{ACTUAL_VERSION}\n", ""])
+    git.expects(:exec).returns([0, "git version #{ACTUAL_VERSION}\n", ''])
   end
 
-  it "should extract from git --version output" do
+  it 'should extract from git --version output' do
     git.version.should == ACTUAL_VERSION
   end
 end
 
-describe "Braid::Operations::Git#require_version" do
-  REQUIRED_VERSION = "1.5.4.5"
+describe 'Braid::Operations::Git#require_version' do
+  REQUIRED_VERSION = '1.5.4.5'
   PASS_VERSIONS    = %w(1.5.4.6 1.5.5 1.6 1.5.4.5.2 1.5.5.1.98.gf0ec4)
   FAIL_VERSIONS    = %w(1.5.4.4 1.5.4 1.5.3 1.4.5.6)
 
   def set_version(str)
-    git.expects(:exec).returns([0, "git version #{str}\n", ""])
+    git.expects(:exec).returns([0, "git version #{str}\n", ''])
   end
 
-  it "should return true for higher revisions" do
+  it 'should return true for higher revisions' do
     PASS_VERSIONS.each do |version|
       set_version(version)
       git.require_version(REQUIRED_VERSION).should == true
     end
   end
 
-  it "should return false for lower revisions" do
+  it 'should return false for lower revisions' do
     FAIL_VERSIONS.each do |version|
       set_version(version)
       git.require_version(REQUIRED_VERSION).should == false
@@ -58,9 +58,9 @@ describe "Braid::Operations::Git#require_version" do
   end
 end
 
-describe "Braid::Operations::GitCache#path" do
-  it "should use the local cache directory and strip characters" do
-    git_cache.path("git://path").should == File.join(Braid.local_cache_dir, "git___path")
-    git_cache.path("git@domain:repository.git").should == File.join(Braid.local_cache_dir, "git_domain_repository.git")
+describe 'Braid::Operations::GitCache#path' do
+  it 'should use the local cache directory and strip characters' do
+    git_cache.path('git://path').should == File.join(Braid.local_cache_dir, 'git___path')
+    git_cache.path('git@domain:repository.git').should == File.join(Braid.local_cache_dir, 'git_domain_repository.git')
   end
 end

data/spec/test_helper.rb

@@ -9,7 +9,7 @@ def new_from_options(url, options = {})
 end
 
 def build_mirror(options = {})
-  Braid::Mirror.new("path", options)
+  Braid::Mirror.new('path', options)
 end
 
 include Braid::Operations::VersionControl

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braid
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Cristi Balan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main