git_shizzle 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df6e2b253b4bd24dc1609846aa5239ecd70d4c46
-  data.tar.gz: 386a45ca3f5e6064667d963fe4c350410cc52087
+  metadata.gz: 8f81e7bd6d517a1aee359ee001614c960293db9e
+  data.tar.gz: 8244dd26914f17b277e238a021d1e2b4085e3a92
 SHA512:
-  metadata.gz: 1926c4e558290bc166966612f45620339be6ca516651941e58b86a44442f2dff82e84613ca817ca6e1e221435d9a514b4238d02fcb89f85d0aea19a67742d9cf
-  data.tar.gz: bd37c769b451a9402addc6207378faec6c0657fb9f87a75be7d4d89b40d165637685ef35d6bb59d60e51c5da4d05cf8fa050772c1da1c2422ed22d33dd72e5e1
+  metadata.gz: a194af6c83e344ebb3d4f525bcd032eb77a1cf9d21e92c18fcb6c52067a40551ce6c9c2be161bc17dd14ce66e36b9db448d0051b858ad709a4c0fa66335c6b7e
+  data.tar.gz: aa1334b811aa300578507bb9f27d2bdd45665d9907da10c112b29335929e42e5e079d641b24be3b06af2607cc45d22be762fdf43de5bb7abdc97cfd9de182d5b

data/.gitignore

@@ -1,2 +1,4 @@
 .idea/
+coverage/
 tmp
+Gemfile.lock

data/.rspec

@@ -1,3 +1,2 @@
 --require spec_helper
---format documentation
 --tag ~@draft

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+bundler_args: --without development
+script: bundle exec rspec
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+notifications:
+  on_success: never
+  recipients:
+    - agross@therightstuff.de

data/Gemfile

@@ -1,3 +1,27 @@
-source 'http://rubygems.org'
+require 'rbconfig'
+
+source 'https://rubygems.org'
 
 gemspec
+
+group :development do
+  gem 'guard-bundler', require: false
+  gem 'guard-rspec', require: false
+
+  case RbConfig::CONFIG['target_os']
+  when /windows|bccwin|cygwin|djgpp|mingw|mswin|wince/i
+    gem 'ruby_gntp', require: false
+    gem 'wdm', require: false
+  when /linux/i
+    gem 'rb-inotify', require: false
+  when /mac|darwin/i
+    gem 'rb-fsevent', require: false
+    gem 'growl', require: false
+  end
+end
+
+group :development, :ci do
+  gem 'rspec', '~> 3.0', require: false
+  gem 'rspec-its', require: false
+  gem 'coveralls', require: false
+end

data/Guardfile

@@ -14,9 +14,10 @@ end
 
 guard 'rspec',
   :all_on_start => true,
-  :all_after_pass => false,
+  :all_after_pass => true,
   :notification => true,
-  :cmd => 'bundle exec rspec --format documentation --tag ~@draft' do
+  :cmd => 'bundle exec rspec' do
+    watch('.rspec')
     watch(%r{^spec/.+_spec\.rb$})
     watch(%r{^lib/(.+)\.rb$})
     watch('spec/spec_helper.rb') { 'spec' }

data/README.md

@@ -0,0 +1,66 @@
+# git_shizzle
+
+[![Gem Version](https://badge.fury.io/rb/git_shizzle.png)](http://badge.fury.io/rb/git_shizzle) [![Build Status](https://travis-ci.org/agross/git_shizzle.png?branch=master)](https://travis-ci.org/agross/git_shizzle) [![Dependency Status](https://gemnasium.com/agross/git_shizzle.png)](https://gemnasium.com/agross/git_shizzle) [![Code Climate](https://codeclimate.com/github/agross/git_shizzle.png)](https://codeclimate.com/github/agross/git_shizzle) [![Coverage Status](https://coveralls.io/repos/agross/git_shizzle/badge.png)](https://coveralls.io/r/agross/git_shizzle)
+
+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 in the list of "Changes not staged for commit", run `quick-git stage 1`.
+
+* Tested against Ruby 1.9.3, 2.0.0 and 2.1.0
+
+## Installation
+
+```bash
+$ gem install git_shizzle
+```
+
+## Usage
+
+```bash
+$ quick-git help
+```
+
+### Examples
+
+```bash
+# Stage modified file 1 (first in output of git status).
+$ quick-git stage 1
+
+# Stage modified file 1, 2, 3 and 4, as in output of git status.
+$ quick-git stage 1 2 3 4
+
+# Stage files 1 to 3. Used like a Ruby range.
+$ quick-git stage 1..3
+
+# Stage all modified files.
+$ quick-git stage .
+
+# Show diff of modified file 1.
+$ quick-git diff 1
+
+# Remove staged file 1 from the index.
+$ quick-git unstage 1
+
+# Add untracked file 1 to the index.
+$ quick-git track 1
+
+# Discard working copy changes of modified file 1.
+$ quick-git checkout 1
+```
+
+### git aliases
+
+I recommend you set up git aliases like `git config --global alias.qa quick-git stage`. See some examples in [my dotfiles repository](https://github.com/agross/dotfiles/blob/master/profiles/cygwin/git/gitconfig#L18).
+
+## Development
+
+* Source hosted at [GitHub](https://github.com/agross/git_shizzle)
+* Report issues/Questions/Feature requests on [GitHub Issues](https://github.com/agross/git_shizzle/issues)
+
+Pull requests are very welcome! Make sure your patches are well tested. Please create a topic branch for every separate change you make.
+
+## Contributing
+
+1. Fork it (http://github.com/agross/git_shizzle/fork)
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/git_shizzle.gemspec

@@ -1,6 +1,5 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
-require 'rbconfig'
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'git_shizzle/version'
 
 Gem::Specification.new do |s|
@@ -10,33 +9,17 @@ Gem::Specification.new do |s|
   s.authors     = ['Bjoern Rochel', 'Alexander Groß']
   s.email       = ['bjoern@bjro.de', 'agross@therightstuff.de']
   s.homepage    = 'http://grossweber.com'
-  s.licenses    = ['BSD']
+  s.license     = 'BSD'
   s.description = %q{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 in the list of "Changes not staged for commit", run `quick-git stage 1`.}
   s.summary     = %q{Quickly operate on the git working copy and the index}
 
-  s.add_dependency 'thor', '~> 0.16'
-
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rspec-mocks'
-  s.add_development_dependency 'guard'
-  s.add_development_dependency 'guard-rspec'
-  s.add_development_dependency 'guard-bundler'
+  s.required_ruby_version = '>= 1.9.3'
 
-  case RbConfig::CONFIG['target_os']
-  when /windows|bccwin|cygwin|djgpp|mingw|mswin|wince/i
-    s.add_development_dependency 'win32console'
-    s.add_development_dependency 'ruby_gntp'
-    s.add_development_dependency 'wdm'
-  when /linux/i
-    s.add_development_dependency 'rb-inotify', '~> 0.8.8'
-  when /mac|darwin/i
-    s.add_development_dependency 'rb-fsevent'
-    s.add_development_dependency 'growl'
-  end
+  s.add_dependency 'thor', '~> 0.16'
 
-  s.files         = `git ls-files`.split("\n")
+  git = ENV['TEAMCITY_GIT_PATH'] || 'git'
+  s.files         = `"#{git}" ls-files -z`.split("\x0")
+  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.executables   = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   s.require_paths = ['lib']
 end

data/lib/commands.rb

@@ -11,7 +11,7 @@ command :stage do
       when :modified
         ['add --', path]
       when :deleted
-        ['rm --', path]
+        ['rm --quiet --', path]
     end
   end
 end
@@ -37,9 +37,9 @@ command :track do
   end
 
   action do |index, work_tree, path|
-     ['add --', path] if work_tree == :untracked
-  end
+    ['add --', path] if work_tree == :untracked
   end
+end
 
 desc 'diff files'
 command :diff do
@@ -72,7 +72,7 @@ command :checkout do
   action do |index, work_tree, path|
     ['checkout --', path]
   end
-  end
+end
 
 desc 'unstage files'
 command :unstage do

data/lib/git_shizzle/git/git.rb

@@ -10,17 +10,15 @@ module GitShizzle::Git
     end
 
     def status
-      Dir.chdir(@repo_location) do
-        status = command 'status --porcelain -z', [], :verbose => false, :redirect_io => true
-        status
-          .each_line("\x00")
-          .select { |line| line =~ /^[\p{Lu}\x20\?!]{2}\s/ }
-          .each_with_index.map do |line, index|
-            File.new(:index => index,
-                     :status => line[0..1],
-                     :path => line[3..-1].delete("\000"),
-                     :status_line => line)
-        end
+      status = command 'status --porcelain -z', [], :verbose => false, :redirect_io => true
+      status
+        .each_line("\x00")
+        .select { |line| line =~ /^[\p{Lu}\x20\?!]{2}\s/ }
+        .each_with_index.map do |line, index|
+          File.new(:index => index,
+                   :status => line[0..1],
+                   :path => line[3..-1].delete("\000"),
+                   :status_line => line)
       end
     end
 
@@ -48,20 +46,22 @@ module GitShizzle::Git
     end
 
     def run_command(git_cmd, params = { }, &block)
-      if block_given?
-        IO.popen(git_cmd, &block)
-      else
-        if params.fetch(:redirect_io, false)
-          git_cmd += ' 2>&1'
-          `#{git_cmd}`.chomp
+      Dir.chdir(@repo_location) do
+        if block_given?
+          IO.popen(git_cmd, &block)
         else
-          system git_cmd
+          if params.fetch(:redirect_io, false)
+            git_cmd += ' 2>&1'
+            `#{git_cmd}`.chomp
+          else
+            system git_cmd
+          end
         end
       end
     end
 
     def echo(msg, verbose)
-      puts(msg) if verbose && defined?(Thor)
+      $stdout.puts(msg) if verbose && defined?(Thor)
     end
   end
 end

data/lib/git_shizzle/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module GitShizzle
-  VERSION = '0.2.6'
+  VERSION = '0.2.8'
 end

data/spec/git_shizzle/builtin_commands/checkout_spec.rb

@@ -0,0 +1,51 @@
+require 'git_shizzle'
+
+describe 'Checkout 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 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(/checkout/, anything)
+    end
+
+    context 'when a modified file is checked out' do
+      it 'should run git checkout' do
+        subject.checkout 2
+
+        expect(git).to have_received(:command).with('checkout --', ['modified'])
+      end
+    end
+
+    context 'when a deleted file is checked out' do
+      it 'should run git checkout' do
+        subject.checkout 1
+
+        expect(git).to have_received(:command).with('checkout --', ['deleted'])
+      end
+    end
+  end
+
+  describe 'repository without modified files' do
+    it 'should fail' do
+      expect { subject.checkout 1 }.to raise_error
+    end
+  end
+end

data/spec/git_shizzle/builtin_commands/diff_cached_spec.rb

@@ -0,0 +1,55 @@
+require 'git_shizzle'
+
+describe 'Diff 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'
+
+      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)
+    end
+
+    before do
+      allow(git).to receive(:command).and_call_original
+      allow(git).to receive(:command).with(/diff/, anything)
+    end
+
+    context 'when a staged modified file is diffed' do
+      it 'should run git diff --cached' do
+        subject.diff_cached 2
+
+        expect(git).to have_received(:command).with('diff --cached --', ['modified'])
+      end
+    end
+
+    context 'when a staged deleted file is diffed' do
+      it 'should run git diff --cached' do
+        subject.diff_cached 1
+
+        expect(git).to have_received(:command).with('diff --cached --', ['deleted'])
+      end
+    end
+  end
+
+  describe 'repository without staged files' do
+    it 'should fail' do
+      expect { subject.diff_cached 1 }.to raise_error
+    end
+  end
+end

data/spec/git_shizzle/builtin_commands/diff_spec.rb

@@ -0,0 +1,51 @@
+require 'git_shizzle'
+
+describe 'Diff 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 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(/diff/, anything)
+    end
+
+    context 'when a modified file is diffed' do
+      it 'should run git diff' do
+        subject.diff 2
+
+        expect(git).to have_received(:command).with('diff --', ['modified'])
+      end
+    end
+
+    context 'when a deleted file is diffed' do
+      it 'should run git diff' do
+        subject.diff 1
+
+        expect(git).to have_received(:command).with('diff --', ['deleted'])
+      end
+    end
+  end
+
+  describe 'repository without modified files' do
+    it 'should fail' do
+      expect { subject.diff 1 }.to raise_error
+    end
+  end
+end