git_shizzle 0.2.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: df6e2b253b4bd24dc1609846aa5239ecd70d4c46
+  data.tar.gz: 386a45ca3f5e6064667d963fe4c350410cc52087
+SHA512:
+  metadata.gz: 1926c4e558290bc166966612f45620339be6ca516651941e58b86a44442f2dff82e84613ca817ca6e1e221435d9a514b4238d02fcb89f85d0aea19a67742d9cf
+  data.tar.gz: bd37c769b451a9402addc6207378faec6c0657fb9f87a75be7d4d89b40d165637685ef35d6bb59d60e51c5da4d05cf8fa050772c1da1c2422ed22d33dd72e5e1

data/.gitignore

@@ -0,0 +1,2 @@
+.idea/
+tmp

data/.rspec

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

data/Gemfile

@@ -0,0 +1,3 @@
+source 'http://rubygems.org'
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,71 @@
+PATH
+  remote: .
+  specs:
+    git_shizzle (0.2.5)
+      thor (~> 0.16)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
+    ffi (1.9.3-x86-mingw32)
+    formatador (0.2.4)
+    guard (2.4.0)
+      formatador (>= 0.2.4)
+      listen (~> 2.1)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-bundler (2.0.0)
+      bundler (~> 1.0)
+      guard (~> 2.2)
+    guard-rspec (4.2.6)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
+    listen (2.4.1)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.4)
+    method_source (0.8.2)
+    pry (0.9.12.6-x86-mingw32)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      win32console (~> 1.3)
+    rake (10.1.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
+      ffi (>= 0.5.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.5)
+    ruby_gntp (0.3.4)
+    slop (3.4.7)
+    thor (0.18.1)
+    timers (1.1.0)
+    wdm (0.1.0)
+    win32console (1.3.2-x86-mingw32)
+
+PLATFORMS
+  x86-mingw32
+
+DEPENDENCIES
+  git_shizzle!
+  guard
+  guard-bundler
+  guard-rspec
+  rake
+  rspec
+  rspec-mocks
+  ruby_gntp
+  wdm
+  win32console

data/Guardfile

@@ -0,0 +1,23 @@
+case RbConfig::CONFIG['target_os']
+when /windows|bccwin|cygwin|djgpp|mingw|mswin|wince/i
+  notification :gntp, :host => 'localhost'
+when /linux/i
+  notification :notifysend
+when /mac|darwin/i
+  notification :growl
+end
+
+guard 'bundler' do
+  watch('Gemfile')
+  watch(/^.+\.gemspec/)
+end
+
+guard 'rspec',
+  :all_on_start => true,
+  :all_after_pass => false,
+  :notification => true,
+  :cmd => 'bundle exec rspec --format documentation --tag ~@draft' do
+    watch(%r{^spec/.+_spec\.rb$})
+    watch(%r{^lib/(.+)\.rb$})
+    watch('spec/spec_helper.rb') { 'spec' }
+end

data/Thorfile

@@ -0,0 +1,5 @@
+# -*- encoding: utf-8 -*-
+
+$:.push File.expand_path("../lib", __FILE__)
+
+require 'git-shizzle/cli'

data/bin/quick-git

@@ -0,0 +1,8 @@
+#! ruby
+
+$:.push File.expand_path("../../lib/git_shizzle", __FILE__)
+
+require 'thor'
+require 'cli'
+
+GitShizzle::Cli.start(ARGV)

data/doc.txt

@@ -0,0 +1,8 @@
+stage 1 ==> index
+stage 1 2 3 4 ==> index
+stage 1..3 ==> index
+stage . ==> index
+diff 1 => show diff on modified tracked file
+unstage 1 ==> remove from index
+track 1 => add untracked file into index
+checkout 1 => discard working directory changes of tracked file

data/git_shizzle.gemspec

@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path('../lib', __FILE__)
+require 'rbconfig'
+require 'git_shizzle/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'git_shizzle'
+  s.version     = GitShizzle::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ['Bjoern Rochel', 'Alexander Groß']
+  s.email       = ['bjoern@bjro.de', 'agross@therightstuff.de']
+  s.homepage    = 'http://grossweber.com'
+  s.licenses    = ['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'
+
+  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.files         = `git ls-files`.split("\n")
+  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

@@ -0,0 +1,86 @@
+# -*- encoding: utf-8 -*-
+
+desc 'stage files'
+command :stage do
+  applies_to do |index, work_tree|
+    work_tree == :modified || work_tree == :deleted
+  end
+
+  action do |index, work_tree, path|
+    case work_tree
+      when :modified
+        ['add --', path]
+      when :deleted
+        ['rm --', path]
+    end
+  end
+end
+
+desc 'stage patches'
+command :stage_with_patch do
+  applies_to do |index, work_tree|
+    work_tree == :modified
+  end
+
+  action do |index, work_tree, path|
+    case work_tree
+      when :modified
+        ['add --patch --', path]
+    end
+  end
+end
+
+desc 'track files'
+command :track do
+  applies_to do |index, work_tree|
+    index == :untracked || work_tree == :untracked
+  end
+
+  action do |index, work_tree, path|
+     ['add --', path] if work_tree == :untracked
+  end
+  end
+
+desc 'diff files'
+command :diff do
+  applies_to do |index, work_tree|
+    work_tree == :modified || work_tree == :deleted
+  end
+
+  action do |index, work_tree, path|
+    ['diff --', path]
+  end
+end
+
+desc 'diff cached (staged) files'
+command :diff_cached do
+  applies_to do |index, work_tree|
+    index == :modified || index == :deleted
+  end
+
+  action do |index, work_tree, path|
+    ['diff --cached --', path]
+  end
+end
+
+desc 'checkout files'
+command :checkout do
+  applies_to do |index, work_tree|
+    work_tree == :modified || work_tree == :deleted
+  end
+
+  action do |index, work_tree, path|
+    ['checkout --', path]
+  end
+  end
+
+desc 'unstage files'
+command :unstage do
+  applies_to do |index, work_tree|
+    index == :modified || index == :deleted || index == :added
+  end
+
+  action do |index, work_tree, path|
+    ['reset HEAD --', path]
+  end
+end

data/lib/git_shizzle/cli.rb

@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+
+require 'thor'
+require 'git_shizzle'
+
+module GitShizzle
+  class Cli < Thor
+    package_name 'GitShizzle'
+
+    commands = GitShizzle::Dsl::CommandCollection.new
+    commands.load
+
+    commands.each do |command|
+      desc "#{command.identifier}", "#{command.description} by index or range"
+      define_method(command.identifier) do |*indexes|
+        begin
+          shizzle.send(:run, command.identifier, *indexes)
+        rescue GitShizzle::Error => e
+          puts e.message
+        end
+      end
+    end
+
+    private
+    def shizzle
+      @shizzle ||= GitShizzle::QuickGit.new
+    end
+  end
+end

data/lib/git_shizzle/dsl/command.rb

@@ -0,0 +1,41 @@
+# -*- encoding: utf-8 -*-
+
+module GitShizzle::Dsl
+  class Command
+    attr_reader :identifier, :description
+
+    def initialize(identifier, description, block)
+      @identifier = identifier
+      @description = description
+
+      GitShizzle::Dsl::CommandContext.new(self).instance_eval &block
+    end
+
+    def applicable_files(git_status)
+      git_status.find_all do |file|
+        @filter.call(file.index_status, file.work_tree_status, file.path)
+      end
+    end
+
+    def invoke(git, files)
+      raise GitShizzle::IndexSpecifications::NoFilesError.new(@identifier) if files.empty?
+
+      files.
+        map { |file| @action.call(file.index_status, file.work_tree_status, file.path) }.
+        group_by { |group| group[0] }.
+        each_pair { |command, command_paths| git.command command, paths_for(command_paths) }
+    end
+
+    def paths_for(command_paths)
+      command_paths.map { |a| a[1] }
+    end
+
+    def set_filter(block)
+      @filter = block
+    end
+
+    def set_action(block)
+      @action = block
+    end
+  end
+end

data/lib/git_shizzle/dsl/command_collection.rb

@@ -0,0 +1,50 @@
+# -*- encoding: utf-8 -*-
+
+module GitShizzle::Dsl
+  class CommandCollection
+    def initialize
+      @commands = []
+    end
+
+    def add_command(command)
+      raise DuplicateCommandDefinitionError.new(command) if @commands.any? { |c| c.identifier == command.identifier}
+
+      @commands << command
+    end
+
+    def load(contents = nil)
+      data = contents
+
+      unless data
+        filenames = ['commands', 'Commands', 'commands.rb', 'Commands.rb'].map do |f|
+          "#{File.dirname(__FILE__)}/../../#{f}"
+        end
+        filename = filenames.find { |f| File.file?(f) }
+        raise GitShizzle::Dsl::NoCommandFileFoundError.new if filename.nil?
+
+        data = File.read(filename)
+      end
+
+      dsl.instance_eval(data, "./#{filename}")
+    end
+
+    def each(&block)
+      @commands.each do |command|
+        if block_given?
+          block.call command
+        else
+          yield command
+        end
+      end
+    end
+
+    def find(identifier)
+      @commands.find { |c| c.identifier == identifier } or raise GitShizzle::Dsl::CommandNotFoundError.new(identifier)
+    end
+
+    private
+    def dsl
+      GitShizzle::Dsl::Dsl.new(self)
+    end
+  end
+end

data/lib/git_shizzle/dsl/command_context.rb

@@ -0,0 +1,19 @@
+# -*- encoding: utf-8 -*-
+
+module GitShizzle::Dsl
+  class CommandContext
+    def initialize(command)
+      @command = command
+    end
+
+    def applies_to(&block)
+      raise CommandDefinitionError.new(@command, '#applies_to requires a block.') unless block_given?
+      @command.set_filter block
+    end
+
+    def action(&block)
+      raise CommandDefinitionError.new(@command, '#action requires a block.') unless block_given?
+      @command.set_action block
+    end
+  end
+end

data/lib/git_shizzle/dsl/command_definition_error.rb

@@ -0,0 +1,15 @@
+# -*- encoding: utf-8 -*-
+
+module GitShizzle::Dsl
+  class CommandDefinitionError < GitShizzle::Error
+    def initialize(command_or_identifier, message)
+      if command_or_identifier.respond_to? :identifier
+        identifier = command_or_identifier.identifier
+      else
+        identifier = command_or_identifier
+      end
+
+      super "Command '#{identifier}': #{message}"
+    end
+  end
+end

data/lib/git_shizzle/dsl/command_not_found_error.rb

@@ -0,0 +1,9 @@
+# -*- encoding: utf-8 -*-
+
+module GitShizzle::Dsl
+  class CommandNotFoundError < GitShizzle::Error
+    def initialize(identifier)
+      super "Could not find '#{identifier}' command."
+    end
+  end
+end

data/lib/git_shizzle/dsl/dsl.rb

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+
+module GitShizzle::Dsl
+  class Dsl
+    def initialize(commands)
+      @commands = commands
+    end
+
+    def desc(description)
+      @description = description
+    end
+
+    def command(identifier, &block)
+      raise CommandDefinitionError.new(identifier, '#command requires a block.') unless block_given?
+
+      command = Command.new(identifier, @description, block)
+      @commands.add_command(command)
+
+      reset_description
+    end
+
+    private
+    def reset_description
+      @description = nil
+    end
+  end
+end

data/lib/git_shizzle/dsl/duplicate_command_definition_error.rb

@@ -0,0 +1,9 @@
+# -*- encoding: utf-8 -*-
+
+module GitShizzle::Dsl
+  class DuplicateCommandDefinitionError < GitShizzle::Error
+    def initialize(command)
+      super "The '#{command.identifier}' command was specified twice."
+    end
+  end
+end

data/lib/git_shizzle/dsl/no_command_file_found_error.rb

@@ -0,0 +1,5 @@
+# -*- encoding: utf-8 -*-
+
+module GitShizzle::Dsl
+  class NoCommandFileFoundError < GitShizzle::Error; end
+end

data/lib/git_shizzle/dsl.rb

@@ -0,0 +1,8 @@
+# -*- encoding: utf-8 -*-
+
+Dir["#{File.dirname(__FILE__)}/dsl/*.rb"].each do |path|
+  require "git_shizzle/dsl/#{File.basename(path, '.rb')}"
+end
+
+module GitShizzle::Dsl
+end

data/lib/git_shizzle/error.rb

@@ -0,0 +1,5 @@
+# -*- encoding: utf-8 -*-
+
+module GitShizzle
+  class Error < StandardError; end
+end

data/lib/git_shizzle/git/file.rb

@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+
+module GitShizzle::Git
+  class File
+    attr_reader :status_line, :index_status, :work_tree_status, :path
+
+    def initialize(params)
+      @status_line = params[:status_line]
+      @path = params[:path]
+      @index_status = map params[:status][0]
+      @work_tree_status = map params[:status][1]
+    end
+
+    def inspect
+      "Path: #{path}: work tree #{@work_tree_status}, index #{@index_status}"
+    end
+
+    private
+    def map(status_code)
+      case status_code
+        when '?'
+          :untracked
+        when 'M'
+          :modified
+        when 'A'
+          :added
+        when 'D'
+          :deleted
+        when 'C'
+          :copied
+        when 'R'
+          :renamed
+        when 'U'
+          :unmerged
+        when ' '
+          nil
+        else
+          raise "Unexpected file status code '#{status_code}' for file #{@path} (status line was: #{@status_line})"
+      end
+    end
+  end
+end

data/lib/git_shizzle/git/git.rb

@@ -0,0 +1,67 @@
+# -*- encoding: utf-8 -*-
+
+module GitShizzle::Git
+  class GitExecuteError < GitShizzle::Error;
+  end
+
+  class Git
+    def initialize(repo_location)
+      @repo_location = repo_location
+    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
+      end
+    end
+
+    def command(cmd, opts = [], params = { }, &block)
+      opts = [opts].flatten.map { |s| escape(s) }.join(' ')
+
+      git_cmd = "git #{cmd} #{opts}"
+      echo git_cmd, params.fetch(:verbose, true)
+
+      out = run_command(git_cmd, params, &block)
+
+      if $?.exitstatus > 0
+        if $?.exitstatus == 1 && out == ''
+          return ''
+        end
+        raise GitShizzle::Git::GitExecuteError.new(git_cmd + ':' + out.to_s)
+      end
+      out
+    end
+
+    private
+    def escape(s)
+      escaped = s.to_s.gsub('\'', '\'\\\'\'')
+      %Q{"#{escaped}"}
+    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
+        else
+          system git_cmd
+        end
+      end
+    end
+
+    def echo(msg, verbose)
+      puts(msg) if verbose && defined?(Thor)
+    end
+  end
+end

data/lib/git_shizzle/git.rb

@@ -0,0 +1,8 @@
+# -*- encoding: utf-8 -*-
+
+Dir["#{File.dirname(__FILE__)}/git/*.rb"].each do |path|
+  require "git_shizzle/git/#{File.basename(path, '.rb')}"
+end
+
+module GitShizzle::Git
+end

data/lib/git_shizzle/index_specifications/base.rb

@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+
+module GitShizzle::IndexSpecifications
+  class Base
+    def include?(index)
+      false
+    end
+
+    def register_match(index)
+      matches << index
+    end
+
+    def matches
+      @matches ||= []
+    end
+
+    def unmatched
+    end
+
+    private
+    def assert_numeric(index, *spec)
+      spec << index if spec.empty?
+
+      all_numeric = spec.all? { |s|
+        s.is_a? Numeric or /\d+/.match(s)
+      }
+
+      raise IndexParserError.new(index) unless all_numeric
+    end
+  end
+end