braid 1.0.16 → 1.0.17

data/spec/mirror_spec.rb

@@ -3,17 +3,17 @@ 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'
+    expect(@mirror.branch).to eq('master')
   end
 
   it 'should default mirror to last path part, ignoring trailing .git' do
     new_from_options('http://path.git')
-    @mirror.path.should == 'path'
+    expect(@mirror.path).to eq('path')
   end
 
   it 'should strip trailing slash from specified path' do
     new_from_options('http://path.git', 'path' => 'vendor/tools/mytool/')
-    @mirror.path.should == 'vendor/tools/mytool'
+    expect(@mirror.path).to eq('vendor/tools/mytool')
   end
 end
 
@@ -32,7 +32,7 @@ describe 'Braid::Mirror#diff' do
     set_hashes('b' * 40, 'b' * 40)
     git.expects(:fetch)
     git.expects(:diff_tree).never
-    @mirror.diff.should == ''
+    expect(@mirror.diff).to eq('')
   end
 
   it 'should generate a diff when the hashes do not match' do
@@ -40,22 +40,22 @@ describe 'Braid::Mirror#diff' do
     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
+    expect(@mirror.diff).to eq(diff)
   end
 end
 
 describe 'Braid::Mirror#base_revision' do
   it 'should be inferred when no revision is set' do
     @mirror = build_mirror
-    @mirror.revision.should be_nil
+    expect(@mirror.revision).to be_nil
     @mirror.expects(:inferred_revision).returns('b' * 40)
-    @mirror.base_revision.should == 'b' * 40
+    expect(@mirror.base_revision).to eq('b' * 40)
   end
 
   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
+    expect(@mirror.base_revision).to eq('a' * 40)
   end
 end
 
@@ -67,7 +67,7 @@ describe 'Braid::Mirror#inferred_revision' do
         "commit #{'b' * 40}\n#{'t' * 40}\n"
     )
     git.expects(:tree_hash).with(@mirror.path, 'a' * 40).returns('t' * 40)
-    @mirror.send(:inferred_revision).should == 'b' * 40
+    expect(@mirror.send(:inferred_revision)).to eq('b' * 40)
   end
 end
 
@@ -78,11 +78,11 @@ describe 'Braid::Mirror#cached?' 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
+    expect(@mirror).to be_cached
   end
 
   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
+    expect(@mirror).not_to be_cached
   end
 end

data/spec/operations_spec.rb

@@ -4,7 +4,7 @@ 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'
+    expect(git.remote_url('braid/git/one')).to eq('git://path')
   end
 end
 
@@ -12,13 +12,13 @@ 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.rev_parse('a' * 7).should == full_revision
+    expect(git.rev_parse('a' * 7)).to eq(full_revision)
   end
 
   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: ...'])
-    lambda { git.rev_parse(ambiguous_revision) }.should raise_error(Braid::Operations::UnknownRevision)
+    expect { git.rev_parse(ambiguous_revision) }.to raise_error(Braid::Operations::UnknownRevision)
   end
 end
 
@@ -30,7 +30,7 @@ describe 'Braid::Operations::Git#version' do
   end
 
   it 'should extract from git --version output' do
-    git.version.should == ACTUAL_VERSION
+    expect(git.version).to eq(ACTUAL_VERSION)
   end
 end
 
@@ -46,21 +46,21 @@ describe 'Braid::Operations::Git#require_version' do
   it 'should return true for higher revisions' do
     PASS_VERSIONS.each do |version|
       set_version(version)
-      git.require_version(REQUIRED_VERSION).should == true
+      expect(git.require_version(REQUIRED_VERSION)).to eq(true)
     end
   end
 
   it 'should return false for lower revisions' do
     FAIL_VERSIONS.each do |version|
       set_version(version)
-      git.require_version(REQUIRED_VERSION).should == false
+      expect(git.require_version(REQUIRED_VERSION)).to eq(false)
     end
   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')
+    expect(git_cache.path('git://path')).to eq(File.join(Braid.local_cache_dir, 'git___path'))
+    expect(git_cache.path('git@domain:repository.git')).to eq(File.join(Braid.local_cache_dir, 'git_domain_repository.git'))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braid
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.17
 platform: ruby
 authors:
 - Cristi Balan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -46,14 +46,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 3.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 3.4.4
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -89,7 +89,6 @@ files:
 - 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
@@ -113,9 +112,12 @@ files:
 - spec/fixtures/skit1/layouts/layout.liquid
 - spec/fixtures/skit1/preview.png
 - spec/integration/adding_spec.rb
+- spec/integration/diff_spec.rb
+- spec/integration/integration_helper.rb
 - spec/integration/push_spec.rb
+- spec/integration/remove_spec.rb
+- spec/integration/status_spec.rb
 - spec/integration/updating_spec.rb
-- spec/integration_helper.rb
 - spec/mirror_spec.rb
 - spec/operations_spec.rb
 - spec/test_helper.rb

data/lib/braid/commands/list.rb

@@ -1,10 +0,0 @@
-module Braid
-  module Commands
-    class List < Command
-      def run(path = nil, options = {})
-        msg "WARNING: list command is deprecated. Please use \"braid status\" instead.\n"
-        Command.run(:status, path, options)
-      end
-    end
-  end
-end