git_shizzle 0.2.6 → 0.2.8

data/spec/git_shizzle/builtin_commands/stage_patch_spec.rb

@@ -0,0 +1,37 @@
+require 'git_shizzle'
+
+describe 'Stage patches by index', :draft => true do
+
+  let(:git) { GitShizzle::Git::Git.new(repo) }
+  subject { GitShizzle::QuickGit.new(git) }
+
+  before do
+    allow($stdout).to receive(:puts)
+  end
+
+  describe 'repository with modified files' do
+    before do
+      %w{ deleted modified }.each { |f| create f; stage f }
+      `git commit --message Blah`
+
+      delete 'deleted'
+      modify 'modified'
+
+      expect(git.status[0].work_tree_status).to eq(:deleted)
+      expect(git.status[1].work_tree_status).to eq(:modified)
+    end
+
+    before do
+      allow(git).to receive(:command).and_call_original
+      allow(git).to receive(:command).with(/add/, anything)
+    end
+
+    context 'when a modified file is staged' do
+      it 'should run git add --patch' do
+        subject.stage_with_patch 2
+
+        expect(git).to have_received(:command).with('add --patch --', ['modified'])
+      end
+    end
+  end
+end

data/spec/{git-shizzle → git_shizzle}/builtin_commands/stage_spec.rb

@@ -1,4 +1,3 @@
-require File.join(File.dirname(__FILE__), '../../spec_helper')
 require 'git_shizzle'
 
 describe 'Stage files by index' do
@@ -6,24 +5,28 @@ describe 'Stage files by index' do
   let(:git) { GitShizzle::Git::Git.new(repo) }
   subject { GitShizzle::QuickGit.new(git) }
 
-  context 'repository with modified files' do
-    before (:each) do
+  before do
+    allow($stdout).to receive(:puts)
+  end
+
+  describe 'repository with modified files' do
+    before do
       %w{ deleted modified }.each { |f| create f; stage f }
       `git commit --message Blah`
 
       delete 'deleted'
       modify 'modified'
 
-      git.status[0].work_tree_status.should == :deleted
-      git.status[1].work_tree_status.should == :modified
+      expect(git.status[0].work_tree_status).to eq(:deleted)
+      expect(git.status[1].work_tree_status).to eq(:modified)
     end
 
     context 'when a deleted file is staged' do
       it 'should run git rm' do
         subject.stage 1
 
-        git.status[0].index_status.should == :deleted
-        git.status[1].index_status.should be_nil
+        expect(git.status[0].index_status).to eq(:deleted)
+        expect(git.status[1].index_status).to be_nil
       end
     end
 
@@ -31,8 +34,8 @@ describe 'Stage files by index' do
       it 'should run git add' do
         subject.stage 2
 
-        git.status[0].index_status.should be_nil
-        git.status[1].index_status.should == :modified
+        expect(git.status[0].index_status).to be_nil
+        expect(git.status[1].index_status).to eq(:modified)
       end
     end
 
@@ -40,8 +43,8 @@ describe 'Stage files by index' do
       it 'should run git add and git rm' do
         subject.stage 1, 2
 
-        git.status[0].index_status.should == :deleted
-        git.status[1].index_status.should == :modified
+        expect(git.status[0].index_status).to eq(:deleted)
+        expect(git.status[1].index_status).to eq(:modified)
       end
     end
   end
@@ -54,20 +57,20 @@ describe 'Stage files by index' do
 
         %w{ modified }.each { |f| modify f; stage f; modify f }
 
-        git.status[0].index_status.should == :modified
-        git.status[0].work_tree_status.should == :modified
+        expect(git.status[0].index_status).to eq(:modified)
+        expect(git.status[0].work_tree_status).to eq(:modified)
       end
 
       it 'should run git add' do
         subject.stage 1
 
-        git.status[0].index_status.should == :modified
-        git.status[0].work_tree_status.should be_nil
+        expect(git.status[0].index_status).to eq(:modified)
+        expect(git.status[0].work_tree_status).to be_nil
       end
     end
   end
 
-  context 'when the repository contains no modified files' do
+  context 'repository without modified files' do
     it 'should fail' do
       expect { subject.stage 1 }.to raise_error
     end

data/spec/{git-shizzle → git_shizzle}/builtin_commands/track_spec.rb

@@ -1,4 +1,3 @@
-require File.join(File.dirname(__FILE__), '../../spec_helper')
 require 'git_shizzle'
 
 describe 'Track files by index' do
@@ -6,21 +5,25 @@ describe 'Track files by index' do
   let(:git) { GitShizzle::Git::Git.new(repo) }
   subject { GitShizzle::QuickGit.new(git) }
 
-  context 'repository with untracked files' do
-    before (:each) do
+  before do
+    allow($stdout).to receive(:puts)
+  end
+
+  describe 'repository with untracked files' do
+    before do
       create 'untracked-1'
       create 'untracked-2'
 
-      git.status[0].work_tree_status.should == :untracked
-      git.status[1].work_tree_status.should == :untracked
+      expect(git.status[0].work_tree_status).to eq(:untracked)
+      expect(git.status[1].work_tree_status).to eq(:untracked)
     end
 
     context 'when a single file is tracked' do
       it 'should run git add for the file' do
         subject.track 1
 
-        git.status[0].index_status.should == :added
-        git.status[1].index_status.should == :untracked
+        expect(git.status[0].index_status).to eq(:added)
+        expect(git.status[1].index_status).to eq(:untracked)
       end
     end
 
@@ -28,12 +31,12 @@ describe 'Track files by index' do
       it 'should run git add for all specified files' do
         subject.track 1, 2
 
-        git.status.each { |entry| entry.index_status.should == :added }
+        git.status.each { |entry| expect(entry.index_status).to eq(:added) }
       end
     end
   end
 
-  context 'when the repository contains no untracked files' do
+  describe 'repository without untracked files' do
     it 'should fail' do
       expect { subject.track 1 }.to raise_error
     end

data/spec/git_shizzle/builtin_commands/unstage_spec.rb

@@ -0,0 +1,67 @@
+require 'git_shizzle'
+
+describe 'Unstage staged/cached files by index' do
+
+  let(:git) { GitShizzle::Git::Git.new(repo) }
+  subject { GitShizzle::QuickGit.new(git) }
+
+  before do
+    allow($stdout).to receive(:puts)
+  end
+
+  describe 'repository with staged files' do
+    before do
+      %w{ deleted modified }.each { |f| create f; stage f }
+      `git commit --message Blah`
+
+      delete 'deleted'
+      stage 'deleted'
+      modify 'modified'
+      stage 'modified'
+      create 'untracked'
+      stage 'untracked'
+
+      expect(git.status[0].work_tree_status).to eq(nil)
+      expect(git.status[0].index_status).to eq(:deleted)
+      expect(git.status[1].work_tree_status).to eq(nil)
+      expect(git.status[1].index_status).to eq(:modified)
+      expect(git.status[2].work_tree_status).to eq(nil)
+      expect(git.status[2].index_status).to eq(:added)
+    end
+
+    before do
+      allow(git).to receive(:command).and_call_original
+      allow(git).to receive(:command).with(/reset/, anything)
+    end
+
+    context 'when a staged modified file is unstaged' do
+      it 'should run git reset HEAD' do
+        subject.unstage 2
+
+        expect(git).to have_received(:command).with('reset HEAD --', ['modified'])
+      end
+    end
+
+    context 'when a staged deleted file is unstaged' do
+      it 'should run git reset HEAD' do
+        subject.unstage 1
+
+        expect(git).to have_received(:command).with('reset HEAD --', ['deleted'])
+      end
+    end
+
+    context 'when a staged new file is unstaged' do
+      it 'should run git reset HEAD' do
+        subject.unstage 3
+
+        expect(git).to have_received(:command).with('reset HEAD --', ['untracked'])
+      end
+    end
+  end
+
+  describe 'repository without staged files' do
+    it 'should fail' do
+      expect { subject.unstage 1 }.to raise_error
+    end
+  end
+end

data/spec/{git-shizzle → git_shizzle}/command_spec.rb

@@ -1,4 +1,3 @@
-require File.join(File.dirname(__FILE__), '../spec_helper')
 require 'git_shizzle'
 
 describe 'Commands specified on the CLI' do

data/spec/git_shizzle/dsl_spec.rb

@@ -0,0 +1,42 @@
+require 'git_shizzle'
+
+describe GitShizzle::Dsl::CommandCollection do
+  context 'when reading commands' do
+    it 'should not accept commands without a definition' do
+      command_spec = <<-EOF
+command :foo
+      EOF
+
+      expect { subject.load command_spec }.to raise_error(GitShizzle::Dsl::CommandDefinitionError, "Command 'foo': #command requires a block.")
+    end
+  end
+
+  it 'should not accept duplicate identifiers' do
+    command_spec = <<-EOF
+command :foo do end
+command :foo do end
+    EOF
+
+    expect { subject.load command_spec }.to raise_error(GitShizzle::Dsl::DuplicateCommandDefinitionError, "The 'foo' command was specified twice.")
+  end
+
+  it 'should not accept empty filters' do
+    command_spec = <<-EOF
+command :foo do
+  applies_to
+end
+    EOF
+
+    expect { subject.load command_spec }.to raise_error(GitShizzle::Dsl::CommandDefinitionError, "Command 'foo': #applies_to requires a block.")
+  end
+
+  it 'should not accept empty actions' do
+    command_spec = <<-EOF
+command :foo do
+  action
+end
+    EOF
+
+    expect { subject.load command_spec }.to raise_error(GitShizzle::Dsl::CommandDefinitionError, "Command 'foo': #action requires a block.")
+  end
+end

data/spec/git_shizzle/git_spec.rb

@@ -0,0 +1,34 @@
+require 'git_shizzle'
+
+describe 'Git repository' do
+
+  let(:git) { GitShizzle::Git::Git.new(repo) }
+  subject { GitShizzle::QuickGit.new(git) }
+
+  context 'when invoking a command in a subdirectory of the Git repository' do
+    let(:subdir) { 'sub-directory' }
+    it 'should succeed' do
+      FileUtils.touch 'file'
+      FileUtils.mkdir subdir
+
+      Dir.chdir(subdir) do
+        subject.run(:track, 1)
+      end
+    end
+  end
+
+  context 'when invoking a command for a file with spaces' do
+    it 'should succeed' do
+      FileUtils.touch 'file with spaces'
+
+      subject.run(:track, 1)
+     end
+  end
+
+  context 'when invoking a command outside a Git repository' do
+    it 'should fail' do
+      FileUtils.rm_rf '.git'
+      expect { subject.run(:track) }.to raise_error(GitShizzle::Git::GitExecuteError, /Not a git repository/)
+    end
+  end
+end

data/spec/{git-shizzle → git_shizzle}/index_spec.rb

@@ -1,4 +1,3 @@
-require File.join(File.dirname(__FILE__), '../spec_helper')
 require 'git_shizzle'
 
 describe 'Indexes specified on the CLI' do
@@ -7,7 +6,11 @@ describe 'Indexes specified on the CLI' do
   subject { GitShizzle::QuickGit.new(git) }
   let(:number_of_untracked_files) { 10 }
 
-  before (:each) do
+  before do
+    allow($stdout).to receive(:puts)
+  end
+
+  before do
     number_of_untracked_files.times.each do |i|
       create 'untracked-%02d' % (i + 1)
     end
@@ -16,7 +19,7 @@ describe 'Indexes specified on the CLI' do
   def assert_index_status(*status)
     number_of_untracked_files.times.each do |i|
       expected_status = status[i] || status[-1]
-      git.status[i].index_status.should == expected_status
+      expect(git.status[i].index_status).to eq(expected_status)
     end
   end
 

data/spec/{git-shizzle → git_shizzle}/status_parser_spec.rb

@@ -1,4 +1,3 @@
-require File.join(File.dirname(__FILE__), '../spec_helper')
 require 'git_shizzle'
 
 describe 'File index, status and path parsed from `git status`' do
@@ -10,7 +9,7 @@ describe 'File index, status and path parsed from `git status`' do
     it 'should be able to parse' do
       create 'file-name'
 
-      git.status.count.should == 1
+      expect(git.status.count).to eq(1)
     end
   end
 
@@ -18,7 +17,7 @@ describe 'File index, status and path parsed from `git status`' do
     it 'should be able to parse' do
       create 'file name'
 
-      git.status.count.should == 1
+      expect(git.status.count).to eq(1)
     end
   end
 
@@ -27,7 +26,7 @@ describe 'File index, status and path parsed from `git status`' do
       create 'file-1'
       create 'file-2'
 
-      git.status.count.should == 2
+      expect(git.status.count).to eq(2)
     end
   end
 
@@ -40,7 +39,7 @@ describe 'File index, status and path parsed from `git status`' do
         move 'file', 'renamed-file'
         stage
 
-        git.status.count.should == 1
+        expect(git.status.count).to eq(1)
       end
     end
 
@@ -53,7 +52,7 @@ describe 'File index, status and path parsed from `git status`' do
         stage
         create 'untracked'
 
-        git.status.count.should == 2
+        expect(git.status.count).to eq(2)
       end
     end
   end

data/spec/helpers/git_repository.rb

@@ -6,8 +6,8 @@ module GitRepository
   extend RSpec::SharedContext
 
   let(:repo) { @repo }
-  before(:each) { create_sample_repo }
-  after(:each) { remove_sample_repo }
+  before { create_sample_repo }
+  after { remove_sample_repo }
 
   def create_sample_repo
     @previous_dir = Dir.pwd
@@ -28,7 +28,7 @@ module GitRepository
   end
 
   def move(src, dst)
-    FileUtils.mv src, dst, :verbose => true
+    FileUtils.mv src, dst
   end
 
   def delete(file)

data/spec/spec_helper.rb

@@ -1,6 +1,13 @@
 # -*- encoding: utf-8 -*-
 require 'helpers/git_repository'
+require 'coveralls'
+
+Coveralls.wear!
 
 RSpec.configure do |config|
   config.include GitRepository
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_shizzle
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Bjoern Rochel
@@ -9,148 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2015-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.16'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: win32console
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby_gntp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: wdm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: git_shizzle lets you quickly operate on the file lists printed by `git
   status`. Imagine a number before each line of the status output and use that index
   to specify the file you want to operate on. For example, to stage the first file
@@ -163,14 +37,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
-- Gemfile.lock
 - Guardfile
+- README.md
 - Thorfile
 - bin/quick-git
-- doc.txt
 - git_shizzle.gemspec
 - lib/commands.rb
 - lib/git_shizzle.rb
@@ -197,18 +71,18 @@ files:
 - lib/git_shizzle/index_specifications/file.rb
 - lib/git_shizzle/index_specifications/range.rb
 - lib/git_shizzle/version.rb
-- spec/git-shizzle/builtin_commands/checkout_spec.rb
-- spec/git-shizzle/builtin_commands/diff_cached_spec.rb
-- spec/git-shizzle/builtin_commands/diff_spec.rb
-- spec/git-shizzle/builtin_commands/stage_patch_spec.rb
-- spec/git-shizzle/builtin_commands/stage_spec.rb
-- spec/git-shizzle/builtin_commands/track_spec.rb
-- spec/git-shizzle/builtin_commands/unstage_spec.rb
-- spec/git-shizzle/command_spec.rb
-- spec/git-shizzle/dsl_spec.rb
-- spec/git-shizzle/git_spec.rb
-- spec/git-shizzle/index_spec.rb
-- spec/git-shizzle/status_parser_spec.rb
+- spec/git_shizzle/builtin_commands/checkout_spec.rb
+- spec/git_shizzle/builtin_commands/diff_cached_spec.rb
+- spec/git_shizzle/builtin_commands/diff_spec.rb
+- spec/git_shizzle/builtin_commands/stage_patch_spec.rb
+- spec/git_shizzle/builtin_commands/stage_spec.rb
+- spec/git_shizzle/builtin_commands/track_spec.rb
+- spec/git_shizzle/builtin_commands/unstage_spec.rb
+- spec/git_shizzle/command_spec.rb
+- spec/git_shizzle/dsl_spec.rb
+- spec/git_shizzle/git_spec.rb
+- spec/git_shizzle/index_spec.rb
+- spec/git_shizzle/status_parser_spec.rb
 - spec/helpers/git_repository.rb
 - spec/spec_helper.rb
 homepage: http://grossweber.com
@@ -221,12 +95,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -236,17 +110,17 @@ signing_key:
 specification_version: 4
 summary: Quickly operate on the git working copy and the index
 test_files:
-- spec/git-shizzle/builtin_commands/checkout_spec.rb
-- spec/git-shizzle/builtin_commands/diff_cached_spec.rb
-- spec/git-shizzle/builtin_commands/diff_spec.rb
-- spec/git-shizzle/builtin_commands/stage_patch_spec.rb
-- spec/git-shizzle/builtin_commands/stage_spec.rb
-- spec/git-shizzle/builtin_commands/track_spec.rb
-- spec/git-shizzle/builtin_commands/unstage_spec.rb
-- spec/git-shizzle/command_spec.rb
-- spec/git-shizzle/dsl_spec.rb
-- spec/git-shizzle/git_spec.rb
-- spec/git-shizzle/index_spec.rb
-- spec/git-shizzle/status_parser_spec.rb
+- spec/git_shizzle/builtin_commands/checkout_spec.rb
+- spec/git_shizzle/builtin_commands/diff_cached_spec.rb
+- spec/git_shizzle/builtin_commands/diff_spec.rb
+- spec/git_shizzle/builtin_commands/stage_patch_spec.rb
+- spec/git_shizzle/builtin_commands/stage_spec.rb
+- spec/git_shizzle/builtin_commands/track_spec.rb
+- spec/git_shizzle/builtin_commands/unstage_spec.rb
+- spec/git_shizzle/command_spec.rb
+- spec/git_shizzle/dsl_spec.rb
+- spec/git_shizzle/git_spec.rb
+- spec/git_shizzle/index_spec.rb
+- spec/git_shizzle/status_parser_spec.rb
 - spec/helpers/git_repository.rb
 - spec/spec_helper.rb